Changeset 12514 in webkit

Timestamp:

Feb 1, 2006 2:36:00 PM (18 years ago)

Author:

bdakin

Message:

Patch by Darin. Reviewed by Beth.

Fix for <rdar://problem/4424126> REGRESSION(412-420+): yellow
highlight fails to follow cursor when mousing over star rating
(6232)

Event coordinates cannot be calculated until there is a target.
This patch restructures the code so that the coordinates are
initialized when the mouse event is created but are not calculated
until the target is set.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• khtml/xml/dom2_eventsimpl.cpp (modified) (4 diffs)
• khtml/xml/dom2_eventsimpl.h (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-02-01  Darin Adler  <darin@apple.com>
+
+        Reviewed by Beth.
+
+        Fix for <rdar://problem/4424126> REGRESSION(412-420+): yellow 
+        highlight fails to follow cursor when mousing over star rating
+        (6232)
+
+        Event coordinates cannot be calculated until there is a target. 
+        This patch restructures the code so that the coordinates are 
+        initialized when the mouse event is created but are not calculated
+        until the target is set.
+
+        * khtml/xml/dom2_eventsimpl.cpp:
+        (WebCore::EventImpl::setTarget): Now calls receievdTarget() if the
+        target is not nil.
+        (WebCore::EventImpl::receivedTarget): virtual receivedTarget()
+        (WebCore::MouseRelatedEventImpl::MouseRelatedEventImpl): Call 
+        initCoordinates()
+        (WebCore::MouseRelatedEventImpl::initCoordinates): Formerly called 
+        computePositions(), this now only initializes the coordinates and 
+        lets receivedTarget() take care of the computations. 
+        (WebCore::MouseRelatedEventImpl::receivedTarget): Takes care of 
+        computing the coordinates.
+        (WebCore::MouseEventImpl::initMouseEvent): Call initCoordinates()
+        * khtml/xml/dom2_eventsimpl.h:
+        (WebCore::EventImpl::target): Fix spacing.
+        (WebCore::EventImpl::currentTarget): Same.
+        (WebCore::EventImpl::setCurrentTarget): Same.
+
 2006-01-31  Maciej Stachowiak  <mjs@apple.com>
 

trunk/WebCore/khtml/xml/dom2_eventsimpl.cpp

@@ -123 +123 @@
 }
 
+void EventImpl::setTarget(NodeImpl* target)
+{
+    m_target = target;
+    if (target)
+        receivedTarget();
+}
+
+void EventImpl::receivedTarget()
+{
+}
+
 // -----------------------------------------------------------------------------
 
@@ -219 +230 @@
     , m_clientX(clientXArg), m_clientY(clientYArg)
 {
-    computePositions();
-}
-
-void MouseRelatedEventImpl::computePositions()
-{
+    initCoordinates();
+}
+
+void MouseRelatedEventImpl::initCoordinates()
+{
+    // Set up initial values for coordinates.
+    // Correct values can't be computed until we have at target, so receivedTarget
+    // does the "real" computation.
     m_pageX = m_clientX;
     m_pageY = m_clientY;
-
     m_layerX = m_pageX;
     m_layerY = m_pageY;
-
     m_offsetX = m_pageX;
     m_offsetY = m_pageY;
-
-    AbstractViewImpl* av = view();
-    if (!av)
-        return;
-    DocumentImpl* doc = av->document();
+}
+
+void MouseRelatedEventImpl::receivedTarget()
+{
+    // Compute coordinates that are based on the target.
+    m_offsetX = m_pageX;
+    m_offsetY = m_pageY;
+    m_layerX = m_pageX;    
+    m_layerY = m_pageY;    
+
+    // Can't do anything if the target is not in a document.
+    NodeImpl* targ = target();
+    ASSERT(targ);
+    DocumentImpl* doc = targ->getDocument();
     if (!doc)
         return;
-    FrameView* kv = doc->view();
-    if (!kv)
-        return;
-
+
+    // Must have an updated render tree for this math to work correctly.
     doc->updateRendering();
 
@@ -251 +270 @@
     // pageX and pageY here.
 
-    // Compute offset position.
-    // FIXME: This won't work because setTarget wasn't called yet!
-    m_offsetX = m_pageX;
-    m_offsetY = m_pageY;
+    // Adjust offsetX/Y to be relative to the target's position.
     if (!isSimulated()) {
-        if (NodeImpl *n = target())
-            if (RenderObject *r = n->renderer()) {
-                int rx, ry;
-                if (r->absolutePosition(rx, ry)) {
-                    m_offsetX -= rx;
-                    m_offsetY -= ry;
-                }
+        if (RenderObject* r = targ->renderer()) {
+            int rx, ry;
+            if (r->absolutePosition(rx, ry)) {
+                m_offsetX -= rx;
+                m_offsetY -= ry;
             }
+        }
     }
 
-    // Compute layer position.
-    m_layerX = m_pageX;
-    m_layerY = m_pageY;
-    if (RenderObject* docRenderer = doc->renderer()) {
-        // FIXME: Should we use the target node instead of hit testing?
-        // If we want to, then we'll have to wait until setTarget is called.
-        RenderObject::NodeInfo hitTestResult(true, false);
-        docRenderer->layer()->hitTest(hitTestResult, m_pageX, m_pageY);
-        NodeImpl* n = hitTestResult.innerNonSharedNode();
-        while (n && !n->renderer())
-            n = n->parent();
-        if (n) {
-            n->renderer()->enclosingLayer()->updateLayerPosition();    
-            for (RenderLayer* layer = n->renderer()->enclosingLayer(); layer; layer = layer->parent()) {
-                m_layerX -= layer->xPos();
-                m_layerY -= layer->yPos();
-            }
+    // Adjust layerX/Y to be relative to the layer.
+    // FIXME: We're pretty sure this is the wrong defintion of "layer."
+    // Our RenderLayer is a more modern concept, and layerX/Y is some
+    // other notion about groups of elements; we should test and fix this.
+    NodeImpl* n = targ;
+    while (n && !n->renderer())
+        n = n->parent();
+    if (n) {
+        RenderLayer* layer = n->renderer()->enclosingLayer();
+        layer->updateLayerPosition();
+        for (; layer; layer = layer->parent()) {
+            m_layerX -= layer->xPos();
+            m_layerY -= layer->yPos();
         }
     }
@@ -381 +392 @@
     m_relatedTarget = relatedTargetArg;
 
-    computePositions();
+    initCoordinates();
 }
 

trunk/WebCore/khtml/xml/dom2_eventsimpl.h

@@ -46 +46 @@
 public:
     EventImpl();
-    EventImpl(const AtomicString &type, bool canBubbleArg, bool cancelableArg);
+    EventImpl(const AtomicString& type, bool canBubbleArg, bool cancelableArg);
     virtual ~EventImpl();
 
     const AtomicString &type() const { return m_type; }
-    NodeImpl *target() const { return m_target.get(); }
-    void setTarget(NodeImpl *target) { m_target = target; }
-    NodeImpl *currentTarget() const { return m_currentTarget; }
-    void setCurrentTarget(NodeImpl *currentTarget) { m_currentTarget = currentTarget; }
+    NodeImpl* target() const { return m_target.get(); }
+    void setTarget(NodeImpl*);
+    NodeImpl* currentTarget() const { return m_currentTarget; }
+    void setCurrentTarget(NodeImpl* currentTarget) { m_currentTarget = currentTarget; }
     unsigned short eventPhase() const { return m_eventPhase; }
     void setEventPhase(unsigned short eventPhase) { m_eventPhase = eventPhase; }
@@ -85 +85 @@
 
 protected:
+    virtual void receivedTarget();
     bool dispatched() const { return m_target; }
 
@@ -97 +98 @@
     bool m_cancelBubble;
 
-    NodeImpl *m_currentTarget; // ref > 0 maintained externally
+    NodeImpl* m_currentTarget; // ref > 0 maintained externally
     unsigned short m_eventPhase;
     RefPtr<NodeImpl> m_target;
@@ -193 +194 @@
     int m_clientX;
     int m_clientY;
-    void computePositions();
+    void initCoordinates();
+    virtual void receivedTarget();
 private:
     int m_pageX;