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

[bweinstein at apple.com]

The following commit has been merged in the debian/experimental branch:
commit be327dc10e2a6b7e888a02d7dd8e727307a904f1
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 23:53:06 2010 +0000

    WebKit2: More Windows build fixage. Copy another new header into WebKitOutputDir.
    
    * win/WebKit2Generated.make:
    
    WebKitTools: More Windows build fixage. Rename a variable that was named string.
    
    * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
    (WTR::hasPrefix):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70728 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 98350ce..67ba6f1 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,11 @@
 2010-10-27  Brian Weinstein  <bweinstein at apple.com>
 
+        More Windows build fixage. Copy another new header into WebKitOutputDir.
+
+        * win/WebKit2Generated.make:
+
+2010-10-27  Brian Weinstein  <bweinstein at apple.com>
+
         Windows build fix. Copy a new header into WebKitOutputDir.
 
         * win/WebKit2Generated.make:
diff --git a/WebKit2/win/WebKit2Generated.make b/WebKit2/win/WebKit2Generated.make
index b42f782..4eb940b 100644
--- a/WebKit2/win/WebKit2Generated.make
+++ b/WebKit2/win/WebKit2Generated.make
@@ -47,6 +47,7 @@ all:
     xcopy /y /d "..\UIProcess\API\cpp\WKRetainPtr.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundle.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleBackForwardList.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
+    xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleBackForwardListItem.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleFrame.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleFramePrivate.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleHitTestResult.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 431041c..a0da419 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-27  Brian Weinstein  <bweinstein at apple.com>
+
+        More Windows build fixage. Rename a variable that was named string.
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::hasPrefix):
+
 2010-10-27  Ojan Vafai  <ojan at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
index b3f3698..884ee0b 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
@@ -46,9 +46,9 @@ template<typename T> static inline WKRetainPtr<T> adoptWK(T item)
     return WKRetainPtr<T>(AdoptWK, item);
 }
 
-static bool hasPrefix(const string& string, const string& prefix)
+static bool hasPrefix(const string& searchString, const string& prefix)
 {
-    return string.length() >= prefix.length() && string.substr(0, prefix.length()) == prefix;
+    return searchString.length() >= prefix.length() && searchString.substr(0, prefix.length()) == prefix;
 }
 
 static JSValueRef propertyValue(JSContextRef context, JSObjectRef object, const char* propertyName)

-- 
WebKit Debian packaging