Changeset 23994 in webkit

Timestamp:

Jul 4, 2007, 7:59:41 PM (18 years ago)

Author:

aroben

Message:

Change MouseEventWithHitTestResults to hold onto a HitTestResult

Reviewed by Sam.

• dom/Document.cpp:

(WebCore::Document::prepareMouseEvent):

• page/MouseEventWithHitTestResults.cpp:

(WebCore::MouseEventWithHitTestResults::MouseEventWithHitTestResults):
(WebCore::MouseEventWithHitTestResults::targetNode):
(WebCore::MouseEventWithHitTestResults::localPoint):
(WebCore::MouseEventWithHitTestResults::scrollbar):

• page/MouseEventWithHitTestResults.h:

(WebCore::MouseEventWithHitTestResults::event):
(WebCore::MouseEventWithHitTestResults::hitTestResult):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)
• page/MouseEventWithHitTestResults.cpp (modified) (3 diffs)
• page/MouseEventWithHitTestResults.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-04  Adam Roben  <aroben@apple.com>
+
+        Change MouseEventWithHitTestResults to hold onto a HitTestResult
+
+        Reviewed by Sam.
+
+        * dom/Document.cpp:
+        (WebCore::Document::prepareMouseEvent):
+        * page/MouseEventWithHitTestResults.cpp:
+        (WebCore::MouseEventWithHitTestResults::MouseEventWithHitTestResults):
+        (WebCore::MouseEventWithHitTestResults::targetNode):
+        (WebCore::MouseEventWithHitTestResults::localPoint):
+        (WebCore::MouseEventWithHitTestResults::scrollbar):
+        * page/MouseEventWithHitTestResults.h:
+        (WebCore::MouseEventWithHitTestResults::event):
+        (WebCore::MouseEventWithHitTestResults::hitTestResult):
+
 2007-07-04  Matt Lilek  <pewtermoose@gmail.com>
 

trunk/WebCore/dom/Document.cpp

@@ -1749 +1749 @@
 
     if (!renderer())
-        return MouseEventWithHitTestResults(event, 0, IntPoint(), 0, false);
+        return MouseEventWithHitTestResults(event, HitTestResult(IntPoint()));
 
     HitTestResult result(documentPoint);
@@ -1757 +1757 @@
         updateRendering();
 
-    bool isOverLink = result.URLElement() && result.URLElement()->isLink();
-    return MouseEventWithHitTestResults(event, result.innerNode(), result.localPoint(), result.scrollbar(), isOverLink);
+    return MouseEventWithHitTestResults(event, result);
 }
 

trunk/WebCore/page/MouseEventWithHitTestResults.cpp

@@ -21 +21 @@
 #include "MouseEventWithHitTestResults.h"
 
+#include "Element.h"
+#include "Node.h"
+
 // Would TargetedMouseEvent be a better name?
 
@@ -35 +38 @@
 }
 
-MouseEventWithHitTestResults::MouseEventWithHitTestResults(const PlatformMouseEvent& event,
-        PassRefPtr<Node> node, const IntPoint& localPoint, PlatformScrollbar* scrollbar, bool isOverLink)
+MouseEventWithHitTestResults::MouseEventWithHitTestResults(const PlatformMouseEvent& event, const HitTestResult& hitTestResult)
     : m_event(event)
-    , m_targetNode(node)
-    , m_targetElement(targetElement(m_targetNode.get()))
-    , m_localPoint(localPoint)
-    , m_scrollbar(scrollbar)
-    , m_isOverLink(isOverLink)
+    , m_hitTestResult(hitTestResult)
 {
 }
@@ -48 +46 @@
 Node* MouseEventWithHitTestResults::targetNode() const
 {
-    if (m_targetElement && !m_targetNode->inDocument() && m_targetElement->inDocument())
-        return m_targetElement.get();
-    return m_targetNode.get();
+    Node* node = m_hitTestResult.innerNonSharedNode();
+    if (node && node->inDocument())
+        return node;
+
+    Element* element = targetElement(node);
+    if (element && element->inDocument())
+        return element;
+
+    return node;
+}
+
+const IntPoint MouseEventWithHitTestResults::localPoint() const
+{
+    return m_hitTestResult.localPoint();
+}
+
+PlatformScrollbar* MouseEventWithHitTestResults::scrollbar() const
+{
+    return m_hitTestResult.scrollbar();
+}
+
+bool MouseEventWithHitTestResults::isOverLink() const
+{
+    return m_hitTestResult.URLElement() && m_hitTestResult.URLElement()->isLink();
 }
 

trunk/WebCore/page/MouseEventWithHitTestResults.h

@@ -22 +22 @@
 #define MouseEventWithHitTestResults_h
 
-#include "Element.h"
+#include "HitTestResult.h"
 #include "PlatformMouseEvent.h"
 
@@ -32 +32 @@
 class MouseEventWithHitTestResults {
 public:
-    MouseEventWithHitTestResults(const PlatformMouseEvent&, PassRefPtr<Node>, const IntPoint& localPoint, PlatformScrollbar*, bool isOverLink);
+    MouseEventWithHitTestResults(const PlatformMouseEvent&, const HitTestResult&);
 
     const PlatformMouseEvent& event() const { return m_event; }
+    const HitTestResult& hitTestResult() const { return m_hitTestResult; }
     Node* targetNode() const;
-    const IntPoint& localPoint() const { return m_localPoint; }
-    PlatformScrollbar* scrollbar() const { return m_scrollbar; }
-    bool isOverLink() const { return m_isOverLink; }
+    const IntPoint localPoint() const;
+    PlatformScrollbar* scrollbar() const;
+    bool isOverLink() const;
 
 private:
     PlatformMouseEvent m_event;
-    RefPtr<Node> m_targetNode;
-    RefPtr<Element> m_targetElement;
-    IntPoint m_localPoint;
-    PlatformScrollbar* m_scrollbar;
-    bool m_isOverLink;
+    HitTestResult m_hitTestResult;
 };