[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 646a6cdc9fd7c08de6cc196a80c20bfd0960df0a
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 5 21:55:12 2009 +0000

    2009-12-05  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            [bzt] Implement ChromiumPort
            https://bugs.webkit.org/show_bug.cgi?id=32182
    
            * Scripts/modules/webkitport.py:
            * Scripts/modules/webkitport_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51730 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1fba09b..97203de 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Eric Seidel.
 
+        [bzt] Implement ChromiumPort
+        https://bugs.webkit.org/show_bug.cgi?id=32182
+
+        * Scripts/modules/webkitport.py:
+        * Scripts/modules/webkitport_unittest.py:
+
+2009-12-05  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         Move update-webkit into BuildSteps
         https://bugs.webkit.org/show_bug.cgi?id=32181
 
diff --git a/WebKitTools/Scripts/modules/webkitport.py b/WebKitTools/Scripts/modules/webkitport.py
index 022088c..e769171 100644
--- a/WebKitTools/Scripts/modules/webkitport.py
+++ b/WebKitTools/Scripts/modules/webkitport.py
@@ -50,6 +50,8 @@ class WebKitPort():
             return MacPort
         if options.port == "qt":
             return QtPort
+        if options.port == "chromium":
+            return ChromiumPort
         # FIXME: We should default to WinPort on Windows.
         return MacPort
 
@@ -98,3 +100,25 @@ class QtPort(WebKitPort):
         command = WebKitPort.build_webkit_command()
         command.append("--qt")
         return command
+
+
+class ChromiumPort(WebKitPort):
+    @classmethod
+    def name(cls):
+        return "Chromium"
+
+    @classmethod
+    def flag(cls):
+        return "--port=chromium"
+
+    @classmethod
+    def update_webkit_command(cls):
+        command = WebKitPort.update_webkit_command()
+        command.append("--chromium")
+        return command
+
+    @classmethod
+    def build_webkit_command(cls):
+        command = WebKitPort.build_webkit_command()
+        command.append("--chromium")
+        return command
diff --git a/WebKitTools/Scripts/modules/webkitport_unittest.py b/WebKitTools/Scripts/modules/webkitport_unittest.py
index 83b8921..c713e83 100644
--- a/WebKitTools/Scripts/modules/webkitport_unittest.py
+++ b/WebKitTools/Scripts/modules/webkitport_unittest.py
@@ -29,7 +29,7 @@
 
 import unittest
 
-from modules.webkitport import WebKitPort, MacPort, QtPort
+from modules.webkitport import WebKitPort, MacPort, QtPort, ChromiumPort
 
 class WebKitPortTest(unittest.TestCase):
     def test_mac_port(self):
@@ -44,6 +44,13 @@ class WebKitPortTest(unittest.TestCase):
         self.assertEquals(QtPort.run_webkit_tests_command(), [WebKitPort.script_path("run-webkit-tests")])
         self.assertEquals(QtPort.build_webkit_command(), [WebKitPort.script_path("build-webkit"), "--qt"])
 
+    def test_chromium_port(self):
+        self.assertEquals(ChromiumPort.name(), "Chromium")
+        self.assertEquals(ChromiumPort.flag(), "--port=chromium")
+        self.assertEquals(ChromiumPort.run_webkit_tests_command(), [WebKitPort.script_path("run-webkit-tests")])
+        self.assertEquals(ChromiumPort.build_webkit_command(), [WebKitPort.script_path("build-webkit"), "--chromium"])
+        self.assertEquals(ChromiumPort.update_webkit_command(), [WebKitPort.script_path("update-webkit"), "--chromium"])
+
 
 if __name__ == '__main__':
     unittest.main()

-- 
WebKit Debian packaging