Title: [240762] tags/Safari-608.1.3.1/Source/WebCore
- Revision
- 240762
- Author
- [email protected]
- Date
- 2019-01-30 22:33:35 -0800 (Wed, 30 Jan 2019)
Log Message
Cherry-pick r240692. rdar://problem/47283874
Try to fix the watchOS build.
* dom/Element.cpp:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240692 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: tags/Safari-608.1.3.1/Source/WebCore/ChangeLog (240761 => 240762)
--- tags/Safari-608.1.3.1/Source/WebCore/ChangeLog 2019-01-31 06:33:32 UTC (rev 240761)
+++ tags/Safari-608.1.3.1/Source/WebCore/ChangeLog 2019-01-31 06:33:35 UTC (rev 240762)
@@ -1,5 +1,21 @@
2019-01-30 Babak Shafiei <[email protected]>
+ Cherry-pick r240692. rdar://problem/47283874
+
+ Try to fix the watchOS build.
+
+ * dom/Element.cpp:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240692 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-29 Andy Estes <[email protected]>
+
+ Try to fix the watchOS build.
+
+ * dom/Element.cpp:
+
+2019-01-30 Babak Shafiei <[email protected]>
+
Cherry-pick r240596. rdar://problem/47283874
Limit user-agent interactions based on the touch-action property on iOS
Modified: tags/Safari-608.1.3.1/Source/WebCore/dom/Element.cpp (240761 => 240762)
--- tags/Safari-608.1.3.1/Source/WebCore/dom/Element.cpp 2019-01-31 06:33:32 UTC (rev 240761)
+++ tags/Safari-608.1.3.1/Source/WebCore/dom/Element.cpp 2019-01-31 06:33:35 UTC (rev 240762)
@@ -3403,11 +3403,13 @@
return true;
}
+#if ENABLE(FULLSCREEN_API) || ENABLE(POINTER_EVENTS)
static Element* parentCrossingFrameBoundaries(const Element* element)
{
ASSERT(element);
return element->parentElement() ? element->parentElement() : element->document().ownerElement();
}
+#endif
#if ENABLE(FULLSCREEN_API)
void Element::webkitRequestFullscreen()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
