<!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>[161656] trunk/Tools</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/161656">161656</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-01-10 11:12:26 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove knowledge of Blackberry from build scripts
https://bugs.webkit.org/show_bug.cgi?id=126766
Reviewed by Anders Carlsson.
Remove isBlackBerry() and references to it, and rmeove
blackberry-related stuff from the watchlist.
* Scripts/build-webkit:
* Scripts/webkit-build-directory:
* Scripts/webkitdirs.pm:
(determineBaseProductDir):
(argumentsForConfiguration):
(builtDylibPathForName):
(isAppleWebKit):
(buildCMakeProjectOrExit):
(cmakeBasedPortArguments):
(cmakeBasedPortName):
* Scripts/webkitperl/FeatureList.pm:
* Scripts/webkitpy/common/config/watchlist:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsbuildwebkit">trunk/Tools/Scripts/build-webkit</a></li>
<li><a href="#trunkToolsScriptswebkitbuilddirectory">trunk/Tools/Scripts/webkit-build-directory</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
<li><a href="#trunkToolsScriptswebkitperlFeatureListpm">trunk/Tools/Scripts/webkitperl/FeatureList.pm</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="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (161655 => 161656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-10 19:07:55 UTC (rev 161655)
+++ trunk/Tools/ChangeLog 2014-01-10 19:12:26 UTC (rev 161656)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-01-10 Simon Fraser <simon.fraser@apple.com>
+
+ Remove knowledge of Blackberry from build scripts
+ https://bugs.webkit.org/show_bug.cgi?id=126766
+
+ Reviewed by Anders Carlsson.
+
+ Remove isBlackBerry() and references to it, and rmeove
+ blackberry-related stuff from the watchlist.
+
+ * Scripts/build-webkit:
+ * Scripts/webkit-build-directory:
+ * Scripts/webkitdirs.pm:
+ (determineBaseProductDir):
+ (argumentsForConfiguration):
+ (builtDylibPathForName):
+ (isAppleWebKit):
+ (buildCMakeProjectOrExit):
+ (cmakeBasedPortArguments):
+ (cmakeBasedPortName):
+ * Scripts/webkitperl/FeatureList.pm:
+ * Scripts/webkitpy/common/config/watchlist:
+
</ins><span class="cx"> 2014-01-10 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Fix up simulator build and enable default features
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (161655 => 161656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit 2014-01-10 19:07:55 UTC (rev 161655)
+++ trunk/Tools/Scripts/build-webkit 2014-01-10 19:12:26 UTC (rev 161656)
</span><span class="lines">@@ -127,7 +127,6 @@
</span><span class="cx"> --simulator Use the current iphonesimulator SDK (iOS only)
</span><span class="cx"> --coverage Enable Code Coverage support (Mac only)
</span><span class="cx">
</span><del>- --blackberry Build the BlackBerry port on Mac/Linux
</del><span class="cx"> --efl Build the EFL port
</span><span class="cx"> --nix Build the Nix port
</span><span class="cx"> --gtk Build the GTK+ port
</span><span class="lines">@@ -136,7 +135,7 @@
</span><span class="cx">
</span><span class="cx"> --inspector-frontend Copy changes to the inspector front-end files to the build directory
</span><span class="cx">
</span><del>- --prefix=<path> Set installation prefix to the given path (Gtk/Efl/BlackBerry only)
</del><ins>+ --prefix=<path> Set installation prefix to the given path (Gtk/Efl only)
</ins><span class="cx"> --makeargs=<arguments> Optional Makefile flags
</span><span class="cx"> --cmakeargs=<arguments> Optional CMake flags (e.g. --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local")
</span><span class="cx">
</span><span class="lines">@@ -308,18 +307,6 @@
</span><span class="cx"> buildCMakeProjectOrExit($clean, "WinCE", $prefixPath, $makeArgs, (cmakeBasedPortArguments(), cMakeArgsFromFeatures()), $cmakeArgs);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if (isBlackBerry()) {
- my $numberOfJobs;
- if ($ENV{"USE_ICECC"}) {
- $numberOfJobs = 50; # 50 is the number we choose for internal development
- } else {
- $numberOfJobs = numberOfCPUs();
- }
- $makeArgs .= ($makeArgs ? " " : "") . "-j" . $numberOfJobs if $makeArgs !~ /-j\s*\d+/;
- $prefixPath = $ENV{"STAGE_DIR"} unless $prefixPath;
- buildCMakeProjectOrExit($clean, "BlackBerry", $prefixPath, $makeArgs, (cmakeBasedPortArguments(), cMakeArgsFromFeatures()), $cmakeArgs);
-}
-
</del><span class="cx"> # Build, and abort if the build fails.
</span><span class="cx"> for my $dir (@projects) {
</span><span class="cx"> chdir $dir or die;
</span></span></pre></div>
<a id="trunkToolsScriptswebkitbuilddirectory"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkit-build-directory (161655 => 161656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkit-build-directory 2014-01-10 19:07:55 UTC (rev 161655)
+++ trunk/Tools/Scripts/webkit-build-directory 2014-01-10 19:12:26 UTC (rev 161656)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> -h|--help Show this help message
</span><span class="cx"> --top-level Show the top-level build directory
</span><span class="cx">
</span><del>- --blackberry Find the build directory for the BlackBerry port on Mac/Linux
</del><span class="cx"> --efl Find the build directory for the EFL port
</span><span class="cx"> --gtk Find the build directory for the GTK+ port
</span><span class="cx"> --wincairo Find the build directory for using Cairo (rather than CoreGraphics) on Windows
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (161655 => 161656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2014-01-10 19:07:55 UTC (rev 161655)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-01-10 19:12:26 UTC (rev 161656)
</span><span class="lines">@@ -97,7 +97,6 @@
</span><span class="cx"> my $isWin64;
</span><span class="cx"> my $isEfl;
</span><span class="cx"> my $isNix;
</span><del>-my $isBlackBerry;
</del><span class="cx"> my $isInspectorFrontend;
</span><span class="cx"> my $isWK2;
</span><span class="cx"> my $shouldTargetWebProcess;
</span><span class="lines">@@ -224,11 +223,6 @@
</span><span class="cx"> $baseProductDir = "$sourceDir/WebKitBuild";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (isBlackBerry()) {
- my %archInfo = blackberryTargetArchitecture();
- $baseProductDir = "$baseProductDir/" . $archInfo{"cpuDir"};
- }
-
</del><span class="cx"> if (isGit() && isGitBranchBuild()) {
</span><span class="cx"> my $branch = gitBranch();
</span><span class="cx"> $baseProductDir = "$baseProductDir/$branch";
</span><span class="lines">@@ -386,7 +380,6 @@
</span><span class="cx"> push(@args, '--nix') if isNix();
</span><span class="cx"> push(@args, '--wincairo') if isWinCairo();
</span><span class="cx"> push(@args, '--wince') if isWinCE();
</span><del>- push(@args, '--blackberry') if isBlackBerry();
</del><span class="cx"> push(@args, '--inspector-frontend') if isInspectorFrontend();
</span><span class="cx"> return @args;
</span><span class="cx"> }
</span><span class="lines">@@ -775,10 +768,6 @@
</span><span class="cx"> my $libraryName = shift;
</span><span class="cx"> determineConfigurationProductDir();
</span><span class="cx">
</span><del>- if (isBlackBerry()) {
- my $libraryExtension = $libraryName =~ /^WebKit$/i ? ".so" : ".a";
- return "$configurationProductDir/$libraryName/lib" . lc($libraryName) . $libraryExtension;
- }
</del><span class="cx"> if (isGtk()) {
</span><span class="cx"> # WebKitGTK+ for GTK2, WebKitGTK+ for GTK3, and WebKit2 respectively.
</span><span class="cx"> my @libraries = ("libwebkitgtk-1.0", "libwebkitgtk-3.0", "libwebkit2gtk-3.0");
</span><span class="lines">@@ -914,137 +903,6 @@
</span><span class="cx"> return $isWK2;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub isBlackBerry()
-{
- determineIsBlackBerry();
- return $isBlackBerry;
-}
-
-sub determineIsBlackBerry()
-{
- return if defined($isBlackBerry);
- $isBlackBerry = checkForArgumentAndRemoveFromARGV("--blackberry");
-}
-
-sub blackberryTargetArchitecture()
-{
- my $arch = $ENV{"BLACKBERRY_ARCH_TYPE"} ? $ENV{"BLACKBERRY_ARCH_TYPE"} : "arm";
- my $cpu = $ENV{"BLACKBERRY_ARCH_CPU"} ? $ENV{"BLACKBERRY_ARCH_CPU"} : "";
- my $cpuDir;
- my $buSuffix;
- if (($cpu eq "v7le") || ($cpu eq "a9")) {
- $cpuDir = $arch . "le-v7";
- $buSuffix = $arch . "v7";
- } else {
- $cpu = $arch;
- $cpuDir = $arch;
- $buSuffix = $arch;
- }
- return ("arch" => $arch,
- "cpu" => $cpu,
- "cpuDir" => $cpuDir,
- "buSuffix" => $buSuffix);
-}
-
-sub blackberryCMakeArguments()
-{
- my %archInfo = blackberryTargetArchitecture();
- my $arch = $archInfo{"arch"};
- my $cpu = $archInfo{"cpu"};
- my $cpuDir = $archInfo{"cpuDir"};
- my $buSuffix = $archInfo{"buSuffix"};
-
- my @cmakeExtraOptions;
- if ($cpu eq "a9") {
- $cpu = $arch . "v7le";
- push @cmakeExtraOptions, '-DTARGETING_PLAYBOOK=1';
- }
-
- my $stageDir = $ENV{"STAGE_DIR"};
- my $stageLib = File::Spec->catdir($stageDir, $cpuDir, "lib");
- my $stageUsrLib = File::Spec->catdir($stageDir, $cpuDir, "usr", "lib");
- my $stageInc = File::Spec->catdir($stageDir, "usr", "include");
-
- my $qnxHost = $ENV{"QNX_HOST"};
- my $ccCommand;
- my $cxxCommand;
- if ($ENV{"USE_ICECC"}) {
- chomp($ccCommand = `which icecc`);
- $cxxCommand = $ccCommand;
- } else {
- $ccCommand = File::Spec->catfile($qnxHost, "usr", "bin", "qcc");
- $cxxCommand = $ccCommand;
- }
-
- if ($ENV{"CCWRAP"}) {
- $ccCommand = $ENV{"CCWRAP"};
- push @cmakeExtraOptions, "-DCMAKE_C_COMPILER_ARG1=qcc";
- push @cmakeExtraOptions, "-DCMAKE_CXX_COMPILER_ARG1=qcc";
- }
-
- push @cmakeExtraOptions, "-DCMAKE_SKIP_RPATH='ON'" if isDarwin();
- push @cmakeExtraOptions, "-DPUBLIC_BUILD=1" if $ENV{"PUBLIC_BUILD"};
- push @cmakeExtraOptions, "-DENABLE_GLES2=1" unless $ENV{"DISABLE_GLES2"};
-
- my @includeSystemDirectories;
- push @includeSystemDirectories, File::Spec->catdir($stageInc, "harfbuzzng");
- push @includeSystemDirectories, File::Spec->catdir($stageInc, "imf");
- # We only use jpeg-turbo for device build
- push @includeSystemDirectories, File::Spec->catdir($stageInc, "jpeg-turbo") if $arch=~/arm/;
- push @includeSystemDirectories, $stageInc;
- push @includeSystemDirectories, File::Spec->catdir($stageInc, "browser", "platform");
- push @includeSystemDirectories, File::Spec->catdir($stageInc, "browser", "platform", "graphics");
- push @includeSystemDirectories, File::Spec->catdir($stageInc, "browser", "qsk");
- push @includeSystemDirectories, File::Spec->catdir($stageInc, "ots");
- push @includeSystemDirectories, File::Spec->catdir($stageInc, "iType", "common");
- push @includeSystemDirectories, File::Spec->catdir($stageInc, "iType", "port", "nto");
-
- my @cxxFlags;
- push @cxxFlags, "-Wl,-rpath-link,$stageLib";
- push @cxxFlags, "-Wl,-rpath-link," . File::Spec->catfile($stageUsrLib, "torch-webkit");
- push @cxxFlags, "-Wl,-rpath-link,$stageUsrLib";
- push @cxxFlags, "-L$stageLib";
- push @cxxFlags, "-L$stageUsrLib";
-
- if ($ENV{"PROFILE"}) {
- push @cmakeExtraOptions, "-DPROFILING=1";
- push @cxxFlags, "-p";
- }
-
- my @cmakeArgs;
- push @cmakeArgs, '-DCMAKE_SYSTEM_NAME="QNX"';
- push @cmakeArgs, "-DCMAKE_SYSTEM_PROCESSOR=\"$cpuDir\"";
- push @cmakeArgs, '-DCMAKE_SYSTEM_VERSION="1"';
- push @cmakeArgs, "-DCMAKE_C_COMPILER=\"$ccCommand\"";
- push @cmakeArgs, "-DCMAKE_CXX_COMPILER=\"$cxxCommand\"";
- push @cmakeArgs, "-DCMAKE_C_FLAGS=\"-Vgcc_nto${cpu} -g @cxxFlags\"";
- push @cmakeArgs, "-DCMAKE_CXX_FLAGS=\"-Vgcc_nto${cpu}_cpp-ne -g -lang-c++ @cxxFlags\"";
-
- # We cannot use CMAKE_INCLUDE_PATH since this describes the search path for header files in user directories.
- # And the QNX system headers are in user directories on the host OS (i.e. they aren't installed in the host OS's
- # system header search path). So, we need to inform g++ that these user directories (@includeSystemDirectories)
- # are to be taken as the host OS's system header directories when building our port.
- #
- # Also, we cannot use CMAKE_SYSTEM_INCLUDE_PATH since that will override the entire system header path.
- # So, we define the additional system include paths in ADDITIONAL_SYSTEM_INCLUDE_PATH. This list will
- # be processed in OptionsBlackBerry.cmake.
- push @cmakeArgs, '-DADDITIONAL_SYSTEM_INCLUDE_PATH="' . join(';', @includeSystemDirectories) . '"';
-
- # FIXME: Make this more general purpose such that we can pass a list of directories and files.
- push @cmakeArgs, '-DTHIRD_PARTY_ICU_DIR="' . File::Spec->catdir($stageInc, "unicode") . '"';
- push @cmakeArgs, '-DTHIRD_PARTY_UNICODE_FILE="' . File::Spec->catfile($stageInc, "unicode.h") . '"';
-
- push @cmakeArgs, "-DCMAKE_LIBRARY_PATH=\"$stageLib;$stageUsrLib\"";
- push @cmakeArgs, '-DCMAKE_AR="' . File::Spec->catfile($qnxHost, "usr", "bin", "nto${buSuffix}-ar") . '"';
- push @cmakeArgs, '-DCMAKE_RANLIB="' . File::Spec->catfile($qnxHost, "usr", "bin", "nto${buSuffix}-ranlib") . '"';
- push @cmakeArgs, '-DCMAKE_LD="'. File::Spec->catfile($qnxHost, "usr", "bin", "nto${buSuffix}-ld") . '"';
- push @cmakeArgs, '-DCMAKE_LINKER="' . File::Spec->catfile($qnxHost, "usr", "bin", "nto${buSuffix}-ld") . '"';
- push @cmakeArgs, "-DECLIPSE_CDT4_GENERATE_SOURCE_PROJECT=TRUE";
- push @cmakeArgs, '-G"Eclipse CDT4 - Unix Makefiles"';
- push @cmakeArgs, @cmakeExtraOptions;
- return @cmakeArgs;
-}
-
</del><span class="cx"> sub determineIsEfl()
</span><span class="cx"> {
</span><span class="cx"> return if defined($isEfl);
</span><span class="lines">@@ -1236,7 +1094,7 @@
</span><span class="cx">
</span><span class="cx"> sub isAppleWebKit()
</span><span class="cx"> {
</span><del>- return !(isGtk() or isEfl() or isWinCE() or isBlackBerry() or isNix());
</del><ins>+ return !(isGtk() or isEfl() or isWinCE() or isNix());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub isAppleMacWebKit()
</span><span class="lines">@@ -2108,9 +1966,7 @@
</span><span class="cx">
</span><span class="cx"> $returnCode = exitStatus(generateBuildSystemFromCMakeProject($port, $prefixPath, @cmakeArgs));
</span><span class="cx"> exit($returnCode) if $returnCode;
</span><del>- if (isBlackBerry()) {
- return 0 if (defined($ENV{"GENERATE_CMAKE_PROJECT_ONLY"}) eq '1');
- }
</del><ins>+
</ins><span class="cx"> $returnCode = exitStatus(buildCMakeGeneratedProject($makeArgs));
</span><span class="cx"> exit($returnCode) if $returnCode;
</span><span class="cx"> return 0;
</span><span class="lines">@@ -2118,14 +1974,12 @@
</span><span class="cx">
</span><span class="cx"> sub cmakeBasedPortArguments()
</span><span class="cx"> {
</span><del>- return blackberryCMakeArguments() if isBlackBerry();
</del><span class="cx"> return ('-G "Visual Studio 8 2005 STANDARDSDK_500 (ARMV4I)"') if isWinCE();
</span><span class="cx"> return ();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub cmakeBasedPortName()
</span><span class="cx"> {
</span><del>- return "BlackBerry" if isBlackBerry();
</del><span class="cx"> return "Efl" if isEfl();
</span><span class="cx"> return "WinCE" if isWinCE();
</span><span class="cx"> return "Nix" if isNix();
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (161655 => 161656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-01-10 19:07:55 UTC (rev 161655)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-01-10 19:12:26 UTC (rev 161656)
</span><span class="lines">@@ -166,10 +166,10 @@
</span><span class="cx"> define => "ENABLE_ACCELERATED_2D_CANVAS", default => 0, value => \$accelerated2DCanvasSupport },
</span><span class="cx">
</span><span class="cx"> { option => "battery-status", desc => "Toggle Battery Status support",
</span><del>- define => "ENABLE_BATTERY_STATUS", default => (isEfl() || isBlackBerry()), value => \$batteryStatusSupport },
</del><ins>+ define => "ENABLE_BATTERY_STATUS", default => isEfl(), value => \$batteryStatusSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "blob", desc => "Toggle Blob support",
</span><del>- define => "ENABLE_BLOB", default => ((isAppleMacWebKit() && !isIOSWebKit()) || isGtk() || isBlackBerry() || isEfl()), value => \$blobSupport },
</del><ins>+ define => "ENABLE_BLOB", default => ((isAppleMacWebKit() && !isIOSWebKit()) || isGtk() || isEfl()), value => \$blobSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "canvas-path", desc => "Toggle Canvas Path support",
</span><span class="cx"> define => "ENABLE_CANVAS_PATH", default => 1, value => \$canvasPathSupport },
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> define => "ENABLE_CSS_SHAPES", default => 1, value => \$cssShapesSupport },
</span><span class="cx">
</span><span class="cx"> { option => "css-filters", desc => "Toggle CSS Filters support",
</span><del>- define => "ENABLE_CSS_FILTERS", default => (isAppleMacWebKit() || isBlackBerry() || isIOSWebKit()), value => \$cssFiltersSupport },
</del><ins>+ define => "ENABLE_CSS_FILTERS", default => (isAppleMacWebKit() || isIOSWebKit()), value => \$cssFiltersSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "css3-conditional-rules", desc => "Toggle CSS3 Conditional Rules support (i.e. \@supports)",
</span><span class="cx"> define => "ENABLE_CSS3_CONDITIONAL_RULES", default => 0, value => \$css3ConditionalRulesSupport },
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> define => "ENABLE_CSS_IMAGE_ORIENTATION", default => (isEfl() || isGtk()), value => \$cssImageOrientationSupport },
</span><span class="cx">
</span><span class="cx"> { option => "css-image-resolution", desc => "Toggle CSS image-resolution support",
</span><del>- define => "ENABLE_CSS_IMAGE_RESOLUTION", default => (isBlackBerry() || isGtk()), value => \$cssImageResolutionSupport },
</del><ins>+ define => "ENABLE_CSS_IMAGE_RESOLUTION", default => isGtk(), value => \$cssImageResolutionSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "css-image-set", desc => "Toggle CSS image-set support",
</span><span class="cx"> define => "ENABLE_CSS_IMAGE_SET", default => (isEfl() || isGtk()), value => \$cssImageSetSupport },
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> define => "ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED", default => 1, value => \$cssAnimationsTransformsUnprefixedSupport },
</span><span class="cx">
</span><span class="cx"> { option => "custom-scheme-handler", desc => "Toggle Custom Scheme Handler support",
</span><del>- define => "ENABLE_CUSTOM_SCHEME_HANDLER", default => (isBlackBerry() || isEfl()), value => \$customSchemeHandlerSupport },
</del><ins>+ define => "ENABLE_CUSTOM_SCHEME_HANDLER", default => isEfl(), value => \$customSchemeHandlerSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "datalist-element", desc => "Toggle Datalist Element support",
</span><span class="cx"> define => "ENABLE_DATALIST_ELEMENT", default => isEfl(), value => \$datalistElementSupport },
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> define => "ENABLE_DETAILS_ELEMENT", default => 1, value => \$detailsElementSupport },
</span><span class="cx">
</span><span class="cx"> { option => "device-orientation", desc => "Toggle Device Orientation support",
</span><del>- define => "ENABLE_DEVICE_ORIENTATION", default => (isIOSWebKit() || isBlackBerry()), value => \$deviceOrientationSupport },
</del><ins>+ define => "ENABLE_DEVICE_ORIENTATION", default => isIOSWebKit(), value => \$deviceOrientationSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "directory-upload", desc => "Toggle Directory Upload support",
</span><span class="cx"> define => "ENABLE_DIRECTORY_UPLOAD", default => 0, value => \$directoryUploadSupport },
</span><span class="lines">@@ -256,10 +256,10 @@
</span><span class="cx"> define => "ENABLE_DOM4_EVENTS_CONSTRUCTOR", default => (isAppleWebKit() || isGtk() || isEfl()), value => \$dom4EventsConstructor },
</span><span class="cx">
</span><span class="cx"> { option => "download-attribute", desc => "Toggle Download Attribute support",
</span><del>- define => "ENABLE_DOWNLOAD_ATTRIBUTE", default => (isBlackBerry() || isEfl()), value => \$downloadAttributeSupport },
</del><ins>+ define => "ENABLE_DOWNLOAD_ATTRIBUTE", default => isEfl(), value => \$downloadAttributeSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "filters", desc => "Toggle Filters support",
</span><del>- define => "ENABLE_FILTERS", default => (isAppleWebKit() || isIOSWebKit() || isGtk() || isEfl() || isBlackBerry()), value => \$filtersSupport },
</del><ins>+ define => "ENABLE_FILTERS", default => (isAppleWebKit() || isIOSWebKit() || isGtk() || isEfl()), value => \$filtersSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "font-load-events", desc => "Toggle Font Load Events support",
</span><span class="cx"> define => "ENABLE_FONT_LOAD_EVENTS", default => 0, value => \$fontLoadEventsSupport },
</span><span class="lines">@@ -268,13 +268,13 @@
</span><span class="cx"> define => "ENABLE_FTPDIR", default => !isWinCE(), value => \$ftpDirSupport },
</span><span class="cx">
</span><span class="cx"> { option => "fullscreen-api", desc => "Toggle Fullscreen API support",
</span><del>- define => "ENABLE_FULLSCREEN_API", default => (isAppleMacWebKit() || isEfl() || isGtk() || isBlackBerry()), value => \$fullscreenAPISupport },
</del><ins>+ define => "ENABLE_FULLSCREEN_API", default => (isAppleMacWebKit() || isEfl() || isGtk()), value => \$fullscreenAPISupport },
</ins><span class="cx">
</span><span class="cx"> { option => "gamepad", desc => "Toggle Gamepad support",
</span><span class="cx"> define => "ENABLE_GAMEPAD", default => (isEfl() || isGtk()), value => \$gamepadSupport },
</span><span class="cx">
</span><span class="cx"> { option => "geolocation", desc => "Toggle Geolocation support",
</span><del>- define => "ENABLE_GEOLOCATION", default => (isAppleWebKit() || isIOSWebKit() || isGtk() || isBlackBerry()), value => \$geolocationSupport },
</del><ins>+ define => "ENABLE_GEOLOCATION", default => (isAppleWebKit() || isIOSWebKit() || isGtk()), value => \$geolocationSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "high-dpi-canvas", desc => "Toggle High DPI Canvas support",
</span><span class="cx"> define => "ENABLE_HIGH_DPI_CANVAS", default => (isAppleWebKit()), value => \$highDPICanvasSupport },
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx"> define => "ENABLE_INPUT_SPEECH", default => 0, value => \$inputSpeechSupport },
</span><span class="cx">
</span><span class="cx"> { option => "input-type-color", desc => "Toggle Input Type Color support",
</span><del>- define => "ENABLE_INPUT_TYPE_COLOR", default => (isBlackBerry() || isEfl()), value => \$inputTypeColorSupport },
</del><ins>+ define => "ENABLE_INPUT_TYPE_COLOR", default => isEfl(), value => \$inputTypeColorSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "input-type-date", desc => "Toggle Input Type Date support",
</span><span class="cx"> define => "ENABLE_INPUT_TYPE_DATE", default => 0, value => \$inputTypeDateSupport },
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx"> define => "ENABLE_JAVASCRIPT_DEBUGGER", default => 1, value => \$javascriptDebuggerSupport },
</span><span class="cx">
</span><span class="cx"> { option => "legacy-notifications", desc => "Toggle Legacy Notifications support",
</span><del>- define => "ENABLE_LEGACY_NOTIFICATIONS", default => isBlackBerry(), value => \$legacyNotificationsSupport },
</del><ins>+ define => "ENABLE_LEGACY_NOTIFICATIONS", default => 0, value => \$legacyNotificationsSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "legacy-vendor-prefixes", desc => "Toggle Legacy Vendor Prefix support",
</span><span class="cx"> define => "ENABLE_LEGACY_VENDOR_PREFIXES", default => 1, value => \$legacyVendorPrefixSupport },
</span><span class="lines">@@ -331,7 +331,7 @@
</span><span class="cx"> define => "ENABLE_LINK_PREFETCH", default => (isGtk() || isEfl()), value => \$linkPrefetchSupport },
</span><span class="cx">
</span><span class="cx"> { option => "mathml", desc => "Toggle MathML support",
</span><del>- define => "ENABLE_MATHML", default => !isBlackBerry(), value => \$mathmlSupport },
</del><ins>+ define => "ENABLE_MATHML", default => 1, value => \$mathmlSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "media-capture", desc => "Toggle Media Capture support",
</span><span class="cx"> define => "ENABLE_MEDIA_CAPTURE", default => isEfl(), value => \$mediaCaptureSupport },
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx"> define => "ENABLE_MEDIA_STATISTICS", default => 0, value => \$mediaStatisticsSupport },
</span><span class="cx">
</span><span class="cx"> { option => "media-stream", desc => "Toggle Media Stream support",
</span><del>- define => "ENABLE_MEDIA_STREAM", default => (isBlackBerry() || isGtk()), value => \$mediaStreamSupport },
</del><ins>+ define => "ENABLE_MEDIA_STREAM", default => isGtk(), value => \$mediaStreamSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "meter-element", desc => "Toggle Meter Element support",
</span><span class="cx"> define => "ENABLE_METER_ELEMENT", default => !isAppleWinWebKit(), value => \$meterElementSupport },
</span><span class="lines">@@ -355,25 +355,25 @@
</span><span class="cx"> define => "ENABLE_MOUSE_CURSOR_SCALE", default => isEfl(), value => \$mouseCursorScaleSupport },
</span><span class="cx">
</span><span class="cx"> { option => "navigator-content-utils", desc => "Toggle Navigator Content Utils support",
</span><del>- define => "ENABLE_NAVIGATOR_CONTENT_UTILS", default => (isBlackBerry() || isEfl()), value => \$registerProtocolHandlerSupport },
</del><ins>+ define => "ENABLE_NAVIGATOR_CONTENT_UTILS", default => isEfl(), value => \$registerProtocolHandlerSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "netscape-plugin-api", desc => "Toggle Netscape Plugin API support",
</span><span class="cx"> define => "ENABLE_NETSCAPE_PLUGIN_API", default => !isIOSWebKit(), value => \$netscapePluginAPISupport },
</span><span class="cx">
</span><span class="cx"> { option => "network-info", desc => "Toggle Network Info support",
</span><del>- define => "ENABLE_NETWORK_INFO", default => (isEfl() || isBlackBerry()), value => \$networkInfoSupport },
</del><ins>+ define => "ENABLE_NETWORK_INFO", default => isEfl(), value => \$networkInfoSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "nosniff", desc => "Toggle support for 'X-Content-Type-Options: nosniff'",
</span><span class="cx"> define => "ENABLE_NOSNIFF", default => 0, value => \$nosniffSupport },
</span><span class="cx">
</span><span class="cx"> { option => "notifications", desc => "Toggle Notifications support",
</span><del>- define => "ENABLE_NOTIFICATIONS", default => isBlackBerry(), value => \$notificationsSupport },
</del><ins>+ define => "ENABLE_NOTIFICATIONS", default => 0, value => \$notificationsSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "orientation-events", desc => "Toggle Orientation Events support",
</span><del>- define => "ENABLE_ORIENTATION_EVENTS", default => isIOSWebKit() || isBlackBerry(), value => \$orientationEventsSupport },
</del><ins>+ define => "ENABLE_ORIENTATION_EVENTS", default => isIOSWebKit(), value => \$orientationEventsSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "page-visibility-api", desc => "Toggle Page Visibility API support",
</span><del>- define => "ENABLE_PAGE_VISIBILITY_API", default => (isBlackBerry() || isEfl() || isGtk()), value => \$pageVisibilityAPISupport },
</del><ins>+ define => "ENABLE_PAGE_VISIBILITY_API", default => (isEfl() || isGtk()), value => \$pageVisibilityAPISupport },
</ins><span class="cx">
</span><span class="cx"> { option => "plugin-proxy-for-video", desc => "Toggle Plugin Proxy for Video support",
</span><span class="cx"> define => "ENABLE_PLUGIN_PROXY_FOR_VIDEO", default => isIOSWebKit(), value => \$pluginProxyForVideo },
</span><span class="lines">@@ -400,7 +400,7 @@
</span><span class="cx"> define => "ENABLE_RESOURCE_TIMING", default => isGtk(), value => \$resourceTimingSupport },
</span><span class="cx">
</span><span class="cx"> { option => "request-animation-frame", desc => "Toggle Request Animation Frame support",
</span><del>- define => "ENABLE_REQUEST_ANIMATION_FRAME", default => (isAppleMacWebKit() || isGtk() || isEfl() || isBlackBerry()), value => \$requestAnimationFrameSupport },
</del><ins>+ define => "ENABLE_REQUEST_ANIMATION_FRAME", default => (isAppleMacWebKit() || isGtk() || isEfl()), value => \$requestAnimationFrameSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "seccomp-filters", desc => "Toggle Seccomp Filter sandbox",
</span><span class="cx"> define => "ENABLE_SECCOMP_FILTERS", default => 0, value => \$seccompFiltersSupport },
</span><span class="lines">@@ -412,7 +412,7 @@
</span><span class="cx"> define => "ENABLE_SHADOW_DOM", default => 0, value => \$shadowDOMSupport },
</span><span class="cx">
</span><span class="cx"> { option => "shared-workers", desc => "Toggle Shared Workers support",
</span><del>- define => "ENABLE_SHARED_WORKERS", default => (isAppleWebKit() || isGtk() || isBlackBerry() || isEfl()), value => \$sharedWorkersSupport },
</del><ins>+ define => "ENABLE_SHARED_WORKERS", default => (isAppleWebKit() || isGtk() || isEfl()), value => \$sharedWorkersSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "sql-database", desc => "Toggle SQL Database support",
</span><span class="cx"> define => "ENABLE_SQL_DATABASE", default => 1, value => \$sqlDatabaseSupport },
</span><span class="lines">@@ -427,13 +427,13 @@
</span><span class="cx"> define => "ENABLE_SVG_FONTS", default => 1, value => \$svgFontsSupport },
</span><span class="cx">
</span><span class="cx"> { option => "system-malloc", desc => "Toggle system allocator instead of TCmalloc",
</span><del>- define => "USE_SYSTEM_MALLOC", default => (isBlackBerry() || isWinCE()), value => \$systemMallocSupport },
</del><ins>+ define => "USE_SYSTEM_MALLOC", default => isWinCE(), value => \$systemMallocSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "template-element", desc => "Toggle HTMLTemplateElement support",
</span><span class="cx"> define => "ENABLE_TEMPLATE_ELEMENT", default => 1, value => \$templateElementSupport },
</span><span class="cx">
</span><span class="cx"> { option => "text-autosizing", desc => "Toggle Text Autosizing support",
</span><del>- define => "ENABLE_TEXT_AUTOSIZING", default => isBlackBerry(), value => \$textAutosizingSupport },
</del><ins>+ define => "ENABLE_TEXT_AUTOSIZING", default => 0, value => \$textAutosizingSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "tiled-backing-store", desc => "Toggle Tiled Backing Store support",
</span><span class="cx"> define => "WTF_USE_TILED_BACKING_STORE", default => isEfl(), value => \$tiledBackingStoreSupport },
</span><span class="lines">@@ -442,10 +442,10 @@
</span><span class="cx"> define => "ENABLE_THREADED_HTML_PARSER", default => 0, value => \$threadedHTMLParserSupport },
</span><span class="cx">
</span><span class="cx"> { option => "touch-events", desc => "Toggle Touch Events support",
</span><del>- define => "ENABLE_TOUCH_EVENTS", default => (isIOSWebKit() || isBlackBerry() || isEfl()), value => \$touchEventsSupport },
</del><ins>+ define => "ENABLE_TOUCH_EVENTS", default => (isIOSWebKit() || isEfl()), value => \$touchEventsSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "touch-slider", desc => "Toggle Touch Slider support",
</span><del>- define => "ENABLE_TOUCH_SLIDER", default => isBlackBerry(), value => \$touchSliderSupport },
</del><ins>+ define => "ENABLE_TOUCH_SLIDER", default => 0, value => \$touchSliderSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "touch-icon-loading", desc => "Toggle Touch Icon Loading Support",
</span><span class="cx"> define => "ENABLE_TOUCH_ICON_LOADING", default => 0, value => \$touchIconLoadingSupport },
</span><span class="lines">@@ -454,13 +454,13 @@
</span><span class="cx"> define => "ENABLE_USER_TIMING", default => isGtk(), value => \$userTimingSupport },
</span><span class="cx">
</span><span class="cx"> { option => "vibration", desc => "Toggle Vibration support",
</span><del>- define => "ENABLE_VIBRATION", default => (isEfl() || isBlackBerry()), value => \$vibrationSupport },
</del><ins>+ define => "ENABLE_VIBRATION", default => isEfl(), value => \$vibrationSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "video", desc => "Toggle Video support",
</span><del>- define => "ENABLE_VIDEO", default => (isAppleWebKit() || isGtk() || isBlackBerry() || isEfl()), value => \$videoSupport },
</del><ins>+ define => "ENABLE_VIDEO", default => (isAppleWebKit() || isGtk() || isEfl()), value => \$videoSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "video-track", desc => "Toggle Video Track support",
</span><del>- define => "ENABLE_VIDEO_TRACK", default => (isAppleWebKit() || isGtk() || isEfl() || isBlackBerry()), value => \$videoTrackSupport },
</del><ins>+ define => "ENABLE_VIDEO_TRACK", default => (isAppleWebKit() || isGtk() || isEfl()), value => \$videoTrackSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "webgl", desc => "Toggle WebGL support",
</span><span class="cx"> define => "ENABLE_WEBGL", default => (isAppleMacWebKit() || isIOSWebKit() || isGtk() || isEfl()), value => \$webglSupport },
</span><span class="lines">@@ -475,7 +475,7 @@
</span><span class="cx"> define => "ENABLE_WEB_SOCKETS", default => 1, value => \$webSocketsSupport },
</span><span class="cx">
</span><span class="cx"> { option => "web-timing", desc => "Toggle Web Timing support",
</span><del>- define => "ENABLE_WEB_TIMING", default => (isBlackBerry() || isGtk() || isEfl()), value => \$webTimingSupport },
</del><ins>+ define => "ENABLE_WEB_TIMING", default => (isGtk() || isEfl()), value => \$webTimingSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "xhr-timeout", desc => "Toggle XHR Timeout support",
</span><span class="cx"> define => "ENABLE_XHR_TIMEOUT", default => (isEfl() || isGtk() || isAppleMacWebKit()), value => \$xhrTimeoutSupport },
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigwatchlist"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/watchlist (161655 => 161656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/watchlist 2014-01-10 19:07:55 UTC (rev 161655)
+++ trunk/Tools/Scripts/webkitpy/common/config/watchlist 2014-01-10 19:12:26 UTC (rev 161656)
</span><span class="lines">@@ -156,23 +156,6 @@
</span><span class="cx"> "Editing": {
</span><span class="cx"> "filename": r"Source/WebCore/editing/",
</span><span class="cx"> },
</span><del>- "BlackBerry": {
- "filename": r"Source/WebKit/blackberry/"
- r"|Source/WebCore/page/blackberry"
- r"|Source/WebCore/history/blackberry"
- r"|Source/WebCore/plugins/blackberry"
- r"|Source/WebCore/editing/blackberry"
- r"|Source/WebCore/Resources/blackberry"
- r"|Source/WebCore/platform/image-decoders/blackberry"
- r"|Source/WebCore/platform/blackberry"
- r"|Source/WebCore/platform/text/blackberry"
- r"|Source/WebCore/platform/network/blackberry"
- r"|Source/WebCore/platform/graphics/blackberry"
- r"|Source/WTF/wtf/blackberry"
- r"|ManualTests/blackberry"
- r"|Tools/DumpRenderTree/blackberry"
- r"|LayoutTests/platform/blackberry",
- },
</del><span class="cx"> "NetworkInfo": {
</span><span class="cx"> "filename": r"Source/WebCore/Modules/networkinfo",
</span><span class="cx"> },
</span><span class="lines">@@ -202,7 +185,6 @@
</span><span class="cx"> "TouchAdjustment": {
</span><span class="cx"> "filename": r"Source/WebCore/page/TouchAdjustment.*"
</span><span class="cx"> r"|LayoutTests/touchadjustment"
</span><del>- r"|Source/WebKit/blackberry/WebKitSupport/FatFingers.*",
</del><span class="cx"> },
</span><span class="cx"> "SVG": {
</span><span class="cx"> "filename": r"Source/WebCore/svg"
</span></span></pre>
</div>
</div>
</body>
</html>