[Cocoa] Remove interfaces in the To Be Removed groups
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 21 Apr 2014 06:35:15 +0000 (06:35 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 21 Apr 2014 06:35:15 +0000 (06:35 +0000)
https://bugs.webkit.org/show_bug.cgi?id=131925

Reviewed by Darin Adler.

* Shared/API/Cocoa/WKRemoteObjectInterface.h: Removed.
* Shared/API/Cocoa/WKRemoteObjectInterface.mm: Removed.
* Shared/API/Cocoa/WKRemoteObjectRegistry.h: Removed.
* Shared/API/Cocoa/WKRemoteObjectRegistry.mm: Removed.
* UIProcess/API/Cocoa/WKProcessPool.mm:
* UIProcess/API/Cocoa/WKProcessPoolConfiguration.h: Removed.
* UIProcess/API/Cocoa/WKProcessPoolConfiguration.mm: Removed.
* UIProcess/API/Cocoa/WKProcessPoolConfigurationPrivate.h: Removed.
* UIProcess/API/Cocoa/WKProcessPoolToBeRemoved.mm: Removed.
* UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInBrowserContextControllerToBeRemoved.mm: Removed.
* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@167586 268f45cc-cd09-0410-ab3c-d52691b4dbfc

14 files changed:
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectInterface.h [deleted file]
Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectInterface.mm [deleted file]
Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectRegistry.h [deleted file]
Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectRegistry.mm [deleted file]
Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm
Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfiguration.h [deleted file]
Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfiguration.mm [deleted file]
Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfigurationPrivate.h [deleted file]
Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolToBeRemoved.mm [deleted file]
Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInBrowserContextControllerToBeRemoved.mm [deleted file]
Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h

index 008dff4..8ca6bd1 100644 (file)
@@ -1,5 +1,26 @@
 2014-04-20  Dan Bernstein  <mitz@apple.com>
 
+        [Cocoa] Remove interfaces in the To Be Removed groups
+        https://bugs.webkit.org/show_bug.cgi?id=131925
+
+        Reviewed by Darin Adler.
+
+        * Shared/API/Cocoa/WKRemoteObjectInterface.h: Removed.
+        * Shared/API/Cocoa/WKRemoteObjectInterface.mm: Removed.
+        * Shared/API/Cocoa/WKRemoteObjectRegistry.h: Removed.
+        * Shared/API/Cocoa/WKRemoteObjectRegistry.mm: Removed.
+        * UIProcess/API/Cocoa/WKProcessPool.mm:
+        * UIProcess/API/Cocoa/WKProcessPoolConfiguration.h: Removed.
+        * UIProcess/API/Cocoa/WKProcessPoolConfiguration.mm: Removed.
+        * UIProcess/API/Cocoa/WKProcessPoolConfigurationPrivate.h: Removed.
+        * UIProcess/API/Cocoa/WKProcessPoolToBeRemoved.mm: Removed.
+        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInBrowserContextControllerToBeRemoved.mm: Removed.
+        * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h:
+
+2014-04-20  Dan Bernstein  <mitz@apple.com>
+
         [Cocoa] Crash when setting a bundle parameter to nil
         https://bugs.webkit.org/show_bug.cgi?id=131917
 
diff --git a/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectInterface.h b/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectInterface.h
deleted file mode 100644 (file)
index 66d213f..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-#import <WebKit2/_WKRemoteObjectInterface.h>
-
-#if WK_API_ENABLED
-
-WK_API_CLASS
-@interface WKRemoteObjectInterface : _WKRemoteObjectInterface
-
-@end
-
-#endif
diff --git a/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectInterface.mm b/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectInterface.mm
deleted file mode 100644 (file)
index f22b3fa..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-#import "config.h"
-#import "WKRemoteObjectInterface.h"
-
-#if WK_API_ENABLED
-
-@implementation WKRemoteObjectInterface
-
-@end
-
-#endif
diff --git a/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectRegistry.h b/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectRegistry.h
deleted file mode 100644 (file)
index 41659ba..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-#import <WebKit2/_WKRemoteObjectRegistry.h>
-
-#if WK_API_ENABLED
-
-WK_API_CLASS
-@interface WKRemoteObjectRegistry : _WKRemoteObjectRegistry
-
-@end
-
-#endif
diff --git a/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectRegistry.mm b/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectRegistry.mm
deleted file mode 100644 (file)
index 3e997ae..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-#import "config.h"
-#import "WKRemoteObjectRegistry.h"
-
-#if WK_API_ENABLED
-
-@implementation WKRemoteObjectRegistry
-
-@end
-
-#endif
index aa690ca..0367436 100644 (file)
 
 #if WK_API_ENABLED
 
-#import "_WKDownloadDelegate.h"
 #import "CacheModel.h"
 #import "DownloadClient.h"
 #import "HistoryClient.h"
 #import "ProcessModel.h"
 #import "WKObject.h"
-#import "WKProcessPoolConfigurationPrivate.h"
 #import "WeakObjCPtr.h"
 #import "WebCertificateInfo.h"
 #import "WebContext.h"
 #import "WebCookieManagerProxy.h"
 #import "WebProcessMessages.h"
+#import "_WKDownloadDelegate.h"
+#import "_WKProcessPoolConfiguration.h"
 #import <WebCore/CertificateInfo.h>
 #import <wtf/RetainPtr.h>
 
diff --git a/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfiguration.h b/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfiguration.h
deleted file mode 100644 (file)
index 090dfb4..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-#import <WebKit2/_WKProcessPoolConfiguration.h>
-
-#if WK_API_ENABLED
-
-#import <WebKit2/WKProcessPool.h>
-
-WK_API_CLASS
-@interface WKProcessPoolConfiguration : _WKProcessPoolConfiguration
-
-@property (nonatomic, copy, setter=_setInjectedBundleURL:) NSURL *_injectedBundleURL;
-
-@end
-
-
-@interface WKProcessPool (WKToBeRemoved)
-
-- (instancetype)initWithConfiguration:(WKProcessPoolConfiguration *)configuration;
-
-@property (nonatomic, readonly) WKProcessPoolConfiguration *configuration;
-
-@end
-
-#endif
-
diff --git a/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfiguration.mm b/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfiguration.mm
deleted file mode 100644 (file)
index 455e55a..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-#import "config.h"
-#import "WKProcessPoolConfiguration.h"
-
-#if WK_API_ENABLED
-
-@implementation WKProcessPoolConfiguration
-
-- (NSURL *)_injectedBundleURL
-{
-    return self.injectedBundleURL;
-}
-
-- (void)_setInjectedBundleURL:(NSURL *)_injectedBundleURL
-{
-    self.injectedBundleURL = _injectedBundleURL;
-}
-
-@end
-
-#endif
diff --git a/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfigurationPrivate.h b/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfigurationPrivate.h
deleted file mode 100644 (file)
index a7a6320..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-#import <WebKit2/WKProcessPoolConfiguration.h>
diff --git a/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolToBeRemoved.mm b/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolToBeRemoved.mm
deleted file mode 100644 (file)
index 65c17f3..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2014 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 "WKProcessPoolPrivate.h"
-
-#if WK_API_ENABLED
-
-#import "WKProcessPoolConfiguration.h"
-
-@implementation WKProcessPool (WKToBeRemoved)
-
-- (instancetype)initWithConfiguration:(WKProcessPoolConfiguration *)configuration
-{
-    return [self _initWithConfiguration:configuration];
-}
-
-- (WKProcessPoolConfiguration *)configuration
-{
-    return (WKProcessPoolConfiguration *)self._configuration;
-}
-
-@end
-
-#endif
index 0e0b589..d313c96 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import "config.h"
-#import "WKProcessPoolConfigurationPrivate.h"
+#import "_WKProcessPoolConfiguration.h"
 
 #if WK_API_ENABLED
 
index fe4fb30..1c49580 100644 (file)
                1A1B0EB518A424950038481A /* WKNavigationResponse.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A1B0EB318A424950038481A /* WKNavigationResponse.mm */; };
                1A1B0EB618A424950038481A /* WKNavigationResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1B0EB418A424950038481A /* WKNavigationResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
                1A1B0EB818A424CD0038481A /* WKNavigationResponseInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1B0EB718A424CD0038481A /* WKNavigationResponseInternal.h */; };
-               1A1B748B18DA576D00047E02 /* WKProcessPoolConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1B748A18DA576D00047E02 /* WKProcessPoolConfiguration.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               1A1B748D18DA577600047E02 /* WKProcessPoolConfigurationPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1B748C18DA577600047E02 /* WKProcessPoolConfigurationPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               1A1B748F18DA5A3900047E02 /* WKProcessPoolConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A1B748E18DA5A3900047E02 /* WKProcessPoolConfiguration.mm */; };
-               1A1B749218DA5D9F00047E02 /* WKProcessPoolToBeRemoved.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A1B749018DA5D9F00047E02 /* WKProcessPoolToBeRemoved.mm */; };
                1A1C649B11F4174200553C19 /* WebContextMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A1C648611F415B700553C19 /* WebContextMac.mm */; };
                1A1D8BA11731A36300141DA4 /* LocalStorageDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1D8B9F1731A36300141DA4 /* LocalStorageDatabase.cpp */; };
                1A1D8BA21731A36300141DA4 /* LocalStorageDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1D8BA01731A36300141DA4 /* LocalStorageDatabase.h */; };
                1AC1338618590C4600F3EC05 /* RemoteObjectRegistryMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC1338418590C4600F3EC05 /* RemoteObjectRegistryMessages.h */; };
                1AC1415118AC47EE006C602C /* WKWebViewConfigurationPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC1415018AC47EE006C602C /* WKWebViewConfigurationPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AC25FC212A48F6000BD2671 /* PluginProcessShim.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC25F8A12A48E0300BD2671 /* PluginProcessShim.mm */; };
-               1AC303A218E4D9F90018609F /* WKRemoteObjectRegistry.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC303A018E4D9F90018609F /* WKRemoteObjectRegistry.mm */; };
-               1AC303A318E4D9F90018609F /* WKRemoteObjectRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC303A118E4D9F90018609F /* WKRemoteObjectRegistry.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               1AC303A718E4DAE90018609F /* WKWebProcessPlugInBrowserContextControllerToBeRemoved.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC303A518E4DAE90018609F /* WKWebProcessPlugInBrowserContextControllerToBeRemoved.mm */; };
-               1AC303AB18E4DB7C0018609F /* WKRemoteObjectInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC303A918E4DB7C0018609F /* WKRemoteObjectInterface.mm */; };
-               1AC303AC18E4DB7C0018609F /* WKRemoteObjectInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC303AA18E4DB7C0018609F /* WKRemoteObjectInterface.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AC4C82916B876A90069DCCD /* MessageFlags.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC4C82816B876A90069DCCD /* MessageFlags.h */; };
                1AC5FFC2174BFD1B0001483D /* PluginProcessAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC5FFC1174BFD1B0001483D /* PluginProcessAttributes.h */; };
                1AC7537B183A9FDB0072CB15 /* PageLoadState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC75379183A9FDA0072CB15 /* PageLoadState.cpp */; };
                1A1B0EB318A424950038481A /* WKNavigationResponse.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNavigationResponse.mm; sourceTree = "<group>"; };
                1A1B0EB418A424950038481A /* WKNavigationResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationResponse.h; sourceTree = "<group>"; };
                1A1B0EB718A424CD0038481A /* WKNavigationResponseInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationResponseInternal.h; sourceTree = "<group>"; };
-               1A1B748A18DA576D00047E02 /* WKProcessPoolConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessPoolConfiguration.h; sourceTree = "<group>"; };
-               1A1B748C18DA577600047E02 /* WKProcessPoolConfigurationPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessPoolConfigurationPrivate.h; sourceTree = "<group>"; };
-               1A1B748E18DA5A3900047E02 /* WKProcessPoolConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKProcessPoolConfiguration.mm; sourceTree = "<group>"; };
-               1A1B749018DA5D9F00047E02 /* WKProcessPoolToBeRemoved.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKProcessPoolToBeRemoved.mm; sourceTree = "<group>"; };
                1A1C648611F415B700553C19 /* WebContextMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContextMac.mm; sourceTree = "<group>"; };
                1A1D8B9F1731A36300141DA4 /* LocalStorageDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalStorageDatabase.cpp; sourceTree = "<group>"; };
                1A1D8BA01731A36300141DA4 /* LocalStorageDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalStorageDatabase.h; sourceTree = "<group>"; };
                1AC25F8912A48E0300BD2671 /* PluginProcessShim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcessShim.h; sourceTree = "<group>"; };
                1AC25F8A12A48E0300BD2671 /* PluginProcessShim.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginProcessShim.mm; sourceTree = "<group>"; };
                1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = PluginProcessShim.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-               1AC303A018E4D9F90018609F /* WKRemoteObjectRegistry.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKRemoteObjectRegistry.mm; sourceTree = "<group>"; };
-               1AC303A118E4D9F90018609F /* WKRemoteObjectRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKRemoteObjectRegistry.h; sourceTree = "<group>"; };
-               1AC303A518E4DAE90018609F /* WKWebProcessPlugInBrowserContextControllerToBeRemoved.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebProcessPlugInBrowserContextControllerToBeRemoved.mm; sourceTree = "<group>"; };
-               1AC303A918E4DB7C0018609F /* WKRemoteObjectInterface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKRemoteObjectInterface.mm; sourceTree = "<group>"; };
-               1AC303AA18E4DB7C0018609F /* WKRemoteObjectInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKRemoteObjectInterface.h; sourceTree = "<group>"; };
                1AC4C82816B876A90069DCCD /* MessageFlags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageFlags.h; sourceTree = "<group>"; };
                1AC5FFC1174BFD1B0001483D /* PluginProcessAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcessAttributes.h; sourceTree = "<group>"; };
                1AC75379183A9FDA0072CB15 /* PageLoadState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageLoadState.cpp; sourceTree = "<group>"; };
                        path = mac;
                        sourceTree = "<group>";
                };
-               1A1B748918DA55FD00047E02 /* To Be Removed */ = {
-                       isa = PBXGroup;
-                       children = (
-                               1A1B748A18DA576D00047E02 /* WKProcessPoolConfiguration.h */,
-                               1A1B748C18DA577600047E02 /* WKProcessPoolConfigurationPrivate.h */,
-                               1A1B748E18DA5A3900047E02 /* WKProcessPoolConfiguration.mm */,
-                               1A1B749018DA5D9F00047E02 /* WKProcessPoolToBeRemoved.mm */,
-                       );
-                       name = "To Be Removed";
-                       sourceTree = "<group>";
-               };
                1A43E826188F38E2009E4D30 /* Deprecated */ = {
                        isa = PBXGroup;
                        children = (
                        path = Cocoa;
                        sourceTree = "<group>";
                };
-               1AC3039D18E4D9C90018609F /* To Be Removed */ = {
-                       isa = PBXGroup;
-                       children = (
-                               1AC303A118E4D9F90018609F /* WKRemoteObjectRegistry.h */,
-                               1AC303A018E4D9F90018609F /* WKRemoteObjectRegistry.mm */,
-                               1AC303AA18E4DB7C0018609F /* WKRemoteObjectInterface.h */,
-                               1AC303A918E4DB7C0018609F /* WKRemoteObjectInterface.mm */,
-                       );
-                       name = "To Be Removed";
-                       sourceTree = "<group>";
-               };
-               1AC303A418E4DAD30018609F /* To Be Removed */ = {
-                       isa = PBXGroup;
-                       children = (
-                               1AC303A518E4DAE90018609F /* WKWebProcessPlugInBrowserContextControllerToBeRemoved.mm */,
-                       );
-                       name = "To Be Removed";
-                       sourceTree = "<group>";
-               };
                1AE00D6818327C1200087DD7 /* IPC */ = {
                        isa = PBXGroup;
                        children = (
                1F0181681858DC1500F92884 /* Cocoa */ = {
                        isa = PBXGroup;
                        children = (
-                               1AC303A418E4DAD30018609F /* To Be Removed */,
                                1AA2E56518D77508003814BD /* WKWebProcessBundleParameters.h */,
                                1AA2E56418D77508003814BD /* WKWebProcessBundleParameters.mm */,
                                3795789B18AD4F1100B9ED2E /* WKWebProcessPlugInFormDelegatePrivate.h */,
                        isa = PBXGroup;
                        children = (
                                1A43E826188F38E2009E4D30 /* Deprecated */,
-                               1A1B748918DA55FD00047E02 /* To Be Removed */,
                                37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */,
                                37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */,
                                379A873518BBFA4300588AF2 /* _WKActivatedElementInfoInternal.h */,
                37DFA6FE1810BB2D001F4A9F /* Cocoa */ = {
                        isa = PBXGroup;
                        children = (
-                               1AC3039D18E4D9C90018609F /* To Be Removed */,
                                1AC1337E18590AE400F3EC05 /* RemoteObjectRegistry.h */,
                                1AC1338118590B0500F3EC05 /* RemoteObjectRegistry.messages.in */,
                                1AC1337D18590AE400F3EC05 /* RemoteObjectRegistry.mm */,
                                1A7E377518E4A33A003D0FFF /* WKScriptMessageHandler.h in Headers */,
                                293EBEAB1627D9C9005F89F1 /* WKDOMText.h in Headers */,
                                BC017D2116263308007054F5 /* WKDOMTextIterator.h in Headers */,
-                               1A1B748B18DA576D00047E02 /* WKProcessPoolConfiguration.h in Headers */,
                                37DFA7001810BB92001F4A9F /* WKFoundation.h in Headers */,
                                1ABC3DF11899C6B6004F0626 /* WKNavigationInternal.h in Headers */,
                                0F0C365A18C0555800F607D7 /* LayerRepresentation.h in Headers */,
                                7CF47FFB17275C57008ACB91 /* PageBanner.h in Headers */,
                                BC6EDAA6111271C600E7678B /* PageClient.h in Headers */,
                                1A90C23712650717003E44D4 /* PageOverlay.h in Headers */,
-                               1AC303A318E4D9F90018609F /* WKRemoteObjectRegistry.h in Headers */,
                                C574A58112E66681002DFE98 /* PasteboardTypes.h in Headers */,
                                E19582D3153CBFD700B60875 /* PDFKitImports.h in Headers */,
                                51FCB18917BBFE0300394CD8 /* SynchronousNetworkLoaderClient.h in Headers */,
                                1A6FB7D311E651E200DB1371 /* Plugin.h in Headers */,
                                31A67E0D165B2A99006CBA66 /* PlugInAutoStartProvider.h in Headers */,
                                1A9FBA8D13FF04E600DEED67 /* PluginComplexTextInputState.h in Headers */,
-                               1AC303AC18E4DB7C0018609F /* WKRemoteObjectInterface.h in Headers */,
                                1AA56F2911E92BC80061B882 /* PluginController.h in Headers */,
                                1A8EF4CB1252403700F7067F /* PluginControllerProxy.h in Headers */,
                                1A9E32A11823018900F5D04C /* _WKRemoteObjectRegistryInternal.h in Headers */,
                                1A3D610213A7CC2A00F95D4E /* PluginModuleInfo.h in Headers */,
                                1A043976124D034800FFBFB5 /* PluginProcess.h in Headers */,
                                1AC5FFC2174BFD1B0001483D /* PluginProcessAttributes.h in Headers */,
-                               1A1B748D18DA577600047E02 /* WKProcessPoolConfigurationPrivate.h in Headers */,
                                1A0EC906124C0AB8007EF4A5 /* PluginProcessConnection.h in Headers */,
                                1A0EC90F124C0AF5007EF4A5 /* PluginProcessConnectionManager.h in Headers */,
                                1A7865BA16CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h in Headers */,
                                E170877016D6CFE500F99226 /* BlobRegistrationData.cpp in Sources */,
                                E170876B16D6CA6900F99226 /* BlobRegistryProxy.cpp in Sources */,
                                BCF18638167D071E00A1A85A /* CacheModel.cpp in Sources */,
-                               1AC303A718E4DAE90018609F /* WKWebProcessPlugInBrowserContextControllerToBeRemoved.mm in Sources */,
                                1AA2E51E12E4C05E00BC4966 /* CGUtilities.cpp in Sources */,
                                2DA944B01884E9BA00ED86DB /* WebProcessProxyIOS.mm in Sources */,
                                1A2D957012848564001EB962 /* ChildProcess.cpp in Sources */,
                                BC8ACA1416670D89004C1941 /* ObjCObjectGraph.mm in Sources */,
                                BC8ACA1616670D89004C1941 /* ObjCObjectGraphCoders.mm in Sources */,
                                1AF4CEEF18BC481800BC2D34 /* VisitedLinkTableController.cpp in Sources */,
-                               1A1B749218DA5D9F00047E02 /* WKProcessPoolToBeRemoved.mm in Sources */,
                                2DA9449F1884E4F000ED86DB /* NativeWebTouchEventIOS.mm in Sources */,
                                BCCF673312C7F15C008F9C35 /* OriginAndDatabases.cpp in Sources */,
                                51E351F5180F5C7500E53BE9 /* WebIDBFactoryBackend.cpp in Sources */,
                                372CAF0C1833FD910040AC27 /* WKNSError.mm in Sources */,
                                1A9E329A1822E1CC00F5D04C /* WKRemoteObject.mm in Sources */,
                                2D28F3E41885CCC1004B9EAE /* WebChromeClientIOS.mm in Sources */,
-                               1AC303AB18E4DB7C0018609F /* WKRemoteObjectInterface.mm in Sources */,
                                F6A90813133C20510082C3F4 /* WebCookieManagerMac.mm in Sources */,
                                330934471315B9220097A7BC /* WebCookieManagerMessageReceiver.cpp in Sources */,
                                330934551315B9750097A7BC /* WebCookieManagerProxy.cpp in Sources */,
                                BC20528211C94284008F3375 /* WKBundlePage.cpp in Sources */,
                                7CF47FF617275B71008ACB91 /* WKBundlePageBanner.cpp in Sources */,
                                37C4C08C1814AC5C003688B9 /* WKBackForwardList.mm in Sources */,
-                               1A1B748F18DA5A3900047E02 /* WKProcessPoolConfiguration.mm in Sources */,
                                7CF47FFE17276AE3008ACB91 /* WKBundlePageBannerMac.mm in Sources */,
                                BC7B633E12A45D1200D174A4 /* WKBundlePageGroup.cpp in Sources */,
                                EDCA71B7128DDA8C00201B26 /* WKBundlePageOverlay.cpp in Sources */,
                                2D1B5D5D185869C8006C6596 /* ViewGestureControllerMessageReceiver.cpp in Sources */,
                                37608822150414F700FC82C7 /* WKRenderObject.cpp in Sources */,
                                3336763A130C99DC006C9DE2 /* WKResourceCacheManager.cpp in Sources */,
-                               1AC303A218E4D9F90018609F /* WKRemoteObjectRegistry.mm in Sources */,
                                F634445C12A885E9000612D8 /* WKSecurityOrigin.cpp in Sources */,
                                BC407603124FF0270068F20A /* WKSerializedScriptValue.cpp in Sources */,
                                1AC1337118566C7C00F3EC05 /* APIFrameHandle.cpp in Sources */,
diff --git a/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInBrowserContextControllerToBeRemoved.mm b/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInBrowserContextControllerToBeRemoved.mm
deleted file mode 100644 (file)
index 3eacd14..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-#import "config.h"
-#import "WKWebProcessPlugInBrowserContextControllerPrivate.h"
-
-#if WK_API_ENABLED
-
-@implementation WKWebProcessPlugInBrowserContextController (WKToBeRemoved)
-
-- (WKRemoteObjectRegistry *)remoteObjectRegistry
-{
-    return (WKRemoteObjectRegistry *)self._remoteObjectRegistry;
-}
-
-@end
-
-#endif
index 8e1e15d..089e85d 100644 (file)
 
 @end
 
-@class WKRemoteObjectRegistry;
-
-@interface WKWebProcessPlugInBrowserContextController (WKToBeRemoved)
-
-@property (nonatomic, readonly) WKRemoteObjectRegistry *remoteObjectRegistry;
-@end;
-
-
-
 #endif // WK_API_ENABLED