Title: [161656] trunk/Tools
Revision
161656
Author
[email protected]
Date
2014-01-10 11:12:26 -0800 (Fri, 10 Jan 2014)

Log Message

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:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (161655 => 161656)


--- trunk/Tools/ChangeLog	2014-01-10 19:07:55 UTC (rev 161655)
+++ trunk/Tools/ChangeLog	2014-01-10 19:12:26 UTC (rev 161656)
@@ -1,3 +1,26 @@
+2014-01-10  Simon Fraser  <[email protected]>
+
+        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:
+
 2014-01-10  Daniel Bates  <[email protected]>
 
         [iOS] Fix up simulator build and enable default features

Modified: trunk/Tools/Scripts/build-webkit (161655 => 161656)


--- 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)
@@ -127,7 +127,6 @@
   --simulator                       Use the current iphonesimulator SDK (iOS only)
   --coverage                        Enable Code Coverage support (Mac only)
 
-  --blackberry                      Build the BlackBerry port on Mac/Linux
   --efl                             Build the EFL port
   --nix                             Build the Nix port
   --gtk                             Build the GTK+ port
@@ -136,7 +135,7 @@
 
   --inspector-frontend              Copy changes to the inspector front-end files to the build directory
 
-  --prefix=<path>                   Set installation prefix to the given path (Gtk/Efl/BlackBerry only)
+  --prefix=<path>                   Set installation prefix to the given path (Gtk/Efl only)
   --makeargs=<arguments>            Optional Makefile flags
   --cmakeargs=<arguments>           Optional CMake flags (e.g. --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local")
 
@@ -308,18 +307,6 @@
     buildCMakeProjectOrExit($clean, "WinCE", $prefixPath, $makeArgs, (cmakeBasedPortArguments(), cMakeArgsFromFeatures()), $cmakeArgs);
 }
 
-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);
-}
-
 # Build, and abort if the build fails.
 for my $dir (@projects) {
     chdir $dir or die;

Modified: trunk/Tools/Scripts/webkit-build-directory (161655 => 161656)


--- 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)
@@ -47,7 +47,6 @@
   -h|--help             Show this help message
   --top-level           Show the top-level build directory
 
-  --blackberry          Find the build directory for the BlackBerry port on Mac/Linux
   --efl                 Find the build directory for the EFL port
   --gtk                 Find the build directory for the GTK+ port
   --wincairo            Find the build directory for using Cairo (rather than CoreGraphics) on Windows

Modified: trunk/Tools/Scripts/webkitdirs.pm (161655 => 161656)


--- 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)
@@ -97,7 +97,6 @@
 my $isWin64;
 my $isEfl;
 my $isNix;
-my $isBlackBerry;
 my $isInspectorFrontend;
 my $isWK2;
 my $shouldTargetWebProcess;
@@ -224,11 +223,6 @@
         $baseProductDir = "$sourceDir/WebKitBuild";
     }
 
-    if (isBlackBerry()) {
-        my %archInfo = blackberryTargetArchitecture();
-        $baseProductDir = "$baseProductDir/" . $archInfo{"cpuDir"};
-    }
-
     if (isGit() && isGitBranchBuild()) {
         my $branch = gitBranch();
         $baseProductDir = "$baseProductDir/$branch";
@@ -386,7 +380,6 @@
     push(@args, '--nix') if isNix();
     push(@args, '--wincairo') if isWinCairo();
     push(@args, '--wince') if isWinCE();
-    push(@args, '--blackberry') if isBlackBerry();
     push(@args, '--inspector-frontend') if isInspectorFrontend();
     return @args;
 }
@@ -775,10 +768,6 @@
     my $libraryName = shift;
     determineConfigurationProductDir();
 
-    if (isBlackBerry()) {
-        my $libraryExtension = $libraryName =~ /^WebKit$/i ? ".so" : ".a";
-        return "$configurationProductDir/$libraryName/lib" . lc($libraryName) . $libraryExtension;
-    }
     if (isGtk()) {
         # WebKitGTK+ for GTK2, WebKitGTK+ for GTK3, and WebKit2 respectively.
         my @libraries = ("libwebkitgtk-1.0", "libwebkitgtk-3.0", "libwebkit2gtk-3.0");
@@ -914,137 +903,6 @@
     return $isWK2;
 }
 
-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;
-}
-
 sub determineIsEfl()
 {
     return if defined($isEfl);
@@ -1236,7 +1094,7 @@
 
 sub isAppleWebKit()
 {
-    return !(isGtk() or isEfl() or isWinCE() or isBlackBerry() or isNix());
+    return !(isGtk() or isEfl() or isWinCE() or isNix());
 }
 
 sub isAppleMacWebKit()
@@ -2108,9 +1966,7 @@
 
     $returnCode = exitStatus(generateBuildSystemFromCMakeProject($port, $prefixPath, @cmakeArgs));
     exit($returnCode) if $returnCode;
-    if (isBlackBerry()) {
-        return 0 if (defined($ENV{"GENERATE_CMAKE_PROJECT_ONLY"}) eq '1');
-    }
+
     $returnCode = exitStatus(buildCMakeGeneratedProject($makeArgs));
     exit($returnCode) if $returnCode;
     return 0;
@@ -2118,14 +1974,12 @@
 
 sub cmakeBasedPortArguments()
 {
-    return blackberryCMakeArguments() if isBlackBerry();
     return ('-G "Visual Studio 8 2005 STANDARDSDK_500 (ARMV4I)"') if isWinCE();
     return ();
 }
 
 sub cmakeBasedPortName()
 {
-    return "BlackBerry" if isBlackBerry();
     return "Efl" if isEfl();
     return "WinCE" if isWinCE();
     return "Nix" if isNix();

Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (161655 => 161656)


--- 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)
@@ -166,10 +166,10 @@
       define => "ENABLE_ACCELERATED_2D_CANVAS", default => 0, value => \$accelerated2DCanvasSupport },
 
     { option => "battery-status", desc => "Toggle Battery Status support",
-      define => "ENABLE_BATTERY_STATUS", default => (isEfl() || isBlackBerry()), value => \$batteryStatusSupport },
+      define => "ENABLE_BATTERY_STATUS", default => isEfl(), value => \$batteryStatusSupport },
 
     { option => "blob", desc => "Toggle Blob support",
-      define => "ENABLE_BLOB", default => ((isAppleMacWebKit() && !isIOSWebKit()) || isGtk() || isBlackBerry() || isEfl()), value => \$blobSupport },
+      define => "ENABLE_BLOB", default => ((isAppleMacWebKit() && !isIOSWebKit()) || isGtk() || isEfl()), value => \$blobSupport },
 
     { option => "canvas-path", desc => "Toggle Canvas Path support",
       define => "ENABLE_CANVAS_PATH", default => 1, value => \$canvasPathSupport },
@@ -193,7 +193,7 @@
       define => "ENABLE_CSS_SHAPES", default => 1, value => \$cssShapesSupport },
 
     { option => "css-filters", desc => "Toggle CSS Filters support",
-      define => "ENABLE_CSS_FILTERS", default => (isAppleMacWebKit() || isBlackBerry() || isIOSWebKit()), value => \$cssFiltersSupport },
+      define => "ENABLE_CSS_FILTERS", default => (isAppleMacWebKit() || isIOSWebKit()), value => \$cssFiltersSupport },
 
     { option => "css3-conditional-rules", desc => "Toggle CSS3 Conditional Rules support (i.e. \@supports)",
       define => "ENABLE_CSS3_CONDITIONAL_RULES", default => 0, value => \$css3ConditionalRulesSupport },
@@ -214,7 +214,7 @@
       define => "ENABLE_CSS_IMAGE_ORIENTATION", default => (isEfl() || isGtk()), value => \$cssImageOrientationSupport },
 
     { option => "css-image-resolution", desc => "Toggle CSS image-resolution support",
-      define => "ENABLE_CSS_IMAGE_RESOLUTION", default => (isBlackBerry() || isGtk()), value => \$cssImageResolutionSupport },
+      define => "ENABLE_CSS_IMAGE_RESOLUTION", default => isGtk(), value => \$cssImageResolutionSupport },
 
     { option => "css-image-set", desc => "Toggle CSS image-set support",
       define => "ENABLE_CSS_IMAGE_SET", default => (isEfl() || isGtk()), value => \$cssImageSetSupport },
@@ -235,7 +235,7 @@
       define => "ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED", default => 1, value => \$cssAnimationsTransformsUnprefixedSupport },
 
     { option => "custom-scheme-handler", desc => "Toggle Custom Scheme Handler support",
-      define => "ENABLE_CUSTOM_SCHEME_HANDLER", default => (isBlackBerry() || isEfl()), value => \$customSchemeHandlerSupport },
+      define => "ENABLE_CUSTOM_SCHEME_HANDLER", default => isEfl(), value => \$customSchemeHandlerSupport },
 
     { option => "datalist-element", desc => "Toggle Datalist Element support",
       define => "ENABLE_DATALIST_ELEMENT", default => isEfl(), value => \$datalistElementSupport },
@@ -247,7 +247,7 @@
       define => "ENABLE_DETAILS_ELEMENT", default => 1, value => \$detailsElementSupport },
 
     { option => "device-orientation", desc => "Toggle Device Orientation support",
-      define => "ENABLE_DEVICE_ORIENTATION", default => (isIOSWebKit() || isBlackBerry()), value => \$deviceOrientationSupport },
+      define => "ENABLE_DEVICE_ORIENTATION", default => isIOSWebKit(), value => \$deviceOrientationSupport },
 
     { option => "directory-upload", desc => "Toggle Directory Upload support",
       define => "ENABLE_DIRECTORY_UPLOAD", default => 0, value => \$directoryUploadSupport },
@@ -256,10 +256,10 @@
       define => "ENABLE_DOM4_EVENTS_CONSTRUCTOR", default => (isAppleWebKit() || isGtk() || isEfl()), value => \$dom4EventsConstructor },
 
     { option => "download-attribute", desc => "Toggle Download Attribute support",
-      define => "ENABLE_DOWNLOAD_ATTRIBUTE", default => (isBlackBerry() || isEfl()), value => \$downloadAttributeSupport },
+      define => "ENABLE_DOWNLOAD_ATTRIBUTE", default => isEfl(), value => \$downloadAttributeSupport },
 
     { option => "filters", desc => "Toggle Filters support",
-      define => "ENABLE_FILTERS", default => (isAppleWebKit() || isIOSWebKit() || isGtk() || isEfl() || isBlackBerry()), value => \$filtersSupport },
+      define => "ENABLE_FILTERS", default => (isAppleWebKit() || isIOSWebKit() || isGtk() || isEfl()), value => \$filtersSupport },
 
     { option => "font-load-events", desc => "Toggle Font Load Events support",
       define => "ENABLE_FONT_LOAD_EVENTS", default => 0, value => \$fontLoadEventsSupport },
@@ -268,13 +268,13 @@
       define => "ENABLE_FTPDIR", default => !isWinCE(), value => \$ftpDirSupport },
 
     { option => "fullscreen-api", desc => "Toggle Fullscreen API support",
-      define => "ENABLE_FULLSCREEN_API", default => (isAppleMacWebKit() || isEfl() || isGtk() || isBlackBerry()), value => \$fullscreenAPISupport },
+      define => "ENABLE_FULLSCREEN_API", default => (isAppleMacWebKit() || isEfl() || isGtk()), value => \$fullscreenAPISupport },
 
     { option => "gamepad", desc => "Toggle Gamepad support",
       define => "ENABLE_GAMEPAD", default => (isEfl() || isGtk()), value => \$gamepadSupport },
 
     { option => "geolocation", desc => "Toggle Geolocation support",
-      define => "ENABLE_GEOLOCATION", default => (isAppleWebKit() || isIOSWebKit() || isGtk() || isBlackBerry()), value => \$geolocationSupport },
+      define => "ENABLE_GEOLOCATION", default => (isAppleWebKit() || isIOSWebKit() || isGtk()), value => \$geolocationSupport },
 
     { option => "high-dpi-canvas", desc => "Toggle High DPI Canvas support",
       define => "ENABLE_HIGH_DPI_CANVAS", default => (isAppleWebKit()), value => \$highDPICanvasSupport },
@@ -292,7 +292,7 @@
       define => "ENABLE_INPUT_SPEECH", default => 0, value => \$inputSpeechSupport },
 
     { option => "input-type-color", desc => "Toggle Input Type Color support",
-      define => "ENABLE_INPUT_TYPE_COLOR", default => (isBlackBerry() || isEfl()), value => \$inputTypeColorSupport },
+      define => "ENABLE_INPUT_TYPE_COLOR", default => isEfl(), value => \$inputTypeColorSupport },
 
     { option => "input-type-date", desc => "Toggle Input Type Date support",
       define => "ENABLE_INPUT_TYPE_DATE", default => 0, value => \$inputTypeDateSupport },
@@ -319,7 +319,7 @@
       define => "ENABLE_JAVASCRIPT_DEBUGGER", default => 1, value => \$_javascript_DebuggerSupport },
 
     { option => "legacy-notifications", desc => "Toggle Legacy Notifications support",
-      define => "ENABLE_LEGACY_NOTIFICATIONS", default => isBlackBerry(), value => \$legacyNotificationsSupport },
+      define => "ENABLE_LEGACY_NOTIFICATIONS", default => 0, value => \$legacyNotificationsSupport },
 
     { option => "legacy-vendor-prefixes", desc => "Toggle Legacy Vendor Prefix support",
       define => "ENABLE_LEGACY_VENDOR_PREFIXES", default => 1, value => \$legacyVendorPrefixSupport },
@@ -331,7 +331,7 @@
       define => "ENABLE_LINK_PREFETCH", default => (isGtk() || isEfl()), value => \$linkPrefetchSupport },
 
     { option => "mathml", desc => "Toggle MathML support",
-      define => "ENABLE_MATHML", default => !isBlackBerry(), value => \$mathmlSupport },
+      define => "ENABLE_MATHML", default => 1, value => \$mathmlSupport },
 
     { option => "media-capture", desc => "Toggle Media Capture support",
       define => "ENABLE_MEDIA_CAPTURE", default => isEfl(), value => \$mediaCaptureSupport },
@@ -343,7 +343,7 @@
       define => "ENABLE_MEDIA_STATISTICS", default => 0, value => \$mediaStatisticsSupport },
 
     { option => "media-stream", desc => "Toggle Media Stream support",
-      define => "ENABLE_MEDIA_STREAM", default => (isBlackBerry() || isGtk()), value => \$mediaStreamSupport },
+      define => "ENABLE_MEDIA_STREAM", default => isGtk(), value => \$mediaStreamSupport },
 
     { option => "meter-element", desc => "Toggle Meter Element support",
       define => "ENABLE_METER_ELEMENT", default => !isAppleWinWebKit(), value => \$meterElementSupport },
@@ -355,25 +355,25 @@
       define => "ENABLE_MOUSE_CURSOR_SCALE", default => isEfl(), value => \$mouseCursorScaleSupport },
 
     { option => "navigator-content-utils", desc => "Toggle Navigator Content Utils support",
-      define => "ENABLE_NAVIGATOR_CONTENT_UTILS", default => (isBlackBerry() || isEfl()), value => \$registerProtocolHandlerSupport },
+      define => "ENABLE_NAVIGATOR_CONTENT_UTILS", default => isEfl(), value => \$registerProtocolHandlerSupport },
 
     { option => "netscape-plugin-api", desc => "Toggle Netscape Plugin API support",
       define => "ENABLE_NETSCAPE_PLUGIN_API", default => !isIOSWebKit(), value => \$netscapePluginAPISupport },
 
     { option => "network-info", desc => "Toggle Network Info support",
-      define => "ENABLE_NETWORK_INFO", default => (isEfl() || isBlackBerry()), value => \$networkInfoSupport },
+      define => "ENABLE_NETWORK_INFO", default => isEfl(), value => \$networkInfoSupport },
 
     { option => "nosniff", desc => "Toggle support for 'X-Content-Type-Options: nosniff'",
       define => "ENABLE_NOSNIFF", default => 0, value => \$nosniffSupport },
 
     { option => "notifications", desc => "Toggle Notifications support",
-      define => "ENABLE_NOTIFICATIONS", default => isBlackBerry(), value => \$notificationsSupport },
+      define => "ENABLE_NOTIFICATIONS", default => 0, value => \$notificationsSupport },
 
     { option => "orientation-events", desc => "Toggle Orientation Events support",
-      define => "ENABLE_ORIENTATION_EVENTS", default => isIOSWebKit() || isBlackBerry(), value => \$orientationEventsSupport },
+      define => "ENABLE_ORIENTATION_EVENTS", default => isIOSWebKit(), value => \$orientationEventsSupport },
 
     { option => "page-visibility-api", desc => "Toggle Page Visibility API support",
-      define => "ENABLE_PAGE_VISIBILITY_API", default => (isBlackBerry() || isEfl() || isGtk()), value => \$pageVisibilityAPISupport },
+      define => "ENABLE_PAGE_VISIBILITY_API", default => (isEfl() || isGtk()), value => \$pageVisibilityAPISupport },
 
     { option => "plugin-proxy-for-video", desc => "Toggle Plugin Proxy for Video support",
       define => "ENABLE_PLUGIN_PROXY_FOR_VIDEO", default => isIOSWebKit(), value => \$pluginProxyForVideo },
@@ -400,7 +400,7 @@
       define => "ENABLE_RESOURCE_TIMING", default => isGtk(), value => \$resourceTimingSupport },
 
     { option => "request-animation-frame", desc => "Toggle Request Animation Frame support",
-      define => "ENABLE_REQUEST_ANIMATION_FRAME", default => (isAppleMacWebKit() || isGtk() || isEfl() || isBlackBerry()), value => \$requestAnimationFrameSupport },
+      define => "ENABLE_REQUEST_ANIMATION_FRAME", default => (isAppleMacWebKit() || isGtk() || isEfl()), value => \$requestAnimationFrameSupport },
 
     { option => "seccomp-filters", desc => "Toggle Seccomp Filter sandbox",
       define => "ENABLE_SECCOMP_FILTERS", default => 0, value => \$seccompFiltersSupport },
@@ -412,7 +412,7 @@
       define => "ENABLE_SHADOW_DOM", default => 0, value => \$shadowDOMSupport },
 
     { option => "shared-workers", desc => "Toggle Shared Workers support",
-      define => "ENABLE_SHARED_WORKERS", default => (isAppleWebKit() || isGtk() || isBlackBerry() || isEfl()), value => \$sharedWorkersSupport },
+      define => "ENABLE_SHARED_WORKERS", default => (isAppleWebKit() || isGtk() || isEfl()), value => \$sharedWorkersSupport },
 
     { option => "sql-database", desc => "Toggle SQL Database support",
       define => "ENABLE_SQL_DATABASE", default => 1, value => \$sqlDatabaseSupport },
@@ -427,13 +427,13 @@
       define => "ENABLE_SVG_FONTS", default => 1, value => \$svgFontsSupport },
 
     { option => "system-malloc", desc => "Toggle system allocator instead of TCmalloc",
-      define => "USE_SYSTEM_MALLOC", default => (isBlackBerry() || isWinCE()), value => \$systemMallocSupport },
+      define => "USE_SYSTEM_MALLOC", default => isWinCE(), value => \$systemMallocSupport },
 
     { option => "template-element", desc => "Toggle HTMLTemplateElement support",
       define => "ENABLE_TEMPLATE_ELEMENT", default => 1, value => \$templateElementSupport },
 
     { option => "text-autosizing", desc => "Toggle Text Autosizing support",
-      define => "ENABLE_TEXT_AUTOSIZING", default => isBlackBerry(), value => \$textAutosizingSupport },
+      define => "ENABLE_TEXT_AUTOSIZING", default => 0, value => \$textAutosizingSupport },
 
     { option => "tiled-backing-store", desc => "Toggle Tiled Backing Store support",
       define => "WTF_USE_TILED_BACKING_STORE", default => isEfl(), value => \$tiledBackingStoreSupport },
@@ -442,10 +442,10 @@
       define => "ENABLE_THREADED_HTML_PARSER", default => 0, value => \$threadedHTMLParserSupport },
 
     { option => "touch-events", desc => "Toggle Touch Events support",
-      define => "ENABLE_TOUCH_EVENTS", default => (isIOSWebKit() || isBlackBerry() || isEfl()), value => \$touchEventsSupport },
+      define => "ENABLE_TOUCH_EVENTS", default => (isIOSWebKit() || isEfl()), value => \$touchEventsSupport },
 
     { option => "touch-slider", desc => "Toggle Touch Slider support",
-      define => "ENABLE_TOUCH_SLIDER", default => isBlackBerry(), value => \$touchSliderSupport },
+      define => "ENABLE_TOUCH_SLIDER", default => 0, value => \$touchSliderSupport },
 
     { option => "touch-icon-loading", desc => "Toggle Touch Icon Loading Support",
       define => "ENABLE_TOUCH_ICON_LOADING", default => 0, value => \$touchIconLoadingSupport },
@@ -454,13 +454,13 @@
       define => "ENABLE_USER_TIMING", default => isGtk(), value => \$userTimingSupport },
 
     { option => "vibration", desc => "Toggle Vibration support",
-      define => "ENABLE_VIBRATION", default => (isEfl() || isBlackBerry()), value => \$vibrationSupport },
+      define => "ENABLE_VIBRATION", default => isEfl(), value => \$vibrationSupport },
 
     { option => "video", desc => "Toggle Video support",
-      define => "ENABLE_VIDEO", default => (isAppleWebKit() || isGtk() || isBlackBerry() || isEfl()), value => \$videoSupport },
+      define => "ENABLE_VIDEO", default => (isAppleWebKit() || isGtk() || isEfl()), value => \$videoSupport },
 
     { option => "video-track", desc => "Toggle Video Track support",
-      define => "ENABLE_VIDEO_TRACK", default => (isAppleWebKit() || isGtk() || isEfl() || isBlackBerry()), value => \$videoTrackSupport },
+      define => "ENABLE_VIDEO_TRACK", default => (isAppleWebKit() || isGtk() || isEfl()), value => \$videoTrackSupport },
 
     { option => "webgl", desc => "Toggle WebGL support",
       define => "ENABLE_WEBGL", default => (isAppleMacWebKit() || isIOSWebKit() || isGtk() || isEfl()), value => \$webglSupport },
@@ -475,7 +475,7 @@
       define => "ENABLE_WEB_SOCKETS", default => 1, value => \$webSocketsSupport },
 
     { option => "web-timing", desc => "Toggle Web Timing support",
-      define => "ENABLE_WEB_TIMING", default => (isBlackBerry() || isGtk() || isEfl()), value => \$webTimingSupport },
+      define => "ENABLE_WEB_TIMING", default => (isGtk() || isEfl()), value => \$webTimingSupport },
 
     { option => "xhr-timeout", desc => "Toggle XHR Timeout support",
       define => "ENABLE_XHR_TIMEOUT", default => (isEfl() || isGtk() || isAppleMacWebKit()), value => \$xhrTimeoutSupport },

Modified: trunk/Tools/Scripts/webkitpy/common/config/watchlist (161655 => 161656)


--- 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)
@@ -156,23 +156,6 @@
         "Editing": {
             "filename": r"Source/WebCore/editing/",
         },
-        "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",
-        },
         "NetworkInfo": {
             "filename": r"Source/WebCore/Modules/networkinfo",
         },
@@ -202,7 +185,6 @@
         "TouchAdjustment": {
             "filename": r"Source/WebCore/page/TouchAdjustment.*"
                         r"|LayoutTests/touchadjustment"
-                        r"|Source/WebKit/blackberry/WebKitSupport/FatFingers.*",
         },
         "SVG": {
             "filename": r"Source/WebCore/svg"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to