[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[mihaip at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit eec1f03d5be952a4fcffb0040907e076012ddf5c
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 1 00:20:22 2011 +0000

    2011-01-31  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Tony Chang.
    
            [Chromium] Switch chromium-mac to use ChromiumDriver
            https://bugs.webkit.org/show_bug.cgi?id=53461
    
            For the sake of consistency with the other Chromium platforms (and so
            that chromium-mac picks up special flags like --enable-hardware-gpu),
            switch chromium-mac from the WebKitDriver to ChromiumDriver.
    
            * Scripts/webkitpy/layout_tests/port/chromium.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77172 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index c340243..3415546 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-31  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [Chromium] Switch chromium-mac to use ChromiumDriver
+        https://bugs.webkit.org/show_bug.cgi?id=53461
+        
+        For the sake of consistency with the other Chromium platforms (and so
+        that chromium-mac picks up special flags like --enable-hardware-gpu),
+        switch chromium-mac from the WebKitDriver to ChromiumDriver.
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+
 2011-01-31  Dirk Pranke  <dpranke at chromium.org>
 
         Reviewed by Mihai Parparita.
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
index 179a9a6..3608203 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -45,11 +45,6 @@ from webkitpy.layout_tests.layout_package import test_output
 
 import base
 import http_server
-
-# Chromium DRT on OSX uses WebKitDriver.
-if sys.platform == 'darwin':
-    import webkit
-
 import websocket_server
 
 _log = logging.getLogger("webkitpy.layout_tests.port.chromium")
@@ -217,8 +212,6 @@ class ChromiumPort(base.Port):
 
     def create_driver(self, worker_number):
         """Starts a new Driver and returns a handle to it."""
-        if not self.get_option('use_test_shell') and sys.platform == 'darwin':
-            return webkit.WebKitDriver(self, worker_number)
         return ChromiumDriver(self, worker_number)
 
     def start_helper(self):

-- 
WebKit Debian packaging