Diff
Modified: trunk/Source/WebKit2/ChangeLog (160027 => 160028)
--- trunk/Source/WebKit2/ChangeLog 2013-12-03 20:05:52 UTC (rev 160027)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-03 20:12:09 UTC (rev 160028)
@@ -1,3 +1,16 @@
+2013-12-03 Anders Carlsson <[email protected]>
+
+ Remove old WebKit::APIClient cruft
+ https://bugs.webkit.org/show_bug.cgi?id=125173
+
+ Reviewed by Antti Koivisto.
+
+ * Shared/APIClient.h:
+ * Shared/APIClientTraits.cpp: Removed.
+ * Shared/APIClientTraits.h: Removed.
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/Plugins/PDF/PDFPlugin.mm:
+
2013-12-03 Enrica Casucci <[email protected]>
Build fix for iOS.
Modified: trunk/Source/WebKit2/Shared/APIClient.h (160027 => 160028)
--- trunk/Source/WebKit2/Shared/APIClient.h 2013-12-03 20:05:52 UTC (rev 160027)
+++ trunk/Source/WebKit2/Shared/APIClient.h 2013-12-03 20:12:09 UTC (rev 160028)
@@ -26,11 +26,9 @@
#ifndef APIClient_h
#define APIClient_h
-#include "APIClientTraits.h"
#include <algorithm>
#include <array>
-// FIXME: Transition all clients from WebKit::APIClient to API::Client.
namespace API {
template<typename ClientInterface> struct ClientTraits;
@@ -84,36 +82,4 @@
} // namespace API
-namespace WebKit {
-
-template<typename ClientInterface, int currentVersion> class APIClient {
-public:
- APIClient()
- {
- initialize(0);
- }
-
- void initialize(const ClientInterface* client)
- {
- COMPILE_ASSERT(sizeof(APIClientTraits<ClientInterface>::interfaceSizesByVersion) / sizeof(size_t) == currentVersion + 1, size_of_some_interfaces_are_unknown);
-
- if (client && client->version == currentVersion) {
- m_client = *client;
- return;
- }
-
- memset(&m_client, 0, sizeof(m_client));
-
- if (client && client->version < currentVersion)
- memcpy(&m_client, client, APIClientTraits<ClientInterface>::interfaceSizesByVersion[client->version]);
- }
-
- const ClientInterface& client() const { return m_client; }
-
-protected:
- ClientInterface m_client;
-};
-
-} // namespace WebKit
-
#endif // APIClient_h
Deleted: trunk/Source/WebKit2/Shared/APIClientTraits.cpp (160027 => 160028)
--- trunk/Source/WebKit2/Shared/APIClientTraits.cpp 2013-12-03 20:05:52 UTC (rev 160027)
+++ trunk/Source/WebKit2/Shared/APIClientTraits.cpp 2013-12-03 20:12:09 UTC (rev 160028)
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "APIClientTraits.h"
-
-#include "WKBundle.h"
-#include "WKBundlePage.h"
-
-namespace WebKit {
-
-const size_t APIClientTraits<WKBundleClient>::interfaceSizesByVersion[] = {
- offsetof(WKBundleClient, didReceiveMessageToPage),
- sizeof(WKBundleClient)
-};
-
-const size_t APIClientTraits<WKBundlePageLoaderClient>::interfaceSizesByVersion[] = {
- offsetof(WKBundlePageLoaderClient, didLayoutForFrame),
- offsetof(WKBundlePageLoaderClient, didFinishProgress),
- offsetof(WKBundlePageLoaderClient, didReceiveIntentForFrame_unavailable),
- offsetof(WKBundlePageLoaderClient, didLayout),
- offsetof(WKBundlePageLoaderClient, featuresUsedInPage),
- offsetof(WKBundlePageLoaderClient, willLoadURLRequest),
- offsetof(WKBundlePageLoaderClient, willDestroyFrame),
- sizeof(WKBundlePageLoaderClient)
-};
-
-const size_t APIClientTraits<WKBundlePageResourceLoadClient>::interfaceSizesByVersion[] = {
- offsetof(WKBundlePageResourceLoadClient, shouldCacheResponse),
- sizeof(WKBundlePageResourceLoadClient)
-};
-
-const size_t APIClientTraits<WKBundlePageFullScreenClient>::interfaceSizesByVersion[] = {
- offsetof(WKBundlePageFullScreenClient, beganEnterFullScreen),
- sizeof(WKBundlePageFullScreenClient)
-};
-
-const size_t APIClientTraits<WKPageContextMenuClient>::interfaceSizesByVersion[] = {
- offsetof(WKPageContextMenuClient, contextMenuDismissed),
- offsetof(WKPageContextMenuClient, getContextMenuFromProposedMenu),
- offsetof(WKPageContextMenuClient, showContextMenu),
- sizeof(WKPageContextMenuClient)
-};
-
-const size_t APIClientTraits<WKPagePolicyClient>::interfaceSizesByVersion[] = {
- offsetof(WKPagePolicyClient, decidePolicyForNavigationAction),
- sizeof(WKPagePolicyClient)
-};
-
-const size_t APIClientTraits<WKPageUIClient>::interfaceSizesByVersion[] = {
- offsetof(WKPageUIClient, createNewPage),
- offsetof(WKPageUIClient, showColorPicker),
- sizeof(WKPageUIClient)
-};
-
-const size_t APIClientTraits<WKBundlePageFormClient>::interfaceSizesByVersion[] = {
- offsetof(WKBundlePageFormClient, willSendSubmitEvent),
- offsetof(WKBundlePageFormClient, didFocusTextField),
- sizeof(WKBundlePageFormClient)
-};
-
-const size_t APIClientTraits<WKBundlePageEditorClient>::interfaceSizesByVersion[] = {
- offsetof(WKBundlePageEditorClient, willWriteToPasteboard),
- sizeof(WKBundlePageEditorClient)
-};
-
-const size_t APIClientTraits<WKBundlePageUIClient>::interfaceSizesByVersion[] = {
- offsetof(WKBundlePageUIClient, didReachApplicationCacheOriginQuota),
- sizeof(WKBundlePageUIClient)
-};
-
-const size_t APIClientTraits<WKContextInjectedBundleClient>::interfaceSizesByVersion[] = {
- offsetof(WKContextInjectedBundleClient, getInjectedBundleInitializationUserData),
- sizeof(WKContextInjectedBundleClient)
-};
-
-const size_t APIClientTraits<WKIconDatabaseClient>::interfaceSizesByVersion[] = {
- offsetof(WKIconDatabaseClient, iconDataReadyForPageURL),
- sizeof(WKIconDatabaseClient)
-};
-
-const size_t APIClientTraits<WKGeolocationProvider>::interfaceSizesByVersion[] = {
- offsetof(WKGeolocationProvider, setEnableHighAccuracy),
- sizeof(WKGeolocationProvider)
-};
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/Shared/APIClientTraits.h (160027 => 160028)
--- trunk/Source/WebKit2/Shared/APIClientTraits.h 2013-12-03 20:05:52 UTC (rev 160027)
+++ trunk/Source/WebKit2/Shared/APIClientTraits.h 2013-12-03 20:12:09 UTC (rev 160028)
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef APIClientTraits_h
-#define APIClientTraits_h
-
-#include "WKBundle.h"
-#include "WKBundlePage.h"
-#include "WKContext.h"
-#include "WKGeolocationManager.h"
-#include "WKIconDatabase.h"
-#include "WKPage.h"
-
-namespace WebKit {
-
-template <typename ClientInterface> struct APIClientTraits {
- static const size_t interfaceSizesByVersion[1];
-};
-template <typename ClientInterface> const size_t APIClientTraits<ClientInterface>::interfaceSizesByVersion[] = { sizeof(ClientInterface) };
-
-template<> struct APIClientTraits<WKBundleClient> {
- static const size_t interfaceSizesByVersion[2];
-};
-
-template<> struct APIClientTraits<WKBundlePageLoaderClient> {
- static const size_t interfaceSizesByVersion[8];
-};
-
-template<> struct APIClientTraits<WKBundlePageResourceLoadClient> {
- static const size_t interfaceSizesByVersion[2];
-};
-
-template<> struct APIClientTraits<WKBundlePageFullScreenClient> {
- static const size_t interfaceSizesByVersion[2];
-};
-
-template<> struct APIClientTraits<WKBundlePageUIClient> {
- static const size_t interfaceSizesByVersion[3];
-};
-
-template<> struct APIClientTraits<WKPageContextMenuClient> {
- static const size_t interfaceSizesByVersion[4];
-};
-
-template<> struct APIClientTraits<WKPagePolicyClient> {
- static const size_t interfaceSizesByVersion[2];
-};
-
-template<> struct APIClientTraits<WKPageUIClient> {
- static const size_t interfaceSizesByVersion[3];
-};
-
-template<> struct APIClientTraits<WKBundlePageFormClient> {
- static const size_t interfaceSizesByVersion[3];
-};
-
-template<> struct APIClientTraits<WKBundlePageEditorClient> {
- static const size_t interfaceSizesByVersion[2];
-};
-
-template<> struct APIClientTraits<WKContextInjectedBundleClient> {
- static const size_t interfaceSizesByVersion[2];
-};
-
-template<> struct APIClientTraits<WKIconDatabaseClient> {
- static const size_t interfaceSizesByVersion[2];
-};
-
-template<> struct APIClientTraits<WKGeolocationProvider> {
- static const size_t interfaceSizesByVersion[2];
-};
-
-} // namespace WebKit
-
-#endif // APIClientTraits_h
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (160027 => 160028)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-03 20:05:52 UTC (rev 160027)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-03 20:12:09 UTC (rev 160028)
@@ -674,8 +674,6 @@
5272B28A1406985D0096A5D0 /* StatisticsData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5272B2881406985D0096A5D0 /* StatisticsData.cpp */; };
5272B28B1406985D0096A5D0 /* StatisticsData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5272B2891406985D0096A5D0 /* StatisticsData.h */; };
5D1A239115E75B220023E981 /* webkit2 in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 5D1A238E15E75AD50023E981 /* webkit2 */; };
- 5D51845513BCF9CC00C7FF4A /* APIClientTraits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D51845313BCF9CC00C7FF4A /* APIClientTraits.cpp */; };
- 5D51845613BCF9CC00C7FF4A /* APIClientTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D51845413BCF9CC00C7FF4A /* APIClientTraits.h */; };
5DA6ED0A1490606900B41D12 /* DynamicLinkerEnvironmentExtractor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DA6ED081490606900B41D12 /* DynamicLinkerEnvironmentExtractor.h */; };
5DA6ED0B1490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5DA6ED091490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm */; };
6501BD1A12F1243400E9F248 /* WKBundleInspector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65B86F1712F11D7B00B7DD8A /* WKBundleInspector.cpp */; };
@@ -2241,8 +2239,6 @@
5272B2891406985D0096A5D0 /* StatisticsData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatisticsData.h; sourceTree = "<group>"; };
5D1A238E15E75AD50023E981 /* webkit2 */ = {isa = PBXFileReference; lastKnownFileType = folder; path = webkit2; sourceTree = "<group>"; };
5D442A5516D5856700AC3331 /* PluginService.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PluginService.entitlements; sourceTree = "<group>"; };
- 5D51845313BCF9CC00C7FF4A /* APIClientTraits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIClientTraits.cpp; sourceTree = "<group>"; };
- 5D51845413BCF9CC00C7FF4A /* APIClientTraits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIClientTraits.h; sourceTree = "<group>"; };
5DA6ED081490606900B41D12 /* DynamicLinkerEnvironmentExtractor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicLinkerEnvironmentExtractor.h; sourceTree = "<group>"; };
5DA6ED091490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DynamicLinkerEnvironmentExtractor.mm; sourceTree = "<group>"; };
5DAD7294116FF70B00EE5396 /* WebContentProcess.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebContentProcess.xcconfig; sourceTree = "<group>"; };
@@ -3405,8 +3401,6 @@
BC64696D11DBE603006455B0 /* APIArray.cpp */,
BC64696E11DBE603006455B0 /* APIArray.h */,
1A3DD205125E5A2F004515E6 /* APIClient.h */,
- 5D51845313BCF9CC00C7FF4A /* APIClientTraits.cpp */,
- 5D51845413BCF9CC00C7FF4A /* APIClientTraits.h */,
B63403F814910D57001070B5 /* APIObject.cpp */,
BCF04C8C11FF9B7D00F86A58 /* APIObject.h */,
A7D792D51767CB6E00881CBE /* ActivityAssertion.cpp */,
@@ -5583,7 +5577,6 @@
A7D792D81767CCA300881CBE /* ActivityAssertion.h in Headers */,
1A3DD206125E5A2F004515E6 /* APIClient.h in Headers */,
1AC75380183BE50F0072CB15 /* DataReference.h in Headers */,
- 5D51845613BCF9CC00C7FF4A /* APIClientTraits.h in Headers */,
1AB474D8184D43FD0051B622 /* WKBundlePageLoaderClient.h in Headers */,
1AEFD27911D16C81008219D3 /* ArgumentCoder.h in Headers */,
1AEFD2F711D1807B008219D3 /* ArgumentCoders.h in Headers */,
@@ -6909,7 +6902,6 @@
files = (
51E35200180F5D0F00E53BE9 /* DatabaseToWebProcessConnection.cpp in Sources */,
A7D792D61767CB6E00881CBE /* ActivityAssertion.cpp in Sources */,
- 5D51845513BCF9CC00C7FF4A /* APIClientTraits.cpp in Sources */,
B63403F914910D57001070B5 /* APIObject.cpp in Sources */,
1A3D610513A7F03A00F95D4E /* ArgumentCoders.cpp in Sources */,
1AAF0C4B12B16334008E49E2 /* ArgumentCodersCF.cpp in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (160027 => 160028)
--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2013-12-03 20:05:52 UTC (rev 160027)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2013-12-03 20:12:09 UTC (rev 160028)
@@ -38,6 +38,8 @@
#import "PDFPluginAnnotation.h"
#import "PDFPluginPasswordField.h"
#import "PluginView.h"
+#import "WKAccessibilityWebPageObject.h"
+#import "WKPageFindMatchesClient.h"
#import "WebContextMessages.h"
#import "WebCoreArgumentCoders.h"
#import "WebEvent.h"
@@ -45,7 +47,6 @@
#import "WebPage.h"
#import "WebPageProxyMessages.h"
#import "WebProcess.h"
-#import "WKAccessibilityWebPageObject.h"
#import <_javascript_Core/JSContextRef.h>
#import <_javascript_Core/JSObjectRef.h>
#import <_javascript_Core/JSStringRef.h>
