WebKit2: More Windows build fixage. Copy another new header into WebKitOutputDir.
authorbweinstein@apple.com <bweinstein@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 27 Oct 2010 23:53:06 +0000 (23:53 +0000)
committerbweinstein@apple.com <bweinstein@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 27 Oct 2010 23:53:06 +0000 (23:53 +0000)
* win/WebKit2Generated.make:

WebKitTools: More Windows build fixage. Rename a variable that was named string.

* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::hasPrefix):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@70728 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit2/ChangeLog
WebKit2/win/WebKit2Generated.make
WebKitTools/ChangeLog
WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

index 98350ce..67ba6f1 100644 (file)
@@ -1,5 +1,11 @@
 2010-10-27  Brian Weinstein  <bweinstein@apple.com>
 
+        More Windows build fixage. Copy another new header into WebKitOutputDir.
+
+        * win/WebKit2Generated.make:
+
+2010-10-27  Brian Weinstein  <bweinstein@apple.com>
+
         Windows build fix. Copy a new header into WebKitOutputDir.
 
         * win/WebKit2Generated.make:
index b42f782..4eb940b 100644 (file)
@@ -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"
index 431041c..a0da419 100644 (file)
@@ -1,3 +1,10 @@
+2010-10-27  Brian Weinstein  <bweinstein@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@chromium.org>
 
         Reviewed by Dimitri Glazkov.
index b3f3698..884ee0b 100644 (file)
@@ -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)