<!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>[173258] trunk/Source</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/173258">173258</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-04 08:42:54 -0700 (Thu, 04 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Make iOS build when ENABLE_TOUCH_EVENT and ENABLE_IOS_TOUCH_EVENTS disabled
https://bugs.webkit.org/show_bug.cgi?id=136494
Reviewed by Andy Estes.
Source/WebCore:
* WebCore.exp.in: Add ENABLE(IOS_TOUCH_EVENTS) and ENABLE(TOUCH_EVENTS) guards. Also, sort this file using
the script Tools/Scripts/sort-export-file.
* bindings/js/JSDocumentCustom.cpp: Add ENABLE(TOUCH_EVENTS)-guard around headers JSTouch.h and JSTouchList.h.
* page/ios/WebEventRegion.mm: Substitute ENABLE(IOS_TOUCH_EVENTS) for ENABLE(TOUCH_EVENTS) since this
code is specific to the iOS touch machinery.
* page/scrolling/ScrollingCoordinator.cpp: Add ENABLE(IOS_TOUCH_EVENTS) and ENABLE(TOUCH_EVENTS) guards.
(WebCore::ScrollingCoordinator::computeNonFastScrollableRegion): Substitute ENABLE(IOS_TOUCH_EVENTS) for PLATFORM(IOS).
* platform/ios/ScrollAnimatorIOS.h: Add ENABLE(TOUCH_EVENTS) guard.
* platform/ios/ScrollAnimatorIOS.mm:
(WebCore::ScrollAnimatorIOS::ScrollAnimatorIOS): Ditto.
* platform/ios/wak/WAKResponder.h: Ditto.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::RenderLayer): Add ENABLE(IOS_TOUCH_EVENTS) guard.
(WebCore::RenderLayer::~RenderLayer): Substitute ENABLE(IOS_TOUCH_EVENTS) for PLATFORM(IOS) since this
code is specific to the iOS touch machinery.
* rendering/RenderLayer.h: Add ENABLE(IOS_TOUCH_EVENTS) guard.
Source/WebKit/mac:
* MigrateHeaders.make: Migrate header WebEventRegion.h only when ENABLE_IOS_TOUCH_EVENTS is defined.
* WebView/WebView.mm: Substitute ENABLE(IOS_TOUCH_EVENTS) for ENABLE(TOUCH_EVENTS).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDocumentCustomcpp">trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorepageiosWebEventRegionmm">trunk/Source/WebCore/page/ios/WebEventRegion.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformiosScrollAnimatorIOSh">trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosScrollAnimatorIOSmm">trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWAKResponderh">trunk/Source/WebCore/platform/ios/wak/WAKResponder.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMigrateHeadersmake">trunk/Source/WebKit/mac/MigrateHeaders.make</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173257 => 173258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-04 11:14:18 UTC (rev 173257)
+++ trunk/Source/WebCore/ChangeLog 2014-09-04 15:42:54 UTC (rev 173258)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-09-04 Daniel Bates <dabates@apple.com>
+
+ [iOS] Make iOS build when ENABLE_TOUCH_EVENT and ENABLE_IOS_TOUCH_EVENTS disabled
+ https://bugs.webkit.org/show_bug.cgi?id=136494
+
+ Reviewed by Andy Estes.
+
+ * WebCore.exp.in: Add ENABLE(IOS_TOUCH_EVENTS) and ENABLE(TOUCH_EVENTS) guards. Also, sort this file using
+ the script Tools/Scripts/sort-export-file.
+ * bindings/js/JSDocumentCustom.cpp: Add ENABLE(TOUCH_EVENTS)-guard around headers JSTouch.h and JSTouchList.h.
+ * page/ios/WebEventRegion.mm: Substitute ENABLE(IOS_TOUCH_EVENTS) for ENABLE(TOUCH_EVENTS) since this
+ code is specific to the iOS touch machinery.
+ * page/scrolling/ScrollingCoordinator.cpp: Add ENABLE(IOS_TOUCH_EVENTS) and ENABLE(TOUCH_EVENTS) guards.
+ (WebCore::ScrollingCoordinator::computeNonFastScrollableRegion): Substitute ENABLE(IOS_TOUCH_EVENTS) for PLATFORM(IOS).
+ * platform/ios/ScrollAnimatorIOS.h: Add ENABLE(TOUCH_EVENTS) guard.
+ * platform/ios/ScrollAnimatorIOS.mm:
+ (WebCore::ScrollAnimatorIOS::ScrollAnimatorIOS): Ditto.
+ * platform/ios/wak/WAKResponder.h: Ditto.
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::RenderLayer): Add ENABLE(IOS_TOUCH_EVENTS) guard.
+ (WebCore::RenderLayer::~RenderLayer): Substitute ENABLE(IOS_TOUCH_EVENTS) for PLATFORM(IOS) since this
+ code is specific to the iOS touch machinery.
+ * rendering/RenderLayer.h: Add ENABLE(IOS_TOUCH_EVENTS) guard.
+
</ins><span class="cx"> 2014-09-04 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r173240) [GTK] Debug build broken.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (173257 => 173258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-09-04 11:14:18 UTC (rev 173257)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-09-04 15:42:54 UTC (rev 173258)
</span><span class="lines">@@ -2468,7 +2468,6 @@
</span><span class="cx"> .objc_class_name_WAKView
</span><span class="cx"> .objc_class_name_WAKWindow
</span><span class="cx"> .objc_class_name_WebEvent
</span><del>-.objc_class_name_WebEventRegion
</del><span class="cx"> _InitWebCoreThreadSystemInterface
</span><span class="cx"> _NSApp
</span><span class="cx"> _WAKViewDidScrollNotification
</span><span class="lines">@@ -2549,10 +2548,8 @@
</span><span class="cx"> __ZN7WebCore12AudioSession11setCategoryENS0_12CategoryTypeE
</span><span class="cx"> __ZN7WebCore12AudioSession13sharedSessionEv
</span><span class="cx"> __ZN7WebCore12EventHandler10mouseMovedEP8WebEvent
</span><del>-__ZN7WebCore12EventHandler10touchEventEP8WebEvent
</del><span class="cx"> __ZN7WebCore12EventHandler10wheelEventEP8WebEvent
</span><span class="cx"> __ZN7WebCore12EventHandler15sendScrollEventEv
</span><del>-__ZN7WebCore12EventHandler16handleTouchEventERKNS_18PlatformTouchEventE
</del><span class="cx"> __ZN7WebCore12EventHandler7mouseUpEP8WebEvent
</span><span class="cx"> __ZN7WebCore12EventHandler8keyEventEP8WebEvent
</span><span class="cx"> __ZN7WebCore12EventHandler9mouseDownEP8WebEvent
</span><span class="lines">@@ -2729,7 +2726,6 @@
</span><span class="cx"> __ZN7WebCore6Editor59ensureLastEditCommandHasCurrentSelectionIfOpenForMoreTypingEv
</span><span class="cx"> __ZN7WebCore6Widget17setPlatformWidgetEP7WAKView
</span><span class="cx"> __ZN7WebCore6WidgetC2EP7WAKView
</span><del>-__ZN7WebCore8Document13getTouchRectsERN3WTF6VectorINS_7IntRectELm0ENS1_15CrashOnOverflowEEE
</del><span class="cx"> __ZN7WebCore8Document19dispatchWindowEventEN3WTF10PassRefPtrINS_5EventEEENS2_INS_11EventTargetEEE
</span><span class="cx"> __ZN7WebCore8IntPointC1ERK7CGPoint
</span><span class="cx"> __ZN7WebCore8PositionC1EN3WTF10PassRefPtrINS_4NodeEEENS0_10AnchorTypeE
</span><span class="lines">@@ -3238,6 +3234,12 @@
</span><span class="cx"> __ZN7WebCore12RenderObject19resetTextAutosizingEv
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(IOS_TOUCH_EVENTS)
+.objc_class_name_WebEventRegion
+__ZN7WebCore12EventHandler10touchEventEP8WebEvent
+__ZN7WebCore8Document13getTouchRectsERN3WTF6VectorINS_7IntRectELm0ENS1_15CrashOnOverflowEEE
+#endif
+
</ins><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> __ZN7WebCore12SourceBuffer25bufferedSamplesForTrackIDERKN3WTF12AtomicStringE
</span><span class="cx"> __ZN7WebCore14toSourceBufferEN3JSC7JSValueE
</span><span class="lines">@@ -3397,6 +3399,10 @@
</span><span class="cx"> __ZTVN7WebCore25PlatformSpeechSynthesizerE
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
+__ZN7WebCore12EventHandler16handleTouchEventERKNS_18PlatformTouchEventE
+#endif
+
</ins><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> .objc_class_name_WebVideoFullscreenController
</span><span class="cx"> __ZN7WebCore10TimeRanges3addEdd
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDocumentCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp (173257 => 173258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2014-09-04 11:14:18 UTC (rev 173257)
+++ trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2014-09-04 15:42:54 UTC (rev 173258)
</span><span class="lines">@@ -25,23 +25,26 @@
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "HTMLDocument.h"
</span><span class="cx"> #include "JSCanvasRenderingContext2D.h"
</span><del>-#if ENABLE(WEBGL)
-#include "JSWebGLRenderingContext.h"
-#endif
</del><span class="cx"> #include "JSDOMWindowCustom.h"
</span><span class="cx"> #include "JSHTMLDocument.h"
</span><span class="cx"> #include "JSLocation.h"
</span><span class="cx"> #include "JSSVGDocument.h"
</span><del>-#include "JSTouch.h"
-#include "JSTouchList.h"
</del><span class="cx"> #include "Location.h"
</span><span class="cx"> #include "NodeTraversal.h"
</span><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "SVGDocument.h"
</span><span class="cx"> #include "TouchList.h"
</span><del>-
</del><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="cx">
</span><ins>+#if ENABLE(WEBGL)
+#include "JSWebGLRenderingContext.h"
+#endif
+
+#if ENABLE(TOUCH_EVENTS)
+#include "JSTouch.h"
+#include "JSTouchList.h"
+#endif
+
</ins><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosWebEventRegionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ios/WebEventRegion.mm (173257 => 173258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/WebEventRegion.mm 2014-09-04 11:14:18 UTC (rev 173257)
+++ trunk/Source/WebCore/page/ios/WebEventRegion.mm 2014-09-04 15:42:54 UTC (rev 173258)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "WebEventRegion.h"
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS)
</del><ins>+#if ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx">
</span><span class="cx"> #import "FloatQuad.h"
</span><span class="cx">
</span><span class="lines">@@ -105,4 +105,4 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#endif // ENABLE(TOUCH_EVENTS)
</del><ins>+#endif // ENABLE(IOS_TOUCH_EVENTS)
</ins></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (173257 => 173258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2014-09-04 11:14:18 UTC (rev 173257)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2014-09-04 15:42:54 UTC (rev 173258)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">
</span><span class="cx"> Region ScrollingCoordinator::computeNonFastScrollableRegion(const Frame* frame, const IntPoint& frameLocation) const
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS)
</del><ins>+#if ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> // On iOS, we use nonFastScrollableRegion to represent the region covered by elements with touch event handlers.
</span><span class="cx"> ASSERT(frame->isMainFrame());
</span><span class="cx"> UNUSED_PARAM(frameLocation);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosScrollAnimatorIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.h (173257 => 173258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.h 2014-09-04 11:14:18 UTC (rev 173257)
+++ trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.h 2014-09-04 15:42:54 UTC (rev 173258)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+#if ENABLE(TOUCH_EVENTS)
</ins><span class="cx"> void determineScrollableAreaForTouchSequence(const IntSize& touchDelta);
</span><span class="cx">
</span><span class="cx"> // State for handling sequences of touches in defaultTouchEventHandler.
</span><span class="lines">@@ -63,6 +64,7 @@
</span><span class="cx"> // When we're in a touch sequence, this will point to the scrollable area that
</span><span class="cx"> // should actually be scrolled during the sequence.
</span><span class="cx"> ScrollableArea* m_scrollableAreaForTouchSequence;
</span><ins>+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosScrollAnimatorIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.mm (173257 => 173258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.mm 2014-09-04 11:14:18 UTC (rev 173257)
+++ trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.mm 2014-09-04 15:42:54 UTC (rev 173258)
</span><span class="lines">@@ -28,11 +28,14 @@
</span><span class="cx">
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "Page.h"
</span><del>-#include "PlatformTouchEventIOS.h"
</del><span class="cx"> #include "RenderLayer.h"
</span><span class="cx"> #include "ScrollableArea.h"
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
+#include "PlatformTouchEventIOS.h"
+#endif
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -44,11 +47,13 @@
</span><span class="cx">
</span><span class="cx"> ScrollAnimatorIOS::ScrollAnimatorIOS(ScrollableArea* scrollableArea)
</span><span class="cx"> : ScrollAnimator(scrollableArea)
</span><ins>+#if ENABLE(TOUCH_EVENTS)
</ins><span class="cx"> , m_touchScrollAxisLatch(AxisLatchNotComputed)
</span><span class="cx"> , m_inTouchSequence(false)
</span><span class="cx"> , m_committedToScrollAxis(false)
</span><span class="cx"> , m_startedScroll(false)
</span><span class="cx"> , m_scrollableAreaForTouchSequence(0)
</span><ins>+#endif
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -56,6 +61,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
</ins><span class="cx"> bool ScrollAnimatorIOS::handleTouchEvent(const PlatformTouchEvent& touchEvent)
</span><span class="cx"> {
</span><span class="cx"> if (touchEvent.type() == PlatformEvent::TouchStart && touchEvent.touchCount() == 1) {
</span><span class="lines">@@ -180,5 +186,6 @@
</span><span class="cx"> ASSERT(scrollableArea);
</span><span class="cx"> m_scrollableAreaForTouchSequence = scrollableArea;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKResponderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKResponder.h (173257 => 173258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKResponder.h 2014-09-04 11:14:18 UTC (rev 173257)
+++ trunk/Source/WebCore/platform/ios/wak/WAKResponder.h 2014-09-04 15:42:54 UTC (rev 173258)
</span><span class="lines">@@ -46,7 +46,9 @@
</span><span class="cx"> - (void)mouseExited:(WebEvent *)theEvent;
</span><span class="cx"> - (void)keyDown:(WebEvent *)event;
</span><span class="cx"> - (void)keyUp:(WebEvent *)event;
</span><ins>+#if ENABLE(TOUCH_EVENTS)
</ins><span class="cx"> - (void)touch:(WebEvent *)event;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> - (void)insertText:(NSString *)text;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (173257 => 173258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-09-04 11:14:18 UTC (rev 173257)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-09-04 15:42:54 UTC (rev 173258)
</span><span class="lines">@@ -176,7 +176,11 @@
</span><span class="cx"> , m_viewportConstrainedNotCompositedReason(NoNotCompositedReason)
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_adjustForIOSCaretWhenScrolling(false)
</span><ins>+#endif
+#if PLATFORM(IOS)
+#if ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> , m_registeredAsTouchEventListenerForScrolling(false)
</span><ins>+#endif
</ins><span class="cx"> , m_inUserScroll(false)
</span><span class="cx"> , m_requiresScrollBoundsOriginUpdate(false)
</span><span class="cx"> #endif
</span><span class="lines">@@ -235,7 +239,7 @@
</span><span class="cx"> renderer().view().frameView().removeScrollableArea(this);
</span><span class="cx">
</span><span class="cx"> if (!renderer().documentBeingDestroyed()) {
</span><del>-#if PLATFORM(IOS)
</del><ins>+#if ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> unregisterAsTouchEventListenerForScrolling();
</span><span class="cx"> #endif
</span><span class="cx"> if (Element* element = renderer().element())
</span><span class="lines">@@ -2065,7 +2069,9 @@
</span><span class="cx"> return ScrollableArea::handleTouchEvent(touchEvent);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><ins>+#endif // PLATFORM(IOS)
</ins><span class="cx">
</span><ins>+#if ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> void RenderLayer::registerAsTouchEventListenerForScrolling()
</span><span class="cx"> {
</span><span class="cx"> if (!renderer().element() || m_registeredAsTouchEventListenerForScrolling)
</span><span class="lines">@@ -2083,7 +2089,7 @@
</span><span class="cx"> renderer().document().removeTouchEventListener(renderer().element());
</span><span class="cx"> m_registeredAsTouchEventListenerForScrolling = false;
</span><span class="cx"> }
</span><del>-#endif // PLATFORM(IOS)
</del><ins>+#endif // ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx">
</span><span class="cx"> bool RenderLayer::usesCompositedScrolling() const
</span><span class="cx"> {
</span><span class="lines">@@ -6576,7 +6582,7 @@
</span><span class="cx"> if (addedOrRemoved)
</span><span class="cx"> updateNeedsCompositedScrolling();
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
</del><ins>+#if ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> if (addedOrRemoved) {
</span><span class="cx"> if (isScrollable && !hasAcceleratedTouchScrolling())
</span><span class="cx"> registerAsTouchEventListenerForScrolling();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (173257 => 173258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2014-09-04 11:14:18 UTC (rev 173257)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2014-09-04 15:42:54 UTC (rev 173258)
</span><span class="lines">@@ -1257,7 +1257,9 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> bool m_adjustForIOSCaretWhenScrolling : 1;
</span><ins>+#if ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> bool m_registeredAsTouchEventListenerForScrolling : 1;
</span><ins>+#endif
</ins><span class="cx"> bool m_inUserScroll : 1;
</span><span class="cx"> bool m_requiresScrollBoundsOriginUpdate : 1;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (173257 => 173258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-09-04 11:14:18 UTC (rev 173257)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-09-04 15:42:54 UTC (rev 173258)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-09-04 Daniel Bates <dabates@apple.com>
+
+ [iOS] Make iOS build when ENABLE_TOUCH_EVENT and ENABLE_IOS_TOUCH_EVENTS disabled
+ https://bugs.webkit.org/show_bug.cgi?id=136494
+
+ Reviewed by Andy Estes.
+
+ * MigrateHeaders.make: Migrate header WebEventRegion.h only when ENABLE_IOS_TOUCH_EVENTS is defined.
+ * WebView/WebView.mm: Substitute ENABLE(IOS_TOUCH_EVENTS) for ENABLE(TOUCH_EVENTS).
+
</ins><span class="cx"> 2014-09-02 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: fix prefixes for subclasses of JSC::ConsoleClient
</span></span></pre></div>
<a id="trunkSourceWebKitmacMigrateHeadersmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/MigrateHeaders.make (173257 => 173258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/MigrateHeaders.make 2014-09-04 11:14:18 UTC (rev 173257)
+++ trunk/Source/WebKit/mac/MigrateHeaders.make 2014-09-04 15:42:54 UTC (rev 173258)
</span><span class="lines">@@ -215,8 +215,7 @@
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/WebCoreThread.h \
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/WebCoreThreadMessage.h \
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/WebCoreThreadRun.h \
</span><del>- $(PRIVATE_HEADERS_DIR)/WebEvent.h \
- $(PRIVATE_HEADERS_DIR)/WebEventRegion.h
</del><ins>+ $(PRIVATE_HEADERS_DIR)/WebEvent.h
</ins><span class="cx">
</span><span class="cx"> # Special case WAKScrollView.h, which contains the protocol named
</span><span class="cx"> # <WebCoreFrameScrollView> and shouldn't be changed by the default rule.
</span><span class="lines">@@ -232,6 +231,11 @@
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/DOMTouchList.h
</span><span class="cx"> endif
</span><span class="cx">
</span><ins>+ifeq ($(findstring ENABLE_IOS_TOUCH_EVENTS, $(FEATURE_DEFINES)), ENABLE_IOS_TOUCH_EVENTS)
+all : \
+ $(PRIVATE_HEADERS_DIR)/WebEventRegion.h
+endif
+
</ins><span class="cx"> ifeq ($(findstring ENABLE_IOS_GESTURE_EVENTS, $(FEATURE_DEFINES)), ENABLE_IOS_GESTURE_EVENTS)
</span><span class="cx"> all : \
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/DOMGestureEvent.h
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (173257 => 173258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-09-04 11:14:18 UTC (rev 173257)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-09-04 15:42:54 UTC (rev 173258)
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> #include <WebCore/QuickLook.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS)
</del><ins>+#if ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> #import <WebCore/WebEventRegion.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>