[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tony at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 8f3e3280a4b290a504d27d72b97f4fb84fe09d4a
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 22:37:39 2010 +0000

    2010-08-24  Tony Chang  <tony at chromium.org>
    
            Reviewed by Eric Seidel.
    
            [chromium] fix the platform result fallback order on mac/win
            https://bugs.webkit.org/show_bug.cgi?id=44483
    
            * Scripts/webkitpy/layout_tests/port/google_chrome.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65944 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 30a4e84..44ab0d9 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-24  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        [chromium] fix the platform result fallback order on mac/win
+        https://bugs.webkit.org/show_bug.cgi?id=44483
+
+        * Scripts/webkitpy/layout_tests/port/google_chrome.py:
+
 2010-08-24  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome.py
index 1ea053b..46ab3ed 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome.py
@@ -36,9 +36,10 @@ def GetGoogleChromePort(port_name, options):
             def baseline_search_path(self):
                 paths = chromium_linux.ChromiumLinuxPort.baseline_search_path(
                     self)
-                paths.insert(0, self._webkit_baseline_path(self._name))
+                paths.insert(0, self._webkit_baseline_path(
+                    'google-chrome-linux32'))
                 return paths
-        return GoogleChromeLinux32Port(port_name, options)
+        return GoogleChromeLinux32Port(None, options)
     elif port_name == 'google-chrome-linux64':
         import chromium_linux
 
@@ -46,9 +47,10 @@ def GetGoogleChromePort(port_name, options):
             def baseline_search_path(self):
                 paths = chromium_linux.ChromiumLinuxPort.baseline_search_path(
                     self)
-                paths.insert(0, self._webkit_baseline_path(self._name))
+                paths.insert(0, self._webkit_baseline_path(
+                    'google-chrome-linux64'))
                 return paths
-        return GoogleChromeLinux64Port(port_name, options)
+        return GoogleChromeLinux64Port(None, options)
     elif port_name.startswith('google-chrome-mac'):
         import chromium_mac
 
@@ -59,7 +61,7 @@ def GetGoogleChromePort(port_name, options):
                 paths.insert(0, self._webkit_baseline_path(
                     'google-chrome-mac'))
                 return paths
-        return GoogleChromeMacPort(port_name, options)
+        return GoogleChromeMacPort(None, options)
     elif port_name.startswith('google-chrome-win'):
         import chromium_win
 
@@ -70,5 +72,5 @@ def GetGoogleChromePort(port_name, options):
                 paths.insert(0, self._webkit_baseline_path(
                     'google-chrome-win'))
                 return paths
-        return GoogleChromeWinPort(port_name, options)
+        return GoogleChromeWinPort(None, options)
     raise NotImplementedError('unsupported port: %s' % port_name)

-- 
WebKit Debian packaging