Merge webkit.org at r58033 : Initial merge by git

Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1

1 files changed, 12 insertions, 0 deletions

diff --git a/WebKitTools/Scripts/build-dumprendertree b/WebKitTools/Scripts/build-dumprendertree
index 72e81b0..14690a8 100755
--- a/WebKitTools/Scripts/build-dumprendertree
+++ b/WebKitTools/Scripts/build-dumprendertree
@@ -45,6 +45,7 @@ Usage: $programName [options] [options to pass to build system]
   --gtk         Build the GTK+ port
   --qt          Build the Qt port
   --wx          Build the wxWindows port
+  --chromium    Build the Chromium port
 EOF
 
 GetOptions(
@@ -72,6 +73,17 @@ if (isAppleMacWebKit()) {
 } elsif (isQt() || isGtk() || isWx()) {
     # Qt, Gtk and wxWindows build everything in one shot. No need to build anything here.
     $result = 0;
+} elsif (isChromium()) {
+    if (isDarwin()) {
+        $result = buildXCodeProject("DumpRenderTree.gyp/DumpRenderTree", $clean, @ARGV);
+    } elsif (isCygwin() || isWindows()) {
+        # Windows build - builds the root visual studio solution.
+        $result = buildChromiumVisualStudioProject("DumpRenderTree.gyp/DumpRenderTree.sln", $clean);
+    } elsif (isLinux()) {
+        $result = buildChromiumMakefile("../../WebKit/chromium/", "DumpRenderTree", $clean);
+    } else {
+        die "This platform is not supported by Chromium.\n";
+    }
 } else {
     die "Building not defined for this platform!\n";
 }