<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[161661] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161661">161661</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-10 12:40:28 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkCMakeListstxt">trunk/CMakeLists.txt</a></li>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesnavigatorcontentutilsNavigatorContentUtilscpp">trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp</a></li>
<li><a href="#trunkSourceWebCoreUseJSCcmake">trunk/Source/WebCore/UseJSC.cmake</a></li>
<li><a href="#trunkSourceWebCorebindingsgenericRuntimeEnabledFeaturescpp">trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsGCControllercpp">trunk/Source/WebCore/bindings/js/GCController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsGCControllerh">trunk/Source/WebCore/bindings/js/GCController.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2Scriptsgenerateforwardingheaderspl">trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigwatchlist">trunk/Tools/Scripts/webkitpy/common/config/watchlist</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/CMakeLists.txt (161660 => 161661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/CMakeLists.txt 2014-01-10 20:38:41 UTC (rev 161660)
+++ trunk/CMakeLists.txt 2014-01-10 20:40:28 UTC (rev 161661)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><span class="cx"> # Determine which port will be built
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><del>-set(ALL_PORTS Efl WinCE BlackBerry GTK Nix)
</del><ins>+set(ALL_PORTS Efl WinCE GTK Nix)
</ins><span class="cx"> set(PORT "NOPORT" CACHE STRING "choose which WebKit port to build (one of ${ALL_PORTS})")
</span><span class="cx">
</span><span class="cx"> list(FIND ALL_PORTS ${PORT} RET)
</span></span></pre></div>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (161660 => 161661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-01-10 20:38:41 UTC (rev 161660)
+++ trunk/ChangeLog 2014-01-10 20:40:28 UTC (rev 161661)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-01-09 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the BlackBerry files outside WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161660 => 161661)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-01-10 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the WebCore, WebKit build targets following <http://trac.webkit.org/changeset/161638>
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnavigatorcontentutilsNavigatorContentUtilscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp (161660 => 161661)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> static void initProtocolHandlerWhitelist()
</span><span class="cx"> {
</span><span class="cx"> protocolWhitelist = new HashSet<String>;
</span><del>-#if !PLATFORM(BLACKBERRY)
</del><span class="cx"> static const char* protocols[] = {
</span><span class="cx"> "bitcoin",
</span><span class="cx"> "geo",
</span><span class="lines">@@ -67,7 +66,6 @@
</span><span class="cx"> };
</span><span class="cx"> for (size_t i = 0; i < WTF_ARRAY_LENGTH(protocols); ++i)
</span><span class="cx"> protocolWhitelist->add(protocols[i]);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool verifyCustomHandlerURL(const String& baseURL, const String& url, ExceptionCode& ec)
</span></span></pre></div>
<a id="trunkSourceWebCoreUseJSCcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/UseJSC.cmake (161660 => 161661)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -11,16 +11,6 @@
</span><span class="cx"> bindings/js
</span><span class="cx"> )
</span><span class="cx">
</span><del>-if (PORT MATCHES "BlackBerry")
- list(APPEND WebCore_IDL_INCLUDES
- testing/js
- )
- list(APPEND WebCore_IDL_FILES
- testing/Internals.idl
- testing/InternalSettings.idl
- )
-endif ()
-
</del><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> bindings/js/ArrayValue.cpp
</span><span class="cx"> bindings/js/CallbackFunction.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgenericRuntimeEnabledFeaturescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp (161660 => 161661)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -71,12 +71,8 @@
</span><span class="cx"> , m_isJavaScriptI18NAPIEnabled(false)
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN)
</del><span class="cx"> , m_isVideoTrackEnabled(true)
</span><del>-#else
- , m_isVideoTrackEnabled(false)
</del><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> #if ENABLE(SHADOW_DOM)
</span><span class="cx"> , m_isShadowDOMEnabled(false)
</span><span class="cx"> , m_isAuthorShadowDOMForAnyElementEnabled(false)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsGCControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/GCController.cpp (161660 => 161661)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GCController::GCController()
</span><del>-#if !USE(CF) && !PLATFORM(BLACKBERRY)
</del><ins>+#if !USE(CF)
</ins><span class="cx"> : m_GCTimer(this, &GCController::gcTimerFired)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> // systems with CoreFoundation. If and when the notion of a run loop is pushed
</span><span class="cx"> // down into WTF so that more platforms can take advantage of it, we will be
</span><span class="cx"> // able to use reportAbandonedObjectGraph on more platforms.
</span><del>-#if USE(CF) || PLATFORM(BLACKBERRY)
</del><ins>+#if USE(CF)
</ins><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><span class="cx"> JSDOMWindow::commonVM()->heap.reportAbandonedObjectGraph();
</span><span class="cx"> #else
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !USE(CF) && !PLATFORM(BLACKBERRY)
</del><ins>+#if !USE(CF)
</ins><span class="cx"> void GCController::gcTimerFired(Timer<GCController>*)
</span><span class="cx"> {
</span><span class="cx"> collect(0);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsGCControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/GCController.h (161660 => 161661)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef GCController_h
</span><span class="cx"> #define GCController_h
</span><span class="cx">
</span><del>-#if USE(CF) || PLATFORM(BLACKBERRY)
</del><ins>+#if USE(CF)
</ins><span class="cx"> #include <wtf/FastMalloc.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #else
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> private:
</span><span class="cx"> GCController(); // Use gcController() instead
</span><span class="cx">
</span><del>-#if !USE(CF) && !PLATFORM(BLACKBERRY)
</del><ins>+#if !USE(CF)
</ins><span class="cx"> void gcTimerFired(Timer<GCController>*);
</span><span class="cx"> Timer<GCController> m_GCTimer;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161660 => 161661)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-01-10 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Implement NetworkResourceLoader::receivedCancellation
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptsgenerateforwardingheaderspl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl (161660 => 161661)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> my $srcRoot = realpath(File::Spec->catfile(dirname(abs_path($0)), "../.."));
</span><span class="cx"> my $incFromRoot = abs_path($ARGV[0]);
</span><del>-my @platformPrefixes = ("blackberry", "cf", "Cocoa", "CoordinatedGraphics", "curl", "efl", "gtk", "mac", "soup", "win");
</del><ins>+my @platformPrefixes = ("cf", "Cocoa", "CoordinatedGraphics", "curl", "efl", "gtk", "mac", "soup", "win");
</ins><span class="cx"> my @frameworks = ("JavaScriptCore", "WebCore", "WebKit2");
</span><span class="cx"> my @skippedPrefixes;
</span><span class="cx"> my @frameworkHeaders;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (161660 => 161661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-10 20:38:41 UTC (rev 161660)
+++ trunk/Tools/ChangeLog 2014-01-10 20:40:28 UTC (rev 161661)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-01-09 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the BlackBerry files outside WebCore
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigwatchlist"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/watchlist (161660 => 161661)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -283,7 +283,6 @@
</span><span class="cx"> "AppleMacPublicApi": [ "timothy@apple.com" ],
</span><span class="cx"> "Battery": [ "gyuyoung.kim@webkit.org", "dchris@gmail.com" ],
</span><span class="cx"> "BindingsScripts": [ "dchris@gmail.com", "cgarcia@igalia.com" ],
</span><del>- "BlackBerry": [ "mifenton@rim.com", "rwlbuis@gmail.com", "tonikitoo@webkit.org" ],
</del><span class="cx"> "Cairo": [ "dominik.rottsches@intel.com" ],
</span><span class="cx"> "CMake": [ "rakuco@webkit.org", "gyuyoung.kim@webkit.org", "ryuan.choi@gmail.com" ],
</span><span class="cx"> "CoordinatedGraphics" : [ "noam@webkit.org", "zeno@webkit.org", "cmarcelo@webkit.org", "luiz@webkit.org", "ryuan.choi@gmail.com" ],
</span></span></pre>
</div>
</div>
</body>
</html>