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

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 41bb0551fd18983ab7bf81d03a65e0be6f7db93b
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 22 02:41:40 2009 +0000

    Hopefully closer to a build fix. JavaScriptCore will build now.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52472 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
index 8acda63..5304fa6 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
@@ -54,8 +54,6 @@ EXPORTS
     ?className at JSObject@JSC@@UBE?AVUString at 2@XZ
     ?collate at Collator@WTF@@QBE?AW4Result at 12@PB_WI0I at Z
     ?collectAllGarbage at Heap@JSC@@QAEXXZ
-    ?computeHash at UStringImpl@JSC@@SAIPB_WH at Z
-    ?computeHash at UStringImpl@JSC@@SAIPBDH at Z
     ?configurable at PropertyDescriptor@JSC@@QBE_NXZ
     ?construct at JSC@@YAPAVJSObject at 1@PAVExecState at 1@VJSValue at 1@W4ConstructType at 1@ABTConstructData at 1@ABVArgList at 1@@Z
     ?constructArray at JSC@@YAPAVJSArray at 1@PAVExecState at 1@ABVArgList at 1@@Z
@@ -101,8 +99,8 @@ EXPORTS
     ?despecifyDictionaryFunction at Structure@JSC@@QAEXABVIdentifier at 2@@Z
     ?despecifyFunctionTransition at Structure@JSC@@SA?AV?$PassRefPtr at VStructure@JSC@@@WTF@@PAV12 at ABVIdentifier@2@@Z
     ?destroy at Heap@JSC@@QAEXXZ
-    ?destroy at UStringImpl@JSC@@AAEXXZ
     ?destroyJSGlobalObjectData at JSGlobalObject@JSC@@CAXPAX at Z
+    ?destroy at UStringImpl@JSC@@AAEXXZ
     ?detach at Debugger@JSC@@UAEXPAVJSGlobalObject at 2@@Z
     ?detachThread at WTF@@YAXI at Z
     ?didTimeOut at TimeoutChecker@JSC@@QAE_NPAVExecState at 2@@Z
diff --git a/JavaScriptCore/runtime/UStringImpl.cpp b/JavaScriptCore/runtime/UStringImpl.cpp
index 6724747..fa9abe6 100644
--- a/JavaScriptCore/runtime/UStringImpl.cpp
+++ b/JavaScriptCore/runtime/UStringImpl.cpp
@@ -28,7 +28,7 @@
 
 #include "Identifier.h"
 #include "UString.h"
-#include "UTF8.h"
+#include <wtf/unicode/UTF8.h>
 
 using namespace WTF::Unicode;
 using namespace std;
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index aaa8476..eca22dc 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -42087,6 +42087,10 @@
 					RelativePath="..\ForwardingHeaders\runtime\UString.h"
 					>
 				</File>
+                <File
+					RelativePath="..\ForwardingHeaders\runtime\UStringImpl.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="pcre"

-- 
WebKit Debian packaging