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

[dpranke at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 6941fb50c086169eaf0cc44ab772ff83f54f0485
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 4 21:40:58 2010 +0000

    2010-03-04  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Fix dangling reference to "port" instead of "self._port_obj" that
            was preventing the http_server from starting on Windows.
    
            * Scripts/webkitpy/layout_tests/port/http_server.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55551 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d0ac45b..3f46b87 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-04  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Fix dangling reference to "port" instead of "self._port_obj" that
+        was preventing the http_server from starting on Windows.
+
+        * Scripts/webkitpy/layout_tests/port/http_server.py:
+
 2010-03-04  Diego Gonzalez  <diego.gonzalez at openbossa.org>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/http_server.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/http_server.py
index e56040c..7de44c4 100755
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/http_server.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/http_server.py
@@ -201,7 +201,7 @@ class Lighttpd(http_server_base.HttpServerBase):
                 env['PATH'])
 
         if sys.platform == 'win32' and self._register_cygwin:
-            setup_mount = port.path_from_chromium_base('third_party',
+            setup_mount = self._port_obj.path_from_chromium_base('third_party',
                 'cygwin', 'setup_mount.bat')
             subprocess.Popen(setup_mount).wait()
 

-- 
WebKit Debian packaging