<!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>[37251] 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/37251">37251</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2008-10-03 13:10:32 -0700 (Fri, 03 Oct 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>2008-10-03  David Hyatt  &lt;hyatt@apple.com&gt;

        Preparation for enabling scrollbars to hit test properly inside transforms.  Clean up the scrollbar
        event handlers to no longer be virtual.  Don't pass a mouse event where none is needed.  Add a new
        method on Scrollbars called transformEvent that will apply all of the transforms to make a new event
        that will work properly for hit testing.  This patch just stubs out that method to return the same
        event untransformed.

        Reviewed by Darin Adler

        * page/EventHandler.cpp:
        (WebCore::EventHandler::handleMouseDoubleClickEvent):
        (WebCore::EventHandler::handleMouseMoveEvent):
        (WebCore::EventHandler::handleMouseReleaseEvent):
        (WebCore::EventHandler::passMousePressEventToScrollbar):
        * page/gtk/EventHandlerGtk.cpp:
        * page/mac/EventHandlerMac.mm:
        * page/qt/EventHandlerQt.cpp:
        * page/win/EventHandlerWin.cpp:
        * page/wx/EventHandlerWx.cpp:
        * platform/Scrollbar.cpp:
        (WebCore::Scrollbar::mouseMoved):
        (WebCore::Scrollbar::mouseExited):
        (WebCore::Scrollbar::mouseUp):
        (WebCore::Scrollbar::mouseDown):
        (WebCore::Scrollbar::transformEvent):
        * platform/Scrollbar.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="#trunkWebCorepagegtkEventHandlerGtkcpp">trunk/WebCore/page/gtk/EventHandlerGtk.cpp</a></li>
<li><a href="#trunkWebCorepagemacEventHandlerMacmm">trunk/WebCore/page/mac/EventHandlerMac.mm</a></li>
<li><a href="#trunkWebCorepageqtEventHandlerQtcpp">trunk/WebCore/page/qt/EventHandlerQt.cpp</a></li>
<li><a href="#trunkWebCorepagewinEventHandlerWincpp">trunk/WebCore/page/win/EventHandlerWin.cpp</a></li>
<li><a href="#trunkWebCorepagewxEventHandlerWxcpp">trunk/WebCore/page/wx/EventHandlerWx.cpp</a></li>
<li><a href="#trunkWebCoreplatformScrollbarcpp">trunk/WebCore/platform/Scrollbar.cpp</a></li>
<li><a href="#trunkWebCoreplatformScrollbarh">trunk/WebCore/platform/Scrollbar.h</a></li>
<li><a href="#trunkWebCoreplatformqtScrollbarQtcpp">trunk/WebCore/platform/qt/ScrollbarQt.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (37250 => 37251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-10-03 20:00:46 UTC (rev 37250)
+++ trunk/WebCore/ChangeLog        2008-10-03 20:10:32 UTC (rev 37251)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2008-10-03  David Hyatt  &lt;hyatt@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Preparation for enabling scrollbars to hit test properly inside transforms.  Clean up the scrollbar
+        event handlers to no longer be virtual.  Don't pass a mouse event where none is needed.  Add a new
+        method on Scrollbars called transformEvent that will apply all of the transforms to make a new event
+        that will work properly for hit testing.  This patch just stubs out that method to return the same
+        event untransformed.
+
+        Reviewed by Darin Adler
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleMouseDoubleClickEvent):
+        (WebCore::EventHandler::handleMouseMoveEvent):
+        (WebCore::EventHandler::handleMouseReleaseEvent):
+        (WebCore::EventHandler::passMousePressEventToScrollbar):
+        * page/gtk/EventHandlerGtk.cpp:
+        * page/mac/EventHandlerMac.mm:
+        * page/qt/EventHandlerQt.cpp:
+        * page/win/EventHandlerWin.cpp:
+        * page/wx/EventHandlerWx.cpp:
+        * platform/Scrollbar.cpp:
+        (WebCore::Scrollbar::mouseMoved):
+        (WebCore::Scrollbar::mouseExited):
+        (WebCore::Scrollbar::mouseUp):
+        (WebCore::Scrollbar::mouseDown):
+        (WebCore::Scrollbar::transformEvent):
+        * platform/Scrollbar.h:
+
+2008-10-03  David Hyatt  &lt;hyatt@apple.com&gt;
+
</ins><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=21340
</span><span class="cx">         
</span><span class="cx">         Remove &quot;containingWindow()/setContainingWindow()&quot; from Widget.  HostWindow covers this now.
</span></span></pre></div>
<a id="trunkWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/EventHandler.cpp (37250 => 37251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/EventHandler.cpp        2008-10-03 20:00:46 UTC (rev 37250)
+++ trunk/WebCore/page/EventHandler.cpp        2008-10-03 20:10:32 UTC (rev 37251)
</span><span class="lines">@@ -1119,7 +1119,7 @@
</span><span class="cx">         swallowClickEvent = dispatchMouseEvent(clickEvent, mev.targetNode(), true, m_clickCount, mouseEvent, true);
</span><span class="cx"> 
</span><span class="cx">     if (m_lastScrollbarUnderMouse)
</span><del>-        swallowMouseUpEvent = m_lastScrollbarUnderMouse-&gt;handleMouseReleaseEvent(mouseEvent);
</del><ins>+        swallowMouseUpEvent = m_lastScrollbarUnderMouse-&gt;mouseUp();
</ins><span class="cx">             
</span><span class="cx">     bool swallowMouseReleaseEvent = false;
</span><span class="cx">     if (!swallowMouseUpEvent)
</span><span class="lines">@@ -1173,7 +1173,7 @@
</span><span class="cx"> 
</span><span class="cx">     // Send events right to a scrollbar if the mouse is pressed.
</span><span class="cx">     if (m_lastScrollbarUnderMouse &amp;&amp; m_mousePressed)
</span><del>-        return m_lastScrollbarUnderMouse-&gt;handleMouseMoveEvent(mouseEvent);
</del><ins>+        return m_lastScrollbarUnderMouse-&gt;mouseMoved(m_lastScrollbarUnderMouse-&gt;transformEvent(mouseEvent));
</ins><span class="cx"> 
</span><span class="cx">     // Treat mouse move events while the mouse is pressed as &quot;read-only&quot; in prepareMouseEvent
</span><span class="cx">     // if we are allowed to select.
</span><span class="lines">@@ -1198,7 +1198,7 @@
</span><span class="cx">         if (m_lastScrollbarUnderMouse != scrollbar) {
</span><span class="cx">             // Send mouse exited to the old scrollbar.
</span><span class="cx">             if (m_lastScrollbarUnderMouse)
</span><del>-                m_lastScrollbarUnderMouse-&gt;handleMouseOutEvent(mouseEvent);
</del><ins>+                m_lastScrollbarUnderMouse-&gt;mouseExited();
</ins><span class="cx">             m_lastScrollbarUnderMouse = m_mousePressed ? 0 : scrollbar;
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="lines">@@ -1220,7 +1220,7 @@
</span><span class="cx">             swallowEvent |= passMouseMoveEventToSubframe(mev, newSubframe.get(), hoveredNode);
</span><span class="cx">     } else {
</span><span class="cx">         if (scrollbar &amp;&amp; !m_mousePressed)
</span><del>-            scrollbar-&gt;handleMouseMoveEvent(mouseEvent); // Handle hover effects on platforms that support visual feedback on scrollbar hovering.
</del><ins>+            scrollbar-&gt;mouseMoved(scrollbar-&gt;transformEvent(mouseEvent)); // Handle hover effects on platforms that support visual feedback on scrollbar hovering.
</ins><span class="cx">         if ((!m_resizeLayer || !m_resizeLayer-&gt;inResizeMode()) &amp;&amp; !m_frame-&gt;page()-&gt;mainFrame()-&gt;eventHandler()-&gt;panScrollInProgress() &amp;&amp; m_frame-&gt;view())
</span><span class="cx">             m_frame-&gt;view()-&gt;setCursor(selectCursor(mev, scrollbar));
</span><span class="cx">     }
</span><span class="lines">@@ -1266,7 +1266,7 @@
</span><span class="cx"> 
</span><span class="cx">     if (m_lastScrollbarUnderMouse) {
</span><span class="cx">         invalidateClick();
</span><del>-        return m_lastScrollbarUnderMouse-&gt;handleMouseReleaseEvent(mouseEvent);
</del><ins>+        return m_lastScrollbarUnderMouse-&gt;mouseUp();
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     MouseEventWithHitTestResults mev = prepareMouseEvent(HitTestRequest(false, false, false, true), mouseEvent);
</span><span class="lines">@@ -2157,4 +2157,12 @@
</span><span class="cx">     m_pendingFrameBeforeUnloadEventCount = 0;
</span><span class="cx">     return; 
</span><span class="cx"> }
</span><ins>+
+bool EventHandler::passMousePressEventToScrollbar(MouseEventWithHitTestResults&amp; mev, Scrollbar* scrollbar)
+{
+    if (!scrollbar || !scrollbar-&gt;enabled())
+        return false;
+    return scrollbar-&gt;mouseDown(mev.event());
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkWebCorepagegtkEventHandlerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/gtk/EventHandlerGtk.cpp (37250 => 37251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/gtk/EventHandlerGtk.cpp        2008-10-03 20:00:46 UTC (rev 37250)
+++ trunk/WebCore/page/gtk/EventHandlerGtk.cpp        2008-10-03 20:10:32 UTC (rev 37251)
</span><span class="lines">@@ -123,10 +123,4 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool EventHandler::passMousePressEventToScrollbar(MouseEventWithHitTestResults&amp;, Scrollbar* scrollbar)
-{
-    notImplemented();
-    return false;
</del><span class="cx"> }
</span><del>-
-}
</del></span></pre></div>
<a id="trunkWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/mac/EventHandlerMac.mm (37250 => 37251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/mac/EventHandlerMac.mm        2008-10-03 20:00:46 UTC (rev 37250)
+++ trunk/WebCore/page/mac/EventHandlerMac.mm        2008-10-03 20:10:32 UTC (rev 37251)
</span><span class="lines">@@ -645,13 +645,4 @@
</span><span class="cx">     return passSubframeEventToSubframe(mev, subframe);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool EventHandler::passMousePressEventToScrollbar(MouseEventWithHitTestResults&amp; mev, Scrollbar* scrollbar)
-{
-    if (!scrollbar || !scrollbar-&gt;enabled())
-        return false;
-    if (scrollbar-&gt;platformWidget())
-        return passMouseDownEventToWidget(scrollbar);
-    return scrollbar-&gt;handleMousePressEvent(mev.event());
</del><span class="cx"> }
</span><del>-
-}
</del></span></pre></div>
<a id="trunkWebCorepageqtEventHandlerQtcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/qt/EventHandlerQt.cpp (37250 => 37251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/qt/EventHandlerQt.cpp        2008-10-03 20:00:46 UTC (rev 37250)
+++ trunk/WebCore/page/qt/EventHandlerQt.cpp        2008-10-03 20:10:32 UTC (rev 37251)
</span><span class="lines">@@ -134,11 +134,4 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool EventHandler::passMousePressEventToScrollbar(MouseEventWithHitTestResults&amp; mev, Scrollbar* scrollbar)
-{
-    if (!scrollbar || !scrollbar-&gt;enabled())
-        return false;
-    return scrollbar-&gt;handleMousePressEvent(mev.event());
</del><span class="cx"> }
</span><del>-
-}
</del></span></pre></div>
<a id="trunkWebCorepagewinEventHandlerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/win/EventHandlerWin.cpp (37250 => 37251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/win/EventHandlerWin.cpp        2008-10-03 20:00:46 UTC (rev 37250)
+++ trunk/WebCore/page/win/EventHandlerWin.cpp        2008-10-03 20:10:32 UTC (rev 37251)
</span><span class="lines">@@ -77,13 +77,6 @@
</span><span class="cx">     return static_cast&lt;FrameView*&gt;(widget)-&gt;frame()-&gt;eventHandler()-&gt;handleWheelEvent(wheelEvent);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool EventHandler::passMousePressEventToScrollbar(MouseEventWithHitTestResults&amp; mev, Scrollbar* scrollbar)
-{
-    if (!scrollbar || !scrollbar-&gt;enabled())
-        return false;
-    return scrollbar-&gt;handleMousePressEvent(mev.event());
-}
-
</del><span class="cx"> bool EventHandler::tabsToAllControls(KeyboardEvent*) const
</span><span class="cx"> {
</span><span class="cx">     return true;
</span></span></pre></div>
<a id="trunkWebCorepagewxEventHandlerWxcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/wx/EventHandlerWx.cpp (37250 => 37251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/wx/EventHandlerWx.cpp        2008-10-03 20:00:46 UTC (rev 37250)
+++ trunk/WebCore/page/wx/EventHandlerWx.cpp        2008-10-03 20:10:32 UTC (rev 37251)
</span><span class="lines">@@ -58,11 +58,6 @@
</span><span class="cx">     return passSubframeEventToSubframe(mev, subframe);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool EventHandler::passMousePressEventToScrollbar(MouseEventWithHitTestResults&amp; mouseEvent, Scrollbar* scrollbar)
-{
-    return passMouseDownEventToWidget(scrollbar);
-}
-
</del><span class="cx"> bool EventHandler::passWidgetMouseDownEventToWidget(const MouseEventWithHitTestResults&amp; event)
</span><span class="cx"> {
</span><span class="cx">     // Figure out which view to send the event to.
</span></span></pre></div>
<a id="trunkWebCoreplatformScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/Scrollbar.cpp (37250 => 37251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/Scrollbar.cpp        2008-10-03 20:00:46 UTC (rev 37250)
+++ trunk/WebCore/platform/Scrollbar.cpp        2008-10-03 20:10:32 UTC (rev 37251)
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool Scrollbar::handleMouseMoveEvent(const PlatformMouseEvent&amp; evt)
</del><ins>+bool Scrollbar::mouseMoved(const PlatformMouseEvent&amp; evt)
</ins><span class="cx"> {
</span><span class="cx">     if (m_pressedPart == ThumbPart) {
</span><span class="cx">         moveThumb(m_orientation == HorizontalScrollbar ? 
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool Scrollbar::handleMouseOutEvent(const PlatformMouseEvent&amp; event)
</del><ins>+bool Scrollbar::mouseExited()
</ins><span class="cx"> {
</span><span class="cx">     if (theme()-&gt;invalidateOnMouseEnterExit())
</span><span class="cx">         invalidate(); // Just invalidate the whole scrollbar, since the buttons at either end change anyway.
</span><span class="lines">@@ -329,7 +329,7 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool Scrollbar::handleMouseReleaseEvent(const PlatformMouseEvent&amp; event)
</del><ins>+bool Scrollbar::mouseUp()
</ins><span class="cx"> {
</span><span class="cx">     theme()-&gt;invalidatePart(this, m_pressedPart);
</span><span class="cx">     m_pressedPart = NoPart;
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool Scrollbar::handleMousePressEvent(const PlatformMouseEvent&amp; evt)
</del><ins>+bool Scrollbar::mouseDown(const PlatformMouseEvent&amp; evt)
</ins><span class="cx"> {
</span><span class="cx">     // Early exit for right click
</span><span class="cx">     if (evt.button() == RightButton)
</span><span class="lines">@@ -425,4 +425,9 @@
</span><span class="cx">     m_client-&gt;invalidateScrollbarRect(this, rect);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+PlatformMouseEvent Scrollbar::transformEvent(const PlatformMouseEvent&amp; event)
+{
+    return event;
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkWebCoreplatformScrollbarh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/Scrollbar.h (37250 => 37251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/Scrollbar.h        2008-10-03 20:00:46 UTC (rev 37250)
+++ trunk/WebCore/platform/Scrollbar.h        2008-10-03 20:10:32 UTC (rev 37251)
</span><span class="lines">@@ -91,21 +91,25 @@
</span><span class="cx">     // These methods are used for platform scrollbars to give :hover feedback.  They will not get called
</span><span class="cx">     // when the mouse went down in a scrollbar, since it is assumed the scrollbar will start
</span><span class="cx">     // grabbing all events in that case anyway.
</span><del>-    virtual bool handleMouseMoveEvent(const PlatformMouseEvent&amp;);
-    virtual bool handleMouseOutEvent(const PlatformMouseEvent&amp;);
</del><ins>+    bool mouseMoved(const PlatformMouseEvent&amp;);
+    bool mouseExited();
</ins><span class="cx">     
</span><span class="cx">     // Used by some platform scrollbars to know when they've been released from capture.
</span><del>-    virtual bool handleMouseReleaseEvent(const PlatformMouseEvent&amp;);
</del><ins>+    bool mouseUp();
</ins><span class="cx"> 
</span><del>-    virtual bool handleMousePressEvent(const PlatformMouseEvent&amp;);
</del><ins>+    bool mouseDown(const PlatformMouseEvent&amp;);
</ins><span class="cx"> 
</span><span class="cx"> #if PLATFORM(QT)
</span><span class="cx">     // For platforms that wish to handle context menu events.
</span><span class="cx">     // FIXME: This is misplaced.  Normal hit testing should be used to populate a correct
</span><span class="cx">     // context menu.  There's no reason why the scrollbar should have to do it.
</span><del>-    virtual bool handleContextMenuEvent(const PlatformMouseEvent&amp; event);
</del><ins>+    bool contextMenu(const PlatformMouseEvent&amp; event);
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+    // Takes an event and accounts for any transforms that might occur on the scrollbar.  Returns
+    // a new event that has had all of the transforms applied.
+    PlatformMouseEvent transformEvent(const PlatformMouseEvent&amp;);
+    
</ins><span class="cx">     ScrollbarTheme* theme() const { return m_theme; }
</span><span class="cx"> 
</span><span class="cx">     virtual void setParent(ScrollView*);
</span></span></pre></div>
<a id="trunkWebCoreplatformqtScrollbarQtcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/qt/ScrollbarQt.cpp (37250 => 37251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/qt/ScrollbarQt.cpp        2008-10-03 20:00:46 UTC (rev 37250)
+++ trunk/WebCore/platform/qt/ScrollbarQt.cpp        2008-10-03 20:10:32 UTC (rev 37251)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-bool Scrollbar::handleContextMenuEvent(const PlatformMouseEvent&amp; event)
</del><ins>+bool Scrollbar::contextMenu(const PlatformMouseEvent&amp; event)
</ins><span class="cx"> {
</span><span class="cx"> #ifndef QT_NO_CONTEXTMENU
</span><span class="cx">     bool horizontal = (m_orientation == HorizontalScrollbar);
</span></span></pre>
</div>
</div>

</body>
</html>