Remove WTF_USE_PLATFORM_STRATEGIES
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 15 May 2013 08:07:28 +0000 (08:07 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 15 May 2013 08:07:28 +0000 (08:07 +0000)
https://bugs.webkit.org/show_bug.cgi?id=114431

Reviewed by Darin Adler.

Source/WebCore:

* Modules/webdatabase/DatabaseManager.cpp:
(WebCore::DatabaseManager::DatabaseManager):
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::suspendPostAttachCallbacks):
(WebCore::ContainerNode::resumePostAttachCallbacks):
* dom/VisitedLinkState.cpp:
(WebCore::VisitedLinkState::determineLinkStateSlowCase):
* loader/CookieJar.cpp:
(WebCore::cookies):
(WebCore::setCookies):
(WebCore::cookiesEnabled):
(WebCore::cookieRequestHeaderFieldValue):
(WebCore::getRawCookies):
(WebCore::deleteCookie):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadResourceSynchronously):
* loader/HistoryController.cpp:
(WebCore::addVisitedLink):
* loader/LoaderStrategy.cpp:
* loader/LoaderStrategy.h:
* loader/ResourceLoadScheduler.cpp:
(WebCore::resourceLoadScheduler):
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::releaseResources):
(WebCore::ResourceLoader::willSendRequest):
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::load):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::performPostLoadActions):
* platform/CookiesStrategy.h:
* platform/DatabaseStrategy.cpp:
* platform/DatabaseStrategy.h:
* platform/PasteboardStrategy.h:
* platform/PlatformStrategies.cpp:
* platform/PlatformStrategies.h:
* platform/VisitedLinkStrategy.h:
* platform/mac/PasteboardMac.mm:
* platform/network/BlobRegistry.cpp:
(WebCore::blobRegistry):
* plugins/PluginData.cpp:
(WebCore::PluginData::initPlugins):
* plugins/PluginStrategy.h:
* storage/StorageNamespace.cpp:
(WebCore::StorageNamespace::localStorageNamespace):
(WebCore::StorageNamespace::transientLocalStorageNamespace):
(WebCore::StorageNamespace::sessionStorageNamespace):
* storage/StorageStrategy.cpp:
* storage/StorageStrategy.h:
* workers/SharedWorkerStrategy.h:

Source/WebKit/blackberry:

* WebCoreSupport/AboutDataUseFeatures.in:

Source/WebKit2:

* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
* WebProcess/WebCoreSupport/WebPlatformStrategies.h:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess):

Source/WTF:

* wtf/Platform.h:

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

36 files changed:
Source/WTF/ChangeLog
Source/WTF/wtf/Platform.h
Source/WebCore/ChangeLog
Source/WebCore/Modules/webdatabase/DatabaseManager.cpp
Source/WebCore/dom/ContainerNode.cpp
Source/WebCore/dom/VisitedLinkState.cpp
Source/WebCore/loader/CookieJar.cpp
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/loader/HistoryController.cpp
Source/WebCore/loader/LoaderStrategy.cpp
Source/WebCore/loader/LoaderStrategy.h
Source/WebCore/loader/ResourceLoadScheduler.cpp
Source/WebCore/loader/ResourceLoader.cpp
Source/WebCore/loader/cache/CachedResource.cpp
Source/WebCore/loader/cache/CachedResourceLoader.cpp
Source/WebCore/platform/CookiesStrategy.h
Source/WebCore/platform/DatabaseStrategy.cpp
Source/WebCore/platform/DatabaseStrategy.h
Source/WebCore/platform/PasteboardStrategy.h
Source/WebCore/platform/PlatformStrategies.cpp
Source/WebCore/platform/PlatformStrategies.h
Source/WebCore/platform/VisitedLinkStrategy.h
Source/WebCore/platform/mac/PasteboardMac.mm
Source/WebCore/platform/network/BlobRegistry.cpp
Source/WebCore/plugins/PluginData.cpp
Source/WebCore/plugins/PluginStrategy.h
Source/WebCore/storage/StorageNamespace.cpp
Source/WebCore/storage/StorageStrategy.cpp
Source/WebCore/storage/StorageStrategy.h
Source/WebCore/workers/SharedWorkerStrategy.h
Source/WebKit/blackberry/ChangeLog
Source/WebKit/blackberry/WebCoreSupport/AboutDataUseFeatures.in
Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h
Source/WebKit2/WebProcess/WebProcess.cpp

index ac03af3..59bbfc6 100644 (file)
@@ -1,5 +1,14 @@
 2013-05-14  Carlos Garcia Campos  <cgarcia@igalia.com>
 
+        Remove WTF_USE_PLATFORM_STRATEGIES
+        https://bugs.webkit.org/show_bug.cgi?id=114431
+
+        Reviewed by Darin Adler.
+
+        * wtf/Platform.h:
+
+2013-05-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
         [BlackBerry] Use requestAnimationFrame for animations
         https://bugs.webkit.org/show_bug.cgi?id=115896
 
index a19a733..7247783 100644 (file)
 /* Set up a define for a common error that is intended to cause a build error -- thus the space after Error. */
 #define WTF_PLATFORM_CFNETWORK Error USE_macro_should_be_used_with_CFNETWORK
 
-/* FIXME: Eventually we should enable this for all platforms and get rid of the define. */
-#if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(QT) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY)
-#define WTF_USE_PLATFORM_STRATEGIES 1
-#endif
-
 #if PLATFORM(WIN)
 #define WTF_USE_CROSS_PLATFORM_CONTEXT_MENUS 1
 #endif
index 1b0d3fa..e65c260 100644 (file)
@@ -1,3 +1,60 @@
+2013-05-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Remove WTF_USE_PLATFORM_STRATEGIES
+        https://bugs.webkit.org/show_bug.cgi?id=114431
+
+        Reviewed by Darin Adler.
+
+        * Modules/webdatabase/DatabaseManager.cpp:
+        (WebCore::DatabaseManager::DatabaseManager):
+        * dom/ContainerNode.cpp:
+        (WebCore::ContainerNode::suspendPostAttachCallbacks):
+        (WebCore::ContainerNode::resumePostAttachCallbacks):
+        * dom/VisitedLinkState.cpp:
+        (WebCore::VisitedLinkState::determineLinkStateSlowCase):
+        * loader/CookieJar.cpp:
+        (WebCore::cookies):
+        (WebCore::setCookies):
+        (WebCore::cookiesEnabled):
+        (WebCore::cookieRequestHeaderFieldValue):
+        (WebCore::getRawCookies):
+        (WebCore::deleteCookie):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadResourceSynchronously):
+        * loader/HistoryController.cpp:
+        (WebCore::addVisitedLink):
+        * loader/LoaderStrategy.cpp:
+        * loader/LoaderStrategy.h:
+        * loader/ResourceLoadScheduler.cpp:
+        (WebCore::resourceLoadScheduler):
+        * loader/ResourceLoader.cpp:
+        (WebCore::ResourceLoader::releaseResources):
+        (WebCore::ResourceLoader::willSendRequest):
+        * loader/cache/CachedResource.cpp:
+        (WebCore::CachedResource::load):
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::performPostLoadActions):
+        * platform/CookiesStrategy.h:
+        * platform/DatabaseStrategy.cpp:
+        * platform/DatabaseStrategy.h:
+        * platform/PasteboardStrategy.h:
+        * platform/PlatformStrategies.cpp:
+        * platform/PlatformStrategies.h:
+        * platform/VisitedLinkStrategy.h:
+        * platform/mac/PasteboardMac.mm:
+        * platform/network/BlobRegistry.cpp:
+        (WebCore::blobRegistry):
+        * plugins/PluginData.cpp:
+        (WebCore::PluginData::initPlugins):
+        * plugins/PluginStrategy.h:
+        * storage/StorageNamespace.cpp:
+        (WebCore::StorageNamespace::localStorageNamespace):
+        (WebCore::StorageNamespace::transientLocalStorageNamespace):
+        (WebCore::StorageNamespace::sessionStorageNamespace):
+        * storage/StorageStrategy.cpp:
+        * storage/StorageStrategy.h:
+        * workers/SharedWorkerStrategy.h:
+
 2013-05-15  D├ívid Szabolcs  <David.Szabolcs@stud.u-szeged.hu>
 
         [curl] Add support for HttpOnly cookies
index 0a042e1..afcea14 100644 (file)
 #include "DatabaseBackendSync.h"
 #include "DatabaseCallback.h"
 #include "DatabaseContext.h"
+#include "DatabaseStrategy.h"
 #include "DatabaseSync.h"
 #include "DatabaseTask.h"
 #include "ExceptionCode.h"
 #include "InspectorDatabaseInstrumentation.h"
 #include "Logging.h"
+#include "PlatformStrategies.h"
 #include "ScriptController.h"
 #include "ScriptExecutionContext.h"
 #include "SecurityOrigin.h"
 
-#if USE(PLATFORM_STRATEGIES)
-#include "DatabaseStrategy.h"
-#include "PlatformStrategies.h"
-#else
-#include "DatabaseServer.h"
-#endif
-
 namespace WebCore {
 
 DatabaseManager& DatabaseManager::manager()
@@ -66,18 +61,14 @@ DatabaseManager& DatabaseManager::manager()
 }
 
 DatabaseManager::DatabaseManager()
-    : m_client(0)
+    : m_server(platformStrategies()->databaseStrategy()->getDatabaseServer())
+    , m_client(0)
     , m_databaseIsAvailable(true)
 #if !ASSERT_DISABLED
     , m_databaseContextRegisteredCount(0)
     , m_databaseContextInstanceCount(0)
 #endif
 {
-#if USE(PLATFORM_STRATEGIES)
-    m_server = platformStrategies()->databaseStrategy()->getDatabaseServer();
-#else
-    m_server = new DatabaseServer;
-#endif
     ASSERT(m_server); // We should always have a server to work with.
 }
 
index 60e2f11..a50e15f 100644 (file)
@@ -725,11 +725,7 @@ void ContainerNode::suspendPostAttachCallbacks()
                 s_shouldReEnableMemoryCacheCallsAfterAttach = true;
             }
         }
-#if USE(PLATFORM_STRATEGIES)
         platformStrategies()->loaderStrategy()->resourceLoadScheduler()->suspendPendingRequests();
-#else
-        resourceLoadScheduler()->suspendPendingRequests();
-#endif
     }
     ++s_attachDepth;
 }
@@ -746,11 +742,7 @@ void ContainerNode::resumePostAttachCallbacks()
             if (Page* page = document()->page())
                 page->setMemoryCacheClientCallsEnabled(true);
         }
-#if USE(PLATFORM_STRATEGIES)
         platformStrategies()->loaderStrategy()->resourceLoadScheduler()->resumePendingRequests();
-#else
-        resourceLoadScheduler()->resumePendingRequests();
-#endif
     }
     --s_attachDepth;
 }
index f20c259..32fcb2a 100644 (file)
 #include "NodeTraversal.h"
 #include "Page.h"
 #include "PageGroup.h"
-
-#if USE(PLATFORM_STRATEGIES)
 #include "PlatformStrategies.h"
 #include "VisitedLinkStrategy.h"
-#endif
 
 namespace WebCore {
 
@@ -127,11 +124,7 @@ EInsideLink VisitedLinkState::determineLinkStateSlowCase(Element* element)
 
     m_linksCheckedForVisitedState.add(hash);
 
-#if USE(PLATFORM_STRATEGIES)
     return platformStrategies()->visitedLinkStrategy()->isLinkVisited(page, hash, element->document()->baseURL(), *attribute) ? InsideVisitedLink : InsideUnvisitedLink;
-#else
-    return page->group().isLinkVisited(hash) ? InsideVisitedLink : InsideUnvisitedLink;
-#endif
 }
 
 
index af677d9..98f8741 100644 (file)
 #include "config.h"
 #include "CookieJar.h"
 
+#include "CookiesStrategy.h"
 #include "Document.h"
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "NetworkingContext.h"
 #include "PlatformCookieJar.h"
-
-#if USE(PLATFORM_STRATEGIES)
-#include "CookiesStrategy.h"
 #include "PlatformStrategies.h"
-#endif
 
 namespace WebCore {
 
@@ -67,61 +64,37 @@ inline NetworkStorageSession& storageSession(const Document* document)
 String cookies(const Document* document, const KURL& url)
 {
     LOCAL_SESSION(document)
-#if USE(PLATFORM_STRATEGIES)
     return platformStrategies()->cookiesStrategy()->cookiesForDOM(session, document->firstPartyForCookies(), url);
-#else
-    return cookiesForDOM(session, document->firstPartyForCookies(), url);
-#endif
 }
 
 void setCookies(Document* document, const KURL& url, const String& cookieString)
 {
     LOCAL_SESSION(document)
-#if USE(PLATFORM_STRATEGIES)
     platformStrategies()->cookiesStrategy()->setCookiesFromDOM(session, document->firstPartyForCookies(), url, cookieString);
-#else
-    setCookiesFromDOM(session, document->firstPartyForCookies(), url, cookieString);
-#endif
 }
 
 bool cookiesEnabled(const Document* document)
 {
     LOCAL_SESSION(document)
-#if USE(PLATFORM_STRATEGIES)
     return platformStrategies()->cookiesStrategy()->cookiesEnabled(session, document->firstPartyForCookies(), document->cookieURL());
-#else
-    return cookiesEnabled(session, document->firstPartyForCookies(), document->cookieURL());
-#endif
 }
 
 String cookieRequestHeaderFieldValue(const Document* document, const KURL& url)
 {
     LOCAL_SESSION(document)
-#if USE(PLATFORM_STRATEGIES)
     return platformStrategies()->cookiesStrategy()->cookieRequestHeaderFieldValue(session, document->firstPartyForCookies(), url);
-#else
-    return cookieRequestHeaderFieldValue(session, document->firstPartyForCookies(), url);
-#endif
 }
 
 bool getRawCookies(const Document* document, const KURL& url, Vector<Cookie>& cookies)
 {
     LOCAL_SESSION(document)
-#if USE(PLATFORM_STRATEGIES)
     return platformStrategies()->cookiesStrategy()->getRawCookies(session, document->firstPartyForCookies(), url, cookies);
-#else
-    return getRawCookies(session, document->firstPartyForCookies(), url, cookies);
-#endif
 }
 
 void deleteCookie(const Document* document, const KURL& url, const String& cookieName)
 {
     LOCAL_SESSION(document)
-#if USE(PLATFORM_STRATEGIES)
     platformStrategies()->cookiesStrategy()->deleteCookie(session, url, cookieName);
-#else
-    deleteCookie(session, url, cookieName);
-#endif
 }
 
 }
index 5a57840..3a4f6fd 100644 (file)
@@ -2578,11 +2578,7 @@ unsigned long FrameLoader::loadResourceSynchronously(const ResourceRequest& requ
         ASSERT(!newRequest.isNull());
         
         if (!documentLoader()->applicationCacheHost()->maybeLoadSynchronously(newRequest, error, response, data)) {
-#if USE(PLATFORM_STRATEGIES)
             platformStrategies()->loaderStrategy()->loadResourceSynchronously(networkingContext(), identifier, newRequest, storedCredentials, clientCredentialPolicy, error, response, data);
-#else
-            ResourceHandle::loadResourceSynchronously(networkingContext(), newRequest, storedCredentials, error, response, data);
-#endif
             documentLoader()->applicationCacheHost()->maybeLoadFallbackSynchronously(newRequest, error, response, data);
         }
     }
index 456635c..1f5e185 100644 (file)
 #include "Page.h"
 #include "PageCache.h"
 #include "PageGroup.h"
+#include "PlatformStrategies.h"
 #include "ScrollingCoordinator.h"
 #include "Settings.h"
-#include <wtf/text/CString.h>
-
-#if USE(PLATFORM_STRATEGIES)
-#include "PlatformStrategies.h"
 #include "VisitedLinkStrategy.h"
-#endif
+#include <wtf/text/CString.h>
 
 namespace WebCore {
 
 static inline void addVisitedLink(Page* page, const KURL& url)
 {
-#if USE(PLATFORM_STRATEGIES)
     platformStrategies()->visitedLinkStrategy()->addVisitedLink(page, visitedLinkHash(url.string()));
-#else
-    page->group().addVisitedLink(url);
-#endif
 }
 
 HistoryController::HistoryController(Frame* frame)
index c337940..fc44007 100644 (file)
@@ -30,8 +30,6 @@
 #include "ResourceHandle.h"
 #include "ResourceLoadScheduler.h"
 
-#if USE(PLATFORM_STRATEGIES)
-
 namespace WebCore {
 
 ResourceLoadScheduler* LoaderStrategy::resourceLoadScheduler()
@@ -53,5 +51,3 @@ BlobRegistry* LoaderStrategy::createBlobRegistry()
 
 
 } // namespace WebCore
-
-#endif // USE(PLATFORM_STRATEGIES)
index ca594c5..0e625d3 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef LoaderStrategy_h
 #define LoaderStrategy_h
 
-#if USE(PLATFORM_STRATEGIES)
-
 #include "ResourceHandleTypes.h"
 #include <wtf/Vector.h>
 
@@ -58,6 +56,4 @@ protected:
 
 } // namespace WebCore
 
-#endif // USE(PLATFORM_STRATEGIES)
-
 #endif // LoaderStrategy_h
index cf89822..6c29571 100644 (file)
@@ -69,7 +69,6 @@ ResourceLoadScheduler* resourceLoadScheduler()
     static ResourceLoadScheduler* globalScheduler = 0;
     
     if (!globalScheduler) {
-#if USE(PLATFORM_STRATEGIES)
         static bool isCallingOutToStrategy = false;
         
         // If we're re-entering resourceLoadScheduler() while calling out to the LoaderStrategy,
@@ -82,9 +81,6 @@ ResourceLoadScheduler* resourceLoadScheduler()
         
         TemporaryChange<bool> recursionGuard(isCallingOutToStrategy, true);
         globalScheduler = platformStrategies()->loaderStrategy()->resourceLoadScheduler();
-#else
-        globalScheduler = new ResourceLoadScheduler;
-#endif
     }
 
     return globalScheduler;
index e9ec69b..dc083c2 100644 (file)
@@ -92,13 +92,8 @@ void ResourceLoader::releaseResources()
     // the resources to prevent a double dealloc of WebView <rdar://problem/4372628>
     m_reachedTerminalState = true;
 
-#if USE(PLATFORM_STRATEGIES)
     platformStrategies()->loaderStrategy()->resourceLoadScheduler()->remove(this);
-#endif
     m_identifier = 0;
-#if !USE(PLATFORM_STRATEGIES)
-    resourceLoadScheduler()->remove(this);
-#endif
 
     if (m_handle) {
         // Clear out the ResourceHandle's client so that it doesn't try to call
@@ -257,13 +252,9 @@ void ResourceLoader::willSendRequest(ResourceRequest& request, const ResourceRes
         InspectorInstrumentation::willSendRequest(m_frame.get(), m_identifier, m_frame->loader()->documentLoader(), request, redirectResponse);
 #endif
 
-    if (!redirectResponse.isNull()) {
-#if USE(PLATFORM_STRATEGIES)
+    if (!redirectResponse.isNull())
         platformStrategies()->loaderStrategy()->resourceLoadScheduler()->crossOriginRedirectReceived(this, request.url());
-#else
-        resourceLoadScheduler()->crossOriginRedirectReceived(this, request.url());
-#endif
-    }
+
     m_request = request;
 
     if (!redirectResponse.isNull() && !m_documentLoader->isCommitted())
index 8357f4d..09efaea 100644 (file)
@@ -342,12 +342,7 @@ void CachedResource::load(CachedResourceLoader* cachedResourceLoader, const Reso
         m_fragmentIdentifierForRequest = String();
     }
 
-#if USE(PLATFORM_STRATEGIES)
     m_loader = platformStrategies()->loaderStrategy()->resourceLoadScheduler()->scheduleSubresourceLoad(cachedResourceLoader->frame(), this, request, request.priority(), options);
-#else
-    m_loader = resourceLoadScheduler()->scheduleSubresourceLoad(cachedResourceLoader->frame(), this, request, request.priority(), options);
-#endif
-
     if (!m_loader) {
         failBeforeStarting();
         return;
index 406ce16..7da85f3 100644 (file)
@@ -807,11 +807,7 @@ void CachedResourceLoader::performPostLoadActions()
 {
     checkForPendingPreloads();
 
-#if USE(PLATFORM_STRATEGIES)
     platformStrategies()->loaderStrategy()->resourceLoadScheduler()->servePendingRequests();
-#else
-    resourceLoadScheduler()->servePendingRequests();
-#endif
 }
 
 void CachedResourceLoader::incrementRequestCount(const CachedResource* res)
index d9e066a..c0e6ef2 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef CookiesStrategy_h
 #define CookiesStrategy_h
 
-#if USE(PLATFORM_STRATEGIES)
-
 #include <wtf/HashSet.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/Vector.h>
@@ -54,6 +52,4 @@ protected:
 
 } // namespace WebCore
 
-#endif // USE(PLATFORM_STRATEGIES)
-
 #endif // CookiesStrategy_h
index a846658..3a4b904 100644 (file)
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "DatabaseStrategy.h"
 
-#if USE(PLATFORM_STRATEGIES)
 #if ENABLE(SQL_DATABASE)
 
 #include "DatabaseServer.h"
@@ -41,4 +40,3 @@ AbstractDatabaseServer* DatabaseStrategy::getDatabaseServer()
 } // namespace WebCore
 
 #endif // ENABLE(SQL_DATABASE)
-#endif // USE(PLATFORM_STRATEGIES)
index f869f54..39967d4 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef DatabaseStrategy_h
 #define DatabaseStrategy_h
 
-#if USE(PLATFORM_STRATEGIES)
-
 #include "AbstractDatabaseServer.h"
 
 namespace WebCore {
@@ -44,6 +42,4 @@ protected:
 
 } // namespace WebCore
 
-#endif // USE(PLATFORM_STRATEGIES)
-
 #endif // DatabaseStrategy_h
index f922c66..785fcdd 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef PasteboardStrategy_h
 #define PasteboardStrategy_h
 
-#if USE(PLATFORM_STRATEGIES)
-
 #include "SharedBuffer.h"
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
@@ -64,6 +62,5 @@ protected:
 };
 
 }
-#endif // USE(PLATFORM_STRATEGIES)
 
 #endif // !PasteboardStrategy_h
index ca45150..cf7bf82 100644 (file)
@@ -24,9 +24,6 @@
  */
 
 #include "config.h"
-
-#if USE(PLATFORM_STRATEGIES)
-
 #include "PlatformStrategies.h"
 
 namespace WebCore {
@@ -59,4 +56,3 @@ bool hasPlatformStrategies()
 
 } // namespace WebCore
 
-#endif // USE(PLATFORM_STRATEGIES)
index 5b9e616..ba7cc28 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef PlatformStrategies_h
 #define PlatformStrategies_h
 
-#if USE(PLATFORM_STRATEGIES)
-
 namespace WebCore {
 
 class CookiesStrategy;
@@ -140,6 +138,4 @@ bool hasPlatformStrategies();
     
 } // namespace WebCore
 
-#endif // USE(PLATFORM_STRATEGIES)
-
 #endif // PlatformStrategies_h
index 236fe2f..469f9db 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef VisitedLinkStrategy_h
 #define VisitedLinkStrategy_h
 
-#if USE(PLATFORM_STRATEGIES)
-
 namespace WebCore {
 
 typedef uint64_t LinkHash;
@@ -47,6 +45,4 @@ protected:
 
 } // namespace WebCore
 
-#endif // USE(PLATFORM_STRATEGIES)
-
 #endif // VisitedLinkStrategy_h
index cb45eee..b317473 100644 (file)
@@ -49,6 +49,8 @@
 #import "LoaderNSURLExtras.h"
 #import "MIMETypeRegistry.h"
 #import "Page.h"
+#import "PasteboardStrategy.h"
+#import "PlatformStrategies.h"
 #import "RenderImage.h"
 #import "ResourceBuffer.h"
 #import "Text.h"
 #import <wtf/text/StringBuilder.h>
 #import <wtf/unicode/CharacterNames.h>
 
-#if USE(PLATFORM_STRATEGIES)
-#include "PasteboardStrategy.h"
-#include "PlatformStrategies.h"
-#endif
-
 namespace WebCore {
 
 // FIXME: It's not great to have these both here and in WebKit.
index 9cb137b..5ab042f 100644 (file)
@@ -39,11 +39,7 @@ BlobRegistry& blobRegistry()
 {
     ASSERT(isMainThread());
 
-#if USE(PLATFORM_STRATEGIES)
     static BlobRegistry& instance = *platformStrategies()->loaderStrategy()->createBlobRegistry();
-#else
-    DEFINE_STATIC_LOCAL(BlobRegistryImpl, instance, ());
-#endif
     return instance;
 }
 
index ccdf10d..6ddad46 100644 (file)
 #include "config.h"
 #include "PluginData.h"
 
-#if USE(PLATFORM_STRATEGIES)
 #include "PlatformStrategies.h"
 #include "PluginStrategy.h"
-#endif
 
 namespace WebCore {
 
@@ -78,7 +76,6 @@ String PluginData::pluginFileForMimeType(const String& mimeType) const
     return String();
 }
 
-#if USE(PLATFORM_STRATEGIES)
 void PluginData::refresh()
 {
     platformStrategies()->pluginStrategy()->refreshPlugins();
@@ -90,6 +87,5 @@ void PluginData::initPlugins(const Page* page)
     
     platformStrategies()->pluginStrategy()->getPluginInfo(page, m_plugins);
 }
-#endif
 
 }
index 9d8a7b5..05d199f 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef PluginStrategy_h
 #define PluginStrategy_h
 
-#if USE(PLATFORM_STRATEGIES)
-
 #include "PluginData.h"
 
 namespace WebCore {
@@ -45,6 +43,4 @@ protected:
 
 } // namespace WebCore
 
-#endif // USE(PLATFORM_STRATEGIES)
-
 #endif // PluginStrategy_h
index 10ce769..2bbbedc 100644 (file)
 #include "PlatformStrategies.h"
 #include "StorageStrategy.h"
 
-#if !USE(PLATFORM_STRATEGIES)
-#include "StorageNamespaceImpl.h"
-#endif
-
 namespace WebCore {
 
 PassRefPtr<StorageNamespace> StorageNamespace::localStorageNamespace(PageGroup* pageGroup)
 {
-#if USE(PLATFORM_STRATEGIES)
     return platformStrategies()->storageStrategy()->localStorageNamespace(pageGroup);
-#else
-    return StorageNamespaceImpl::localStorageNamespace(pageGroup);
-#endif
 }
 
 PassRefPtr<StorageNamespace> StorageNamespace::transientLocalStorageNamespace(PageGroup* pageGroup, SecurityOrigin* securityOrigin)
 {
-#if USE(PLATFORM_STRATEGIES)
     return platformStrategies()->storageStrategy()->transientLocalStorageNamespace(pageGroup, securityOrigin);
-#else
-    return StorageNamespaceImpl::transientLocalStorageNamespace(pageGroup, securityOrigin);
-#endif
 }
 
 PassRefPtr<StorageNamespace> StorageNamespace::sessionStorageNamespace(Page* page)
 {
-#if USE(PLATFORM_STRATEGIES)
     return platformStrategies()->storageStrategy()->sessionStorageNamespace(page);
-#else
-    UNUSED_PARAM(page);
-    return StorageNamespaceImpl::sessionStorageNamespace(page);
-#endif
 }
 
 } // namespace WebCore
index 1cf3cd5..88b84f4 100644 (file)
@@ -28,8 +28,6 @@
 
 #include "StorageNamespaceImpl.h"
 
-#if USE(PLATFORM_STRATEGIES)
-
 namespace WebCore {
 
 PassRefPtr<StorageNamespace> StorageStrategy::localStorageNamespace(PageGroup* pageGroup)
@@ -48,5 +46,3 @@ PassRefPtr<StorageNamespace> StorageStrategy::transientLocalStorageNamespace(Pag
 }
 
 } // namespace WebCore
-
-#endif // USE(STORAGE_STRATEGIES)
index 44a23d7..4edd497 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef StorageStrategy_h
 #define StorageStrategy_h
 
-#if USE(PLATFORM_STRATEGIES)
-
 #include <wtf/Forward.h>
 
 namespace WebCore {
@@ -51,6 +49,4 @@ protected:
 
 } // namespace WebCore
 
-#endif // USE(PLATFORM_STRATEGIES)
-
 #endif // StorageStrategy_h
index 4111e4a..3e6fbda 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef SharedWorkerStrategy_h
 #define SharedWorkerStrategy_h
 
-#if USE(PLATFORM_STRATEGIES)
-
 namespace WebCore {
     
 class SharedWorkerStrategy {
@@ -39,6 +37,5 @@ protected:
 };
 
 }
-#endif // USE(PLATFORM_STRATEGIES)
 
 #endif // SharedWorkerStrategy_h
index 58410df..99326c0 100644 (file)
@@ -1,3 +1,12 @@
+2013-05-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Remove WTF_USE_PLATFORM_STRATEGIES
+        https://bugs.webkit.org/show_bug.cgi?id=114431
+
+        Reviewed by Darin Adler.
+
+        * WebCoreSupport/AboutDataUseFeatures.in:
+
 2013-05-14  Tiancheng Jiang  <tijiang@rim.com>
 
         [BlackBerry] Improve Fatfinger phase.
index e6bb7ff..23f5bd1 100644 (file)
@@ -69,7 +69,6 @@ OPENGL_ES_2
 OPENTYPE_SANITIZER
 OPENVG
 OPENVG_BLUR
-PLATFORM_STRATEGIES
 PLATFORM_TEXT_TRACK_MENU
 PLUGIN_HOST_PROCESS
 PROTECTION_SPACE_AUTH_CALLBACK
index c64cf6c..2778882 100644 (file)
@@ -1,3 +1,15 @@
+2013-05-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Remove WTF_USE_PLATFORM_STRATEGIES
+        https://bugs.webkit.org/show_bug.cgi?id=114431
+
+        Reviewed by Darin Adler.
+
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::WebProcess):
+
 2013-05-14  Simon Cooper  <scooper@apple.com>
 
         Add a preference that can disable the fake SYSV SHM shim
index 52d8bcb..91faf28 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "WebPlatformStrategies.h"
 
-#if USE(PLATFORM_STRATEGIES)
-
 #include "BlockingResponseMap.h"
 #include "DataReference.h"
 #include "NetworkResourceLoadParameters.h"
@@ -453,5 +451,3 @@ void WebPlatformStrategies::setStringForType(const String& string, const String&
 #endif
 
 } // namespace WebKit
-
-#endif // USE(PLATFORM_STRATEGIES)
index cf4a617..993541b 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef WebPlatformStrategies_h
 #define WebPlatformStrategies_h
 
-#if USE(PLATFORM_STRATEGIES)
-
 #include <WebCore/CookiesStrategy.h>
 #include <WebCore/DatabaseStrategy.h>
 #include <WebCore/LoaderStrategy.h>
@@ -126,6 +124,4 @@ void handleDidGetPlugins(uint64_t requestID, const Vector<WebCore::PluginInfo>&)
 
 } // namespace WebKit
 
-#endif // USE(PLATFORM_STRATEGIES)
-
 #endif // WebPlatformStrategies_h
index d8cc61c..2e0a1aa 100644 (file)
@@ -180,11 +180,8 @@ WebProcess::WebProcess()
     , m_inWindowPageCount(0)
     , m_nonVisibleProcessCleanupTimer(this, &WebProcess::nonVisibleProcessCleanupTimerFired)
 {
-#if USE(PLATFORM_STRATEGIES)
     // Initialize our platform strategies.
     WebPlatformStrategies::initialize();
-#endif // USE(PLATFORM_STRATEGIES)
-
 
     // FIXME: This should moved to where WebProcess::initialize is called,
     // so that ports have a chance to customize, and ifdefs in this file are