Changeset 150062 in webkit

Timestamp:

May 14, 2013 3:12:35 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Implement platform strategies
​https://bugs.webkit.org/show_bug.cgi?id=112162

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2013-05-14
Reviewed by Rob Buis.

Source/WebCore:

This is just a refactoring, covered by existing tests.

• CMakeLists.txt: Move PlatformStrategies.cpp from platform

specific makefiles to the global one now that all platforms using
cmake implement platform strategies.

• PlatformBlackBerry.cmake:
• PlatformEfl.cmake:
• PlatformWinCE.cmake:
• loader/CookieJar.cpp: Remove the preprocessor error that is not

needed anymore.

• loader/blackberry/CookieJarBlackBerry.cpp: Removed.
• platform/network/blackberry/CookieJarBlackBerry.cpp: Added.

(WebCore):
(WebCore::setCookiesFromDOM):
(WebCore::cookiesForDOM):
(WebCore::cookieRequestHeaderFieldValue):
(WebCore::cookiesEnabled):
(WebCore::getRawCookies):
(WebCore::deleteCookie):
(WebCore::getHostnamesWithCookies):
(WebCore::deleteCookiesForHostname):
(WebCore::deleteAllCookies):

• plugins/blackberry/PluginDataBlackBerry.cpp: Removed.

Source/WebKit:

• PlatformBlackBerry.cmake: Add new files to compilation.

Source/WebKit/blackberry:

• Api/BlackBerryGlobal.cpp:

(BlackBerry::WebKit::globalInitialize): Initialize platform
strategies.

• WebCoreSupport/PlatformStrategiesBlackBerry.cpp: Added.

(PlatformStrategiesBlackBerry::initialize):
(PlatformStrategiesBlackBerry::PlatformStrategiesBlackBerry):
(PlatformStrategiesBlackBerry::createCookiesStrategy):
(PlatformStrategiesBlackBerry::createDatabaseStrategy):
(PlatformStrategiesBlackBerry::createLoaderStrategy):
(PlatformStrategiesBlackBerry::createPasteboardStrategy):
(PlatformStrategiesBlackBerry::createPluginStrategy):
(PlatformStrategiesBlackBerry::createSharedWorkerStrategy):
(PlatformStrategiesBlackBerry::createStorageStrategy):
(PlatformStrategiesBlackBerry::createVisitedLinkStrategy):
(PlatformStrategiesBlackBerry::cookiesForDOM):
(PlatformStrategiesBlackBerry::setCookiesFromDOM):
(PlatformStrategiesBlackBerry::cookiesEnabled):
(PlatformStrategiesBlackBerry::cookieRequestHeaderFieldValue):
(PlatformStrategiesBlackBerry::getRawCookies):
(PlatformStrategiesBlackBerry::deleteCookie):
(PlatformStrategiesBlackBerry::refreshPlugins):
(PlatformStrategiesBlackBerry::getPluginInfo):
(PlatformStrategiesBlackBerry::isLinkVisited):
(PlatformStrategiesBlackBerry::addVisitedLink):

• WebCoreSupport/PlatformStrategiesBlackBerry.h: Added.

(PlatformStrategiesBlackBerry):

Source/WTF:

• wtf/Platform.h: Add BlackBerry platform to the list of platforms

using platform strategies.

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (1 diff)
• WebCore/CMakeLists.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/PlatformBlackBerry.cmake (modified) (3 diffs)
• WebCore/PlatformEfl.cmake (modified) (1 diff)
• WebCore/PlatformWinCE.cmake (modified) (1 diff)
• WebCore/loader/CookieJar.cpp (modified) (1 diff)
• WebCore/loader/blackberry/CookieJarBlackBerry.cpp (deleted)
• WebCore/platform/network/blackberry/CookieJarBlackBerry.cpp (added)
• WebCore/plugins/blackberry/PluginDataBlackBerry.cpp (deleted)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/PlatformBlackBerry.cmake (modified) (1 diff)
• WebKit/blackberry/Api/BlackBerryGlobal.cpp (modified) (2 diffs)
• WebKit/blackberry/ChangeLog (modified) (1 diff)
• WebKit/blackberry/WebCoreSupport/PlatformStrategiesBlackBerry.cpp (added)
• WebKit/blackberry/WebCoreSupport/PlatformStrategiesBlackBerry.h (added)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-05-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [BlackBerry] Implement platform strategies
+        https://bugs.webkit.org/show_bug.cgi?id=112162
+
+        Reviewed by Rob Buis.
+
+        * wtf/Platform.h: Add BlackBerry platform to the list of platforms
+        using platform strategies.
+
 2013-05-13  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WTF/wtf/Platform.h

@@ -887 +887 @@
 
 /* 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)
+#if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(QT) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY)
 #define WTF_USE_PLATFORM_STRATEGIES 1
 #endif

trunk/Source/WebCore/CMakeLists.txt

@@ -1833 +1833 @@
     platform/PlatformEvent.cpp
     platform/PlatformInstrumentation.cpp
+    platform/PlatformStrategies.cpp
     platform/RunLoop.cpp
     platform/RuntimeApplicationChecks.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [BlackBerry] Implement platform strategies
+        https://bugs.webkit.org/show_bug.cgi?id=112162
+
+        Reviewed by Rob Buis.
+
+        This is just a refactoring, covered by existing tests.
+
+        * CMakeLists.txt: Move PlatformStrategies.cpp from platform
+        specific makefiles to the global one now that all platforms using
+        cmake implement platform strategies.
+        * PlatformBlackBerry.cmake:
+        * PlatformEfl.cmake:
+        * PlatformWinCE.cmake:
+        * loader/CookieJar.cpp: Remove the preprocessor error that is not
+        needed anymore.
+        * loader/blackberry/CookieJarBlackBerry.cpp: Removed.
+        * platform/network/blackberry/CookieJarBlackBerry.cpp: Added.
+        (WebCore):
+        (WebCore::setCookiesFromDOM):
+        (WebCore::cookiesForDOM):
+        (WebCore::cookieRequestHeaderFieldValue):
+        (WebCore::cookiesEnabled):
+        (WebCore::getRawCookies):
+        (WebCore::deleteCookie):
+        (WebCore::getHostnamesWithCookies):
+        (WebCore::deleteCookiesForHostname):
+        (WebCore::deleteAllCookies):
+        * plugins/blackberry/PluginDataBlackBerry.cpp: Removed.
+
 2013-05-14  Jocelyn Turcotte  <jocelyn.turcotte@digia.com>
 

trunk/Source/WebCore/PlatformBlackBerry.cmake

@@ -45 +45 @@
     platform/network/ProxyServer.cpp
     platform/network/blackberry/AutofillBackingStore.cpp
+    platform/network/blackberry/CookieJarBlackBerry.cpp
     platform/network/blackberry/DNSBlackBerry.cpp
     platform/network/blackberry/DeferredData.cpp
@@ -95 +96 @@
     editing/blackberry/SmartReplaceBlackBerry.cpp
     html/shadow/MediaControlsBlackBerry.cpp
-    loader/blackberry/CookieJarBlackBerry.cpp
     page/blackberry/AccessibilityObjectBlackBerry.cpp
     page/blackberry/DragControllerBlackBerry.cpp
@@ -205 +205 @@
     list(APPEND WebCore_SOURCES
         plugins/blackberry/NPCallbacksBlackBerry.cpp
-        plugins/blackberry/PluginDataBlackBerry.cpp
         plugins/blackberry/PluginPackageBlackBerry.cpp
         plugins/blackberry/PluginViewBlackBerry.cpp

trunk/Source/WebCore/PlatformEfl.cmake

@@ -159 +159 @@
     platform/network/soup/SoupURIUtils.cpp
 
-    platform/PlatformStrategies.cpp
-
     platform/posix/FileSystemPOSIX.cpp
     platform/posix/SharedBufferPOSIX.cpp

trunk/Source/WebCore/PlatformWinCE.cmake

@@ -32 +32 @@
     platform/Cursor.cpp
     platform/LocalizedStrings.cpp
-    platform/PlatformStrategies.cpp
     platform/ScrollAnimatorNone.cpp
 

trunk/Source/WebCore/loader/CookieJar.cpp

@@ -36 +36 @@
 #include "CookiesStrategy.h"
 #include "PlatformStrategies.h"
-#endif
-
-#if PLATFORM(BLACKBERRY)
-#error Blackberry currently uses a fork of this file because of layering violations
 #endif
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2013-05-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [BlackBerry] Implement platform strategies
+        https://bugs.webkit.org/show_bug.cgi?id=112162
+
+        Reviewed by Rob Buis.
+
+        * PlatformBlackBerry.cmake: Add new files to compilation.
+
 2013-05-06  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebKit/PlatformBlackBerry.cmake

@@ -103 +103 @@
     blackberry/WebCoreSupport/NotificationClientBlackBerry.cpp
     blackberry/WebCoreSupport/PagePopupBlackBerry.cpp
+    blackberry/WebCoreSupport/PlatformStrategiesBlackBerry.cpp
     blackberry/WebCoreSupport/NavigatorContentUtilsClientBlackBerry.cpp
     blackberry/WebCoreSupport/SelectPopupClient.cpp

trunk/Source/WebKit/blackberry/Api/BlackBerryGlobal.cpp

@@ -34 +34 @@
 #include "PageCache.h"
 #include "PageGroup.h"
+#include "PlatformStrategiesBlackBerry.h"
 #include "Settings.h"
 #include "TextureCacheCompositingThread.h"
@@ -74 +75 @@
     // we're grabbing callOnMainThread without using the rest of the threading support.
     WTF::initializeMainThread();
+
+    // Initialize our platform strategies.
+    PlatformStrategiesBlackBerry::initialize();
 
     // Set the minimal timer interval to 4 milliseconds.

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-05-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [BlackBerry] Implement platform strategies
+        https://bugs.webkit.org/show_bug.cgi?id=112162
+
+        Reviewed by Rob Buis.
+
+        * Api/BlackBerryGlobal.cpp:
+        (BlackBerry::WebKit::globalInitialize): Initialize platform
+        strategies.
+        * WebCoreSupport/PlatformStrategiesBlackBerry.cpp: Added.
+        (PlatformStrategiesBlackBerry::initialize):
+        (PlatformStrategiesBlackBerry::PlatformStrategiesBlackBerry):
+        (PlatformStrategiesBlackBerry::createCookiesStrategy):
+        (PlatformStrategiesBlackBerry::createDatabaseStrategy):
+        (PlatformStrategiesBlackBerry::createLoaderStrategy):
+        (PlatformStrategiesBlackBerry::createPasteboardStrategy):
+        (PlatformStrategiesBlackBerry::createPluginStrategy):
+        (PlatformStrategiesBlackBerry::createSharedWorkerStrategy):
+        (PlatformStrategiesBlackBerry::createStorageStrategy):
+        (PlatformStrategiesBlackBerry::createVisitedLinkStrategy):
+        (PlatformStrategiesBlackBerry::cookiesForDOM):
+        (PlatformStrategiesBlackBerry::setCookiesFromDOM):
+        (PlatformStrategiesBlackBerry::cookiesEnabled):
+        (PlatformStrategiesBlackBerry::cookieRequestHeaderFieldValue):
+        (PlatformStrategiesBlackBerry::getRawCookies):
+        (PlatformStrategiesBlackBerry::deleteCookie):
+        (PlatformStrategiesBlackBerry::refreshPlugins):
+        (PlatformStrategiesBlackBerry::getPluginInfo):
+        (PlatformStrategiesBlackBerry::isLinkVisited):
+        (PlatformStrategiesBlackBerry::addVisitedLink):
+        * WebCoreSupport/PlatformStrategiesBlackBerry.h: Added.
+        (PlatformStrategiesBlackBerry):
+
 2013-05-14  Carlos Garcia Campos  <cgarcia@igalia.com>