Reviewed by Beth.

        - Fixed http://bugs.webkit.org/show_bug.cgi?id=11343
          REGRESSION (r16975): fast/events/objc-event-api is failing

          When I moved the autoscroll code from FrameMac to Frame, I mistakingly changed the order of
          a call to invalidateClick.  This change moves it back to the sequence that existed before.  This allows
          the click count to get properly reset during a selection.

        * page/Frame.cpp: (WebCore::Frame::handleMouseMoveEvent):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17111 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 503d536a44a73f5dc0b438cf619830190a7e4684..04d5d031e224d89ecd77c7a82abe3f5b5e7d7574 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2006-10-18  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Beth.
+
+        - Fixed http://bugs.webkit.org/show_bug.cgi?id=11343
+          REGRESSION (r16975): fast/events/objc-event-api is failing
+
+          When I moved the autoscroll code from FrameMac to Frame, I mistakingly changed the order of
+          a call to invalidateClick.  This change moves it back to the sequence that existed before.  This allows
+          the click count to get properly reset during a selection.
+
+        * page/Frame.cpp: (WebCore::Frame::handleMouseMoveEvent):
+
 2006-10-17  Geoffrey Garen  <ggaren@apple.com>
         
         Reviewed by Anders.

diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index e85692fba82a9c35967d8b140279437da335daed..fa510bc582d0e60cbc95e09b06b0ff54011cf01c 100644 (file)
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -1962,6 +1962,11 @@ void Frame::handleMouseMoveEvent(const MouseEventWithHitTestResults& event)
     if (event.event().button() != 0 || !innerNode || !innerNode->renderer())
         return;
 
+    ASSERT(mouseDownMayStartSelect() || mouseDownMayStartAutoscroll());
+
+    setMouseDownMayStartDrag(false);
+    view()->invalidateClick();
+
      if (mouseDownMayStartAutoscroll()) {            
         // If the selection is contained in a layer that can scroll, that layer should handle the autoscroll
         // Otherwise, let the bridge handle it so the view can scroll itself.
@@ -1970,9 +1975,6 @@ void Frame::handleMouseMoveEvent(const MouseEventWithHitTestResults& event)
             renderer = renderer->parent();
         if (renderer)
             handleAutoscroll(renderer);
-                
-        setMouseDownMayStartDrag(false);
-        view()->invalidateClick();
     }
     
     if (mouseDownMayStartSelect() && innerNode->renderer()->shouldSelect()) {