<!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>[191735] 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/191735">191735</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2015-10-29 11:07:46 -0700 (Thu, 29 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Overlay scrollbars disappear during manual drag-scroll
https://bugs.webkit.org/show_bug.cgi?id=150646
-and corresponding-
rdar://problem/23145734
Reviewed by Tim Horton.
New ScrollAnimator function so that we can tell the ScrollbarPainter whether
or not the mouse is tracking the scrollbar.
* platform/ScrollAnimator.h:
(WebCore::ScrollAnimator::ScrollAnimator::mouseIsDownInScrollbar):
* platform/ScrollableArea.cpp:
(WebCore::ScrollableArea::mouseIsDownInScrollbar):
* platform/ScrollableArea.h:
Call into the new ScrollAnimator function of mouseDown and mouseUp.
* platform/Scrollbar.cpp:
(WebCore::Scrollbar::mouseUp):
(WebCore::Scrollbar::mouseDown):
Add setTracking to the ScrollbarPainter.
* platform/mac/NSScrollerImpDetails.h:
Implement mouseIsDownInScrollbar to call setTracking appropriately and to set
begin/endScrollGesture since drag scrolling does not normally trigger that
state change.
* platform/mac/ScrollAnimatorMac.h:
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::mouseIsDownInScrollbar):</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="#trunkSourceWebCoreplatformScrollableAreah">trunk/Source/WebCore/platform/ScrollableArea.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollbarcpp">trunk/Source/WebCore/platform/Scrollbar.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 (191734 => 191735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-29 17:58:38 UTC (rev 191734)
+++ trunk/Source/WebCore/ChangeLog 2015-10-29 18:07:46 UTC (rev 191735)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-10-29 Beth Dakin <bdakin@apple.com>
+
+ Overlay scrollbars disappear during manual drag-scroll
+ https://bugs.webkit.org/show_bug.cgi?id=150646
+ -and corresponding-
+ rdar://problem/23145734
+
+ Reviewed by Tim Horton.
+
+ New ScrollAnimator function so that we can tell the ScrollbarPainter whether
+ or not the mouse is tracking the scrollbar.
+ * platform/ScrollAnimator.h:
+ (WebCore::ScrollAnimator::ScrollAnimator::mouseIsDownInScrollbar):
+ * platform/ScrollableArea.cpp:
+ (WebCore::ScrollableArea::mouseIsDownInScrollbar):
+ * platform/ScrollableArea.h:
+
+ Call into the new ScrollAnimator function of mouseDown and mouseUp.
+ * platform/Scrollbar.cpp:
+ (WebCore::Scrollbar::mouseUp):
+ (WebCore::Scrollbar::mouseDown):
+
+ Add setTracking to the ScrollbarPainter.
+ * platform/mac/NSScrollerImpDetails.h:
+
+ Implement mouseIsDownInScrollbar to call setTracking appropriately and to set
+ begin/endScrollGesture since drag scrolling does not normally trigger that
+ state change.
+ * platform/mac/ScrollAnimatorMac.h:
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::ScrollAnimatorMac::mouseIsDownInScrollbar):
+
</ins><span class="cx"> 2015-10-29 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> MediaPlayer::getSupportedTypes only returns types from the last engine registered
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.h (191734 => 191735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.h 2015-10-29 17:58:38 UTC (rev 191734)
+++ trunk/Source/WebCore/platform/ScrollAnimator.h 2015-10-29 18:07:46 UTC (rev 191735)
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx"> virtual void mouseMovedInContentArea() const { }
</span><span class="cx"> virtual void mouseEnteredScrollbar(Scrollbar*) const { }
</span><span class="cx"> virtual void mouseExitedScrollbar(Scrollbar*) const { }
</span><ins>+ virtual void mouseIsDownInScrollbar(Scrollbar*, bool) const { }
</ins><span class="cx"> virtual void willStartLiveResize() { }
</span><span class="cx"> virtual void contentsResized() const { }
</span><span class="cx"> virtual void willEndLiveResize() { }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollableAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollableArea.cpp (191734 => 191735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollableArea.cpp 2015-10-29 17:58:38 UTC (rev 191734)
+++ trunk/Source/WebCore/platform/ScrollableArea.cpp 2015-10-29 18:07:46 UTC (rev 191735)
</span><span class="lines">@@ -272,6 +272,11 @@
</span><span class="cx"> scrollAnimator().mouseExitedScrollbar(scrollbar);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ScrollableArea::mouseIsDownInScrollbar(Scrollbar* scrollbar, bool mouseIsDown) const
+{
+ scrollAnimator().mouseIsDownInScrollbar(scrollbar, mouseIsDown);
+}
+
</ins><span class="cx"> void ScrollableArea::contentAreaDidShow() const
</span><span class="cx"> {
</span><span class="cx"> if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollableAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollableArea.h (191734 => 191735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollableArea.h 2015-10-29 17:58:38 UTC (rev 191734)
+++ trunk/Source/WebCore/platform/ScrollableArea.h 2015-10-29 18:07:46 UTC (rev 191735)
</span><span class="lines">@@ -108,6 +108,7 @@
</span><span class="cx"> WEBCORE_EXPORT void mouseMovedInContentArea() const;
</span><span class="cx"> WEBCORE_EXPORT void mouseEnteredScrollbar(Scrollbar*) const;
</span><span class="cx"> void mouseExitedScrollbar(Scrollbar*) const;
</span><ins>+ void mouseIsDownInScrollbar(Scrollbar*, bool) const;
</ins><span class="cx"> void contentAreaDidShow() const;
</span><span class="cx"> void contentAreaDidHide() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Scrollbar.cpp (191734 => 191735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Scrollbar.cpp 2015-10-29 17:58:38 UTC (rev 191734)
+++ trunk/Source/WebCore/platform/Scrollbar.cpp 2015-10-29 18:07:46 UTC (rev 191735)
</span><span class="lines">@@ -368,6 +368,8 @@
</span><span class="cx"> m_draggingDocument = false;
</span><span class="cx"> stopTimerIfNeeded();
</span><span class="cx">
</span><ins>+ m_scrollableArea.mouseIsDownInScrollbar(this, false);
+
</ins><span class="cx"> // m_hoveredPart won't be updated until the next mouseMoved or mouseDown, so we have to hit test
</span><span class="cx"> // to really know if the mouse has exited the scrollbar on a mouseUp.
</span><span class="cx"> ScrollbarPart part = theme().hitTest(*this, mouseEvent.position());
</span><span class="lines">@@ -383,6 +385,7 @@
</span><span class="cx"> if (evt.button() == RightButton)
</span><span class="cx"> return true; // FIXME: Handled as context menu by Qt right now. Should just avoid even calling this method on a right click though.
</span><span class="cx">
</span><ins>+ m_scrollableArea.mouseIsDownInScrollbar(this, true);
</ins><span class="cx"> setPressedPart(theme().hitTest(*this, evt.position()));
</span><span class="cx"> int pressedPos = (orientation() == HorizontalScrollbar ? convertFromContainingWindow(evt.position()).x() : convertFromContainingWindow(evt.position()).y());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacNSScrollerImpDetailsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h (191734 => 191735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h 2015-10-29 17:58:38 UTC (rev 191734)
+++ trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h 2015-10-29 18:07:46 UTC (rev 191735)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> - (void)drawKnob;
</span><span class="cx"> - (void)mouseEnteredScroller;
</span><span class="cx"> - (void)mouseExitedScroller;
</span><ins>+- (void)setTracking:(BOOL)tracking;
</ins><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> - (void)setNeedsDisplay:(BOOL)flag;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h (191734 => 191735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h 2015-10-29 17:58:38 UTC (rev 191734)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h 2015-10-29 18:07:46 UTC (rev 191735)
</span><span class="lines">@@ -100,6 +100,7 @@
</span><span class="cx"> virtual void mouseMovedInContentArea() const override;
</span><span class="cx"> virtual void mouseEnteredScrollbar(Scrollbar*) const override;
</span><span class="cx"> virtual void mouseExitedScrollbar(Scrollbar*) const override;
</span><ins>+ virtual void mouseIsDownInScrollbar(Scrollbar*, bool) const override;
</ins><span class="cx"> virtual void willStartLiveResize() override;
</span><span class="cx"> virtual void contentsResized() const override;
</span><span class="cx"> virtual void willEndLiveResize() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (191734 => 191735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-10-29 17:58:38 UTC (rev 191734)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-10-29 18:07:46 UTC (rev 191735)
</span><span class="lines">@@ -853,6 +853,20 @@
</span><span class="cx"> [painter mouseExitedScroller];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ScrollAnimatorMac::mouseIsDownInScrollbar(Scrollbar* scrollbar, bool mouseIsDown) const
+{
+ if ([m_scrollbarPainterController overlayScrollerStateIsLocked])
+ return;
+
+ if (ScrollbarPainter painter = scrollbarPainterForScrollbar(*scrollbar)) {
+ [painter setTracking:mouseIsDown];
+ if (mouseIsDown)
+ [m_scrollbarPainterController beginScrollGesture];
+ else
+ [m_scrollbarPainterController endScrollGesture];
+ }
+}
+
</ins><span class="cx"> void ScrollAnimatorMac::willStartLiveResize()
</span><span class="cx"> {
</span><span class="cx"> if ([m_scrollbarPainterController overlayScrollerStateIsLocked])
</span></span></pre>
</div>
</div>
</body>
</html>