<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[176411] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/176411">176411</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-20 13:50:06 -0800 (Thu, 20 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Add more ENABLE({TOUCH_EVENTS, IOS_TOUCH_EVENTS})-guards in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=138928
Reviewed by Simon Fraser.
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView setupInteraction]):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::didCommitLoad):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::sendTapHighlightForNodeIfNecessary):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionh">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176410 => 176411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-20 21:45:54 UTC (rev 176410)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-20 21:50:06 UTC (rev 176411)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-11-20 Daniel Bates <dabates@apple.com>
+
+ [iOS] Add more ENABLE({TOUCH_EVENTS, IOS_TOUCH_EVENTS})-guards in WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=138928
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView setupInteraction]):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::didCommitLoad):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::sendTapHighlightForNodeIfNecessary):
+
</ins><span class="cx"> 2014-11-20 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add -[WKWebView loadData:MIMEType:textEncodingName:baseURL:]
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (176410 => 176411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2014-11-20 21:45:54 UTC (rev 176410)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2014-11-20 21:50:06 UTC (rev 176411)
</span><span class="lines">@@ -163,7 +163,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)scrollViewWillStartPanOrPinchGesture;
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
</ins><span class="cx"> - (void)_webTouchEvent:(const WebKit::NativeWebTouchEvent&)touchEvent preventsNativeGestures:(BOOL)preventsDefault;
</span><ins>+#endif
</ins><span class="cx"> - (void)_commitPotentialTapFailed;
</span><span class="cx"> - (void)_didGetTapHighlightForRequest:(uint64_t)requestID color:(const WebCore::Color&)color quads:(const Vector<WebCore::FloatQuad>&)highlightedQuads topLeftRadius:(const WebCore::IntSize&)topLeftRadius topRightRadius:(const WebCore::IntSize&)topRightRadius bottomLeftRadius:(const WebCore::IntSize&)bottomLeftRadius bottomRightRadius:(const WebCore::IntSize&)bottomRightRadius;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (176410 => 176411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-11-20 21:45:54 UTC (rev 176410)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-11-20 21:50:06 UTC (rev 176411)
</span><span class="lines">@@ -232,9 +232,11 @@
</span><span class="cx">
</span><span class="cx"> [self.layer addObserver:self forKeyPath:@"transform" options:NSKeyValueObservingOptionInitial context:nil];
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
</ins><span class="cx"> _touchEventGestureRecognizer = adoptNS([[UIWebTouchEventsGestureRecognizer alloc] initWithTarget:self action:@selector(_webTouchEventsRecognized:) touchDelegate:self]);
</span><span class="cx"> [_touchEventGestureRecognizer setDelegate:self];
</span><span class="cx"> [self addGestureRecognizer:_touchEventGestureRecognizer.get()];
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> _singleTapGestureRecognizer = adoptNS([[WKSyntheticClickTapGestureRecognizer alloc] initWithTarget:self action:@selector(_singleTapCommited:)]);
</span><span class="cx"> [_singleTapGestureRecognizer setDelegate:self];
</span><span class="lines">@@ -461,6 +463,7 @@
</span><span class="cx"> return [super resignFirstResponder];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
</ins><span class="cx"> - (void)_webTouchEventsRecognized:(UIWebTouchEventsGestureRecognizer *)gestureRecognizer
</span><span class="cx"> {
</span><span class="cx"> const _UIWebTouchEvent* lastTouchEvent = gestureRecognizer.lastTouchEvent;
</span><span class="lines">@@ -477,6 +480,7 @@
</span><span class="cx"> if (nativeWebTouchEvent.allTouchPointsAreReleased())
</span><span class="cx"> _canSendTouchEventsAsynchronously = NO;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> - (void)_inspectorNodeSearchRecognized:(UIGestureRecognizer *)gestureRecognizer
</span><span class="cx"> {
</span><span class="lines">@@ -534,6 +538,7 @@
</span><span class="cx"> return FloatQuad(points[1], points[0], points[2], points[3]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
</ins><span class="cx"> - (void)_webTouchEvent:(const WebKit::NativeWebTouchEvent&)touchEvent preventsNativeGestures:(BOOL)preventsNativeGesture
</span><span class="cx"> {
</span><span class="cx"> if (preventsNativeGesture) {
</span><span class="lines">@@ -543,6 +548,7 @@
</span><span class="cx"> [_touchEventGestureRecognizer setDefaultPrevented:YES];
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> static inline bool highlightedQuadsAreSmallerThanRect(const Vector<FloatQuad>& quads, const FloatRect& rect)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (176410 => 176411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-11-20 21:45:54 UTC (rev 176410)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-11-20 21:50:06 UTC (rev 176411)
</span><span class="lines">@@ -4487,7 +4487,9 @@
</span><span class="cx"> m_userHasChangedPageScaleFactor = false;
</span><span class="cx"> m_estimatedLatency = std::chrono::milliseconds(1000 / 60);
</span><span class="cx">
</span><ins>+#if ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> WebProcess::shared().eventDispatcher().clearQueuedTouchEventsForPage(*this);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> resetViewportDefaultConfiguration(frame);
</span><span class="cx"> m_viewportConfiguration.resetMinimalUI();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (176410 => 176411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-11-20 21:45:54 UTC (rev 176410)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-11-20 21:50:06 UTC (rev 176411)
</span><span class="lines">@@ -519,7 +519,10 @@
</span><span class="cx"> WebCore::IntRect rectForElementAtInteractionLocation();
</span><span class="cx"> void updateSelectionAppearance();
</span><span class="cx">
</span><ins>+#if ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> void dispatchAsynchronousTouchEvents(const Vector<WebTouchEvent, 1>& queue);
</span><ins>+#endif
+
</ins><span class="cx"> void contentSizeCategoryDidChange(const String&);
</span><span class="cx"> void executeEditCommandWithCallback(const String&, uint64_t callbackID);
</span><span class="cx">
</span><span class="lines">@@ -773,10 +776,13 @@
</span><span class="cx"> void applicationWillEnterForeground();
</span><span class="cx"> void applicationDidBecomeActive();
</span><span class="cx"> void zoomToRect(WebCore::FloatRect, double minimumScale, double maximumScale);
</span><del>- void dispatchTouchEvent(const WebTouchEvent&, bool& handled);
</del><span class="cx"> void completePendingSyntheticClickForContentChangeObserver();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(IOS_TOUCH_EVENTS)
+ void dispatchTouchEvent(const WebTouchEvent&, bool& handled);
+#endif
+
</ins><span class="cx"> #if PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL)
</span><span class="cx"> uint64_t nativeWindowHandle() { return m_nativeWindowHandle; }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (176410 => 176411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-11-20 21:45:54 UTC (rev 176410)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-11-20 21:50:06 UTC (rev 176411)
</span><span class="lines">@@ -509,6 +509,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::sendTapHighlightForNodeIfNecessary(uint64_t requestID, Node* node)
</span><span class="cx"> {
</span><ins>+#if ENABLE(TOUCH_EVENTS)
</ins><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -536,6 +537,10 @@
</span><span class="cx">
</span><span class="cx"> send(Messages::WebPageProxy::DidGetTapHighlightGeometries(requestID, highlightColor, quads, roundedIntSize(borderRadii.topLeft()), roundedIntSize(borderRadii.topRight()), roundedIntSize(borderRadii.bottomLeft()), roundedIntSize(borderRadii.bottomRight())));
</span><span class="cx"> }
</span><ins>+#else
+ UNUSED_PARAM(requestID);
+ UNUSED_PARAM(node);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::potentialTapAtPosition(uint64_t requestID, const WebCore::FloatPoint& position)
</span><span class="lines">@@ -2706,12 +2711,14 @@
</span><span class="cx"> send(Messages::WebPageProxy::ZoomToRect(rect, minimumScale, maximumScale));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> void WebPage::dispatchAsynchronousTouchEvents(const Vector<WebTouchEvent, 1>& queue)
</span><span class="cx"> {
</span><span class="cx"> bool ignored;
</span><span class="cx"> for (const WebTouchEvent& event : queue)
</span><span class="cx"> dispatchTouchEvent(event, ignored);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void WebPage::computePagesForPrintingAndStartDrawingToPDF(uint64_t frameID, const PrintInfo& printInfo, uint32_t firstPage, PassRefPtr<Messages::WebPage::ComputePagesForPrintingAndStartDrawingToPDF::DelayedReply> reply)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>