<!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>[160742] trunk/Source</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/160742">160742</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2013-12-17 18:00:45 -0800 (Tue, 17 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename "canRubberBands" to "canRubberBand"
https://bugs.webkit.org/show_bug.cgi?id=125897
Reviewed by Anders Carlsson.
Rename "canRubberBands" to "canRubberBand" in various places.
Source/WebCore:
* page/scrolling/ScrollingTree.cpp:
(WebCore::ScrollingTree::setCanRubberBandState):
* page/scrolling/ScrollingTree.h:
Source/WebKit2:
* WebProcess/WebPage/EventDispatcher.cpp:
(WebKit::EventDispatcher::wheelEvent):
* WebProcess/WebPage/EventDispatcher.h:
* WebProcess/WebPage/EventDispatcher.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreecpp">trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeh">trunk/Source/WebCore/page/scrolling/ScrollingTree.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageEventDispatchercpp">trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageEventDispatcherh">trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageEventDispatchermessagesin">trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160741 => 160742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-18 01:28:02 UTC (rev 160741)
+++ trunk/Source/WebCore/ChangeLog 2013-12-18 02:00:45 UTC (rev 160742)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-12-17 Simon Fraser <simon.fraser@apple.com>
+
+ Rename "canRubberBands" to "canRubberBand"
+ https://bugs.webkit.org/show_bug.cgi?id=125897
+
+ Reviewed by Anders Carlsson.
+
+ Rename "canRubberBands" to "canRubberBand" in various places.
+
+ * page/scrolling/ScrollingTree.cpp:
+ (WebCore::ScrollingTree::setCanRubberBandState):
+ * page/scrolling/ScrollingTree.h:
+
</ins><span class="cx"> 2013-12-17 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [MSE] Update duration after appending samples, per spec.
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (160741 => 160742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2013-12-18 01:28:02 UTC (rev 160741)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2013-12-18 02:00:45 UTC (rev 160742)
</span><span class="lines">@@ -278,14 +278,14 @@
</span><span class="cx"> m_mainFrameIsRubberBanding = isRubberBanding;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTree::setCanRubberBandState(bool canRubberBandsAtLeft, bool canRubberBandsAtRight, bool canRubberBandsAtTop, bool canRubberBandsAtBottom)
</del><ins>+void ScrollingTree::setCanRubberBandState(bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom)
</ins><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_swipeStateMutex);
</span><span class="cx">
</span><del>- m_rubberBandsAtLeft = canRubberBandsAtLeft;
- m_rubberBandsAtRight = canRubberBandsAtRight;
- m_rubberBandsAtTop = canRubberBandsAtTop;
- m_rubberBandsAtBottom = canRubberBandsAtBottom;
</del><ins>+ m_rubberBandsAtLeft = canRubberBandAtLeft;
+ m_rubberBandsAtRight = canRubberBandAtRight;
+ m_rubberBandsAtTop = canRubberBandAtTop;
+ m_rubberBandsAtBottom = canRubberBandAtBottom;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ScrollingTree::rubberBandsAtLeft()
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (160741 => 160742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2013-12-18 01:28:02 UTC (rev 160741)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2013-12-18 02:00:45 UTC (rev 160742)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Can be called from any thread. Will update what edges allow rubber-banding.
</span><del>- void setCanRubberBandState(bool canRubberBandsAtLeft, bool canRubberBandsAtRight, bool canRubberBandsAtTop, bool canRubberBandsAtBottom);
</del><ins>+ void setCanRubberBandState(bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom);
</ins><span class="cx">
</span><span class="cx"> bool rubberBandsAtLeft();
</span><span class="cx"> bool rubberBandsAtRight();
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160741 => 160742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-18 01:28:02 UTC (rev 160741)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-18 02:00:45 UTC (rev 160742)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-12-17 Simon Fraser <simon.fraser@apple.com>
+
+ Rename "canRubberBands" to "canRubberBand"
+ https://bugs.webkit.org/show_bug.cgi?id=125897
+
+ Reviewed by Anders Carlsson.
+
+ Rename "canRubberBands" to "canRubberBand" in various places.
+
+ * WebProcess/WebPage/EventDispatcher.cpp:
+ (WebKit::EventDispatcher::wheelEvent):
+ * WebProcess/WebPage/EventDispatcher.h:
+ * WebProcess/WebPage/EventDispatcher.messages.in:
+
</ins><span class="cx"> 2013-12-17 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit2 View Gestures: Fix the shadow layer restore-from-overpinched animation
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageEventDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp (160741 => 160742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2013-12-18 01:28:02 UTC (rev 160741)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2013-12-18 02:00:45 UTC (rev 160742)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> connection->addWorkQueueMessageReceiver(Messages::EventDispatcher::messageReceiverName(), m_queue.get(), this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EventDispatcher::wheelEvent(uint64_t pageID, const WebWheelEvent& wheelEvent, bool canRubberBandsAtLeft, bool canRubberBandsAtRight, bool canRubberBandsAtTop, bool canRubberBandsAtBottom)
</del><ins>+void EventDispatcher::wheelEvent(uint64_t pageID, const WebWheelEvent& wheelEvent, bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(THREADED_SCROLLING)
</span><span class="cx"> MutexLocker locker(m_scrollingTreesMutex);
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> // scrolling tree can be notified.
</span><span class="cx"> // We only need to do this at the beginning of the gesture.
</span><span class="cx"> if (platformWheelEvent.phase() == PlatformWheelEventPhaseBegan)
</span><del>- ScrollingThread::dispatch(bind(&ScrollingTree::setCanRubberBandState, scrollingTree, canRubberBandsAtLeft, canRubberBandsAtRight, canRubberBandsAtTop, canRubberBandsAtBottom));
</del><ins>+ ScrollingThread::dispatch(bind(&ScrollingTree::setCanRubberBandState, scrollingTree, canRubberBandAtLeft, canRubberBandAtRight, canRubberBandAtTop, canRubberBandAtBottom));
</ins><span class="cx">
</span><span class="cx"> ScrollingTree::EventResult result = scrollingTree->tryToHandleWheelEvent(platformWheelEvent);
</span><span class="cx"> if (result == ScrollingTree::DidHandleEvent || result == ScrollingTree::DidNotHandleEvent) {
</span><span class="lines">@@ -105,10 +105,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #else
</span><del>- UNUSED_PARAM(canRubberBandsAtLeft);
- UNUSED_PARAM(canRubberBandsAtRight);
- UNUSED_PARAM(canRubberBandsAtTop);
- UNUSED_PARAM(canRubberBandsAtBottom);
</del><ins>+ UNUSED_PARAM(canRubberBandAtLeft);
+ UNUSED_PARAM(canRubberBandAtRight);
+ UNUSED_PARAM(canRubberBandAtTop);
+ UNUSED_PARAM(canRubberBandAtBottom);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> RunLoop::main()->dispatch(bind(&EventDispatcher::dispatchWheelEvent, this, pageID, wheelEvent));
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageEventDispatcherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h (160741 => 160742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h 2013-12-18 01:28:02 UTC (rev 160741)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h 2013-12-18 02:00:45 UTC (rev 160742)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
</span><span class="cx">
</span><span class="cx"> // Message handlers
</span><del>- void wheelEvent(uint64_t pageID, const WebWheelEvent&, bool canRubberBandsAtLeft, bool canRubberBandsAtRight, bool canRubberBandsAtTop, bool canRubberBandsAtBottom);
</del><ins>+ void wheelEvent(uint64_t pageID, const WebWheelEvent&, bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom);
</ins><span class="cx">
</span><span class="cx"> // This is called on the main thread.
</span><span class="cx"> void dispatchWheelEvent(uint64_t pageID, const WebWheelEvent&);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageEventDispatchermessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.messages.in (160741 => 160742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.messages.in 2013-12-18 01:28:02 UTC (rev 160741)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.messages.in 2013-12-18 02:00:45 UTC (rev 160742)
</span><span class="lines">@@ -21,5 +21,5 @@
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><span class="cx"> messages -> EventDispatcher {
</span><del>- WheelEvent(uint64_t pageID, WebKit::WebWheelEvent event, bool canRubberBandsAtLeft, bool canRubberBandsAtRight, bool canRubberBandsAtTop, bool canRubberBandsAtBottom)
</del><ins>+ WheelEvent(uint64_t pageID, WebKit::WebWheelEvent event, bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom)
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>