<!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>[46377] trunk/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/46377">46377</a></dd>
<dt>Author</dt> <dd>bweinstein@apple.com</dd>
<dt>Date</dt> <dd>2009-07-24 14:57:28 -0700 (Fri, 24 Jul 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-07-24  Brian Weinstein  &lt;bweinstein@apple.com&gt;

        Reviewed by Jon Honeycutt.

        Fix of &lt;rdar://6310538&gt; Middle-click panning should be springloaded while dragging
        https://bugs.webkit.org/show_bug.cgi?id=21794

        Create two new booleans to determine whether we have done a springloaded pan scroll, and update
        the name of setPanScrollCursor to updatePanScrollState to more accurately describe what the function
        does.

        * page/EventHandler.cpp:
        (WebCore::EventHandler::EventHandler): Initialized two new booleans.
        (WebCore::EventHandler::autoscrollTimerFired):
        (WebCore::EventHandler::updatePanScrollState): Renamed from setPanScrollCursor.
        (WebCore::EventHandler::stopAutoscrollTimer): Clear the pan scrolling in progress flag.
        (WebCore::EventHandler::handleMouseReleaseEvent): Clear the pan scrolling button pressed flag.
        * page/EventHandler.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorepageEventHandlercpp">trunk/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkWebCorepageEventHandlerh">trunk/WebCore/page/EventHandler.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (46376 => 46377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-07-24 21:31:05 UTC (rev 46376)
+++ trunk/WebCore/ChangeLog        2009-07-24 21:57:28 UTC (rev 46377)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2009-07-24  Brian Weinstein  &lt;bweinstein@apple.com&gt;
+
+        Reviewed by Jon Honeycutt.
+
+        Fix of &lt;rdar://6310538&gt; Middle-click panning should be springloaded while dragging
+        https://bugs.webkit.org/show_bug.cgi?id=21794
+        
+        Create two new booleans to determine whether we have done a springloaded pan scroll, and update
+        the name of setPanScrollCursor to updatePanScrollState to more accurately describe what the function
+        does. 
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::EventHandler): Initialized two new booleans.
+        (WebCore::EventHandler::autoscrollTimerFired):
+        (WebCore::EventHandler::updatePanScrollState): Renamed from setPanScrollCursor.
+        (WebCore::EventHandler::stopAutoscrollTimer): Clear the pan scrolling in progress flag.
+        (WebCore::EventHandler::handleMouseReleaseEvent): Clear the pan scrolling button pressed flag.
+        * page/EventHandler.h:
+
</ins><span class="cx"> 2009-07-24  Yong Li  &lt;yong.li@torchmobile.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by George Staikos.
</span></span></pre></div>
<a id="trunkWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/EventHandler.cpp (46376 => 46377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/EventHandler.cpp        2009-07-24 21:31:05 UTC (rev 46376)
+++ trunk/WebCore/page/EventHandler.cpp        2009-07-24 21:57:28 UTC (rev 46377)
</span><span class="lines">@@ -141,6 +141,8 @@
</span><span class="cx">     , m_mouseDownWasSingleClickInSelection(false)
</span><span class="cx">     , m_beganSelectingText(false)
</span><span class="cx">     , m_panScrollInProgress(false)
</span><ins>+    , m_panScrollButtonPressed(false)
+    , m_springLoadedPanScrollInProgress(false)
</ins><span class="cx">     , m_hoverTimer(this, &amp;EventHandler::hoverTimerFired)
</span><span class="cx">     , m_autoscrollTimer(this, &amp;EventHandler::autoscrollTimerFired)
</span><span class="cx">     , m_autoscrollRenderer(0)
</span><span class="lines">@@ -655,7 +657,7 @@
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx"> #if ENABLE(PAN_SCROLLING)
</span><del>-        setPanScrollCursor();
</del><ins>+        updatePanScrollState();
</ins><span class="cx">         toRenderBox(r)-&gt;panScroll(m_panScrollStartPos);
</span><span class="cx"> #endif
</span><span class="cx">     }
</span><span class="lines">@@ -663,7 +665,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(PAN_SCROLLING)
</span><span class="cx"> 
</span><del>-void EventHandler::setPanScrollCursor()
</del><ins>+void EventHandler::updatePanScrollState()
</ins><span class="cx"> {
</span><span class="cx">     FrameView* view = m_frame-&gt;view();
</span><span class="cx">     if (!view)
</span><span class="lines">@@ -676,6 +678,9 @@
</span><span class="cx">     bool north = m_panScrollStartPos.y() &gt; (m_currentMousePosition.y() + ScrollView::noPanScrollRadius);
</span><span class="cx">     bool south = m_panScrollStartPos.y() &lt; (m_currentMousePosition.y() - ScrollView::noPanScrollRadius);
</span><span class="cx">          
</span><ins>+    if ((east || west || north || south) &amp;&amp; m_panScrollButtonPressed)
+        m_springLoadedPanScrollInProgress = true;
+
</ins><span class="cx">     if (north) {
</span><span class="cx">         if (east)
</span><span class="cx">             view-&gt;setCursor(northEastPanningCursor());
</span><span class="lines">@@ -836,6 +841,7 @@
</span><span class="cx">     m_autoscrollTimer.stop();
</span><span class="cx"> 
</span><span class="cx">     m_panScrollInProgress = false;
</span><ins>+    m_springLoadedPanScrollInProgress = false;
</ins><span class="cx"> 
</span><span class="cx">     // If we're not in the top frame we notify it that we are not doing a panScroll any more.
</span><span class="cx">     if (Page* page = m_frame-&gt;page()) {
</span><span class="lines">@@ -1163,6 +1169,7 @@
</span><span class="cx"> 
</span><span class="cx">         if (renderer) {
</span><span class="cx">             m_panScrollInProgress = true;
</span><ins>+            m_panScrollButtonPressed = true;
</ins><span class="cx">             handleAutoscroll(renderer);
</span><span class="cx">             invalidateClick();
</span><span class="cx">             return true;
</span><span class="lines">@@ -1390,6 +1397,13 @@
</span><span class="cx"> {
</span><span class="cx">     RefPtr&lt;FrameView&gt; protector(m_frame-&gt;view());
</span><span class="cx"> 
</span><ins>+#if ENABLE(PAN_SCROLLING)
+    if (mouseEvent.button() == MiddleButton)
+        m_panScrollButtonPressed = false;
+    if (m_springLoadedPanScrollInProgress)
+       stopAutoscrollTimer();
+#endif
+
</ins><span class="cx">     m_mousePressed = false;
</span><span class="cx">     m_currentMousePosition = mouseEvent.pos();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/EventHandler.h (46376 => 46377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/EventHandler.h        2009-07-24 21:31:05 UTC (rev 46376)
+++ trunk/WebCore/page/EventHandler.h        2009-07-24 21:57:28 UTC (rev 46377)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx">     
</span><span class="cx">     Cursor selectCursor(const MouseEventWithHitTestResults&amp;, Scrollbar*);
</span><span class="cx"> #if ENABLE(PAN_SCROLLING)
</span><del>-    void setPanScrollCursor();
</del><ins>+    void updatePanScrollState();
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     void hoverTimerFired(Timer&lt;EventHandler&gt;*);
</span><span class="lines">@@ -297,6 +297,9 @@
</span><span class="cx">     IntPoint m_panScrollStartPos;
</span><span class="cx">     bool m_panScrollInProgress;
</span><span class="cx"> 
</span><ins>+    bool m_panScrollButtonPressed;
+    bool m_springLoadedPanScrollInProgress;
+
</ins><span class="cx">     Timer&lt;EventHandler&gt; m_hoverTimer;
</span><span class="cx">     
</span><span class="cx">     Timer&lt;EventHandler&gt; m_autoscrollTimer;
</span></span></pre>
</div>
</div>

</body>
</html>