Diff
Modified: trunk/Source/WebCore/ChangeLog (96548 => 96549)
--- trunk/Source/WebCore/ChangeLog 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebCore/ChangeLog 2011-10-03 22:31:24 UTC (rev 96549)
@@ -1,3 +1,22 @@
+2011-10-03 Anders Carlsson <[email protected]>
+
+ Remove custom scrollbar painting hooks
+ https://bugs.webkit.org/show_bug.cgi?id=69163
+
+ Reviewed by Alexey Proskuryakov.
+
+ The custom scrollbar and scroll corner painting hooks aren't used by anyone
+ so go ahead and remove them. This removes the setter/getter and ChromeClient functions.
+
+ * page/Chrome.cpp:
+ * page/ChromeClient.h:
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ * page/Settings.h:
+ * platform/ScrollbarThemeComposite.cpp:
+ (WebCore::ScrollbarThemeComposite::paint):
+ (WebCore::ScrollbarThemeComposite::paintScrollCorner):
+
2011-09-22 Darin Adler <[email protected]>
Rename many obviously-correct call sites in WebCore using releaseRef to use it by its new name leakRef
Modified: trunk/Source/WebCore/WebCore.exp.in (96548 => 96549)
--- trunk/Source/WebCore/WebCore.exp.in 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebCore/WebCore.exp.in 2011-10-03 22:31:24 UTC (rev 96549)
@@ -223,9 +223,7 @@
__ZN7WebCore11startOfWordERKNS_15VisiblePositionENS_9EWordSideE
__ZN7WebCore11toUserSpaceERK7_NSRectP8NSWindow
__ZN7WebCore11writeToFileEiPKci
-__ZN7WebCore12ChromeClient20paintCustomScrollbarEPNS_15GraphicsContextERKNS_9FloatRectENS_20ScrollbarControlSizeEjNS_13ScrollbarPartEbffj
__ZN7WebCore12ChromeClient23paintCustomOverhangAreaEPNS_15GraphicsContextERKNS_7IntRectES5_S5_
-__ZN7WebCore12ChromeClient23paintCustomScrollCornerEPNS_15GraphicsContextERKNS_9FloatRectE
__ZN7WebCore12EditingStyleD1Ev
__ZN7WebCore12EventHandler10mouseMovedEP7NSEvent
__ZN7WebCore12EventHandler10mouseMovedERKNS_18PlatformMouseEventE
Modified: trunk/Source/WebCore/page/Chrome.cpp (96548 => 96549)
--- trunk/Source/WebCore/page/Chrome.cpp 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebCore/page/Chrome.cpp 2011-10-03 22:31:24 UTC (rev 96549)
@@ -559,18 +559,6 @@
return String();
}
-bool ChromeClient::paintCustomScrollbar(GraphicsContext*, const FloatRect&, ScrollbarControlSize,
- ScrollbarControlState, ScrollbarPart, bool,
- float, float, ScrollbarControlPartMask)
-{
- return false;
-}
-
-bool ChromeClient::paintCustomScrollCorner(GraphicsContext*, const FloatRect&)
-{
- return false;
-}
-
bool ChromeClient::paintCustomOverhangArea(GraphicsContext*, const IntRect&, const IntRect&, const IntRect&)
{
return false;
Modified: trunk/Source/WebCore/page/ChromeClient.h (96548 => 96549)
--- trunk/Source/WebCore/page/ChromeClient.h 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebCore/page/ChromeClient.h 2011-10-03 22:31:24 UTC (rev 96549)
@@ -217,11 +217,6 @@
virtual bool shouldReplaceWithGeneratedFileForUpload(const String& path, String& generatedFilename);
virtual String generateReplacementFile(const String& path);
- virtual bool paintCustomScrollbar(GraphicsContext*, const FloatRect&, ScrollbarControlSize,
- ScrollbarControlState, ScrollbarPart pressedPart, bool vertical,
- float value, float proportion, ScrollbarControlPartMask);
- virtual bool paintCustomScrollCorner(GraphicsContext*, const FloatRect&);
-
virtual bool paintCustomOverhangArea(GraphicsContext*, const IntRect&, const IntRect&, const IntRect&);
// FIXME: Remove once all ports are using client-based geolocation. https://bugs.webkit.org/show_bug.cgi?id=40373
Modified: trunk/Source/WebCore/page/Settings.cpp (96548 => 96549)
--- trunk/Source/WebCore/page/Settings.cpp 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebCore/page/Settings.cpp 2011-10-03 22:31:24 UTC (rev 96549)
@@ -167,7 +167,6 @@
, m_localFileContentSniffingEnabled(false)
, m_inApplicationChromeMode(false)
, m_offlineWebApplicationCacheEnabled(false)
- , m_shouldPaintCustomScrollbars(false)
, m_enforceCSSMIMETypeInNoQuirksMode(true)
, m_usesEncodingDetector(false)
, m_allowScriptsToCloseWindows(false)
@@ -650,11 +649,6 @@
m_offlineWebApplicationCacheEnabled = enabled;
}
-void Settings::setShouldPaintCustomScrollbars(bool shouldPaintCustomScrollbars)
-{
- m_shouldPaintCustomScrollbars = shouldPaintCustomScrollbars;
-}
-
void Settings::setEnforceCSSMIMETypeInNoQuirksMode(bool enforceCSSMIMETypeInNoQuirksMode)
{
m_enforceCSSMIMETypeInNoQuirksMode = enforceCSSMIMETypeInNoQuirksMode;
Modified: trunk/Source/WebCore/page/Settings.h (96548 => 96549)
--- trunk/Source/WebCore/page/Settings.h 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebCore/page/Settings.h 2011-10-03 22:31:24 UTC (rev 96549)
@@ -278,9 +278,6 @@
void setOfflineWebApplicationCacheEnabled(bool);
bool offlineWebApplicationCacheEnabled() const { return m_offlineWebApplicationCacheEnabled; }
-
- void setShouldPaintCustomScrollbars(bool);
- bool shouldPaintCustomScrollbars() const { return m_shouldPaintCustomScrollbars; }
void setEnforceCSSMIMETypeInNoQuirksMode(bool);
bool enforceCSSMIMETypeInNoQuirksMode() { return m_enforceCSSMIMETypeInNoQuirksMode; }
@@ -550,7 +547,6 @@
bool m_localFileContentSniffingEnabled : 1;
bool m_inApplicationChromeMode : 1;
bool m_offlineWebApplicationCacheEnabled : 1;
- bool m_shouldPaintCustomScrollbars : 1;
bool m_enforceCSSMIMETypeInNoQuirksMode : 1;
bool m_usesEncodingDetector : 1;
bool m_allowScriptsToCloseWindows : 1;
Modified: trunk/Source/WebCore/platform/ScrollbarThemeComposite.cpp (96548 => 96549)
--- trunk/Source/WebCore/platform/ScrollbarThemeComposite.cpp 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebCore/platform/ScrollbarThemeComposite.cpp 2011-10-03 22:31:24 UTC (rev 96549)
@@ -41,18 +41,6 @@
namespace WebCore {
-static Page* pageForScrollView(ScrollView* view)
-{
- if (!view)
- return 0;
- if (!view->isFrameView())
- return 0;
- FrameView* frameView = static_cast<FrameView*>(view);
- if (!frameView->frame())
- return 0;
- return frameView->frame()->page();
-}
-
bool ScrollbarThemeComposite::paint(Scrollbar* scrollbar, GraphicsContext* graphicsContext, const IntRect& damageRect)
{
// Create the ScrollbarControlPartMask based on the damageRect
@@ -95,35 +83,6 @@
scrollMask |= ForwardTrackPart;
}
-#if PLATFORM(WIN)
- // FIXME: This API makes the assumption that the custom scrollbar's metrics will match
- // the theme's metrics. This is not a valid assumption. The ability for a client to paint
- // custom scrollbars should be removed once scrollbars can be styled via CSS.
- if (Page* page = pageForScrollView(scrollbar->parent())) {
- if (page->settings()->shouldPaintCustomScrollbars()) {
- float proportion = static_cast<float>(scrollbar->visibleSize()) / scrollbar->totalSize();
- float value = scrollbar->currentPos() / static_cast<float>(scrollbar->maximum());
- ScrollbarControlState s = 0;
- if (scrollbar->scrollableArea()->isActive())
- s |= ActiveScrollbarState;
- if (scrollbar->enabled())
- s |= EnabledScrollbarState;
- if (scrollbar->pressedPart() != NoPart)
- s |= PressedScrollbarState;
- if (page->chrome()->client()->paintCustomScrollbar(graphicsContext,
- scrollbar->frameRect(),
- scrollbar->controlSize(),
- s,
- scrollbar->pressedPart(),
- scrollbar->orientation() == VerticalScrollbar,
- value,
- proportion,
- scrollMask))
- return true;
- }
- }
-#endif
-
// Paint the scrollbar background (only used by custom CSS scrollbars).
paintScrollbarBackground(graphicsContext, scrollbar);
@@ -304,11 +263,8 @@
return (scrollbar->orientation() == HorizontalScrollbar) ? constrainedTrackRect.width() : constrainedTrackRect.height();
}
-void ScrollbarThemeComposite::paintScrollCorner(ScrollView* view, GraphicsContext* context, const IntRect& cornerRect)
+void ScrollbarThemeComposite::paintScrollCorner(ScrollView*, GraphicsContext* context, const IntRect& cornerRect)
{
- Page* page = pageForScrollView(view);
- if (page && page->settings()->shouldPaintCustomScrollbars() && page->chrome()->client()->paintCustomScrollCorner(context, cornerRect))
- return;
context->fillRect(cornerRect, Color::white, ColorSpaceDeviceRGB);
}
Modified: trunk/Source/WebKit/chromium/ChangeLog (96548 => 96549)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-03 22:31:24 UTC (rev 96549)
@@ -1,3 +1,13 @@
+2011-10-03 Anders Carlsson <[email protected]>
+
+ Remove custom scrollbar painting hooks
+ https://bugs.webkit.org/show_bug.cgi?id=69163
+
+ Reviewed by Alexey Proskuryakov.
+
+ * src/WebSettingsImpl.cpp:
+ (WebKit::WebSettingsImpl::setShouldPaintCustomScrollbars):
+
2011-10-03 Elliot Poger <[email protected]>
webkit->chromium DEPS roll 103471->103694
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (96548 => 96549)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2011-10-03 22:31:24 UTC (rev 96549)
@@ -247,7 +247,7 @@
void WebSettingsImpl::setShouldPaintCustomScrollbars(bool enabled)
{
- m_settings->setShouldPaintCustomScrollbars(enabled);
+ // FIXME: This should be removed.
}
void WebSettingsImpl::setAllowUniversalAccessFromFileURLs(bool allow)
Modified: trunk/Source/WebKit/win/ChangeLog (96548 => 96549)
--- trunk/Source/WebKit/win/ChangeLog 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebKit/win/ChangeLog 2011-10-03 22:31:24 UTC (rev 96549)
@@ -1,3 +1,23 @@
+2011-10-03 Anders Carlsson <[email protected]>
+
+ Remove custom scrollbar painting hooks
+ https://bugs.webkit.org/show_bug.cgi?id=69163
+
+ Reviewed by Alexey Proskuryakov.
+
+ Remove now unused WebPreferences and ChromeClient overrides.
+
+ * Interfaces/IWebPreferences.idl:
+ * WebCoreSupport/WebChromeClient.cpp:
+ * WebCoreSupport/WebChromeClient.h:
+ * WebPreferenceKeysPrivate.h:
+ * WebPreferences.cpp:
+ (WebPreferences::unused3):
+ (WebPreferences::unused4):
+ * WebPreferences.h:
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged):
+
2011-09-23 Adam Roben <[email protected]>
Remove WebKitAPITest
Modified: trunk/Source/WebKit/win/Interfaces/IWebPreferences.idl (96548 => 96549)
--- trunk/Source/WebKit/win/Interfaces/IWebPreferences.idl 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebKit/win/Interfaces/IWebPreferences.idl 2011-10-03 22:31:24 UTC (rev 96549)
@@ -188,8 +188,8 @@
HRESULT cacheModel([out, retval] WebCacheModel* cacheModel);
HRESULT setCacheModel([in] WebCacheModel cacheModel);
- HRESULT setShouldPaintCustomScrollbars(BOOL shouldPaint);
- HRESULT shouldPaintCustomScrollbars(BOOL *shouldPaint);
+ HRESULT unused3();
+ HRESULT unused4();
HRESULT setZoomsTextOnly(BOOL zoomsTextOnly);
HRESULT zoomsTextOnly(BOOL *zoomsTextOnly);
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp (96548 => 96549)
--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2011-10-03 22:31:24 UTC (rev 96549)
@@ -643,89 +643,6 @@
history->addVisitedLinksToPageGroup(m_webView->page()->group());
}
-bool WebChromeClient::paintCustomScrollbar(GraphicsContext* context, const FloatRect& rect, ScrollbarControlSize size,
- ScrollbarControlState state, ScrollbarPart pressedPart, bool vertical,
- float value, float proportion, ScrollbarControlPartMask parts)
-{
- if (context->paintingDisabled())
- return false;
-
- COMPtr<IWebUIDelegate> delegate = uiDelegate();
- if (!delegate)
- return false;
-
- WebScrollbarControlPartMask webParts = WebNoScrollPart;
- if (parts & BackButtonStartPart) // FIXME: Hyatt, what about BackButtonEndPart?
- webParts |= WebBackButtonPart;
- if (parts & BackTrackPart)
- webParts |= WebBackTrackPart;
- if (parts & ThumbPart)
- webParts |= WebThumbPart;
- if (parts & ForwardTrackPart)
- webParts |= WebForwardTrackPart;
- if (parts & ForwardButtonStartPart) // FIXME: Hyatt, what about ForwardButtonEndPart?
- webParts |= WebForwardButtonPart;
-
- WebScrollbarControlPart webPressedPart = WebNoScrollPart;
- switch (pressedPart) {
- case BackButtonStartPart: // FIXME: Hyatt, what about BackButtonEndPart?
- webPressedPart = WebBackButtonPart;
- break;
- case BackTrackPart:
- webPressedPart = WebBackTrackPart;
- break;
- case ThumbPart:
- webPressedPart = WebThumbPart;
- break;
- case ForwardTrackPart:
- webPressedPart = WebForwardTrackPart;
- break;
- case ForwardButtonStartPart: // FIXME: Hyatt, what about ForwardButtonEndPart?
- webPressedPart = WebForwardButtonPart;
- break;
- default:
- break;
- }
-
- WebScrollBarControlSize webSize;
- switch (size) {
- case SmallScrollbar:
- webSize = WebSmallScrollbar;
- break;
- case RegularScrollbar:
- default:
- webSize = WebRegularScrollbar;
- }
- WebScrollbarControlState webState = 0;
- if (state & ActiveScrollbarState)
- webState |= WebActiveScrollbarState;
- if (state & EnabledScrollbarState)
- webState |= WebEnabledScrollbarState;
- if (state & PressedScrollbarState)
- webState |= WebPressedScrollbarState;
-
- RECT webRect = enclosingIntRect(rect);
- LocalWindowsContext windowsContext(context, webRect);
- HRESULT hr = delegate->paintCustomScrollbar(m_webView, windowsContext.hdc(), webRect, webSize, webState, webPressedPart,
- vertical, value, proportion, webParts);
- return SUCCEEDED(hr);
-}
-
-bool WebChromeClient::paintCustomScrollCorner(GraphicsContext* context, const FloatRect& rect)
-{
- if (context->paintingDisabled())
- return false;
-
- COMPtr<IWebUIDelegate> delegate = uiDelegate();
- if (!delegate)
- return false;
-
- RECT webRect = enclosingIntRect(rect);
- LocalWindowsContext windowsContext(context, webRect);
- HRESULT hr = delegate->paintCustomScrollCorner(m_webView, windowsContext.hdc(), webRect);
- return SUCCEEDED(hr);
-}
-
void WebChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser> prpFileChooser)
{
RefPtr<FileChooser> fileChooser = prpFileChooser;
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h (96548 => 96549)
--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2011-10-03 22:31:24 UTC (rev 96549)
@@ -126,11 +126,6 @@
virtual void populateVisitedLinks();
- virtual bool paintCustomScrollbar(WebCore::GraphicsContext*, const WebCore::FloatRect&, WebCore::ScrollbarControlSize,
- WebCore::ScrollbarControlState, WebCore::ScrollbarPart pressedPart, bool vertical,
- float value, float proportion, WebCore::ScrollbarControlPartMask);
- virtual bool paintCustomScrollCorner(WebCore::GraphicsContext*, const WebCore::FloatRect&);
-
virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
virtual void loadIconForFiles(const Vector<WTF::String>&, WebCore::FileIconLoader*);
Modified: trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h (96548 => 96549)
--- trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h 2011-10-03 22:31:24 UTC (rev 96549)
@@ -125,8 +125,6 @@
#define WebKitAuthorAndUserStylesEnabledPreferenceKey "WebKitAuthorAndUserStylesEnabled"
-#define WebKitPaintCustomScrollbarsPreferenceKey "WebKitPaintCustomScrollbars"
-
#define WebKitPaintNativeControlsPreferenceKey "WebKitPaintNativeControls"
#define WebKitZoomsTextOnlyPreferenceKey "WebKitZoomsTextOnly"
Modified: trunk/Source/WebKit/win/WebPreferences.cpp (96548 => 96549)
--- trunk/Source/WebKit/win/WebPreferences.cpp 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebKit/win/WebPreferences.cpp 2011-10-03 22:31:24 UTC (rev 96549)
@@ -1318,16 +1318,16 @@
return S_OK;
}
-HRESULT WebPreferences::setShouldPaintCustomScrollbars(BOOL shouldPaint)
+HRESULT WebPreferences::unused3()
{
- setBoolValue(CFSTR(WebKitPaintCustomScrollbarsPreferenceKey), shouldPaint);
- return S_OK;
+ ASSERT_NOT_REACHED();
+ return E_FAIL;
}
-HRESULT WebPreferences::shouldPaintCustomScrollbars(BOOL* shouldPaint)
+HRESULT WebPreferences::unused4()
{
- *shouldPaint = boolValueForKey(CFSTR(WebKitPaintCustomScrollbarsPreferenceKey));
- return S_OK;
+ ASSERT_NOT_REACHED();
+ return E_FAIL;
}
HRESULT WebPreferences::shouldPaintNativeControls(BOOL* shouldPaint)
Modified: trunk/Source/WebKit/win/WebPreferences.h (96548 => 96549)
--- trunk/Source/WebKit/win/WebPreferences.h 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebKit/win/WebPreferences.h 2011-10-03 22:31:24 UTC (rev 96549)
@@ -286,12 +286,9 @@
virtual HRESULT STDMETHODCALLTYPE setCacheModel(
/* [in] */ WebCacheModel cacheModel);
- virtual HRESULT STDMETHODCALLTYPE setShouldPaintCustomScrollbars(
- /* [in] */ BOOL shouldPaint);
+ virtual HRESULT STDMETHODCALLTYPE unused3();
+ virtual HRESULT STDMETHODCALLTYPE unused4();
- virtual HRESULT STDMETHODCALLTYPE shouldPaintCustomScrollbars(
- /* [retval][out] */ BOOL *shouldPaint);
-
virtual HRESULT STDMETHODCALLTYPE setAVFoundationEnabled(
/* [in] */ BOOL);
Modified: trunk/Source/WebKit/win/WebView.cpp (96548 => 96549)
--- trunk/Source/WebKit/win/WebView.cpp 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebKit/win/WebView.cpp 2011-10-03 22:31:24 UTC (rev 96549)
@@ -4705,11 +4705,6 @@
return hr;
settings->setDOMPasteAllowed(!!enabled);
- hr = preferences->shouldPaintCustomScrollbars(&enabled);
- if (FAILED(hr))
- return hr;
- settings->setShouldPaintCustomScrollbars(!!enabled);
-
hr = preferences->zoomsTextOnly(&enabled);
if (FAILED(hr))
return hr;
Modified: trunk/Source/WebKit2/ChangeLog (96548 => 96549)
--- trunk/Source/WebKit2/ChangeLog 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-03 22:31:24 UTC (rev 96549)
@@ -1,3 +1,15 @@
+2011-10-03 Anders Carlsson <[email protected]>
+
+ Remove custom scrollbar painting hooks
+ https://bugs.webkit.org/show_bug.cgi?id=69163
+
+ Remove overridden ChromeClient member functions.
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+
2011-10-03 Jer Noble <[email protected]>
Unreviewed, rolling out r96526.
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (96548 => 96549)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2011-10-03 22:31:24 UTC (rev 96549)
@@ -587,20 +587,6 @@
return m_page->injectedBundleUIClient().generateFileForUpload(m_page, path);
}
-bool WebChromeClient::paintCustomScrollbar(GraphicsContext*, const FloatRect&, ScrollbarControlSize,
- ScrollbarControlState, ScrollbarPart pressedPart, bool vertical,
- float value, float proportion, ScrollbarControlPartMask)
-{
- notImplemented();
- return false;
-}
-
-bool WebChromeClient::paintCustomScrollCorner(GraphicsContext*, const FloatRect&)
-{
- notImplemented();
- return false;
-}
-
bool WebChromeClient::paintCustomOverhangArea(GraphicsContext* context, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect)
{
if (!m_page->injectedBundleUIClient().shouldPaintCustomOverhangArea())
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (96548 => 96549)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2011-10-03 22:31:24 UTC (rev 96549)
@@ -151,11 +151,6 @@
virtual bool shouldReplaceWithGeneratedFileForUpload(const String& path, String& generatedFilename) OVERRIDE;
virtual String generateReplacementFile(const String& path) OVERRIDE;
- virtual bool paintCustomScrollbar(WebCore::GraphicsContext*, const WebCore::FloatRect&, WebCore::ScrollbarControlSize,
- WebCore::ScrollbarControlState, WebCore::ScrollbarPart pressedPart, bool vertical,
- float value, float proportion, WebCore::ScrollbarControlPartMask) OVERRIDE;
- virtual bool paintCustomScrollCorner(WebCore::GraphicsContext*, const WebCore::FloatRect&) OVERRIDE;
-
virtual bool paintCustomOverhangArea(WebCore::GraphicsContext*, const WebCore::IntRect&, const WebCore::IntRect&, const WebCore::IntRect&) OVERRIDE;
// This is an asynchronous call. The ChromeClient can display UI asking the user for permission
Modified: trunk/Tools/ChangeLog (96548 => 96549)
--- trunk/Tools/ChangeLog 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Tools/ChangeLog 2011-10-03 22:31:24 UTC (rev 96549)
@@ -1,3 +1,14 @@
+2011-10-03 Anders Carlsson <[email protected]>
+
+ Remove custom scrollbar painting hooks
+ https://bugs.webkit.org/show_bug.cgi?id=69163
+
+ Reviewed by Alexey Proskuryakov.
+
+ * DumpRenderTree/chromium/WebPreferences.cpp:
+ (WebPreferences::applyTo):
+ No need to enable custom scrollbar painting.
+
2011-10-03 David Levin <[email protected]>
watchlist: Make watchlist run on a bot.
Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp (96548 => 96549)
--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2011-10-03 22:25:38 UTC (rev 96548)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2011-10-03 22:31:24 UTC (rev 96549)
@@ -170,7 +170,6 @@
settings->setHixie76WebSocketProtocolEnabled(hixie76WebSocketProtocolEnabled);
// Fixed values.
- settings->setShouldPaintCustomScrollbars(true);
settings->setTextDirectionSubmenuInclusionBehaviorNeverIncluded();
settings->setDownloadableBinaryFontsEnabled(true);
settings->setAllowScriptsToCloseWindows(false);
