Title: [104837] trunk/Source/WebCore
- Revision
- 104837
- Author
- [email protected]
- Date
- 2012-01-12 11:06:35 -0800 (Thu, 12 Jan 2012)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=76133
ScrollAnimatorMac::mouseEnteredScrollbar() and mouseExitedScrollbar() should
only do stuff for legacy scrollbars
-and corresponding-
<rdar://problem/10603290>
Reviewed by Sam Weinig.
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::mouseEnteredScrollbar):
(WebCore::ScrollAnimatorMac::mouseExitedScrollbar):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (104836 => 104837)
--- trunk/Source/WebCore/ChangeLog 2012-01-12 18:38:24 UTC (rev 104836)
+++ trunk/Source/WebCore/ChangeLog 2012-01-12 19:06:35 UTC (rev 104837)
@@ -1,3 +1,17 @@
+2012-01-12 Beth Dakin <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=76133
+ ScrollAnimatorMac::mouseEnteredScrollbar() and mouseExitedScrollbar() should
+ only do stuff for legacy scrollbars
+ -and corresponding-
+ <rdar://problem/10603290>
+
+ Reviewed by Sam Weinig.
+
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::ScrollAnimatorMac::mouseEnteredScrollbar):
+ (WebCore::ScrollAnimatorMac::mouseExitedScrollbar):
+
2012-01-12 Dan Bernstein <[email protected]>
When generating derived sources, use the same compiler that is used to compile WebCore.
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (104836 => 104837)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2012-01-12 18:38:24 UTC (rev 104836)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2012-01-12 19:06:35 UTC (rev 104837)
@@ -742,8 +742,13 @@
void ScrollAnimatorMac::mouseEnteredScrollbar(Scrollbar* scrollbar) const
{
+ // At this time, only legacy scrollbars needs to send notifications here.
+ if (recommendedScrollerStyle() != NSScrollerStyleLegacy)
+ return;
+
if (!scrollableArea()->isOnActivePage())
return;
+
if (isScrollbarOverlayAPIAvailable()) {
if (!supportsUIStateTransitionProgress())
return;
@@ -754,8 +759,13 @@
void ScrollAnimatorMac::mouseExitedScrollbar(Scrollbar* scrollbar) const
{
+ // At this time, only legacy scrollbars needs to send notifications here.
+ if (recommendedScrollerStyle() != NSScrollerStyleLegacy)
+ return;
+
if (!scrollableArea()->isOnActivePage())
return;
+
if (isScrollbarOverlayAPIAvailable()) {
if (!supportsUIStateTransitionProgress())
return;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
