Changeset 161656 in webkit


Ignore:
Timestamp:
Jan 10, 2014, 11:12:26 AM (12 years ago)
Author:
Simon Fraser
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:
Location:
trunk/Tools
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r161651 r161656  
     12014-01-10  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Remove knowledge of Blackberry from build scripts
     4        https://bugs.webkit.org/show_bug.cgi?id=126766
     5
     6        Reviewed by Anders Carlsson.
     7       
     8        Remove isBlackBerry() and references to it, and rmeove
     9        blackberry-related stuff from the watchlist.
     10
     11        * Scripts/build-webkit:
     12        * Scripts/webkit-build-directory:
     13        * Scripts/webkitdirs.pm:
     14        (determineBaseProductDir):
     15        (argumentsForConfiguration):
     16        (builtDylibPathForName):
     17        (isAppleWebKit):
     18        (buildCMakeProjectOrExit):
     19        (cmakeBasedPortArguments):
     20        (cmakeBasedPortName):
     21        * Scripts/webkitperl/FeatureList.pm:
     22        * Scripts/webkitpy/common/config/watchlist:
     23
    1242014-01-10  Daniel Bates  <dabates@apple.com>
    225

  • trunk/Tools/Scripts/build-webkit

    r161328 r161656  
    128128  --coverage                        Enable Code Coverage support (Mac only)
    129129
    130   --blackberry                      Build the BlackBerry port on Mac/Linux
    131130  --efl                             Build the EFL port
    132131  --nix                             Build the Nix port
    … …  
    137136  --inspector-frontend              Copy changes to the inspector front-end files to the build directory
    138137
    139   --prefix=<path>                   Set installation prefix to the given path (Gtk/Efl/BlackBerry only)
     138  --prefix=<path>                   Set installation prefix to the given path (Gtk/Efl only)
    140139  --makeargs=<arguments>            Optional Makefile flags
    141140  --cmakeargs=<arguments>           Optional CMake flags (e.g. --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local")
    … …  
    307306if (isWinCE()) {
    308307    buildCMakeProjectOrExit($clean, "WinCE", $prefixPath, $makeArgs, (cmakeBasedPortArguments(), cMakeArgsFromFeatures()), $cmakeArgs);
    309 }
    310 
    311 if (isBlackBerry()) {
    312     my $numberOfJobs;
    313     if ($ENV{"USE_ICECC"}) {
    314         $numberOfJobs = 50; # 50 is the number we choose for internal development
    315     } else {
    316         $numberOfJobs = numberOfCPUs();
    317     }
    318     $makeArgs .= ($makeArgs ? " " : "") . "-j" . $numberOfJobs if $makeArgs !~ /-j\s*\d+/;
    319     $prefixPath = $ENV{"STAGE_DIR"} unless $prefixPath;
    320     buildCMakeProjectOrExit($clean, "BlackBerry", $prefixPath, $makeArgs, (cmakeBasedPortArguments(), cMakeArgsFromFeatures()), $cmakeArgs);
    321308}
    322309

  • trunk/Tools/Scripts/webkit-build-directory

    r156895 r161656  
    4848  --top-level           Show the top-level build directory
    4949
    50   --blackberry          Find the build directory for the BlackBerry port on Mac/Linux
    5150  --efl                 Find the build directory for the EFL port
    5251  --gtk                 Find the build directory for the GTK+ port

  • trunk/Tools/Scripts/webkitdirs.pm

    r161651 r161656  
    9898my $isEfl;
    9999my $isNix;
    100 my $isBlackBerry;
    101100my $isInspectorFrontend;
    102101my $isWK2;
    … …  
    223222    if (!defined($baseProductDir)) { # Port-specific checks failed, use default
    224223        $baseProductDir = "$sourceDir/WebKitBuild";
    225     }
    226 
    227     if (isBlackBerry()) {
    228         my %archInfo = blackberryTargetArchitecture();
    229         $baseProductDir = "$baseProductDir/" . $archInfo{"cpuDir"};
    230224    }
    231225
    … …  
    387381    push(@args, '--wincairo') if isWinCairo();
    388382    push(@args, '--wince') if isWinCE();
    389     push(@args, '--blackberry') if isBlackBerry();
    390383    push(@args, '--inspector-frontend') if isInspectorFrontend();
    391384    return @args;
    … …  
    776769    determineConfigurationProductDir();
    777770
    778     if (isBlackBerry()) {
    779         my $libraryExtension = $libraryName =~ /^WebKit$/i ? ".so" : ".a";
    780         return "$configurationProductDir/$libraryName/lib" . lc($libraryName) . $libraryExtension;
    781     }
    782771    if (isGtk()) {
    783772        # WebKitGTK+ for GTK2, WebKitGTK+ for GTK3, and WebKit2 respectively.
    … …  
    915904}
    916905
    917 sub isBlackBerry()
    918 {
    919     determineIsBlackBerry();
    920     return $isBlackBerry;
    921 }
    922 
    923 sub determineIsBlackBerry()
    924 {
    925     return if defined($isBlackBerry);
    926     $isBlackBerry = checkForArgumentAndRemoveFromARGV("--blackberry");
    927 }
    928 
    929 sub blackberryTargetArchitecture()
    930 {
    931     my $arch = $ENV{"BLACKBERRY_ARCH_TYPE"} ? $ENV{"BLACKBERRY_ARCH_TYPE"} : "arm";
    932     my $cpu = $ENV{"BLACKBERRY_ARCH_CPU"} ? $ENV{"BLACKBERRY_ARCH_CPU"} : "";
    933     my $cpuDir;
    934     my $buSuffix;
    935     if (($cpu eq "v7le") || ($cpu eq "a9")) {
    936         $cpuDir = $arch . "le-v7";
    937         $buSuffix = $arch . "v7";
    938     } else {
    939         $cpu = $arch;
    940         $cpuDir = $arch;
    941         $buSuffix = $arch;
    942     }
    943     return ("arch" => $arch,
    944             "cpu" => $cpu,
    945             "cpuDir" => $cpuDir,
    946             "buSuffix" => $buSuffix);
    947 }
    948 
    949 sub blackberryCMakeArguments()
    950 {
    951     my %archInfo = blackberryTargetArchitecture();
    952     my $arch = $archInfo{"arch"};
    953     my $cpu = $archInfo{"cpu"};
    954     my $cpuDir = $archInfo{"cpuDir"};
    955     my $buSuffix = $archInfo{"buSuffix"};
    956 
    957     my @cmakeExtraOptions;
    958     if ($cpu eq "a9") {
    959         $cpu = $arch . "v7le";
    960         push @cmakeExtraOptions, '-DTARGETING_PLAYBOOK=1';
    961     }
    962 
    963     my $stageDir = $ENV{"STAGE_DIR"};
    964     my $stageLib = File::Spec->catdir($stageDir, $cpuDir, "lib");
    965     my $stageUsrLib = File::Spec->catdir($stageDir, $cpuDir, "usr", "lib");
    966     my $stageInc = File::Spec->catdir($stageDir, "usr", "include");
    967 
    968     my $qnxHost = $ENV{"QNX_HOST"};
    969     my $ccCommand;
    970     my $cxxCommand;
    971     if ($ENV{"USE_ICECC"}) {
    972         chomp($ccCommand = `which icecc`);
    973         $cxxCommand = $ccCommand;
    974     } else {
    975         $ccCommand = File::Spec->catfile($qnxHost, "usr", "bin", "qcc");
    976         $cxxCommand = $ccCommand;
    977     }
    978 
    979     if ($ENV{"CCWRAP"}) {
    980         $ccCommand = $ENV{"CCWRAP"};
    981         push @cmakeExtraOptions, "-DCMAKE_C_COMPILER_ARG1=qcc";
    982         push @cmakeExtraOptions, "-DCMAKE_CXX_COMPILER_ARG1=qcc";
    983     }
    984 
    985     push @cmakeExtraOptions, "-DCMAKE_SKIP_RPATH='ON'" if isDarwin();
    986     push @cmakeExtraOptions, "-DPUBLIC_BUILD=1" if $ENV{"PUBLIC_BUILD"};
    987     push @cmakeExtraOptions, "-DENABLE_GLES2=1" unless $ENV{"DISABLE_GLES2"};
    988 
    989     my @includeSystemDirectories;
    990     push @includeSystemDirectories, File::Spec->catdir($stageInc, "harfbuzzng");
    991     push @includeSystemDirectories, File::Spec->catdir($stageInc, "imf");
    992     # We only use jpeg-turbo for device build
    993     push @includeSystemDirectories, File::Spec->catdir($stageInc, "jpeg-turbo") if $arch=~/arm/;
    994     push @includeSystemDirectories, $stageInc;
    995     push @includeSystemDirectories, File::Spec->catdir($stageInc, "browser", "platform");
    996     push @includeSystemDirectories, File::Spec->catdir($stageInc, "browser", "platform", "graphics");
    997     push @includeSystemDirectories, File::Spec->catdir($stageInc, "browser", "qsk");
    998     push @includeSystemDirectories, File::Spec->catdir($stageInc, "ots");
    999     push @includeSystemDirectories, File::Spec->catdir($stageInc, "iType", "common");
    1000     push @includeSystemDirectories, File::Spec->catdir($stageInc, "iType", "port", "nto");
    1001 
    1002     my @cxxFlags;
    1003     push @cxxFlags, "-Wl,-rpath-link,$stageLib";
    1004     push @cxxFlags, "-Wl,-rpath-link," . File::Spec->catfile($stageUsrLib, "torch-webkit");
    1005     push @cxxFlags, "-Wl,-rpath-link,$stageUsrLib";
    1006     push @cxxFlags, "-L$stageLib";
    1007     push @cxxFlags, "-L$stageUsrLib";
    1008 
    1009     if ($ENV{"PROFILE"}) {
    1010         push @cmakeExtraOptions, "-DPROFILING=1";
    1011         push @cxxFlags, "-p";
    1012     }
    1013 
    1014     my @cmakeArgs;
    1015     push @cmakeArgs, '-DCMAKE_SYSTEM_NAME="QNX"';
    1016     push @cmakeArgs, "-DCMAKE_SYSTEM_PROCESSOR=\"$cpuDir\"";
    1017     push @cmakeArgs, '-DCMAKE_SYSTEM_VERSION="1"';
    1018     push @cmakeArgs, "-DCMAKE_C_COMPILER=\"$ccCommand\"";
    1019     push @cmakeArgs, "-DCMAKE_CXX_COMPILER=\"$cxxCommand\"";
    1020     push @cmakeArgs, "-DCMAKE_C_FLAGS=\"-Vgcc_nto${cpu} -g @cxxFlags\"";
    1021     push @cmakeArgs, "-DCMAKE_CXX_FLAGS=\"-Vgcc_nto${cpu}_cpp-ne -g -lang-c++ @cxxFlags\"";
    1022 
    1023     # We cannot use CMAKE_INCLUDE_PATH since this describes the search path for header files in user directories.
    1024     # And the QNX system headers are in user directories on the host OS (i.e. they aren't installed in the host OS's
    1025     # system header search path). So, we need to inform g++ that these user directories (@includeSystemDirectories)
    1026     # are to be taken as the host OS's system header directories when building our port.
    1027     #
    1028     # Also, we cannot use CMAKE_SYSTEM_INCLUDE_PATH since that will override the entire system header path.
    1029     # So, we define the additional system include paths in ADDITIONAL_SYSTEM_INCLUDE_PATH. This list will
    1030     # be processed in OptionsBlackBerry.cmake.
    1031     push @cmakeArgs, '-DADDITIONAL_SYSTEM_INCLUDE_PATH="' . join(';', @includeSystemDirectories) . '"';
    1032 
    1033     # FIXME: Make this more general purpose such that we can pass a list of directories and files.
    1034     push @cmakeArgs, '-DTHIRD_PARTY_ICU_DIR="' . File::Spec->catdir($stageInc, "unicode") . '"';
    1035     push @cmakeArgs, '-DTHIRD_PARTY_UNICODE_FILE="' . File::Spec->catfile($stageInc, "unicode.h") . '"';
    1036 
    1037     push @cmakeArgs, "-DCMAKE_LIBRARY_PATH=\"$stageLib;$stageUsrLib\"";
    1038     push @cmakeArgs, '-DCMAKE_AR="' . File::Spec->catfile($qnxHost, "usr", "bin", "nto${buSuffix}-ar") . '"';
    1039     push @cmakeArgs, '-DCMAKE_RANLIB="' . File::Spec->catfile($qnxHost, "usr", "bin", "nto${buSuffix}-ranlib") . '"';
    1040     push @cmakeArgs, '-DCMAKE_LD="'. File::Spec->catfile($qnxHost, "usr", "bin", "nto${buSuffix}-ld") . '"';
    1041     push @cmakeArgs, '-DCMAKE_LINKER="' . File::Spec->catfile($qnxHost, "usr", "bin", "nto${buSuffix}-ld") . '"';
    1042     push @cmakeArgs, "-DECLIPSE_CDT4_GENERATE_SOURCE_PROJECT=TRUE";
    1043     push @cmakeArgs, '-G"Eclipse CDT4 - Unix Makefiles"';
    1044     push @cmakeArgs, @cmakeExtraOptions;
    1045     return @cmakeArgs;
    1046 }
    1047 
    1048906sub determineIsEfl()
    1049907{
    … …  
    12371095sub isAppleWebKit()
    12381096{
    1239     return !(isGtk() or isEfl() or isWinCE() or isBlackBerry() or isNix());
     1097    return !(isGtk() or isEfl() or isWinCE() or isNix());
    12401098}
    12411099
    … …  
    21091967    $returnCode = exitStatus(generateBuildSystemFromCMakeProject($port, $prefixPath, @cmakeArgs));
    21101968    exit($returnCode) if $returnCode;
    2111     if (isBlackBerry()) {
    2112         return 0 if (defined($ENV{"GENERATE_CMAKE_PROJECT_ONLY"}) eq '1');
    2113     }
     1969
    21141970    $returnCode = exitStatus(buildCMakeGeneratedProject($makeArgs));
    21151971    exit($returnCode) if $returnCode;
    … …  
    21191975sub cmakeBasedPortArguments()
    21201976{
    2121     return blackberryCMakeArguments() if isBlackBerry();
    21221977    return ('-G "Visual Studio 8 2005 STANDARDSDK_500 (ARMV4I)"') if isWinCE();
    21231978    return ();
    … …  
    21261981sub cmakeBasedPortName()
    21271982{
    2128     return "BlackBerry" if isBlackBerry();
    21291983    return "Efl" if isEfl();
    21301984    return "WinCE" if isWinCE();

  • trunk/Tools/Scripts/webkitperl/FeatureList.pm

    r161651 r161656  
    167167
    168168    { option => "battery-status", desc => "Toggle Battery Status support",
    169       define => "ENABLE_BATTERY_STATUS", default => (isEfl() || isBlackBerry()), value => \$batteryStatusSupport },
     169      define => "ENABLE_BATTERY_STATUS", default => isEfl(), value => \$batteryStatusSupport },
    170170
    171171    { option => "blob", desc => "Toggle Blob support",
    172       define => "ENABLE_BLOB", default => ((isAppleMacWebKit() && !isIOSWebKit()) || isGtk() || isBlackBerry() || isEfl()), value => \$blobSupport },
     172      define => "ENABLE_BLOB", default => ((isAppleMacWebKit() && !isIOSWebKit()) || isGtk() || isEfl()), value => \$blobSupport },
    173173
    174174    { option => "canvas-path", desc => "Toggle Canvas Path support",
    … …  
    194194
    195195    { option => "css-filters", desc => "Toggle CSS Filters support",
    196       define => "ENABLE_CSS_FILTERS", default => (isAppleMacWebKit() || isBlackBerry() || isIOSWebKit()), value => \$cssFiltersSupport },
     196      define => "ENABLE_CSS_FILTERS", default => (isAppleMacWebKit() || isIOSWebKit()), value => \$cssFiltersSupport },
    197197
    198198    { option => "css3-conditional-rules", desc => "Toggle CSS3 Conditional Rules support (i.e. \@supports)",
    … …  
    215215
    216216    { option => "css-image-resolution", desc => "Toggle CSS image-resolution support",
    217       define => "ENABLE_CSS_IMAGE_RESOLUTION", default => (isBlackBerry() || isGtk()), value => \$cssImageResolutionSupport },
     217      define => "ENABLE_CSS_IMAGE_RESOLUTION", default => isGtk(), value => \$cssImageResolutionSupport },
    218218
    219219    { option => "css-image-set", desc => "Toggle CSS image-set support",
    … …  
    236236
    237237    { option => "custom-scheme-handler", desc => "Toggle Custom Scheme Handler support",
    238       define => "ENABLE_CUSTOM_SCHEME_HANDLER", default => (isBlackBerry() || isEfl()), value => \$customSchemeHandlerSupport },
     238      define => "ENABLE_CUSTOM_SCHEME_HANDLER", default => isEfl(), value => \$customSchemeHandlerSupport },
    239239
    240240    { option => "datalist-element", desc => "Toggle Datalist Element support",
    … …  
    248248
    249249    { option => "device-orientation", desc => "Toggle Device Orientation support",
    250       define => "ENABLE_DEVICE_ORIENTATION", default => (isIOSWebKit() || isBlackBerry()), value => \$deviceOrientationSupport },
     250      define => "ENABLE_DEVICE_ORIENTATION", default => isIOSWebKit(), value => \$deviceOrientationSupport },
    251251
    252252    { option => "directory-upload", desc => "Toggle Directory Upload support",
    … …  
    257257
    258258    { option => "download-attribute", desc => "Toggle Download Attribute support",
    259       define => "ENABLE_DOWNLOAD_ATTRIBUTE", default => (isBlackBerry() || isEfl()), value => \$downloadAttributeSupport },
     259      define => "ENABLE_DOWNLOAD_ATTRIBUTE", default => isEfl(), value => \$downloadAttributeSupport },
    260260
    261261    { option => "filters", desc => "Toggle Filters support",
    262       define => "ENABLE_FILTERS", default => (isAppleWebKit() || isIOSWebKit() || isGtk() || isEfl() || isBlackBerry()), value => \$filtersSupport },
     262      define => "ENABLE_FILTERS", default => (isAppleWebKit() || isIOSWebKit() || isGtk() || isEfl()), value => \$filtersSupport },
    263263
    264264    { option => "font-load-events", desc => "Toggle Font Load Events support",
    … …  
    269269
    270270    { option => "fullscreen-api", desc => "Toggle Fullscreen API support",
    271       define => "ENABLE_FULLSCREEN_API", default => (isAppleMacWebKit() || isEfl() || isGtk() || isBlackBerry()), value => \$fullscreenAPISupport },
     271      define => "ENABLE_FULLSCREEN_API", default => (isAppleMacWebKit() || isEfl() || isGtk()), value => \$fullscreenAPISupport },
    272272
    273273    { option => "gamepad", desc => "Toggle Gamepad support",
    … …  
    275275
    276276    { option => "geolocation", desc => "Toggle Geolocation support",
    277       define => "ENABLE_GEOLOCATION", default => (isAppleWebKit() || isIOSWebKit() || isGtk() || isBlackBerry()), value => \$geolocationSupport },
     277      define => "ENABLE_GEOLOCATION", default => (isAppleWebKit() || isIOSWebKit() || isGtk()), value => \$geolocationSupport },
    278278
    279279    { option => "high-dpi-canvas", desc => "Toggle High DPI Canvas support",
    … …  
    293293
    294294    { option => "input-type-color", desc => "Toggle Input Type Color support",
    295       define => "ENABLE_INPUT_TYPE_COLOR", default => (isBlackBerry() || isEfl()), value => \$inputTypeColorSupport },
     295      define => "ENABLE_INPUT_TYPE_COLOR", default => isEfl(), value => \$inputTypeColorSupport },
    296296
    297297    { option => "input-type-date", desc => "Toggle Input Type Date support",
    … …  
    320320
    321321    { option => "legacy-notifications", desc => "Toggle Legacy Notifications support",
    322       define => "ENABLE_LEGACY_NOTIFICATIONS", default => isBlackBerry(), value => \$legacyNotificationsSupport },
     322      define => "ENABLE_LEGACY_NOTIFICATIONS", default => 0, value => \$legacyNotificationsSupport },
    323323
    324324    { option => "legacy-vendor-prefixes", desc => "Toggle Legacy Vendor Prefix support",
    … …  
    332332
    333333    { option => "mathml", desc => "Toggle MathML support",
    334       define => "ENABLE_MATHML", default => !isBlackBerry(), value => \$mathmlSupport },
     334      define => "ENABLE_MATHML", default => 1, value => \$mathmlSupport },
    335335
    336336    { option => "media-capture", desc => "Toggle Media Capture support",
    … …  
    344344
    345345    { option => "media-stream", desc => "Toggle Media Stream support",
    346       define => "ENABLE_MEDIA_STREAM", default => (isBlackBerry() || isGtk()), value => \$mediaStreamSupport },
     346      define => "ENABLE_MEDIA_STREAM", default => isGtk(), value => \$mediaStreamSupport },
    347347
    348348    { option => "meter-element", desc => "Toggle Meter Element support",
    … …  
    356356
    357357    { option => "navigator-content-utils", desc => "Toggle Navigator Content Utils support",
    358       define => "ENABLE_NAVIGATOR_CONTENT_UTILS", default => (isBlackBerry() || isEfl()), value => \$registerProtocolHandlerSupport },
     358      define => "ENABLE_NAVIGATOR_CONTENT_UTILS", default => isEfl(), value => \$registerProtocolHandlerSupport },
    359359
    360360    { option => "netscape-plugin-api", desc => "Toggle Netscape Plugin API support",
    … …  
    362362
    363363    { option => "network-info", desc => "Toggle Network Info support",
    364       define => "ENABLE_NETWORK_INFO", default => (isEfl() || isBlackBerry()), value => \$networkInfoSupport },
     364      define => "ENABLE_NETWORK_INFO", default => isEfl(), value => \$networkInfoSupport },
    365365
    366366    { option => "nosniff", desc => "Toggle support for 'X-Content-Type-Options: nosniff'",
    … …  
    368368
    369369    { option => "notifications", desc => "Toggle Notifications support",
    370       define => "ENABLE_NOTIFICATIONS", default => isBlackBerry(), value => \$notificationsSupport },
     370      define => "ENABLE_NOTIFICATIONS", default => 0, value => \$notificationsSupport },
    371371
    372372    { option => "orientation-events", desc => "Toggle Orientation Events support",
    373       define => "ENABLE_ORIENTATION_EVENTS", default => isIOSWebKit() || isBlackBerry(), value => \$orientationEventsSupport },
     373      define => "ENABLE_ORIENTATION_EVENTS", default => isIOSWebKit(), value => \$orientationEventsSupport },
    374374
    375375    { option => "page-visibility-api", desc => "Toggle Page Visibility API support",
    376       define => "ENABLE_PAGE_VISIBILITY_API", default => (isBlackBerry() || isEfl() || isGtk()), value => \$pageVisibilityAPISupport },
     376      define => "ENABLE_PAGE_VISIBILITY_API", default => (isEfl() || isGtk()), value => \$pageVisibilityAPISupport },
    377377
    378378    { option => "plugin-proxy-for-video", desc => "Toggle Plugin Proxy for Video support",
    … …  
    401401
    402402    { option => "request-animation-frame", desc => "Toggle Request Animation Frame support",
    403       define => "ENABLE_REQUEST_ANIMATION_FRAME", default => (isAppleMacWebKit() || isGtk() || isEfl() || isBlackBerry()), value => \$requestAnimationFrameSupport },
     403      define => "ENABLE_REQUEST_ANIMATION_FRAME", default => (isAppleMacWebKit() || isGtk() || isEfl()), value => \$requestAnimationFrameSupport },
    404404
    405405    { option => "seccomp-filters", desc => "Toggle Seccomp Filter sandbox",
    … …  
    413413
    414414    { option => "shared-workers", desc => "Toggle Shared Workers support",
    415       define => "ENABLE_SHARED_WORKERS", default => (isAppleWebKit() || isGtk() || isBlackBerry() || isEfl()), value => \$sharedWorkersSupport },
     415      define => "ENABLE_SHARED_WORKERS", default => (isAppleWebKit() || isGtk() || isEfl()), value => \$sharedWorkersSupport },
    416416
    417417    { option => "sql-database", desc => "Toggle SQL Database support",
    … …  
    428428
    429429    { option => "system-malloc", desc => "Toggle system allocator instead of TCmalloc",
    430       define => "USE_SYSTEM_MALLOC", default => (isBlackBerry() || isWinCE()), value => \$systemMallocSupport },
     430      define => "USE_SYSTEM_MALLOC", default => isWinCE(), value => \$systemMallocSupport },
    431431
    432432    { option => "template-element", desc => "Toggle HTMLTemplateElement support",
    … …  
    434434
    435435    { option => "text-autosizing", desc => "Toggle Text Autosizing support",
    436       define => "ENABLE_TEXT_AUTOSIZING", default => isBlackBerry(), value => \$textAutosizingSupport },
     436      define => "ENABLE_TEXT_AUTOSIZING", default => 0, value => \$textAutosizingSupport },
    437437
    438438    { option => "tiled-backing-store", desc => "Toggle Tiled Backing Store support",
    … …  
    443443
    444444    { option => "touch-events", desc => "Toggle Touch Events support",
    445       define => "ENABLE_TOUCH_EVENTS", default => (isIOSWebKit() || isBlackBerry() || isEfl()), value => \$touchEventsSupport },
     445      define => "ENABLE_TOUCH_EVENTS", default => (isIOSWebKit() || isEfl()), value => \$touchEventsSupport },
    446446
    447447    { option => "touch-slider", desc => "Toggle Touch Slider support",
    448       define => "ENABLE_TOUCH_SLIDER", default => isBlackBerry(), value => \$touchSliderSupport },
     448      define => "ENABLE_TOUCH_SLIDER", default => 0, value => \$touchSliderSupport },
    449449
    450450    { option => "touch-icon-loading", desc => "Toggle Touch Icon Loading Support",
    … …  
    455455
    456456    { option => "vibration", desc => "Toggle Vibration support",
    457       define => "ENABLE_VIBRATION", default => (isEfl() || isBlackBerry()), value => \$vibrationSupport },
     457      define => "ENABLE_VIBRATION", default => isEfl(), value => \$vibrationSupport },
    458458
    459459    { option => "video", desc => "Toggle Video support",
    460       define => "ENABLE_VIDEO", default => (isAppleWebKit() || isGtk() || isBlackBerry() || isEfl()), value => \$videoSupport },
     460      define => "ENABLE_VIDEO", default => (isAppleWebKit() || isGtk() || isEfl()), value => \$videoSupport },
    461461
    462462    { option => "video-track", desc => "Toggle Video Track support",
    463       define => "ENABLE_VIDEO_TRACK", default => (isAppleWebKit() || isGtk() || isEfl() || isBlackBerry()), value => \$videoTrackSupport },
     463      define => "ENABLE_VIDEO_TRACK", default => (isAppleWebKit() || isGtk() || isEfl()), value => \$videoTrackSupport },
    464464
    465465    { option => "webgl", desc => "Toggle WebGL support",
    … …  
    476476
    477477    { option => "web-timing", desc => "Toggle Web Timing support",
    478       define => "ENABLE_WEB_TIMING", default => (isBlackBerry() || isGtk() || isEfl()), value => \$webTimingSupport },
     478      define => "ENABLE_WEB_TIMING", default => (isGtk() || isEfl()), value => \$webTimingSupport },
    479479
    480480    { option => "xhr-timeout", desc => "Toggle XHR Timeout support",

  • trunk/Tools/Scripts/webkitpy/common/config/watchlist

    r161250 r161656  
    157157            "filename": r"Source/WebCore/editing/",
    158158        },
    159         "BlackBerry": {
    160             "filename": r"Source/WebKit/blackberry/"
    161                         r"|Source/WebCore/page/blackberry"
    162                         r"|Source/WebCore/history/blackberry"
    163                         r"|Source/WebCore/plugins/blackberry"
    164                         r"|Source/WebCore/editing/blackberry"
    165                         r"|Source/WebCore/Resources/blackberry"
    166                         r"|Source/WebCore/platform/image-decoders/blackberry"
    167                         r"|Source/WebCore/platform/blackberry"
    168                         r"|Source/WebCore/platform/text/blackberry"
    169                         r"|Source/WebCore/platform/network/blackberry"
    170                         r"|Source/WebCore/platform/graphics/blackberry"
    171                         r"|Source/WTF/wtf/blackberry"
    172                         r"|ManualTests/blackberry"
    173                         r"|Tools/DumpRenderTree/blackberry"
    174                         r"|LayoutTests/platform/blackberry",
    175         },
    176159        "NetworkInfo": {
    177160            "filename": r"Source/WebCore/Modules/networkinfo",
    … …  
    203186            "filename": r"Source/WebCore/page/TouchAdjustment.*"
    204187                        r"|LayoutTests/touchadjustment"
    205                         r"|Source/WebKit/blackberry/WebKitSupport/FatFingers.*",
    206188        },
    207189        "SVG": {
Note: See TracChangeset for help on using the changeset viewer.