Unreviewed, rolling out r161939.

http://trac.webkit.org/changeset/161939 https://bugs.webkit.org/show_bug.cgi?id=126956 didn't work with mac, of course (Requested by thorton on #webkit). Source/WebCore: * WebCore.xcodeproj/project.pbxproj: Source/WebKit2: * NetworkProcess/NetworkResourceLoader.cpp: * NetworkProcess/NetworkResourceLoader.h: * NetworkProcess/RemoteNetworkingContext.h: * Shared/WebEventConversion.h: * UIProcess/API/ios/WKGeolocationProviderIOS.mm: * UIProcess/API/ios/WKInteractionView.mm: (-[WKTextPosition isEqual:]): * WebKit2.xcodeproj/project.pbxproj: * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h: * WebProcess/WebPage/WebPage.h: * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h: Canonical link: https://commits.webkit.org/144932@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@161941 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Jan 14, 2014 · 3afc382 · 3afc382
1 parent 27cb80d
commit 3afc382
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 115 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2014-01-13  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r161939.
+        http://trac.webkit.org/changeset/161939
+        https://bugs.webkit.org/show_bug.cgi?id=126956
+
+        didn't work with mac, of course (Requested by thorton on
+        #webkit).
+
+        * WebCore.xcodeproj/project.pbxproj:
+
 2014-01-13  Tim Horton  <timothy_horton@apple.com>
 
         iOS WebKit2 build fixes

diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -518,7 +518,7 @@
 		0FC4E40E187F82E10045882C /* ScrollingCoordinatorIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FC4E408187F82E10045882C /* ScrollingCoordinatorIOS.mm */; };
 		0FC4E40F187F82E10045882C /* ScrollingTreeIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FC4E409187F82E10045882C /* ScrollingTreeIOS.cpp */; };
 		0FC4E410187F82E10045882C /* ScrollingTreeIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC4E40A187F82E10045882C /* ScrollingTreeIOS.h */; };
-		0FC4E411187F82E10045882C /* ScrollingTreeScrollingNodeIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC4E40B187F82E10045882C /* ScrollingTreeScrollingNodeIOS.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		0FC4E411187F82E10045882C /* ScrollingTreeScrollingNodeIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC4E40B187F82E10045882C /* ScrollingTreeScrollingNodeIOS.h */; };
 		0FC4E412187F82E10045882C /* ScrollingTreeScrollingNodeIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FC4E40C187F82E10045882C /* ScrollingTreeScrollingNodeIOS.mm */; };
 		0FCF33240F2B9715004B6795 /* ColorCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FCF33230F2B9715004B6795 /* ColorCG.cpp */; };
 		0FCF332E0F2B9A25004B6795 /* WebLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCF332A0F2B9A25004B6795 /* WebLayer.mm */; };

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,24 @@
+2014-01-13  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r161939.
+        http://trac.webkit.org/changeset/161939
+        https://bugs.webkit.org/show_bug.cgi?id=126956
+
+        didn't work with mac, of course (Requested by thorton on
+        #webkit).
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        * NetworkProcess/NetworkResourceLoader.h:
+        * NetworkProcess/RemoteNetworkingContext.h:
+        * Shared/WebEventConversion.h:
+        * UIProcess/API/ios/WKGeolocationProviderIOS.mm:
+        * UIProcess/API/ios/WKInteractionView.mm:
+        (-[WKTextPosition isEqual:]):
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h:
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
+
 2014-01-13  Benjamin Poulain  <bpoulain@apple.com>
 
         Update WebPageProxyIOS's user agent string

diff --git a/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp b/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
@@ -405,7 +405,7 @@ void NetworkResourceLoader::didReceiveDataArray(ResourceHandle*, CFArrayRef)
 }
 #endif
 
-#if PLATFORM(MAC) && !PLATFORM(IOS)
+#if PLATFORM(MAC)
 void NetworkResourceLoader::willStopBufferingData(ResourceHandle*, const char*, unsigned)
 {
     notImplemented();

diff --git a/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h b/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h
@@ -108,8 +108,8 @@ class NetworkResourceLoader : public RefCounted<NetworkResourceLoader>, public W
     static size_t fileBackedResourceMinimumSize();
 #if !PLATFORM(IOS)
     virtual void willCacheResponseAsync(WebCore::ResourceHandle*, NSCachedURLResponse *) OVERRIDE;
-    virtual void willStopBufferingData(WebCore::ResourceHandle*, const char*, unsigned) OVERRIDE;
 #endif
+    virtual void willStopBufferingData(WebCore::ResourceHandle*, const char*, unsigned) OVERRIDE;
 #endif // PLATFORM(MAC)
 
     // Message handlers.

diff --git a/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h b/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h
@@ -67,6 +67,9 @@ class RemoteNetworkingContext FINAL : public WebCore::NetworkingContext {
     virtual bool localFileContentSniffingEnabled() const OVERRIDE;
     virtual RetainPtr<CFDataRef> sourceApplicationAuditData() const OVERRIDE;
     virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const OVERRIDE;
+#if PLATFORM(IOS)
+    virtual void reportNetworkDataUsage(uint64_t rawBytesSent, uint64_t rawBytesReceived, uint64_t cellularBytesSent, uint64_t cellularBytesReceived) OVERRIDE { }
+#endif // PLATFORM(IOS)
 #endif
 
 #if USE(SOUP)

diff --git a/Source/WebKit2/Shared/WebEventConversion.h b/Source/WebKit2/Shared/WebEventConversion.h
@@ -32,7 +32,7 @@
 
 #if ENABLE(TOUCH_EVENTS)
 #if PLATFORM(IOS)
-#include <WebKitAdditions/PlatformTouchEventIOS.h>
+#include <WebCore/PlatformTouchEventIOS.h>
 #else
 #include <WebCore/PlatformTouchEvent.h>
 #include <WebCore/PlatformTouchPoint.h>

diff --git a/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm b/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm
@@ -45,9 +45,6 @@
 
 using namespace WebKit;
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
 @interface WKGeolocationProviderIOS ()
 -(void)_startUpdating;
 -(void)_stopUpdating;
@@ -278,5 +275,3 @@ - (BOOL)shouldClearCache
     return NO;
 }
 @end
-
-#pragma clang diagnostic pop
diff --git a/Source/WebKit2/UIProcess/API/ios/WKInteractionView.mm b/Source/WebKit2/UIProcess/API/ios/WKInteractionView.mm
@@ -1559,7 +1559,7 @@ + (WKTextPosition *)textPositionWithRect:(CGRect)positionRect
 // since two equal items could have different hashes.
 - (BOOL)isEqual:(id)other
 {
-    if (![other isKindOfClass:[WKTextPosition class]])
+    if (![object isKindOfClass:[WKTextPosition class]])
         return NO;
 
     return CGRectEqualToRect(self.positionRect, ((WKTextPosition *)other).positionRect);