Diff
Modified: trunk/CMakeLists.txt (161660 => 161661)
--- trunk/CMakeLists.txt 2014-01-10 20:38:41 UTC (rev 161660)
+++ trunk/CMakeLists.txt 2014-01-10 20:40:28 UTC (rev 161661)
@@ -40,7 +40,7 @@
# -----------------------------------------------------------------------------
# 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)
Modified: trunk/ChangeLog (161660 => 161661)
--- trunk/ChangeLog 2014-01-10 20:38:41 UTC (rev 161660)
+++ trunk/ChangeLog 2014-01-10 20:40:28 UTC (rev 161661)
@@ -1,3 +1,12 @@
+2014-01-10 Benjamin Poulain <[email protected]>
+
+ 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 <[email protected]>
Remove the BlackBerry files outside WebCore
Modified: trunk/Source/WebCore/ChangeLog (161660 => 161661)
--- trunk/Source/WebCore/ChangeLog 2014-01-10 20:38:41 UTC (rev 161660)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 20:40:28 UTC (rev 161661)
@@ -1,3 +1,20 @@
+2014-01-10 Benjamin Poulain <[email protected]>
+
+ 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 <[email protected]>
Fix the WebCore, WebKit build targets following <http://trac.webkit.org/changeset/161638>
Modified: trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp (161660 => 161661)
--- trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp 2014-01-10 20:38:41 UTC (rev 161660)
+++ trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp 2014-01-10 20:40:28 UTC (rev 161661)
@@ -43,7 +43,6 @@
static void initProtocolHandlerWhitelist()
{
protocolWhitelist = new HashSet<String>;
-#if !PLATFORM(BLACKBERRY)
static const char* protocols[] = {
"bitcoin",
"geo",
@@ -67,7 +66,6 @@
};
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)
Modified: trunk/Source/WebCore/UseJSC.cmake (161660 => 161661)
--- trunk/Source/WebCore/UseJSC.cmake 2014-01-10 20:38:41 UTC (rev 161660)
+++ trunk/Source/WebCore/UseJSC.cmake 2014-01-10 20:40:28 UTC (rev 161661)
@@ -11,16 +11,6 @@
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
Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp (161660 => 161661)
--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp 2014-01-10 20:38:41 UTC (rev 161660)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp 2014-01-10 20:40:28 UTC (rev 161661)
@@ -71,12 +71,8 @@
, 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)
, m_isAuthorShadowDOMForAnyElementEnabled(false)
Modified: trunk/Source/WebCore/bindings/js/GCController.cpp (161660 => 161661)
--- trunk/Source/WebCore/bindings/js/GCController.cpp 2014-01-10 20:38:41 UTC (rev 161660)
+++ trunk/Source/WebCore/bindings/js/GCController.cpp 2014-01-10 20:40:28 UTC (rev 161661)
@@ -49,7 +49,7 @@
}
GCController::GCController()
-#if !USE(CF) && !PLATFORM(BLACKBERRY)
+#if !USE(CF)
: m_GCTimer(this, &GCController::gcTimerFired)
#endif
{
@@ -62,7 +62,7 @@
// 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 @@
#endif
}
-#if !USE(CF) && !PLATFORM(BLACKBERRY)
+#if !USE(CF)
void GCController::gcTimerFired(Timer<GCController>*)
{
collect(0);
Modified: trunk/Source/WebCore/bindings/js/GCController.h (161660 => 161661)
--- trunk/Source/WebCore/bindings/js/GCController.h 2014-01-10 20:38:41 UTC (rev 161660)
+++ trunk/Source/WebCore/bindings/js/GCController.h 2014-01-10 20:40:28 UTC (rev 161661)
@@ -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 @@
private:
GCController(); // Use gcController() instead
-#if !USE(CF) && !PLATFORM(BLACKBERRY)
+#if !USE(CF)
void gcTimerFired(Timer<GCController>*);
Timer<GCController> m_GCTimer;
#endif
Modified: trunk/Source/WebKit2/ChangeLog (161660 => 161661)
--- trunk/Source/WebKit2/ChangeLog 2014-01-10 20:38:41 UTC (rev 161660)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-10 20:40:28 UTC (rev 161661)
@@ -1,3 +1,12 @@
+2014-01-10 Benjamin Poulain <[email protected]>
+
+ 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 <[email protected]>
Implement NetworkResourceLoader::receivedCancellation
Modified: trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl (161660 => 161661)
--- trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl 2014-01-10 20:38:41 UTC (rev 161660)
+++ trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl 2014-01-10 20:40:28 UTC (rev 161661)
@@ -35,7 +35,7 @@
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 = ("_javascript_Core", "WebCore", "WebKit2");
my @skippedPrefixes;
my @frameworkHeaders;
Modified: trunk/Tools/ChangeLog (161660 => 161661)
--- trunk/Tools/ChangeLog 2014-01-10 20:38:41 UTC (rev 161660)
+++ trunk/Tools/ChangeLog 2014-01-10 20:40:28 UTC (rev 161661)
@@ -1,3 +1,12 @@
+2014-01-10 Benjamin Poulain <[email protected]>
+
+ 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 <[email protected]>
Remove the BlackBerry files outside WebCore
Modified: trunk/Tools/Scripts/webkitpy/common/config/watchlist (161660 => 161661)
--- trunk/Tools/Scripts/webkitpy/common/config/watchlist 2014-01-10 20:38:41 UTC (rev 161660)
+++ trunk/Tools/Scripts/webkitpy/common/config/watchlist 2014-01-10 20:40:28 UTC (rev 161661)
@@ -283,7 +283,6 @@
"AppleMacPublicApi": [ "[email protected]" ],
"Battery": [ "[email protected]", "[email protected]" ],
"BindingsScripts": [ "[email protected]", "[email protected]" ],
- "BlackBerry": [ "[email protected]", "[email protected]", "[email protected]" ],
"Cairo": [ "[email protected]" ],
"CMake": [ "[email protected]", "[email protected]", "[email protected]" ],
"CoordinatedGraphics" : [ "[email protected]", "[email protected]", "[email protected]", "[email protected]", "[email protected]" ],
