Remove the BlackBerry port from trunk

https://bugs.webkit.org/show_bug.cgi?id=126715

Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-01-10
Reviewed by Anders Carlsson.

.:

* CMakeLists.txt:

Source/WebCore:

* Modules/navigatorcontentutils/NavigatorContentUtils.cpp:
(WebCore::initProtocolHandlerWhitelist):
* UseJSC.cmake:
* bindings/generic/RuntimeEnabledFeatures.cpp:
(WebCore::RuntimeEnabledFeatures::RuntimeEnabledFeatures):
* bindings/js/GCController.cpp:
(WebCore::GCController::GCController):
(WebCore::GCController::garbageCollectSoon):
* bindings/js/GCController.h:

Source/WebKit2:

* Scripts/generate-forwarding-headers.pl:

Tools:

* Scripts/webkitpy/common/config/watchlist:

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 339bbf8..31290a1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ include(WebKitFeatures)
 # -----------------------------------------------------------------------------
 # Determine which port will be built
 # -----------------------------------------------------------------------------
-set(ALL_PORTS Efl WinCE BlackBerry GTK Nix)
+set(ALL_PORTS Efl WinCE GTK Nix)
 set(PORT "NOPORT" CACHE STRING "choose which WebKit port to build (one of ${ALL_PORTS})")
 
 list(FIND ALL_PORTS ${PORT} RET)

diff --git a/ChangeLog b/ChangeLog
index 13dd9cb..9087ccf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-01-10  Benjamin Poulain  <bpoulain@apple.com>
+
+        Remove the BlackBerry port from trunk
+        https://bugs.webkit.org/show_bug.cgi?id=126715
+
+        Reviewed by Anders Carlsson.
+
+        * CMakeLists.txt:
+
 2014-01-09  Benjamin Poulain  <bpoulain@apple.com>
 
         Remove the BlackBerry files outside WebCore

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 2a367c8..fed7f98 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2014-01-10  Benjamin Poulain  <bpoulain@apple.com>
+
+        Remove the BlackBerry port from trunk
+        https://bugs.webkit.org/show_bug.cgi?id=126715
+
+        Reviewed by Anders Carlsson.
+
+        * Modules/navigatorcontentutils/NavigatorContentUtils.cpp:
+        (WebCore::initProtocolHandlerWhitelist):
+        * UseJSC.cmake:
+        * bindings/generic/RuntimeEnabledFeatures.cpp:
+        (WebCore::RuntimeEnabledFeatures::RuntimeEnabledFeatures):
+        * bindings/js/GCController.cpp:
+        (WebCore::GCController::GCController):
+        (WebCore::GCController::garbageCollectSoon):
+        * bindings/js/GCController.h:
+
 2014-01-10  Daniel Bates  <dabates@apple.com>
 
         Fix the WebCore, WebKit build targets following <http://trac.webkit.org/changeset/161638>

diff --git a/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp b/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp
index f3b1db8..b5fb026 100644 (file)
--- a/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp
+++ b/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp
@@ -43,7 +43,6 @@ static HashSet<String>* protocolWhitelist;
 static void initProtocolHandlerWhitelist()
 {
     protocolWhitelist = new HashSet<String>;
-#if !PLATFORM(BLACKBERRY)
     static const char* protocols[] = {
         "bitcoin",
         "geo",
@@ -67,7 +66,6 @@ static void initProtocolHandlerWhitelist()
     };
     for (size_t i = 0; i < WTF_ARRAY_LENGTH(protocols); ++i)
         protocolWhitelist->add(protocols[i]);
-#endif
 }
 
 static bool verifyCustomHandlerURL(const String& baseURL, const String& url, ExceptionCode& ec)

diff --git a/Source/WebCore/UseJSC.cmake b/Source/WebCore/UseJSC.cmake
index 105af88..6f5801f 100644 (file)
--- a/Source/WebCore/UseJSC.cmake
+++ b/Source/WebCore/UseJSC.cmake
@@ -11,16 +11,6 @@ list(APPEND WebCore_IDL_INCLUDES
     bindings/js
 )
 
-if (PORT MATCHES "BlackBerry")
-    list(APPEND WebCore_IDL_INCLUDES
-        testing/js
-    )
-    list(APPEND WebCore_IDL_FILES
-        testing/Internals.idl
-        testing/InternalSettings.idl
-    )
-endif ()
-
 list(APPEND WebCore_SOURCES
     bindings/js/ArrayValue.cpp
     bindings/js/CallbackFunction.cpp

diff --git a/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp b/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
index fabac62..82b9886 100644 (file)
--- a/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
+++ b/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
@@ -71,11 +71,7 @@ RuntimeEnabledFeatures::RuntimeEnabledFeatures()
     , m_isJavaScriptI18NAPIEnabled(false)
 #endif
 #if ENABLE(VIDEO_TRACK)
-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN)
     , m_isVideoTrackEnabled(true)
-#else
-    , m_isVideoTrackEnabled(false)
-#endif
 #endif
 #if ENABLE(SHADOW_DOM)
     , m_isShadowDOMEnabled(false)

diff --git a/Source/WebCore/bindings/js/GCController.cpp b/Source/WebCore/bindings/js/GCController.cpp
index f910db6..db6901e 100644 (file)
--- a/Source/WebCore/bindings/js/GCController.cpp
+++ b/Source/WebCore/bindings/js/GCController.cpp
@@ -49,7 +49,7 @@ GCController& gcController()
 }
 
 GCController::GCController()
-#if !USE(CF) && !PLATFORM(BLACKBERRY)
+#if !USE(CF)
     : m_GCTimer(this, &GCController::gcTimerFired)
 #endif
 {
@@ -62,7 +62,7 @@ void GCController::garbageCollectSoon()
     // systems with CoreFoundation. If and when the notion of a run loop is pushed 
     // down into WTF so that more platforms can take advantage of it, we will be 
     // able to use reportAbandonedObjectGraph on more platforms.
-#if USE(CF) || PLATFORM(BLACKBERRY)
+#if USE(CF)
     JSLockHolder lock(JSDOMWindow::commonVM());
     JSDOMWindow::commonVM()->heap.reportAbandonedObjectGraph();
 #else
@@ -71,7 +71,7 @@ void GCController::garbageCollectSoon()
 #endif
 }
 
-#if !USE(CF) && !PLATFORM(BLACKBERRY)
+#if !USE(CF)
 void GCController::gcTimerFired(Timer<GCController>*)
 {
     collect(0);

diff --git a/Source/WebCore/bindings/js/GCController.h b/Source/WebCore/bindings/js/GCController.h
index fd232b0..19c98f9 100644 (file)
--- a/Source/WebCore/bindings/js/GCController.h
+++ b/Source/WebCore/bindings/js/GCController.h
@@ -26,7 +26,7 @@
 #ifndef GCController_h
 #define GCController_h
 
-#if USE(CF) || PLATFORM(BLACKBERRY)
+#if USE(CF)
 #include <wtf/FastMalloc.h>
 #include <wtf/Noncopyable.h>
 #else
@@ -53,7 +53,7 @@ namespace WebCore {
     private:
         GCController(); // Use gcController() instead
 
-#if !USE(CF) && !PLATFORM(BLACKBERRY)
+#if !USE(CF)
         void gcTimerFired(Timer<GCController>*);
         Timer<GCController> m_GCTimer;
 #endif

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index c403020..f880121 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2014-01-10  Benjamin Poulain  <bpoulain@apple.com>
+
+        Remove the BlackBerry port from trunk
+        https://bugs.webkit.org/show_bug.cgi?id=126715
+
+        Reviewed by Anders Carlsson.
+
+        * Scripts/generate-forwarding-headers.pl:
+
 2014-01-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Implement NetworkResourceLoader::receivedCancellation

diff --git a/Source/WebKit2/Scripts/generate-forwarding-headers.pl b/Source/WebKit2/Scripts/generate-forwarding-headers.pl
index dba5ead..73675b3 100755 (executable)
--- a/Source/WebKit2/Scripts/generate-forwarding-headers.pl
+++ b/Source/WebKit2/Scripts/generate-forwarding-headers.pl
@@ -35,7 +35,7 @@ use File::Spec::Functions;
 
 my $srcRoot = realpath(File::Spec->catfile(dirname(abs_path($0)), "../.."));
 my $incFromRoot = abs_path($ARGV[0]);
-my @platformPrefixes = ("blackberry", "cf", "Cocoa", "CoordinatedGraphics", "curl", "efl", "gtk", "mac", "soup", "win");
+my @platformPrefixes = ("cf", "Cocoa", "CoordinatedGraphics", "curl", "efl", "gtk", "mac", "soup", "win");
 my @frameworks = ("JavaScriptCore", "WebCore", "WebKit2");
 my @skippedPrefixes;
 my @frameworkHeaders;

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index bd7ba7a..da5cc54 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2014-01-10  Benjamin Poulain  <bpoulain@apple.com>
+
+        Remove the BlackBerry port from trunk
+        https://bugs.webkit.org/show_bug.cgi?id=126715
+
+        Reviewed by Anders Carlsson.
+
+        * Scripts/webkitpy/common/config/watchlist:
+
 2014-01-09  Benjamin Poulain  <bpoulain@apple.com>
 
         Remove the BlackBerry files outside WebCore

diff --git a/Tools/Scripts/webkitpy/common/config/watchlist b/Tools/Scripts/webkitpy/common/config/watchlist
index 239dabd..9b637e8 100644 (file)
--- a/Tools/Scripts/webkitpy/common/config/watchlist
+++ b/Tools/Scripts/webkitpy/common/config/watchlist
@@ -283,7 +283,6 @@
         "AppleMacPublicApi": [ "timothy@apple.com" ],
         "Battery": [ "gyuyoung.kim@webkit.org", "dchris@gmail.com" ],
         "BindingsScripts": [ "dchris@gmail.com", "cgarcia@igalia.com" ],
-        "BlackBerry": [ "mifenton@rim.com", "rwlbuis@gmail.com", "tonikitoo@webkit.org" ],
         "Cairo": [ "dominik.rottsches@intel.com" ],
         "CMake": [ "rakuco@webkit.org", "gyuyoung.kim@webkit.org", "ryuan.choi@gmail.com" ],
         "CoordinatedGraphics" : [ "noam@webkit.org", "zeno@webkit.org", "cmarcelo@webkit.org", "luiz@webkit.org", "ryuan.choi@gmail.com" ],