Changeset 92248 in webkit

Timestamp:

Aug 2, 2011 5:02:01 PM (13 years ago)

Author:

zmo@google.com

Message:

Unreviewed, rolling out r92238.
​http://trac.webkit.org/changeset/92238
​https://bugs.webkit.org/show_bug.cgi?id=65555

fail fast/events/scrollbar-double-click.html on Mac

• platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.h:
• platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm:
• platform/chromium/ScrollbarThemeChromiumMac.h:
• platform/chromium/ScrollbarThemeChromiumMac.mm:

(WebCore::ScrollbarThemeChromiumMac::registerScrollbar):
(WebCore::ScrollbarThemeChromiumMac::setNewPainterForScrollbar):
(WebCore::toScrollbarPainterKnobStyle):
(WebCore::ScrollbarThemeChromiumMac::paint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.h (modified) (1 diff)
• platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (modified) (1 diff)
• platform/chromium/ScrollbarThemeChromiumMac.h (modified) (3 diffs)
• platform/chromium/ScrollbarThemeChromiumMac.mm (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-02  Zhenyao Mo  <zmo@google.com>
+
+        Unreviewed, rolling out r92238.
+        http://trac.webkit.org/changeset/92238
+        https://bugs.webkit.org/show_bug.cgi?id=65555
+
+        fail fast/events/scrollbar-double-click.html on Mac
+
+        * platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.h:
+        * platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm:
+        * platform/chromium/ScrollbarThemeChromiumMac.h:
+        * platform/chromium/ScrollbarThemeChromiumMac.mm:
+        (WebCore::ScrollbarThemeChromiumMac::registerScrollbar):
+        (WebCore::ScrollbarThemeChromiumMac::setNewPainterForScrollbar):
+        (WebCore::toScrollbarPainterKnobStyle):
+        (WebCore::ScrollbarThemeChromiumMac::paint):
+
 2011-08-02  Mark Pilgrim  <pilgrim@chromium.org>
 

trunk/Source/WebCore/platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.h

@@ -62 +62 @@
 int wkScrollbarMinimumThumbLength(WKScrollbarPainterRef);
 void wkScrollbarPainterSetDelegate(WKScrollbarPainterRef, id scrollbarPainterDelegate);
-void wkScrollbarPainterSetEnabled(WKScrollbarPainterRef, bool enabled);
 CGFloat wkScrollbarPainterTrackAlpha(WKScrollbarPainterRef);
 WKScrollbarPainterRef wkMakeScrollbarPainter(int controlSize, bool isHorizontal);

trunk/Source/WebCore/platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm

@@ -188 +188 @@
 }
 
-void wkScrollbarPainterSetEnabled(WKScrollbarPainterRef painter, bool enabled)
-{
-    [painter setEnabled:enabled];
-}
-
 CGFloat wkScrollbarPainterTrackAlpha(WKScrollbarPainterRef painter)
 {

trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.h

@@ -41 +41 @@
     virtual ~ScrollbarThemeChromiumMac();
 
-    virtual void updateEnabledState(Scrollbar*);
-
     virtual bool paint(Scrollbar*, GraphicsContext* context, const IntRect& damageRect);
 
@@ -49 +47 @@
     virtual bool supportsControlTints() const { return true; }
     virtual bool usesOverlayScrollbars() const;
-    virtual void updateScrollbarOverlayStyle(Scrollbar*);
 
     virtual double initialAutoscrollTimerDelay();
@@ -70 +67 @@
     virtual IntRect trackRect(Scrollbar*, bool painting = false);
 
-    virtual int maxOverlapBetweenPages() { return 40; }
-
     virtual int minimumThumbLength(Scrollbar*);
 

trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm

@@ -164 +164 @@
     WKScrollbarPainterRef scrollbarPainter = wkMakeScrollbarPainter(scrollbar->controlSize(), isHorizontal);
     scrollbarMap()->add(scrollbar, scrollbarPainter);
-    updateEnabledState(scrollbar);
-    updateScrollbarOverlayStyle(scrollbar);
 }
 
@@ -176 +174 @@
 {
     scrollbarMap()->set(scrollbar, newPainter);
-    updateEnabledState(scrollbar);
-    updateScrollbarOverlayStyle(scrollbar);
 }
 
@@ -223 +219 @@
     else
         return false;
-}
-
-static inline wkScrollerKnobStyle toScrollbarPainterKnobStyle(ScrollbarOverlayStyle style)
-{
-    switch (style) {
-    case ScrollbarOverlayStyleDark:
-        return wkScrollerKnobStyleDark;
-    case ScrollbarOverlayStyleLight:
-        return wkScrollerKnobStyleLight;
-    default:
-        return wkScrollerKnobStyleDefault;
-    }
-}
-
-void ScrollbarThemeChromiumMac::updateScrollbarOverlayStyle(Scrollbar* scrollbar)
-{
-    if (isScrollbarOverlayAPIAvailable()) {
-        wkSetScrollbarPainterKnobStyle(painterForScrollbar(scrollbar), toScrollbarPainterKnobStyle(scrollbar->scrollableArea()->scrollbarOverlayStyle()));
-    }
 }
 
@@ -448 +425 @@
 }
 
+static inline wkScrollerKnobStyle toScrollbarPainterKnobStyle(ScrollbarOverlayStyle style)
+{
+    switch (style) {
+    case ScrollbarOverlayStyleDark:
+        return wkScrollerKnobStyleDark;
+    case ScrollbarOverlayStyleLight:
+        return wkScrollerKnobStyleLight;
+    default:
+        return wkScrollerKnobStyleDefault;
+    }
+}
+
 static PlatformBridge::ThemePaintState scrollbarStateToThemeState(Scrollbar* scrollbar) {
     if (!scrollbar->enabled())
@@ -457 +446 @@
 
     return PlatformBridge::StateActive;
-}
-
-void ScrollbarThemeChromiumMac::updateEnabledState(Scrollbar* scrollbar)
-{
-    if (isScrollbarOverlayAPIAvailable()) {
-        wkScrollbarPainterSetEnabled(scrollbarMap()->get(scrollbar).get(), scrollbar->enabled());
-    }
 }
 
@@ -496 +478 @@
 #endif
 
+        wkSetScrollbarPainterKnobStyle(painterForScrollbar(scrollbar), toScrollbarPainterKnobStyle(scrollbar->scrollableArea()->scrollbarOverlayStyle()));
+
         GraphicsContextStateSaver stateSaver(*context);
         context->clip(damageRect);