Title: [223425] trunk/Source/WebCore
- Revision
- 223425
- Author
- [email protected]
- Date
- 2017-10-16 12:49:23 -0700 (Mon, 16 Oct 2017)
Log Message
Remove unnecessary include from Document.h
https://bugs.webkit.org/show_bug.cgi?id=178247
Reviewed by Darin Adler.
* dom/Document.cpp:
(WebCore::Document::hasTouchEventHandlers const):
(WebCore::Document::touchEventTargetsContain const):
* dom/Document.h:
(WebCore::Document::hasTouchEventHandlers const): Deleted.
(WebCore::Document::touchEventTargetsContain const): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (223424 => 223425)
--- trunk/Source/WebCore/ChangeLog 2017-10-16 19:46:29 UTC (rev 223424)
+++ trunk/Source/WebCore/ChangeLog 2017-10-16 19:49:23 UTC (rev 223425)
@@ -1,5 +1,19 @@
2017-10-16 Alex Christensen <[email protected]>
+ Remove unnecessary include from Document.h
+ https://bugs.webkit.org/show_bug.cgi?id=178247
+
+ Reviewed by Darin Adler.
+
+ * dom/Document.cpp:
+ (WebCore::Document::hasTouchEventHandlers const):
+ (WebCore::Document::touchEventTargetsContain const):
+ * dom/Document.h:
+ (WebCore::Document::hasTouchEventHandlers const): Deleted.
+ (WebCore::Document::touchEventTargetsContain const): Deleted.
+
+2017-10-16 Alex Christensen <[email protected]>
+
Fix iOS build after r223422
https://bugs.webkit.org/show_bug.cgi?id=178251
Modified: trunk/Source/WebCore/dom/Document.cpp (223424 => 223425)
--- trunk/Source/WebCore/dom/Document.cpp 2017-10-16 19:46:29 UTC (rev 223424)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-10-16 19:49:23 UTC (rev 223425)
@@ -5542,6 +5542,25 @@
m_ranges.remove(range);
}
+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)
{
HTMLCanvasElement* element = getCSSCanvasElement(name);
Modified: trunk/Source/WebCore/dom/Document.h (223424 => 223425)
--- trunk/Source/WebCore/dom/Document.h 2017-10-16 19:46:29 UTC (rev 223424)
+++ trunk/Source/WebCore/dom/Document.h 2017-10-16 19:49:23 UTC (rev 223425)
@@ -53,7 +53,6 @@
#include <pal/SessionID.h>
#include <wtf/Deque.h>
#include <wtf/Forward.h>
-#include <wtf/HashCountedSet.h>
#include <wtf/HashSet.h>
#include <wtf/WeakPtr.h>
#include <wtf/text/AtomicStringHash.h>
@@ -1172,13 +1171,8 @@
WEBCORE_EXPORT void startTrackingStyleRecalcs();
WEBCORE_EXPORT unsigned styleRecalcCount() 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
+ bool hasTouchEventHandlers() const;
+ bool touchEventTargetsContain(Node&) const;
void didAddTouchEventHandler(Node&);
void didRemoveTouchEventHandler(Node&, EventHandlerRemoval = EventHandlerRemoval::One);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
