<!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>[161939] 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/161939">161939</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-01-13 19:35:51 -0800 (Mon, 13 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>iOS WebKit2 build fixes
* NetworkProcess/NetworkResourceLoader.cpp:
* NetworkProcess/NetworkResourceLoader.h:
Introduce/clarify some confusion about CFNETWORK vs. PLATFORM(IOS).
* NetworkProcess/RemoteNetworkingContext.h:
* WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h:
Get rid of an override of something that doesn't exist anymore.
* WebKit2.xcodeproj/project.pbxproj:
Add some files. It's likely there are more missing, but this is a start.
* Shared/WebEventConversion.h:
* WebProcess/WebPage/WebPage.h:
Use WebKitAdditions.
* UIProcess/API/ios/WKGeolocationProviderIOS.mm:
Something bizarre is happening with internal deprecation warnings.
* UIProcess/API/ios/WKInteractionView.mm:
(-[WKTextPosition isEqual:]):
Fix a typo.
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
Remove an override of something that doesn't exist anymore.
* WebCore.xcodeproj/project.pbxproj:
Make some headers private instead of project for WK2's use.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessRemoteNetworkingContexth">trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebEventConversionh">trunk/Source/WebKit2/Shared/WebEventConversion.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosWKGeolocationProviderIOSmm">trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosWKInteractionViewmm">trunk/Source/WebKit2/UIProcess/API/ios/WKInteractionView.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebFrameNetworkingContexth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161938 => 161939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-14 02:43:01 UTC (rev 161938)
+++ trunk/Source/WebCore/ChangeLog 2014-01-14 03:35:51 UTC (rev 161939)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2014-01-13 Tim Horton <timothy_horton@apple.com>
+
+ iOS WebKit2 build fixes
+
+ * WebCore.xcodeproj/project.pbxproj:
+ Make some headers private instead of project for WK2's use.
+
</ins><span class="cx"> 2014-01-13 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Make NetworkStateNotifier.h a private header, needed by iOS.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (161938 => 161939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-14 02:43:01 UTC (rev 161938)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-14 03:35:51 UTC (rev 161939)
</span><span class="lines">@@ -518,7 +518,7 @@
</span><span class="cx"> 0FC4E40E187F82E10045882C /* ScrollingCoordinatorIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FC4E408187F82E10045882C /* ScrollingCoordinatorIOS.mm */; };
</span><span class="cx"> 0FC4E40F187F82E10045882C /* ScrollingTreeIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FC4E409187F82E10045882C /* ScrollingTreeIOS.cpp */; };
</span><span class="cx"> 0FC4E410187F82E10045882C /* ScrollingTreeIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC4E40A187F82E10045882C /* ScrollingTreeIOS.h */; };
</span><del>- 0FC4E411187F82E10045882C /* ScrollingTreeScrollingNodeIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC4E40B187F82E10045882C /* ScrollingTreeScrollingNodeIOS.h */; };
</del><ins>+ 0FC4E411187F82E10045882C /* ScrollingTreeScrollingNodeIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC4E40B187F82E10045882C /* ScrollingTreeScrollingNodeIOS.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 0FC4E412187F82E10045882C /* ScrollingTreeScrollingNodeIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FC4E40C187F82E10045882C /* ScrollingTreeScrollingNodeIOS.mm */; };
</span><span class="cx"> 0FCF33240F2B9715004B6795 /* ColorCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FCF33230F2B9715004B6795 /* ColorCG.cpp */; };
</span><span class="cx"> 0FCF332E0F2B9A25004B6795 /* WebLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCF332A0F2B9A25004B6795 /* WebLayer.mm */; };
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161938 => 161939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-14 02:43:01 UTC (rev 161938)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-14 03:35:51 UTC (rev 161939)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-01-13 Tim Horton <timothy_horton@apple.com>
+
+ iOS WebKit2 build fixes
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ * NetworkProcess/NetworkResourceLoader.h:
+ Introduce/clarify some confusion about CFNETWORK vs. PLATFORM(IOS).
+
+ * NetworkProcess/RemoteNetworkingContext.h:
+ * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h:
+ Get rid of an override of something that doesn't exist anymore.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Add some files. It's likely there are more missing, but this is a start.
+
+ * Shared/WebEventConversion.h:
+ * WebProcess/WebPage/WebPage.h:
+ Use WebKitAdditions.
+
+ * UIProcess/API/ios/WKGeolocationProviderIOS.mm:
+ Something bizarre is happening with internal deprecation warnings.
+
+ * UIProcess/API/ios/WKInteractionView.mm:
+ (-[WKTextPosition isEqual:]):
+ Fix a typo.
+
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
+ Remove an override of something that doesn't exist anymore.
+
</ins><span class="cx"> 2014-01-13 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Build Fix: Don't build the 'All-iOS' target on iOS. Just use 'All'.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (161938 => 161939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-01-14 02:43:01 UTC (rev 161938)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-01-14 03:35:51 UTC (rev 161939)
</span><span class="lines">@@ -405,7 +405,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx"> void NetworkResourceLoader::willStopBufferingData(ResourceHandle*, const char*, unsigned)
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (161938 => 161939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-01-14 02:43:01 UTC (rev 161938)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-01-14 03:35:51 UTC (rev 161939)
</span><span class="lines">@@ -108,8 +108,8 @@
</span><span class="cx"> static size_t fileBackedResourceMinimumSize();
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> virtual void willCacheResponseAsync(WebCore::ResourceHandle*, NSCachedURLResponse *) OVERRIDE;
</span><ins>+ virtual void willStopBufferingData(WebCore::ResourceHandle*, const char*, unsigned) OVERRIDE;
</ins><span class="cx"> #endif
</span><del>- virtual void willStopBufferingData(WebCore::ResourceHandle*, const char*, unsigned) OVERRIDE;
</del><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> // Message handlers.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessRemoteNetworkingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h (161938 => 161939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h 2014-01-14 02:43:01 UTC (rev 161938)
+++ trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h 2014-01-14 03:35:51 UTC (rev 161939)
</span><span class="lines">@@ -67,9 +67,6 @@
</span><span class="cx"> virtual bool localFileContentSniffingEnabled() const OVERRIDE;
</span><span class="cx"> virtual RetainPtr<CFDataRef> sourceApplicationAuditData() const OVERRIDE;
</span><span class="cx"> virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const OVERRIDE;
</span><del>-#if PLATFORM(IOS)
- virtual void reportNetworkDataUsage(uint64_t rawBytesSent, uint64_t rawBytesReceived, uint64_t cellularBytesSent, uint64_t cellularBytesReceived) OVERRIDE { }
-#endif // PLATFORM(IOS)
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebEventConversionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebEventConversion.h (161938 => 161939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebEventConversion.h 2014-01-14 02:43:01 UTC (rev 161938)
+++ trunk/Source/WebKit2/Shared/WebEventConversion.h 2014-01-14 03:35:51 UTC (rev 161939)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#include <WebCore/PlatformTouchEventIOS.h>
</del><ins>+#include <WebKitAdditions/PlatformTouchEventIOS.h>
</ins><span class="cx"> #else
</span><span class="cx"> #include <WebCore/PlatformTouchEvent.h>
</span><span class="cx"> #include <WebCore/PlatformTouchPoint.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosWKGeolocationProviderIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm (161938 => 161939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm 2014-01-14 02:43:01 UTC (rev 161938)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm 2014-01-14 03:35:51 UTC (rev 161939)
</span><span class="lines">@@ -45,6 +45,9 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
</ins><span class="cx"> @interface WKGeolocationProviderIOS ()
</span><span class="cx"> -(void)_startUpdating;
</span><span class="cx"> -(void)_stopUpdating;
</span><span class="lines">@@ -275,3 +278,5 @@
</span><span class="cx"> return NO;
</span><span class="cx"> }
</span><span class="cx"> @end
</span><ins>+
+#pragma clang diagnostic pop
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosWKInteractionViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKInteractionView.mm (161938 => 161939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/WKInteractionView.mm 2014-01-14 02:43:01 UTC (rev 161938)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKInteractionView.mm 2014-01-14 03:35:51 UTC (rev 161939)
</span><span class="lines">@@ -1559,7 +1559,7 @@
</span><span class="cx"> // since two equal items could have different hashes.
</span><span class="cx"> - (BOOL)isEqual:(id)other
</span><span class="cx"> {
</span><del>- if (![object isKindOfClass:[WKTextPosition class]])
</del><ins>+ if (![other isKindOfClass:[WKTextPosition class]])
</ins><span class="cx"> return NO;
</span><span class="cx">
</span><span class="cx"> return CGRectEqualToRect(self.positionRect, ((WKTextPosition *)other).positionRect);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (161938 => 161939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-01-14 02:43:01 UTC (rev 161938)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-01-14 03:35:51 UTC (rev 161939)
</span><span class="lines">@@ -407,6 +407,28 @@
</span><span class="cx"> 2DA049B4180CCCD300AAFA9E /* PlatformCALayerRemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA049B2180CCCD300AAFA9E /* PlatformCALayerRemote.h */; };
</span><span class="cx"> 2DA049B7180CCD0A00AAFA9E /* GraphicsLayerCARemote.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DA049B5180CCD0A00AAFA9E /* GraphicsLayerCARemote.cpp */; };
</span><span class="cx"> 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA049B6180CCD0A00AAFA9E /* GraphicsLayerCARemote.h */; };
</span><ins>+ 2DA944871884E3B500ED86DB /* PageClientImplIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA944781884E3B500ED86DB /* PageClientImplIOS.h */; };
+ 2DA944881884E3B500ED86DB /* PageClientImplIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944791884E3B500ED86DB /* PageClientImplIOS.mm */; };
+ 2DA944891884E3B500ED86DB /* UIWKRemoteView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA9447A1884E3B500ED86DB /* UIWKRemoteView.h */; };
+ 2DA9448A1884E3B500ED86DB /* UIWKRemoteView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA9447B1884E3B500ED86DB /* UIWKRemoteView.mm */; };
+ 2DA9448B1884E3B500ED86DB /* WKContentView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA9447C1884E3B500ED86DB /* WKContentView.h */; };
+ 2DA9448C1884E3B500ED86DB /* WKContentView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA9447D1884E3B500ED86DB /* WKContentView.mm */; };
+ 2DA9448D1884E3B500ED86DB /* WKContentViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA9447E1884E3B500ED86DB /* WKContentViewInternal.h */; };
+ 2DA9448E1884E3B500ED86DB /* WKGeolocationProviderIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA9447F1884E3B500ED86DB /* WKGeolocationProviderIOS.h */; };
+ 2DA9448F1884E3B500ED86DB /* WKGeolocationProviderIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944801884E3B500ED86DB /* WKGeolocationProviderIOS.mm */; };
+ 2DA944901884E3B500ED86DB /* WKGeolocationProviderIOSObjCSecurityOrigin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944811884E3B500ED86DB /* WKGeolocationProviderIOSObjCSecurityOrigin.mm */; };
+ 2DA944911884E3B500ED86DB /* WKInteractionView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA944821884E3B500ED86DB /* WKInteractionView.h */; };
+ 2DA944921884E3B500ED86DB /* WKInteractionView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944831884E3B500ED86DB /* WKInteractionView.mm */; };
+ 2DA944931884E3B500ED86DB /* WKScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA944841884E3B500ED86DB /* WKScrollView.h */; };
+ 2DA944941884E3B500ED86DB /* WKScrollView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944851884E3B500ED86DB /* WKScrollView.mm */; };
+ 2DA944951884E3B500ED86DB /* WKView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944861884E3B500ED86DB /* WKView.mm */; };
+ 2DA9449E1884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944971884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm */; };
+ 2DA9449F1884E4F000ED86DB /* NativeWebTouchEventIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944981884E4F000ED86DB /* NativeWebTouchEventIOS.mm */; };
+ 2DA944A01884E4F000ED86DB /* WebIOSEventFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA944991884E4F000ED86DB /* WebIOSEventFactory.h */; };
+ 2DA944A11884E4F000ED86DB /* WebIOSEventFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA9449A1884E4F000ED86DB /* WebIOSEventFactory.mm */; };
+ 2DA944A21884E4F000ED86DB /* WebPlatformTouchPointIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DA9449B1884E4F000ED86DB /* WebPlatformTouchPointIOS.cpp */; };
+ 2DA944A31884E4F000ED86DB /* WebTouchEventIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DA9449C1884E4F000ED86DB /* WebTouchEventIOS.cpp */; };
+ 2DA944A41884E4F000ED86DB /* WKGestureTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA9449D1884E4F000ED86DB /* WKGestureTypes.h */; };
</ins><span class="cx"> 2DDE0AFA18298CC900F97EAA /* RemoteLayerTreePropertyApplier.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DDE0AF818298CC900F97EAA /* RemoteLayerTreePropertyApplier.h */; };
</span><span class="cx"> 2DDE0AFB18298CC900F97EAA /* RemoteLayerTreePropertyApplier.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DDE0AF918298CC900F97EAA /* RemoteLayerTreePropertyApplier.mm */; };
</span><span class="cx"> 31099973146C75A20029DEB9 /* WebNotificationClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31099971146C759B0029DEB9 /* WebNotificationClient.cpp */; };
</span><span class="lines">@@ -2011,6 +2033,28 @@
</span><span class="cx"> 2DA049B2180CCCD300AAFA9E /* PlatformCALayerRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformCALayerRemote.h; sourceTree = "<group>"; };
</span><span class="cx"> 2DA049B5180CCD0A00AAFA9E /* GraphicsLayerCARemote.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsLayerCARemote.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2DA049B6180CCD0A00AAFA9E /* GraphicsLayerCARemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GraphicsLayerCARemote.h; sourceTree = "<group>"; };
</span><ins>+ 2DA944781884E3B500ED86DB /* PageClientImplIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PageClientImplIOS.h; path = ios/PageClientImplIOS.h; sourceTree = "<group>"; };
+ 2DA944791884E3B500ED86DB /* PageClientImplIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PageClientImplIOS.mm; path = ios/PageClientImplIOS.mm; sourceTree = "<group>"; };
+ 2DA9447A1884E3B500ED86DB /* UIWKRemoteView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UIWKRemoteView.h; path = ios/UIWKRemoteView.h; sourceTree = "<group>"; };
+ 2DA9447B1884E3B500ED86DB /* UIWKRemoteView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = UIWKRemoteView.mm; path = ios/UIWKRemoteView.mm; sourceTree = "<group>"; };
+ 2DA9447C1884E3B500ED86DB /* WKContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKContentView.h; path = ios/WKContentView.h; sourceTree = "<group>"; };
+ 2DA9447D1884E3B500ED86DB /* WKContentView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKContentView.mm; path = ios/WKContentView.mm; sourceTree = "<group>"; };
+ 2DA9447E1884E3B500ED86DB /* WKContentViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKContentViewInternal.h; path = ios/WKContentViewInternal.h; sourceTree = "<group>"; };
+ 2DA9447F1884E3B500ED86DB /* WKGeolocationProviderIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKGeolocationProviderIOS.h; path = ios/WKGeolocationProviderIOS.h; sourceTree = "<group>"; };
+ 2DA944801884E3B500ED86DB /* WKGeolocationProviderIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKGeolocationProviderIOS.mm; path = ios/WKGeolocationProviderIOS.mm; sourceTree = "<group>"; };
+ 2DA944811884E3B500ED86DB /* WKGeolocationProviderIOSObjCSecurityOrigin.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKGeolocationProviderIOSObjCSecurityOrigin.mm; path = ios/WKGeolocationProviderIOSObjCSecurityOrigin.mm; sourceTree = "<group>"; };
+ 2DA944821884E3B500ED86DB /* WKInteractionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKInteractionView.h; path = ios/WKInteractionView.h; sourceTree = "<group>"; };
+ 2DA944831884E3B500ED86DB /* WKInteractionView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKInteractionView.mm; path = ios/WKInteractionView.mm; sourceTree = "<group>"; };
+ 2DA944841884E3B500ED86DB /* WKScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKScrollView.h; path = ios/WKScrollView.h; sourceTree = "<group>"; };
+ 2DA944851884E3B500ED86DB /* WKScrollView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKScrollView.mm; path = ios/WKScrollView.mm; sourceTree = "<group>"; };
+ 2DA944861884E3B500ED86DB /* WKView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKView.mm; path = ios/WKView.mm; sourceTree = "<group>"; };
+ 2DA944971884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NativeWebKeyboardEventIOS.mm; path = ios/NativeWebKeyboardEventIOS.mm; sourceTree = "<group>"; };
+ 2DA944981884E4F000ED86DB /* NativeWebTouchEventIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NativeWebTouchEventIOS.mm; path = ios/NativeWebTouchEventIOS.mm; sourceTree = "<group>"; };
+ 2DA944991884E4F000ED86DB /* WebIOSEventFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebIOSEventFactory.h; path = ios/WebIOSEventFactory.h; sourceTree = "<group>"; };
+ 2DA9449A1884E4F000ED86DB /* WebIOSEventFactory.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebIOSEventFactory.mm; path = ios/WebIOSEventFactory.mm; sourceTree = "<group>"; };
+ 2DA9449B1884E4F000ED86DB /* WebPlatformTouchPointIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebPlatformTouchPointIOS.cpp; path = ios/WebPlatformTouchPointIOS.cpp; sourceTree = "<group>"; };
+ 2DA9449C1884E4F000ED86DB /* WebTouchEventIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebTouchEventIOS.cpp; path = ios/WebTouchEventIOS.cpp; sourceTree = "<group>"; };
+ 2DA9449D1884E4F000ED86DB /* WKGestureTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKGestureTypes.h; path = ios/WKGestureTypes.h; sourceTree = "<group>"; };
</ins><span class="cx"> 2DDE0AF818298CC900F97EAA /* RemoteLayerTreePropertyApplier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteLayerTreePropertyApplier.h; sourceTree = "<group>"; };
</span><span class="cx"> 2DDE0AF918298CC900F97EAA /* RemoteLayerTreePropertyApplier.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteLayerTreePropertyApplier.mm; sourceTree = "<group>"; };
</span><span class="cx"> 31099968146C71F50029DEB9 /* WebNotificationClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebNotificationClient.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3554,6 +3598,7 @@
</span><span class="cx"> 1AADDF4B10D82AF000D3D63D /* Shared */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 2DA944961884E4DA00ED86DB /* ios */,
</ins><span class="cx"> BCDDB314124EBCEF0048D13C /* API */,
</span><span class="cx"> 518E8EF116B208F000E91429 /* Authentication */,
</span><span class="cx"> 1AAF0C4712B16328008E49E2 /* cf */,
</span><span class="lines">@@ -3893,6 +3938,42 @@
</span><span class="cx"> name = mac;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><ins>+ 2DA944771884E3AB00ED86DB /* ios */ = {
+ isa = PBXGroup;
+ children = (
+ 2DA944781884E3B500ED86DB /* PageClientImplIOS.h */,
+ 2DA944791884E3B500ED86DB /* PageClientImplIOS.mm */,
+ 2DA9447A1884E3B500ED86DB /* UIWKRemoteView.h */,
+ 2DA9447B1884E3B500ED86DB /* UIWKRemoteView.mm */,
+ 2DA9447C1884E3B500ED86DB /* WKContentView.h */,
+ 2DA9447D1884E3B500ED86DB /* WKContentView.mm */,
+ 2DA9447E1884E3B500ED86DB /* WKContentViewInternal.h */,
+ 2DA9447F1884E3B500ED86DB /* WKGeolocationProviderIOS.h */,
+ 2DA944801884E3B500ED86DB /* WKGeolocationProviderIOS.mm */,
+ 2DA944811884E3B500ED86DB /* WKGeolocationProviderIOSObjCSecurityOrigin.mm */,
+ 2DA944821884E3B500ED86DB /* WKInteractionView.h */,
+ 2DA944831884E3B500ED86DB /* WKInteractionView.mm */,
+ 2DA944841884E3B500ED86DB /* WKScrollView.h */,
+ 2DA944851884E3B500ED86DB /* WKScrollView.mm */,
+ 2DA944861884E3B500ED86DB /* WKView.mm */,
+ );
+ name = ios;
+ sourceTree = "<group>";
+ };
+ 2DA944961884E4DA00ED86DB /* ios */ = {
+ isa = PBXGroup;
+ children = (
+ 2DA944971884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm */,
+ 2DA944981884E4F000ED86DB /* NativeWebTouchEventIOS.mm */,
+ 2DA944991884E4F000ED86DB /* WebIOSEventFactory.h */,
+ 2DA9449A1884E4F000ED86DB /* WebIOSEventFactory.mm */,
+ 2DA9449B1884E4F000ED86DB /* WebPlatformTouchPointIOS.cpp */,
+ 2DA9449C1884E4F000ED86DB /* WebTouchEventIOS.cpp */,
+ 2DA9449D1884E4F000ED86DB /* WKGestureTypes.h */,
+ );
+ name = ios;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> 31099974146C8AA80029DEB9 /* Notifications (User) */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -4766,6 +4847,7 @@
</span><span class="cx"> BC032DC410F4387C0058C15A /* API */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 2DA944771884E3AB00ED86DB /* ios */,
</ins><span class="cx"> BC0C376610F807660076D7CB /* C */,
</span><span class="cx"> 37C4C08318149C2A003688B9 /* Cocoa */,
</span><span class="cx"> BC8A501311765F4500757573 /* cpp */,
</span><span class="lines">@@ -5886,6 +5968,7 @@
</span><span class="cx"> 1AA575FB1496B52600A4EE06 /* EventDispatcher.h in Headers */,
</span><span class="cx"> 1A90C1F41264FD71003E44D4 /* FindController.h in Headers */,
</span><span class="cx"> 1A910071126675C4001842F5 /* FindIndicator.h in Headers */,
</span><ins>+ 2DA9448D1884E3B500ED86DB /* WKContentViewInternal.h in Headers */,
</ins><span class="cx"> 515E7728183DD6F60007203F /* AsyncRequest.h in Headers */,
</span><span class="cx"> 37C4C08718149C5B003688B9 /* WKBackForwardListItem.h in Headers */,
</span><span class="cx"> 1A91010A1268C8CA001842F5 /* FindIndicatorWindow.h in Headers */,
</span><span class="lines">@@ -6060,6 +6143,7 @@
</span><span class="cx"> 1A24BED5120894D100FBB059 /* SharedMemory.h in Headers */,
</span><span class="cx"> 5272B28B1406985D0096A5D0 /* StatisticsData.h in Headers */,
</span><span class="cx"> 514BDED316C98EDD00E4E25E /* StatisticsRequest.h in Headers */,
</span><ins>+ 2DA944871884E3B500ED86DB /* PageClientImplIOS.h in Headers */,
</ins><span class="cx"> 1AD3306F16B1D991004F60E7 /* StorageAreaImpl.h in Headers */,
</span><span class="cx"> 1ACECD2517162DB1001FC9EF /* StorageAreaMap.h in Headers */,
</span><span class="cx"> 1A334DEE16DE8F88006A8E38 /* StorageAreaMapMessages.h in Headers */,
</span><span class="lines">@@ -6068,6 +6152,8 @@
</span><span class="cx"> 1AB31A9716BC688100F6DBC9 /* StorageManagerMessages.h in Headers */,
</span><span class="cx"> 296BD85D15019BC30071F424 /* StringUtilities.h in Headers */,
</span><span class="cx"> 511D81FF185BBDEE001AED56 /* SQLiteIDBTransaction.h in Headers */,
</span><ins>+ 2DA9448B1884E3B500ED86DB /* WKContentView.h in Headers */,
+ 2DA944A01884E4F000ED86DB /* WebIOSEventFactory.h in Headers */,
</ins><span class="cx"> 7CD102DA1866770600ED429D /* AutoCorrectionCallback.h in Headers */,
</span><span class="cx"> 1AB474E4184D44980051B622 /* WKBundlePageContextMenuClient.h in Headers */,
</span><span class="cx"> 1AA417CB12C00CCA002BE67B /* TextChecker.h in Headers */,
</span><span class="lines">@@ -6117,6 +6203,7 @@
</span><span class="cx"> 51ACBB82127A8BAD00D203B9 /* WebContextMenuProxy.h in Headers */,
</span><span class="cx"> 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */,
</span><span class="cx"> 75E749EA180DBB9800088BA6 /* WebOriginDataManagerMessages.h in Headers */,
</span><ins>+ 2DA944931884E3B500ED86DB /* WKScrollView.h in Headers */,
</ins><span class="cx"> 51ACBBA0127A8F2C00D203B9 /* WebContextMenuProxyMac.h in Headers */,
</span><span class="cx"> BCCB75C61203A1CE00222D1B /* WebContextMessageKinds.h in Headers */,
</span><span class="cx"> BCEE7D0E12846F69009827DA /* WebContextMessages.h in Headers */,
</span><span class="lines">@@ -6124,6 +6211,7 @@
</span><span class="cx"> BCB0B0DC12305A2500B1341E /* WebContextUserMessageCoders.h in Headers */,
</span><span class="cx"> 2D819BA21862800E001F03D1 /* ViewGestureGeometryCollectorMessages.h in Headers */,
</span><span class="cx"> 330934501315B94D0097A7BC /* WebCookieManager.h in Headers */,
</span><ins>+ 2DA944911884E3B500ED86DB /* WKInteractionView.h in Headers */,
</ins><span class="cx"> 330934481315B9220097A7BC /* WebCookieManagerMessages.h in Headers */,
</span><span class="cx"> 330934561315B9750097A7BC /* WebCookieManagerProxy.h in Headers */,
</span><span class="cx"> 515E772C184008B90007203F /* DatabaseProcessCreationParameters.h in Headers */,
</span><span class="lines">@@ -6155,6 +6243,7 @@
</span><span class="cx"> 1A3DD202125E5A1F004515E6 /* WebFindClient.h in Headers */,
</span><span class="cx"> 1A90C1EE1264FD50003E44D4 /* WebFindOptions.h in Headers */,
</span><span class="cx"> BCE469541214E6CB000B98EB /* WebFormClient.h in Headers */,
</span><ins>+ 2DA944891884E3B500ED86DB /* UIWKRemoteView.h in Headers */,
</ins><span class="cx"> BCE469561214E6CB000B98EB /* WebFormSubmissionListenerProxy.h in Headers */,
</span><span class="cx"> 75A8D2D7187D303A00C39C9E /* WKSessionRef.h in Headers */,
</span><span class="cx"> BC032D8D10F437A00058C15A /* WebFrame.h in Headers */,
</span><span class="lines">@@ -6255,6 +6344,7 @@
</span><span class="cx"> 51217465164C21370037A5C1 /* WebResourceBuffer.h in Headers */,
</span><span class="cx"> 33367630130C9998006C9DE2 /* WebResourceCacheManager.h in Headers */,
</span><span class="cx"> 33367656130C9ECA006C9DE2 /* WebResourceCacheManagerMessages.h in Headers */,
</span><ins>+ 2DA944A41884E4F000ED86DB /* WKGestureTypes.h in Headers */,
</ins><span class="cx"> 33367636130C99B2006C9DE2 /* WebResourceCacheManagerProxy.h in Headers */,
</span><span class="cx"> 33367658130C9ECB006C9DE2 /* WebResourceCacheManagerProxyMessages.h in Headers */,
</span><span class="cx"> 510AFFBA16542048001BA05E /* WebResourceLoader.h in Headers */,
</span><span class="lines">@@ -6270,6 +6360,7 @@
</span><span class="cx"> 1AB474E8184D44D00051B622 /* WKBundlePageDiagnosticLoggingClient.h in Headers */,
</span><span class="cx"> 1AC7537C183A9FDB0072CB15 /* PageLoadState.h in Headers */,
</span><span class="cx"> BCDB86C11200FB97007254BE /* APIURL.h in Headers */,
</span><ins>+ 2DA9448E1884E3B500ED86DB /* WKGeolocationProviderIOS.h in Headers */,
</ins><span class="cx"> 51C96119183D294700D2002E /* WebIDBServerConnectionMessages.h in Headers */,
</span><span class="cx"> BCE2315D122C30CA00D5C35A /* APIURLRequest.h in Headers */,
</span><span class="cx"> BC90A1D2122DD55E00CC8C50 /* APIURLResponse.h in Headers */,
</span><span class="lines">@@ -7212,6 +7303,7 @@
</span><span class="cx"> 1A2A4B0E1586A2240090C9E9 /* ColorSpaceData.mm in Sources */,
</span><span class="cx"> 1A6F9FB711E1408500DB1371 /* CommandLineMac.cpp in Sources */,
</span><span class="cx"> BC032DAA10F437D10058C15A /* Connection.cpp in Sources */,
</span><ins>+ 2DA944A31884E4F000ED86DB /* WebTouchEventIOS.cpp in Sources */,
</ins><span class="cx"> 1A30EAC6115D7DA30053E937 /* ConnectionMac.cpp in Sources */,
</span><span class="cx"> 5136183D163126DA00A99DDE /* ConnectionStack.cpp in Sources */,
</span><span class="cx"> 515E773318402D510007203F /* UniqueIDBDatabaseIdentifier.cpp in Sources */,
</span><span class="lines">@@ -7229,6 +7321,7 @@
</span><span class="cx"> 93FC67BD12D3CCF200A60610 /* DecoderAdapter.cpp in Sources */,
</span><span class="cx"> BCE81D98131AE02100241910 /* DictionaryPopupInfo.cpp in Sources */,
</span><span class="cx"> 5167EEA1170377BF007681CA /* DiskCacheMonitor.mm in Sources */,
</span><ins>+ 2DA9448F1884E3B500ED86DB /* WKGeolocationProviderIOS.mm in Sources */,
</ins><span class="cx"> 518E8F0716B2093700E91429 /* Download.cpp in Sources */,
</span><span class="cx"> 2D47B56C1810714E003A3AEE /* RemoteLayerBackingStore.mm in Sources */,
</span><span class="cx"> 518E8F0916B2093700E91429 /* DownloadAuthenticationClient.cpp in Sources */,
</span><span class="lines">@@ -7245,6 +7338,7 @@
</span><span class="cx"> 5DA6ED0B1490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm in Sources */,
</span><span class="cx"> 8CFECE941490F140002AAA32 /* EditorState.cpp in Sources */,
</span><span class="cx"> 93FC67BF12D3CCF200A60610 /* EncoderAdapter.cpp in Sources */,
</span><ins>+ 2DA944A21884E4F000ED86DB /* WebPlatformTouchPointIOS.cpp in Sources */,
</ins><span class="cx"> 51B15A8413843A3900321AD8 /* EnvironmentUtilities.cpp in Sources */,
</span><span class="cx"> 1A7C6CDA1378950800B9C04D /* EnvironmentVariables.cpp in Sources */,
</span><span class="cx"> 1AA575FA1496B52600A4EE06 /* EventDispatcher.cpp in Sources */,
</span><span class="lines">@@ -7287,6 +7381,7 @@
</span><span class="cx"> BCA8C6AF11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp in Sources */,
</span><span class="cx"> 0F5947A3187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.cpp in Sources */,
</span><span class="cx"> BC33E0D212408E8600360F3F /* InjectedBundleRangeHandle.cpp in Sources */,
</span><ins>+ 2DA944951884E3B500ED86DB /* WKView.mm in Sources */,
</ins><span class="cx"> BC14DF78120B5B7900826C0C /* InjectedBundleScriptWorld.cpp in Sources */,
</span><span class="cx"> 1AE49A4A11FFA8CE0048B464 /* JSNPMethod.cpp in Sources */,
</span><span class="cx"> 1AE4987911FF7FAA0048B464 /* JSNPObject.cpp in Sources */,
</span><span class="lines">@@ -7353,6 +7448,8 @@
</span><span class="cx"> 1A2D84A4127F6AD1001EB962 /* NPVariantData.cpp in Sources */,
</span><span class="cx"> BC8ACA1416670D89004C1941 /* ObjCObjectGraph.mm in Sources */,
</span><span class="cx"> BC8ACA1616670D89004C1941 /* ObjCObjectGraphCoders.mm in Sources */,
</span><ins>+ 2DA944941884E3B500ED86DB /* WKScrollView.mm in Sources */,
+ 2DA9449F1884E4F000ED86DB /* NativeWebTouchEventIOS.mm in Sources */,
</ins><span class="cx"> BCCF673312C7F15C008F9C35 /* OriginAndDatabases.cpp in Sources */,
</span><span class="cx"> 51E351F5180F5C7500E53BE9 /* WebIDBFactoryBackend.cpp in Sources */,
</span><span class="cx"> 7C387434172F5615001BD88A /* PageBanner.cpp in Sources */,
</span><span class="lines">@@ -7387,6 +7484,7 @@
</span><span class="cx"> 1A2D90D31281C966001EB962 /* PluginProcessCreationParameters.cpp in Sources */,
</span><span class="cx"> 1AA4792312A59FD9008236C3 /* PluginProcessMac.mm in Sources */,
</span><span class="cx"> BC82838C16B45F0700A278FE /* PluginProcessMain.mm in Sources */,
</span><ins>+ 2DA9449E1884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm in Sources */,
</ins><span class="cx"> 1A0EC604124A9F2C007EF4A5 /* PluginProcessManager.cpp in Sources */,
</span><span class="cx"> 9F54F8951648AE0F007DF81A /* PluginProcessManagerMac.mm in Sources */,
</span><span class="cx"> 1A043CEB124FE38F00FFBFB5 /* PluginProcessMessageReceiver.cpp in Sources */,
</span><span class="lines">@@ -7467,6 +7565,7 @@
</span><span class="cx"> C5E1AFEE16B21025006CC1F2 /* WebArchiveResource.cpp in Sources */,
</span><span class="cx"> BC72BA1D11E64907001EB4EA /* WebBackForwardList.cpp in Sources */,
</span><span class="cx"> 51B3005012529D0E000B5CA0 /* WebBackForwardListCF.cpp in Sources */,
</span><ins>+ 2DA9448C1884E3B500ED86DB /* WKContentView.mm in Sources */,
</ins><span class="cx"> 1AC133741857C21E00F3EC05 /* APIGeometry.cpp in Sources */,
</span><span class="cx"> 518D2CAD12D5153B003BB93B /* WebBackForwardListItem.cpp in Sources */,
</span><span class="cx"> BC72B9FA11E6476B001EB4EA /* WebBackForwardListProxy.cpp in Sources */,
</span><span class="lines">@@ -7492,6 +7591,7 @@
</span><span class="cx"> BC111A5B112F4FBB00337BAB /* WebContextMenuClient.cpp in Sources */,
</span><span class="cx"> 51021E9C12B16788005C033C /* WebContextMenuClientMac.mm in Sources */,
</span><span class="cx"> 512935D71288D19400A4B695 /* WebContextMenuItem.cpp in Sources */,
</span><ins>+ 2DA9448A1884E3B500ED86DB /* UIWKRemoteView.mm in Sources */,
</ins><span class="cx"> 510FBB9A1288C95E00AFFDF4 /* WebContextMenuItemData.cpp in Sources */,
</span><span class="cx"> 2D819BA11862800E001F03D1 /* ViewGestureGeometryCollectorMessageReceiver.cpp in Sources */,
</span><span class="cx"> 51A84CE3127F386B00CA6EA4 /* WebContextMenuProxy.cpp in Sources */,
</span><span class="lines">@@ -7501,6 +7601,7 @@
</span><span class="cx"> 372CAF0C1833FD910040AC27 /* WKNSError.mm in Sources */,
</span><span class="cx"> 1A9E329A1822E1CC00F5D04C /* WKRemoteObject.mm in Sources */,
</span><span class="cx"> F6A90813133C20510082C3F4 /* WebCookieManagerMac.mm in Sources */,
</span><ins>+ 2DA944901884E3B500ED86DB /* WKGeolocationProviderIOSObjCSecurityOrigin.mm in Sources */,
</ins><span class="cx"> 330934471315B9220097A7BC /* WebCookieManagerMessageReceiver.cpp in Sources */,
</span><span class="cx"> 330934551315B9750097A7BC /* WebCookieManagerProxy.cpp in Sources */,
</span><span class="cx"> 33AA1066131F060000D4A575 /* WebCookieManagerProxyClient.cpp in Sources */,
</span><span class="lines">@@ -7601,6 +7702,7 @@
</span><span class="cx"> 51B3005112529D0E000B5CA0 /* WebPageProxyCF.cpp in Sources */,
</span><span class="cx"> 1F7506AD1859161C00EC0FF7 /* WKWebProcessPlugInFrame.mm in Sources */,
</span><span class="cx"> BC857E8712B71EBB00EDEB2E /* WebPageProxyMac.mm in Sources */,
</span><ins>+ 2DA944A11884E4F000ED86DB /* WebIOSEventFactory.mm in Sources */,
</ins><span class="cx"> BCBD3914125BB1A800D2C29F /* WebPageProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> 1A3E736211CC2659007BD539 /* WebPlatformStrategies.cpp in Sources */,
</span><span class="cx"> C0337DDD127A521C008FF4F4 /* WebPlatformTouchPoint.cpp in Sources */,
</span><span class="lines">@@ -7653,6 +7755,7 @@
</span><span class="cx"> C0337DD1127A2980008FF4F4 /* WebWheelEvent.cpp in Sources */,
</span><span class="cx"> 51FCB18517BBFE0300394CD8 /* AsynchronousNetworkLoaderClient.cpp in Sources */,
</span><span class="cx"> 29CD55AB128E294F00133C85 /* WKAccessibilityWebPageObject.mm in Sources */,
</span><ins>+ 2DA944921884E3B500ED86DB /* WKInteractionView.mm in Sources */,
</ins><span class="cx"> 1AC7537F183BE50F0072CB15 /* DataReference.cpp in Sources */,
</span><span class="cx"> 512E34E4130B4D0500ABD19A /* WKApplicationCacheManager.cpp in Sources */,
</span><span class="cx"> 51C96118183D294700D2002E /* WebIDBServerConnectionMessageReceiver.cpp in Sources */,
</span><span class="lines">@@ -7764,6 +7867,7 @@
</span><span class="cx"> 1AC7537B183A9FDB0072CB15 /* PageLoadState.cpp in Sources */,
</span><span class="cx"> BC407607124FF0270068F20A /* WKType.cpp in Sources */,
</span><span class="cx"> 7CD5EBBE1746B04C000C1C45 /* WKTypeRefWrapper.mm in Sources */,
</span><ins>+ 2DA944881884E3B500ED86DB /* PageClientImplIOS.mm in Sources */,
</ins><span class="cx"> 51BA24461858F55D00EA2811 /* WebCrossThreadCopier.cpp in Sources */,
</span><span class="cx"> BC407609124FF0270068F20A /* WKURL.cpp in Sources */,
</span><span class="cx"> BC40761B124FF0370068F20A /* WKURLCF.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebFrameNetworkingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h (161938 => 161939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h 2014-01-14 02:43:01 UTC (rev 161938)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h 2014-01-14 03:35:51 UTC (rev 161939)
</span><span class="lines">@@ -58,9 +58,6 @@
</span><span class="cx"> virtual RetainPtr<CFDataRef> sourceApplicationAuditData() const OVERRIDE;
</span><span class="cx"> virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const OVERRIDE;
</span><span class="cx"> virtual WebCore::NetworkStorageSession& storageSession() const OVERRIDE;
</span><del>-#if PLATFORM(IOS)
- virtual void reportNetworkDataUsage(uint64_t rawBytesSent, uint64_t rawBytesReceived, uint64_t cellularBytesSent, uint64_t cellularBytesReceived) OVERRIDE { }
-#endif // PLATFORM(IOS)
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (161938 => 161939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-01-14 02:43:01 UTC (rev 161938)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-01-14 03:35:51 UTC (rev 161939)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#include <WebCore/PlatformTouchEventIOS.h>
</del><ins>+#include <WebKitAdditions/PlatformTouchEventIOS.h>
</ins><span class="cx"> #else
</span><span class="cx"> #include <WebCore/PlatformTouchEvent.h>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (161938 => 161939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2014-01-14 02:43:01 UTC (rev 161938)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2014-01-14 03:35:51 UTC (rev 161939)
</span><span class="lines">@@ -82,7 +82,6 @@
</span><span class="cx"> virtual void didCommitChangesForLayer(const WebCore::GraphicsLayer*) const OVERRIDE { }
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual void setDeviceScaleFactor(float) OVERRIDE;
</span><del>- virtual bool allowCompositingLayerVisualDegradation() const OVERRIDE { return false; }
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void updateScrolledExposedRect();
</span></span></pre>
</div>
</div>
</body>
</html>