Title: [123486] trunk/Source/WebCore
Revision
123486
Author
[email protected]
Date
2012-07-24 09:17:57 -0700 (Tue, 24 Jul 2012)

Log Message

<rdar://problem/11945102> REGRESSION (r109451): Overlay scrollbars always use the default style, regardless of background color
https://bugs.webkit.org/show_bug.cgi?id=92115

Reviewed by Mark Rowe.

* platform/Scrollbar.cpp:
(WebCore::Scrollbar::scrollbarOverlayStyle): Reversed an incorrect null check.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (123485 => 123486)


--- trunk/Source/WebCore/ChangeLog	2012-07-24 16:00:22 UTC (rev 123485)
+++ trunk/Source/WebCore/ChangeLog	2012-07-24 16:17:57 UTC (rev 123486)
@@ -1,3 +1,13 @@
+2012-07-24  Dan Bernstein  <[email protected]>
+
+        <rdar://problem/11945102> REGRESSION (r109451): Overlay scrollbars always use the default style, regardless of background color
+        https://bugs.webkit.org/show_bug.cgi?id=92115
+
+        Reviewed by Mark Rowe.
+
+        * platform/Scrollbar.cpp:
+        (WebCore::Scrollbar::scrollbarOverlayStyle): Reversed an incorrect null check.
+
 2012-07-24  Andrew Wilson  <[email protected]>
 
         Another prospective build fix for Chromium. Unreviewed.

Modified: trunk/Source/WebCore/platform/Scrollbar.cpp (123485 => 123486)


--- trunk/Source/WebCore/platform/Scrollbar.cpp	2012-07-24 16:00:22 UTC (rev 123485)
+++ trunk/Source/WebCore/platform/Scrollbar.cpp	2012-07-24 16:17:57 UTC (rev 123486)
@@ -114,7 +114,7 @@
 
 ScrollbarOverlayStyle Scrollbar::scrollbarOverlayStyle() const
 {
-    return m_scrollableArea ? ScrollbarOverlayStyleDefault : m_scrollableArea->scrollbarOverlayStyle();
+    return m_scrollableArea ? m_scrollableArea->scrollbarOverlayStyle() : ScrollbarOverlayStyleDefault;
 }
 
 void Scrollbar::getTickmarks(Vector<IntRect>& tickmarks) const
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to