Changeset 185431 in webkit

Timestamp:

Jun 10, 2015, 2:53:42 PM (11 years ago)

Author:

Beth Dakin

Message:

Overriding the overlay scrollbar style on WKView doesn't take effect immediately
​https://bugs.webkit.org/show_bug.cgi?id=145855
-and corresponding-
rdar://problem/20948706

Reviewed by Simon Fraser.

Since we opt into layer-per-part scrollbars in order to move the knob on the
secondary thread, AppKit is creating its own layers for the knob and track. To
invalidate them, we need to call into the ScrollbarPainter’s setNeedsDisplay.

New virtual function on ScrollAnimator to call into ScrollbarPainter’s
setNeedsDispay.

• platform/ScrollAnimator.h:

Call the new function when setting the overlay style.

• platform/ScrollableArea.cpp:

(WebCore::ScrollableArea::setScrollbarOverlayStyle):

Add setNeedsDisplay to the list of ScrollbarPainter methods.

• platform/mac/NSScrollerImpDetails.h:

Implement invalidateScrollbarPartLayers.

• platform/mac/ScrollAnimatorMac.h:
• platform/mac/ScrollAnimatorMac.mm:

(WebCore::ScrollAnimatorMac::invalidateScrollbarPartLayers):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ScrollAnimator.h (modified) (1 diff)
• platform/ScrollableArea.cpp (modified) (2 diffs)
• platform/mac/NSScrollerImpDetails.h (modified) (1 diff)
• platform/mac/ScrollAnimatorMac.h (modified) (1 diff)
• platform/mac/ScrollAnimatorMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-10  Beth Dakin  <bdakin@apple.com>
+
+        Overriding the overlay scrollbar style on WKView doesn't take effect immediately
+        https://bugs.webkit.org/show_bug.cgi?id=145855
+        -and corresponding-
+        rdar://problem/20948706
+
+        Reviewed by Simon Fraser.
+
+        Since we opt into layer-per-part scrollbars in order to move the knob on the 
+        secondary thread, AppKit is creating its own layers for the knob and track. To 
+        invalidate them, we need to call into the ScrollbarPainter’s setNeedsDisplay.
+
+        New virtual function on ScrollAnimator to call into ScrollbarPainter’s 
+        setNeedsDispay.
+        * platform/ScrollAnimator.h:
+
+        Call the new function when setting the overlay style.
+        * platform/ScrollableArea.cpp:
+        (WebCore::ScrollableArea::setScrollbarOverlayStyle):
+
+        Add setNeedsDisplay to the list of ScrollbarPainter methods.
+        * platform/mac/NSScrollerImpDetails.h:
+
+        Implement invalidateScrollbarPartLayers.
+        * platform/mac/ScrollAnimatorMac.h:
+        * platform/mac/ScrollAnimatorMac.mm:
+        (WebCore::ScrollAnimatorMac::invalidateScrollbarPartLayers):
+
 2015-06-10  Matt Rajca  <mrajca@apple.com>
 

trunk/Source/WebCore/platform/ScrollAnimator.h

@@ -111 +111 @@
     virtual void willRemoveHorizontalScrollbar(Scrollbar*) { }
 
+    virtual void invalidateScrollbarPartLayers(Scrollbar*) { }
+
     virtual void verticalScrollbarLayerDidChange() { }
     virtual void horizontalScrollbarLayerDidChange() { }

trunk/Source/WebCore/platform/ScrollableArea.cpp

@@ -342 +342 @@
         ScrollbarTheme::theme()->updateScrollbarOverlayStyle(horizontalScrollbar());
         horizontalScrollbar()->invalidate();
+        if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
+            scrollAnimator->invalidateScrollbarPartLayers(horizontalScrollbar());
     }
     
@@ -347 +349 @@
         ScrollbarTheme::theme()->updateScrollbarOverlayStyle(verticalScrollbar());
         verticalScrollbar()->invalidate();
+        if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
+            scrollAnimator->invalidateScrollbarPartLayers(verticalScrollbar());
     }
 }

trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h

@@ -63 +63 @@
 - (void)mouseEnteredScroller;
 - (void)mouseExitedScroller;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+- (void)setNeedsDisplay:(BOOL)flag;
+#endif
 @end
 

trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h

@@ -116 +116 @@
     virtual void willRemoveHorizontalScrollbar(Scrollbar*);
 
+    void invalidateScrollbarPartLayers(Scrollbar*) override;
+
     virtual void verticalScrollbarLayerDidChange();
     virtual void horizontalScrollbarLayerDidChange();

trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm

@@ -1012 +1012 @@
 }
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+void ScrollAnimatorMac::invalidateScrollbarPartLayers(Scrollbar* scrollbar)
+{
+    ScrollbarPainter painter = scrollbarPainterForScrollbar(scrollbar);
+    [painter setNeedsDisplay:YES];
+}
+#else
+void ScrollAnimatorMac::invalidateScrollbarPartLayers(Scrollbar*)
+{
+}
+#endif
+
 void ScrollAnimatorMac::verticalScrollbarLayerDidChange()
 {