Merge WebKit at r67908: Initial merge by Git

Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972

1 files changed, 10 insertions, 5 deletions

diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index 4234905..cd43499 100755
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -50,6 +50,7 @@ chdirWebKit();
 my $showHelp = 0;
 my $clean = 0;
 my $minimal = 0;
+my $v8 = 0;
 my $installHeaders;
 my $installLibs;
 my $prefixPath;
@@ -197,9 +198,6 @@ my @features = (
     { option => "xslt", desc => "Toggle XSLT support",
       define => "ENABLE_XSLT", default => 1, value => \$xsltSupport },
 
-    { option => "file-writer", desc => "Toggle FileWriter support",
-      define => "ENABLE_FILE_WRITER", default => 0, value => \$fileWriterSupport },
-
     { option => "file-system", desc => "Toggle FileSystem support",
       define => "ENABLE_FILE_SYSTEM", default => 0, value => \$fileSystemSupport },
 
@@ -222,7 +220,8 @@ push @ARGV, split(/ /, $ENV{'BUILD_WEBKIT_ARGS'}) if ($ENV{'BUILD_WEBKIT_ARGS'})
 foreach (@ARGV) {
     if ($_ eq '--minimal') {
         $minimal = 1;
-        last;
+    } elsif ($_ eq '--v8') {
+        $v8 = 1;
     }
 }
 
@@ -250,6 +249,7 @@ Usage: $programName [options] [options to pass to build system]
 
   --install-headers=<path>          Set installation path for the headers (Qt only)
   --install-libs=<path>             Set installation path for the libraries (Qt only)
+  --v8                              Use V8 as JavaScript engine (Qt only)
 
   --prefix=<path>                   Set installation prefix to the given path (Gtk only)
   --makeargs=<arguments>            Optional Makefile flags
@@ -266,6 +266,7 @@ my %options = (
     'prefix=s' => \$prefixPath,
     'makeargs=s' => \$makeArgs,
     'minimal' => \$minimal,
+    'v8' => \$v8,
 );
 
 # Build usage text and options list from features
@@ -288,7 +289,7 @@ setConfiguration();
 my $productDir = productDir();
 
 # Remove 0 byte sized files from productDir after slave lost for Qt buildbots.
-File::Find::find(\&unlinkZeroFiles, $productDir) if isQt();
+File::Find::find(\&unlinkZeroFiles, $productDir) if (isQt() && -e $productDir);
 
 sub unlinkZeroFiles ()
 {
@@ -395,6 +396,10 @@ if (isGtk()) {
     if ($minimal) {
         push @options, "CONFIG+=minimal";
     }
+
+    if ($v8) {
+        push @options, "CONFIG+=v8";
+    }
 }
 
 # Force re-link of existing libraries if different than expected