Changeset 167267 in webkit

Timestamp:

Apr 14, 2014 2:24:04 PM (10 years ago)

Author:

ap@apple.com

Message:

Eliminate CachedFrame::m_mousePressNode
​https://bugs.webkit.org/show_bug.cgi?id=131626

Reviewed by Brady Eidson.

I couldn't find any observable effect of this change.

• history/CachedFrame.cpp:

(WebCore::CachedFrameBase::CachedFrameBase):
(WebCore::CachedFrameBase::restore):
(WebCore::CachedFrame::clear):

• history/CachedFrame.h:

(WebCore::CachedFrame::documentLoader):
(WebCore::CachedFrame::mousePressNode): Deleted.
Eliminated m_mousePressNode, accessor, and code that reached out to EventHandler.

• page/EventHandler.cpp:

(WebCore::EventHandler::mousePressNode): Deleted.
(WebCore::EventHandler::setMousePressNode): Deleted.

• page/EventHandler.h:

(WebCore::EventHandler::setMousePressed): Deleted. This function was already unused.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• history/CachedFrame.cpp (modified) (4 diffs)
• history/CachedFrame.h (modified) (2 diffs)
• page/EventHandler.cpp (modified) (1 diff)
• page/EventHandler.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-14  Alexey Proskuryakov  <ap@apple.com>
+
+        Eliminate CachedFrame::m_mousePressNode
+        https://bugs.webkit.org/show_bug.cgi?id=131626
+
+        Reviewed by Brady Eidson.
+
+        I couldn't find any observable effect of this change.
+
+        * history/CachedFrame.cpp:
+        (WebCore::CachedFrameBase::CachedFrameBase):
+        (WebCore::CachedFrameBase::restore):
+        (WebCore::CachedFrame::clear):
+        * history/CachedFrame.h:
+        (WebCore::CachedFrame::documentLoader):
+        (WebCore::CachedFrame::mousePressNode): Deleted.
+        Eliminated m_mousePressNode, accessor, and code that reached out to EventHandler.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::mousePressNode): Deleted.
+        (WebCore::EventHandler::setMousePressNode): Deleted.
+        * page/EventHandler.h:
+        (WebCore::EventHandler::setMousePressed): Deleted. This function was already unused.
+
 2014-04-14  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/history/CachedFrame.cpp

@@ -32 +32 @@
 #include "Document.h"
 #include "DocumentLoader.h"
-#include "EventHandler.h"
 #include "EventNames.h"
 #include "ExceptionCode.h"
@@ -65 +64 @@
     , m_documentLoader(frame.loader().documentLoader())
     , m_view(frame.view())
-    , m_mousePressNode(frame.eventHandler().mousePressNode())
     , m_url(frame.document()->url())
     , m_isMainFrame(!frame.tree().parent())
@@ -95 +93 @@
 
     frame.animation().resumeAnimationsForDocument(m_document.get());
-    frame.eventHandler().setMousePressNode(m_mousePressNode.get());
     m_document->resumeActiveDOMObjects(ActiveDOMObject::DocumentWillBecomeInactive);
     m_document->resumeScriptedAnimationControllerCallbacks();
@@ -239 +236 @@
     m_document = nullptr;
     m_view = nullptr;
-    m_mousePressNode = nullptr;
     m_url = URL();
 

trunk/Source/WebCore/history/CachedFrame.h

@@ -57 +57 @@
     RefPtr<DocumentLoader> m_documentLoader;
     RefPtr<FrameView> m_view;
-    RefPtr<Node> m_mousePressNode;
     URL m_url;
     std::unique_ptr<ScriptCachedFrameData> m_cachedFrameScriptData;
@@ -82 +81 @@
     using CachedFrameBase::url;
     DocumentLoader* documentLoader() const { return m_documentLoader.get(); }
-    Node* mousePressNode() const { return m_mousePressNode.get(); }
 
     int descendantFrameCount() const;

trunk/Source/WebCore/page/EventHandler.cpp

@@ -1095 +1095 @@
 }
 
-Node* EventHandler::mousePressNode() const
-{
-    return m_mousePressNode.get();
-}
-
-void EventHandler::setMousePressNode(PassRefPtr<Node> node)
-{
-    m_mousePressNode = node;
-}
-
 bool EventHandler::scrollOverflow(ScrollDirection direction, ScrollGranularity granularity, Node* startingNode)
 {

trunk/Source/WebCore/page/EventHandler.h

@@ -131 +131 @@
 #endif
 
-    Node* mousePressNode() const;
-    void setMousePressNode(PassRefPtr<Node>);
-
 #if ENABLE(PAN_SCROLLING)
     void didPanScrollStart();
@@ -155 +152 @@
 
     bool mousePressed() const { return m_mousePressed; }
-    void setMousePressed(bool pressed) { m_mousePressed = pressed; }
+    Node* mousePressNode() const { return m_mousePressNode.get(); }
 
     void setCapturingMouseEventsElement(PassRefPtr<Element>); // A caller is responsible for resetting capturing element to 0.