1 files changed, 41 insertions, 91 deletions
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h b/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h
index bfb73c852..c69ea519e 100644
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2012, 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,19 +27,14 @@
 #define WebPlatformStrategies_h
 
 #include <WebCore/CookiesStrategy.h>
-#include <WebCore/DatabaseStrategy.h>
 #include <WebCore/LoaderStrategy.h>
 #include <WebCore/PasteboardStrategy.h>
 #include <WebCore/PlatformStrategies.h>
-#include <WebCore/PluginStrategy.h>
-#include <WebCore/SharedWorkerStrategy.h>
-#include <WebCore/StorageStrategy.h>
-#include <WebCore/VisitedLinkStrategy.h>
 #include <wtf/NeverDestroyed.h>
 
 namespace WebKit {
 
-class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::DatabaseStrategy, private WebCore::LoaderStrategy, private WebCore::PasteboardStrategy, private WebCore::PluginStrategy, private WebCore::SharedWorkerStrategy, private WebCore::StorageStrategy, private WebCore::VisitedLinkStrategy {
+class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::PasteboardStrategy {
     friend class NeverDestroyed<WebPlatformStrategies>;
 public:
     static void initialize();
@@ -48,99 +43,54 @@ private:
     WebPlatformStrategies();
     
     // WebCore::PlatformStrategies
-    virtual WebCore::CookiesStrategy* createCookiesStrategy() override;
-    virtual WebCore::DatabaseStrategy* createDatabaseStrategy() override;
-    virtual WebCore::LoaderStrategy* createLoaderStrategy() override;
-    virtual WebCore::PasteboardStrategy* createPasteboardStrategy() override;
-    virtual WebCore::PluginStrategy* createPluginStrategy() override;
-    virtual WebCore::SharedWorkerStrategy* createSharedWorkerStrategy() override;
-    virtual WebCore::StorageStrategy* createStorageStrategy() override;
-    virtual WebCore::VisitedLinkStrategy* createVisitedLinkStrategy() override;
+    WebCore::CookiesStrategy* createCookiesStrategy() override;
+    WebCore::LoaderStrategy* createLoaderStrategy() override;
+    WebCore::PasteboardStrategy* createPasteboardStrategy() override;
+    WebCore::BlobRegistry* createBlobRegistry() override;
 
     // WebCore::CookiesStrategy
-    virtual String cookiesForDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&) override;
-    virtual void setCookiesFromDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, const String&) override;
-    virtual bool cookiesEnabled(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&) override;
-    virtual String cookieRequestHeaderFieldValue(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&) override;
-    virtual bool getRawCookies(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, Vector<WebCore::Cookie>&) override;
-    virtual void deleteCookie(const WebCore::NetworkStorageSession&, const WebCore::URL&, const String&) override;
-
-    // WebCore::DatabaseStrategy
-#if ENABLE(SQL_DATABASE)
-    virtual WebCore::AbstractDatabaseServer* getDatabaseServer() override;
-#endif
-#if ENABLE(INDEXED_DATABASE)
-    virtual PassRefPtr<WebCore::IDBFactoryBackendInterface> createIDBFactoryBackend(const String& databaseDirectoryIdentifier) override;
-#endif
-
-    // WebCore::LoaderStrategy
-#if ENABLE(NETWORK_PROCESS)
-    virtual WebCore::ResourceLoadScheduler* resourceLoadScheduler() override;
-    virtual void loadResourceSynchronously(WebCore::NetworkingContext*, unsigned long resourceLoadIdentifier, const WebCore::ResourceRequest&, WebCore::StoredCredentials, WebCore::ClientCredentialPolicy, WebCore::ResourceError&, WebCore::ResourceResponse&, Vector<char>& data) override;
-#if ENABLE(BLOB)
-    virtual WebCore::BlobRegistry* createBlobRegistry() override;
-#endif
-#endif
-
-    // WebCore::PluginStrategy
-    virtual void refreshPlugins() override;
-    virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&) override;
-
-    // WebCore::SharedWorkerStrategy
-    virtual bool isAvailable() const override;
-
-    // WebCore::StorageStrategy.
-    virtual PassRefPtr<WebCore::StorageNamespace> localStorageNamespace(WebCore::PageGroup*) override;
-    virtual PassRefPtr<WebCore::StorageNamespace> transientLocalStorageNamespace(WebCore::PageGroup*, WebCore::SecurityOrigin*) override;
-    virtual PassRefPtr<WebCore::StorageNamespace> sessionStorageNamespace(WebCore::Page*) override;
-
-    // WebCore::VisitedLinkStrategy
-    virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash, const WebCore::URL& baseURL, const WTF::AtomicString& attributeURL) override;
-    virtual void addVisitedLink(WebCore::Page*, WebCore::LinkHash) override;
+    String cookiesForDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&) override;
+    void setCookiesFromDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, const String&) override;
+    bool cookiesEnabled(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&) override;
+    String cookieRequestHeaderFieldValue(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&) override;
+    String cookieRequestHeaderFieldValue(WebCore::SessionID, const WebCore::URL& firstParty, const WebCore::URL&) override;
+    bool getRawCookies(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, Vector<WebCore::Cookie>&) override;
+    void deleteCookie(const WebCore::NetworkStorageSession&, const WebCore::URL&, const String&) override;
+    void addCookie(const WebCore::NetworkStorageSession&, const WebCore::URL&, const WebCore::Cookie&) override;
 
     // WebCore::PasteboardStrategy
 #if PLATFORM(IOS)
-    virtual void writeToPasteboard(const WebCore::PasteboardWebContent&) override;
-    virtual void writeToPasteboard(const WebCore::PasteboardImage&) override;
-    virtual void writeToPasteboard(const String& pasteboardType, const String&) override;
-    virtual int getPasteboardItemsCount() override;
-    virtual String readStringFromPasteboard(int index, const String& pasteboardType) override;
-    virtual PassRefPtr<WebCore::SharedBuffer> readBufferFromPasteboard(int index, const String& pasteboardType) override;
-    virtual WebCore::URL readURLFromPasteboard(int index, const String& pasteboardType) override;
-    virtual long changeCount() override;
+    void writeToPasteboard(const WebCore::PasteboardWebContent&, const String& pasteboardName) override;
+    void writeToPasteboard(const WebCore::PasteboardImage&, const String& pasteboardName) override;
+    void writeToPasteboard(const String& pasteboardType, const String&, const String& pasteboardName) override;
+    int getPasteboardItemsCount(const String& pasteboardName) override;
+    String readStringFromPasteboard(int index, const String& pasteboardType, const String& pasteboardName) override;
+    RefPtr<WebCore::SharedBuffer> readBufferFromPasteboard(int index, const String& pasteboardType, const String& pasteboardName) override;
+    WebCore::URL readURLFromPasteboard(int index, const String& pasteboardType, const String& pasteboardName) override;
 #endif
-#if PLATFORM(MAC)
-    virtual void getTypes(Vector<String>& types, const String& pasteboardName) override;
-    virtual PassRefPtr<WebCore::SharedBuffer> bufferForType(const String& pasteboardType, const String& pasteboardName) override;
-    virtual void getPathnamesForType(Vector<String>& pathnames, const String& pasteboardType, const String& pasteboardName) override;
-    virtual String stringForType(const String& pasteboardType, const String& pasteboardName) override;
-    virtual long changeCount(const String& pasteboardName) override;
-    virtual String uniqueName() override;
-    virtual WebCore::Color color(const String& pasteboardName) override;
-    virtual WebCore::URL url(const String& pasteboardName) override;
-
-    virtual long addTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName) override;
-    virtual long setTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName) override;
-    virtual long copy(const String& fromPasteboard, const String& toPasteboard) override;
-    virtual long setBufferForType(PassRefPtr<WebCore::SharedBuffer>, const String& pasteboardType, const String& pasteboardName) override;
-    virtual long setPathnamesForType(const Vector<String>&, const String& pasteboardType, const String& pasteboardName) override;
-    virtual long setStringForType(const String&, const String& pasteboardType, const String& pasteboardName) override;
+#if PLATFORM(COCOA)
+    void getTypes(Vector<String>& types, const String& pasteboardName) override;
+    RefPtr<WebCore::SharedBuffer> bufferForType(const String& pasteboardType, const String& pasteboardName) override;
+    void getPathnamesForType(Vector<String>& pathnames, const String& pasteboardType, const String& pasteboardName) override;
+    String stringForType(const String& pasteboardType, const String& pasteboardName) override;
+    long changeCount(const String& pasteboardName) override;
+    String uniqueName() override;
+    WebCore::Color color(const String& pasteboardName) override;
+    WebCore::URL url(const String& pasteboardName) override;
+
+    long addTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName) override;
+    long setTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName) override;
+    long copy(const String& fromPasteboard, const String& toPasteboard) override;
+    long setBufferForType(WebCore::SharedBuffer*, const String& pasteboardType, const String& pasteboardName) override;
+    long setPathnamesForType(const Vector<String>&, const String& pasteboardType, const String& pasteboardName) override;
+    long setStringForType(const String&, const String& pasteboardType, const String& pasteboardName) override;
+#endif
+#if PLATFORM(GTK)
+    void writeToClipboard(const String& pasteboardName, const WebCore::SelectionData&) override;
+    Ref<WebCore::SelectionData> readFromClipboard(const String& pasteboardName) override;
 #endif
-
-#if ENABLE(NETSCAPE_PLUGIN_API)
-    // WebCore::PluginStrategy implementation.
-    void populatePluginCache();
-    bool m_pluginCacheIsPopulated;
-    bool m_shouldRefreshPlugins;
-    Vector<WebCore::PluginInfo> m_cachedPlugins;
-    Vector<WebCore::PluginInfo> m_cachedApplicationPlugins;
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
 };
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-void handleDidGetPlugins(uint64_t requestID, const Vector<WebCore::PluginInfo>&, const Vector<WebCore::PluginInfo>& applicationPlugins);
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
 } // namespace WebKit
 
 #endif // WebPlatformStrategies_h