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

[jberlin at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d808f47ba3df0ba9a645861841a1353988dcaa35
Author: jberlin at webkit.org <jberlin at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 20 01:01:53 2010 +0000

    2010-07-19  Jessie Berlin  <jberlin at apple.com>
    
            Windows build fix. Unreviewed.
    
            * WebKitTestRunner/win/TestControllerWin.cpp:
            (WTR::TestController::initializeTestPluginPath):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63703 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5ac7d3a..e95d32c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-19  Jessie Berlin  <jberlin at apple.com>
+
+        Windows build fix. Unreviewed.
+
+        * WebKitTestRunner/win/TestControllerWin.cpp:
+        (WTR::TestController::initializeTestPluginPath):
+
 2010-07-19  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Jon Honeycutt.
diff --git a/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp b/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp
index 295be74..232c396 100644
--- a/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp
+++ b/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp
@@ -25,6 +25,7 @@
 
 #include "TestController.h"
 
+#include <fcntl.h>
 #include <io.h>
 #include <WebKit2/WKStringCF.h>
 
@@ -53,7 +54,7 @@ void TestController::initializeTestPluginPath()
 {
     CFStringRef exeContainerPath = CFURLCopyFileSystemPath(CFURLCreateCopyDeletingLastPathComponent(0, CFBundleCopyExecutableURL(CFBundleGetMainBundle())), kCFURLWindowsPathStyle);
     CFMutableStringRef bundlePath = CFStringCreateMutableCopy(0, 0, exeContainerPath);
-    m_testPluginPath.adopt(AdoptWK, WKStringCreateWithCFString(bundlePath));
+    m_testPluginPath.adopt(WKStringCreateWithCFString(bundlePath));
 }
 
 } // namespace WTR

-- 
WebKit Debian packaging