<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185431] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185431">185431</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2015-06-10 14:53:42 -0700 (Wed, 10 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorh">trunk/Source/WebCore/platform/ScrollAnimator.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollableAreacpp">trunk/Source/WebCore/platform/ScrollableArea.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmacNSScrollerImpDetailsh">trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollAnimatorMach">trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollAnimatorMacmm">trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185430 => 185431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-10 21:30:23 UTC (rev 185430)
+++ trunk/Source/WebCore/ChangeLog 2015-06-10 21:53:42 UTC (rev 185431)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+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):
+
</ins><span class="cx"> 2015-06-10 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> MediaRemoteControls should be marked JSGenerateToJSObject.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.h (185430 => 185431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.h 2015-06-10 21:30:23 UTC (rev 185430)
+++ trunk/Source/WebCore/platform/ScrollAnimator.h 2015-06-10 21:53:42 UTC (rev 185431)
</span><span class="lines">@@ -110,6 +110,8 @@
</span><span class="cx"> virtual void didAddHorizontalScrollbar(Scrollbar*) { }
</span><span class="cx"> virtual void willRemoveHorizontalScrollbar(Scrollbar*) { }
</span><span class="cx">
</span><ins>+ virtual void invalidateScrollbarPartLayers(Scrollbar*) { }
+
</ins><span class="cx"> virtual void verticalScrollbarLayerDidChange() { }
</span><span class="cx"> virtual void horizontalScrollbarLayerDidChange() { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollableAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollableArea.cpp (185430 => 185431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollableArea.cpp 2015-06-10 21:30:23 UTC (rev 185430)
+++ trunk/Source/WebCore/platform/ScrollableArea.cpp 2015-06-10 21:53:42 UTC (rev 185431)
</span><span class="lines">@@ -341,11 +341,15 @@
</span><span class="cx"> if (horizontalScrollbar()) {
</span><span class="cx"> ScrollbarTheme::theme()->updateScrollbarOverlayStyle(horizontalScrollbar());
</span><span class="cx"> horizontalScrollbar()->invalidate();
</span><ins>+ if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
+ scrollAnimator->invalidateScrollbarPartLayers(horizontalScrollbar());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (verticalScrollbar()) {
</span><span class="cx"> ScrollbarTheme::theme()->updateScrollbarOverlayStyle(verticalScrollbar());
</span><span class="cx"> verticalScrollbar()->invalidate();
</span><ins>+ if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
+ scrollAnimator->invalidateScrollbarPartLayers(verticalScrollbar());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacNSScrollerImpDetailsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h (185430 => 185431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h 2015-06-10 21:30:23 UTC (rev 185430)
+++ trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h 2015-06-10 21:53:42 UTC (rev 185431)
</span><span class="lines">@@ -62,6 +62,9 @@
</span><span class="cx"> - (void)drawKnob;
</span><span class="cx"> - (void)mouseEnteredScroller;
</span><span class="cx"> - (void)mouseExitedScroller;
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+- (void)setNeedsDisplay:(BOOL)flag;
+#endif
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface NSObject (ScrollbarPainterController)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h (185430 => 185431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h 2015-06-10 21:30:23 UTC (rev 185430)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h 2015-06-10 21:53:42 UTC (rev 185431)
</span><span class="lines">@@ -115,6 +115,8 @@
</span><span class="cx"> virtual void didAddHorizontalScrollbar(Scrollbar*);
</span><span class="cx"> virtual void willRemoveHorizontalScrollbar(Scrollbar*);
</span><span class="cx">
</span><ins>+ void invalidateScrollbarPartLayers(Scrollbar*) override;
+
</ins><span class="cx"> virtual void verticalScrollbarLayerDidChange();
</span><span class="cx"> virtual void horizontalScrollbarLayerDidChange();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (185430 => 185431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-06-10 21:30:23 UTC (rev 185430)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-06-10 21:53:42 UTC (rev 185431)
</span><span class="lines">@@ -1011,6 +1011,18 @@
</span><span class="cx"> [m_scrollbarPainterController setHorizontalScrollerImp:nil];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#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
+
</ins><span class="cx"> void ScrollAnimatorMac::verticalScrollbarLayerDidChange()
</span><span class="cx"> {
</span><span class="cx"> GraphicsLayer* layer = m_scrollableArea.layerForVerticalScrollbar();
</span></span></pre>
</div>
</div>
</body>
</html>