Changeset 223443 in webkit

Timestamp:

Oct 16, 2017 3:40:34 PM (7 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r223425.

This change broke internal builds.

Reverted changeset:

"Remove unnecessary include from Document.h"
​https://bugs.webkit.org/show_bug.cgi?id=178247
​https://trac.webkit.org/changeset/223425

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-16  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r223425.
+
+        This change broke internal builds.
+
+        Reverted changeset:
+
+        "Remove unnecessary include from Document.h"
+        https://bugs.webkit.org/show_bug.cgi?id=178247
+        https://trac.webkit.org/changeset/223425
+
 2017-10-16  Maureen Daum  <mdaum@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -5546 +5546 @@
 }
 
-bool Document::hasTouchEventHandlers() const
-{
-#if ENABLE(TOUCH_EVENTS)
-    return m_touchEventTargets && m_touchEventTargets->size();
-#else
-    return false;
-#endif
-}
-
-bool Document::touchEventTargetsContain(Node& node) const
-{
-#if ENABLE(TOUCH_EVENTS)
-    return m_touchEventTargets && m_touchEventTargets->contains(&node);
-#else
-    UNUSED_PARAM(node);
-    return false;
-#endif
-}
-    
 std::optional<RenderingContext> Document::getCSSCanvasContext(const String& type, const String& name, int width, int height)
 {

trunk/Source/WebCore/dom/Document.h

@@ -54 +54 @@
 #include <wtf/Deque.h>
 #include <wtf/Forward.h>
+#include <wtf/HashCountedSet.h>
 #include <wtf/HashSet.h>
 #include <wtf/WeakPtr.h>
@@ -1172 +1173 @@
     WEBCORE_EXPORT unsigned styleRecalcCount() const;
 
-    bool hasTouchEventHandlers() const;
-    bool touchEventTargetsContain(Node&) const;
+#if ENABLE(TOUCH_EVENTS)
+    bool hasTouchEventHandlers() const { return (m_touchEventTargets.get()) ? m_touchEventTargets->size() : false; }
+    bool touchEventTargetsContain(Node& node) const { return m_touchEventTargets ? m_touchEventTargets->contains(&node) : false; }
+#else
+    bool hasTouchEventHandlers() const { return false; }
+    bool touchEventTargetsContain(Node&) const { return false; }
+#endif
 
     void didAddTouchEventHandler(Node&);