Get rid of PluginStrategy
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 Aug 2016 18:06:30 +0000 (18:06 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 Aug 2016 18:06:30 +0000 (18:06 +0000)
https://bugs.webkit.org/show_bug.cgi?id=160696

Reviewed by Dan Bernstein.

Source/WebCore:

* WebCore.xcodeproj/project.pbxproj:
* loader/EmptyClients.cpp:
* platform/PlatformStrategies.h:
(WebCore::PlatformStrategies::pluginStrategy): Deleted.
* plugins/PluginInfoProvider.h:
* plugins/PluginStrategy.h: Removed.
(WebCore::PluginStrategy::~PluginStrategy): Deleted.

Source/WebKit/mac:

* WebCoreSupport/WebPlatformStrategies.h:
* WebCoreSupport/WebPlatformStrategies.mm:
(WebPlatformStrategies::createPluginStrategy): Deleted.
* WebCoreSupport/WebPluginInfoProvider.h:
* WebCoreSupport/WebPluginInfoProvider.mm:
(WebPluginInfoProvider::setPluginLoadClientPolicy): Deleted.
(WebPluginInfoProvider::clearPluginClientPolicies): Deleted.

Source/WebKit/win:

* WebCoreSupport/WebPlatformStrategies.cpp:
(WebPlatformStrategies::createPluginStrategy): Deleted.

Source/WebKit2:

* NetworkProcess/NetworkProcessPlatformStrategies.cpp:
(WebKit::NetworkProcessPlatformStrategies::createPluginStrategy): Deleted.
* NetworkProcess/NetworkProcessPlatformStrategies.h:
* WebProcess/Plugins/WebPluginInfoProvider.h:
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
(WebKit::WebPlatformStrategies::createPluginStrategy): Deleted.
* WebProcess/WebCoreSupport/WebPlatformStrategies.h:

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

19 files changed:
Source/WebCore/ChangeLog
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/loader/EmptyClients.cpp
Source/WebCore/platform/PlatformStrategies.h
Source/WebCore/plugins/PluginInfoProvider.h
Source/WebCore/plugins/PluginStrategy.h [deleted file]
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h
Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm
Source/WebKit/mac/WebCoreSupport/WebPluginInfoProvider.h
Source/WebKit/mac/WebCoreSupport/WebPluginInfoProvider.mm
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.cpp
Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.h
Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.h
Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h

index ef3f192..fcac235 100644 (file)
@@ -1,3 +1,18 @@
+2016-08-09  Anders Carlsson  <andersca@apple.com>
+
+        Get rid of PluginStrategy
+        https://bugs.webkit.org/show_bug.cgi?id=160696
+
+        Reviewed by Dan Bernstein.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * loader/EmptyClients.cpp:
+        * platform/PlatformStrategies.h:
+        (WebCore::PlatformStrategies::pluginStrategy): Deleted.
+        * plugins/PluginInfoProvider.h:
+        * plugins/PluginStrategy.h: Removed.
+        (WebCore::PluginStrategy::~PluginStrategy): Deleted.
+
 2016-08-08  Myles C. Maxfield  <mmaxfield@apple.com>
 
         Ensure StringView lifetime is correct inside InlineTextBox
index 27c2f89..dab59a4 100644 (file)
                1A98956B0AA78F80005EF5EF /* URLCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A98956A0AA78F80005EF5EF /* URLCF.cpp */; };
                1AA84F04143BA7BD0051D153 /* ScrollController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AA84F02143BA7BD0051D153 /* ScrollController.mm */; };
                1AA84F05143BA7BD0051D153 /* ScrollController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA84F03143BA7BD0051D153 /* ScrollController.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               1AA8799011CBE846003C664F /* PluginStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA8798F11CBE846003C664F /* PluginStrategy.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AAADDA314DB409F00AF64B3 /* ScrollingTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAADDA114DB409F00AF64B3 /* ScrollingTree.cpp */; };
                1AAADDA414DB409F00AF64B3 /* ScrollingTree.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAADDA214DB409F00AF64B3 /* ScrollingTree.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AAADDE314DC8C8F00AF64B3 /* ScrollingTreeNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAADDE114DC8C8F00AF64B3 /* ScrollingTreeNode.cpp */; };
                1AA6BC4F1CF4F695003F6396 /* QTKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QTKitSPI.h; sourceTree = "<group>"; };
                1AA84F02143BA7BD0051D153 /* ScrollController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollController.mm; sourceTree = "<group>"; };
                1AA84F03143BA7BD0051D153 /* ScrollController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollController.h; sourceTree = "<group>"; };
-               1AA8798F11CBE846003C664F /* PluginStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginStrategy.h; sourceTree = "<group>"; };
                1AAADDA114DB409F00AF64B3 /* ScrollingTree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingTree.cpp; sourceTree = "<group>"; };
                1AAADDA214DB409F00AF64B3 /* ScrollingTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingTree.h; sourceTree = "<group>"; };
                1AAADDE114DC8C8F00AF64B3 /* ScrollingTreeNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingTreeNode.cpp; sourceTree = "<group>"; };
                                A9C6E4F20D745E48006442E9 /* PluginData.h */,
                                1A08FEDA1D592B8B008BA8CB /* PluginInfoProvider.cpp */,
                                1A08FEDB1D592B8B008BA8CB /* PluginInfoProvider.h */,
-                               1AA8798F11CBE846003C664F /* PluginStrategy.h */,
                                0AFDAC3C10F5448C00E1F3D2 /* PluginViewBase.h */,
                        );
                        path = plugins;
                                97205ABC1239292700B17380 /* PluginDocument.h in Headers */,
                                072AE1E5183C0741000A5988 /* PluginReplacement.h in Headers */,
                                71E2183A17359FB8006E6E4D /* PlugInsResources.h in Headers */,
-                               1AA8799011CBE846003C664F /* PluginStrategy.h in Headers */,
                                515BE1931D54F5FB00DD7C68 /* GamepadProviderClient.h in Headers */,
                                0AFDAC3D10F5448C00E1F3D2 /* PluginViewBase.h in Headers */,
                                BCBB8AB913F1AFB000734DF0 /* PODInterval.h in Headers */,
index b01f245..6285aa4 100644 (file)
@@ -83,10 +83,6 @@ class EmptyPluginInfoProvider final : public PluginInfoProvider {
     void refreshPlugins() override { };
     void getPluginInfo(Page&, Vector<PluginInfo>&) override { }
     void getWebVisiblePluginInfo(Page&, Vector<PluginInfo>&) override { }
-#if PLATFORM(MAC)
-    void setPluginLoadClientPolicy(PluginLoadClientPolicy, const String&, const String&, const String&) override { }
-    void clearPluginClientPolicies() override { }
-#endif
 };
 
 class EmptyStorageNamespaceProvider final : public StorageNamespaceProvider {
index a11379f..fffb0dd 100644 (file)
@@ -32,7 +32,6 @@ class BlobRegistry;
 class CookiesStrategy;
 class LoaderStrategy;
 class PasteboardStrategy;
-class PluginStrategy;
 
 class PlatformStrategies {
 public:
@@ -57,13 +56,6 @@ public:
         return m_pasteboardStrategy;
     }
 
-    PluginStrategy* pluginStrategy()
-    {
-        if (!m_pluginStrategy)
-            m_pluginStrategy = createPluginStrategy();
-        return m_pluginStrategy;
-    }
-
     BlobRegistry* blobRegistry()
     {
         if (!m_blobRegistry)
@@ -84,13 +76,11 @@ private:
     virtual CookiesStrategy* createCookiesStrategy() = 0;
     virtual LoaderStrategy* createLoaderStrategy() = 0;
     virtual PasteboardStrategy* createPasteboardStrategy() = 0;
-    virtual PluginStrategy* createPluginStrategy() = 0;
     virtual BlobRegistry* createBlobRegistry() = 0;
 
     CookiesStrategy* m_cookiesStrategy { };
     LoaderStrategy* m_loaderStrategy { };
     PasteboardStrategy* m_pasteboardStrategy { };
-    PluginStrategy* m_pluginStrategy { };
     BlobRegistry* m_blobRegistry { };
 };
 
index 3fffbcc..68be151 100644 (file)
@@ -42,10 +42,6 @@ public:
     virtual void refreshPlugins() = 0;
     virtual void getPluginInfo(Page&, Vector<PluginInfo>&) = 0;
     virtual void getWebVisiblePluginInfo(Page&, Vector<PluginInfo>&) = 0;
-#if PLATFORM(MAC)
-    virtual void setPluginLoadClientPolicy(PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString) = 0;
-    virtual void clearPluginClientPolicies() = 0;
-#endif
 
 private:
     HashSet<Page*> m_pages;
diff --git a/Source/WebCore/plugins/PluginStrategy.h b/Source/WebCore/plugins/PluginStrategy.h
deleted file mode 100644 (file)
index 3a40ceb..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2010 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 PluginStrategy_h
-#define PluginStrategy_h
-
-#include "PluginData.h"
-
-namespace WebCore {
-
-class Page;
-
-class PluginStrategy {
-public:
-    virtual void refreshPlugins() = 0;
-    virtual void getPluginInfo(const Page*, Vector<PluginInfo>&) = 0;
-    virtual void getWebVisiblePluginInfo(const Page*, Vector<PluginInfo>&) = 0;
-#if PLATFORM(MAC)
-    virtual void setPluginLoadClientPolicy(PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString) = 0;
-    virtual void clearPluginClientPolicies() = 0;
-#endif
-
-protected:
-    virtual ~PluginStrategy() { }
-};
-
-} // namespace WebCore
-
-#endif // PluginStrategy_h
index 5bc6efa..383a183 100644 (file)
@@ -1,5 +1,20 @@
 2016-08-09  Anders Carlsson  <andersca@apple.com>
 
+        Get rid of PluginStrategy
+        https://bugs.webkit.org/show_bug.cgi?id=160696
+
+        Reviewed by Dan Bernstein.
+
+        * WebCoreSupport/WebPlatformStrategies.h:
+        * WebCoreSupport/WebPlatformStrategies.mm:
+        (WebPlatformStrategies::createPluginStrategy): Deleted.
+        * WebCoreSupport/WebPluginInfoProvider.h:
+        * WebCoreSupport/WebPluginInfoProvider.mm:
+        (WebPluginInfoProvider::setPluginLoadClientPolicy): Deleted.
+        (WebPluginInfoProvider::clearPluginClientPolicies): Deleted.
+
+2016-08-09  Anders Carlsson  <andersca@apple.com>
+
         Move plug-in enumeration from WebPlatformStrategies to WebPluginInfoProvider
         https://bugs.webkit.org/show_bug.cgi?id=160694
 
index 594bdf5..c5e41dd 100644 (file)
@@ -30,7 +30,6 @@
 #include <WebCore/LoaderStrategy.h>
 #include <WebCore/PasteboardStrategy.h>
 #include <WebCore/PlatformStrategies.h>
-#include <WebCore/PluginStrategy.h>
 
 struct PasteboardImage;
 struct PasteboardWebContent;
@@ -46,7 +45,6 @@ private:
     WebCore::CookiesStrategy* createCookiesStrategy() override;
     WebCore::LoaderStrategy* createLoaderStrategy() override;
     WebCore::PasteboardStrategy* createPasteboardStrategy() override;
-    WebCore::PluginStrategy* createPluginStrategy() override;
     WebCore::BlobRegistry* createBlobRegistry() override;
 
     // WebCore::CookiesStrategy
index fa0ac2a..dbe5d63 100644 (file)
@@ -71,11 +71,6 @@ PasteboardStrategy* WebPlatformStrategies::createPasteboardStrategy()
     return this;
 }
 
-PluginStrategy* WebPlatformStrategies::createPluginStrategy()
-{
-    return nullptr;
-}
-
 BlobRegistry* WebPlatformStrategies::createBlobRegistry()
 {
     return new WebCore::BlobRegistryImpl;
index 769f976..aaea045 100644 (file)
@@ -36,10 +36,6 @@ private:
     void refreshPlugins() override;
     void getPluginInfo(WebCore::Page&, Vector<WebCore::PluginInfo>&) override;
     void getWebVisiblePluginInfo(WebCore::Page&, Vector<WebCore::PluginInfo>&) override;
-#if PLATFORM(MAC)
-    void setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString) override;
-    void clearPluginClientPolicies() override;
-#endif
 
     WebPluginInfoProvider();
 };
index 163adf3..60ff06f 100644 (file)
@@ -72,14 +72,3 @@ void WebPluginInfoProvider::getWebVisiblePluginInfo(WebCore::Page& page, Vector<
 {
     getPluginInfo(page, plugins);
 }
-
-#if PLATFORM(MAC)
-void WebPluginInfoProvider::setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString)
-{
-}
-
-void WebPluginInfoProvider::clearPluginClientPolicies()
-{
-}
-#endif
-
index 15012e7..c1f027f 100644 (file)
@@ -1,5 +1,15 @@
 2016-08-09  Anders Carlsson  <andersca@apple.com>
 
+        Get rid of PluginStrategy
+        https://bugs.webkit.org/show_bug.cgi?id=160696
+
+        Reviewed by Dan Bernstein.
+
+        * WebCoreSupport/WebPlatformStrategies.cpp:
+        (WebPlatformStrategies::createPluginStrategy): Deleted.
+
+2016-08-09  Anders Carlsson  <andersca@apple.com>
+
         Move plug-in enumeration from WebPlatformStrategies to WebPluginInfoProvider
         https://bugs.webkit.org/show_bug.cgi?id=160694
 
index 12a3c4c..c84e9cc 100644 (file)
@@ -63,11 +63,6 @@ PasteboardStrategy* WebPlatformStrategies::createPasteboardStrategy()
     return 0;
 }
 
-PluginStrategy* WebPlatformStrategies::createPluginStrategy()
-{
-    return nullptr;
-}
-
 BlobRegistry* WebPlatformStrategies::createBlobRegistry()
 {
     return new BlobRegistryImpl;
index 50e5550..369a08f 100644 (file)
@@ -1,3 +1,18 @@
+2016-08-09  Anders Carlsson  <andersca@apple.com>
+
+        Get rid of PluginStrategy
+        https://bugs.webkit.org/show_bug.cgi?id=160696
+
+        Reviewed by Dan Bernstein.
+
+        * NetworkProcess/NetworkProcessPlatformStrategies.cpp:
+        (WebKit::NetworkProcessPlatformStrategies::createPluginStrategy): Deleted.
+        * NetworkProcess/NetworkProcessPlatformStrategies.h:
+        * WebProcess/Plugins/WebPluginInfoProvider.h:
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+        (WebKit::WebPlatformStrategies::createPluginStrategy): Deleted.
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+
 2016-08-09  Dan Bernstein  <mitz@apple.com>
 
         Add WKPage SPI for looking up a WKFrame given a WKFrameHandle
index 2f038eb..e6d679f 100644 (file)
@@ -54,11 +54,6 @@ PasteboardStrategy* NetworkProcessPlatformStrategies::createPasteboardStrategy()
     return nullptr;
 }
 
-PluginStrategy* NetworkProcessPlatformStrategies::createPluginStrategy()
-{
-    return nullptr;
-}
-
 BlobRegistry* NetworkProcessPlatformStrategies::createBlobRegistry()
 {
     return new BlobRegistryImpl;
index b6c0b61..3a04c9c 100644 (file)
@@ -40,7 +40,6 @@ private:
     WebCore::CookiesStrategy* createCookiesStrategy() override;
     WebCore::LoaderStrategy* createLoaderStrategy() override;
     WebCore::PasteboardStrategy* createPasteboardStrategy() override;
-    WebCore::PluginStrategy* createPluginStrategy() override;
     WebCore::BlobRegistry* createBlobRegistry() override;
 };
 
index 9e48a69..7a732ef 100644 (file)
@@ -38,8 +38,8 @@ public:
     virtual ~WebPluginInfoProvider();
 
 #if PLATFORM(MAC)
-    void setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString) override;
-    void clearPluginClientPolicies() override;
+    void setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString);
+    void clearPluginClientPolicies();
 #endif
 
 private:
index 9c88b5f..d0bc945 100644 (file)
@@ -98,11 +98,6 @@ PasteboardStrategy* WebPlatformStrategies::createPasteboardStrategy()
     return this;
 }
 
-PluginStrategy* WebPlatformStrategies::createPluginStrategy()
-{
-    return nullptr;
-}
-
 BlobRegistry* WebPlatformStrategies::createBlobRegistry()
 {
     return new BlobRegistryProxy;
index 6dd1e1e..9c1cdba 100644 (file)
@@ -47,7 +47,6 @@ private:
     WebCore::CookiesStrategy* createCookiesStrategy() override;
     WebCore::LoaderStrategy* createLoaderStrategy() override;
     WebCore::PasteboardStrategy* createPasteboardStrategy() override;
-    WebCore::PluginStrategy* createPluginStrategy() override;
     WebCore::BlobRegistry* createBlobRegistry() override;
 
     // WebCore::CookiesStrategy