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

aroben at apple.com aroben at apple.com
Wed Dec 22 14:35:04 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit ce8d4846b4770342b68feebdfc7aadce16648c93
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 13 18:49:38 2010 +0000

    Start compiling BackingStore on Windows
    
    Rubber-stamped by Anders Carlsson.
    
    JavaScriptCore:
    
    Export tryFastRealloc for WebKit2's benefit
    
    * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def: Added
    tryFastRealloc. Removed RegExpObject::info, which is now exported via
    JS_EXPORTDATA.
    
    WebKit2:
    
    * win/WebKit2.vcproj: Added BackingStore.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69678 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 99a11c7..d852518 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-13  Adam Roben  <aroben at apple.com>
+
+        Export tryFastRealloc for WebKit2's benefit
+
+        Rubber-stamped by Anders Carlsson.
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def: Added
+        tryFastRealloc. Removed RegExpObject::info, which is now exported via
+        JS_EXPORTDATA.
+
 2010-10-13  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Maciej Stachowiak.
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
index d7859fc..5a178db 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
@@ -193,7 +193,6 @@ EXPORTS
     ?hasTransition at Structure@JSC@@QAE_NPAVStringImpl at WTF@@I at Z
     ?heap at Heap@JSC@@SAPAV12 at VJSValue@2@@Z
     ?increment at RefCountedLeakCounter@WTF@@QAEXXZ
-    ?info at RegExpObject@JSC@@2UClassInfo at 2@B
     ?init at AtomicString@WTF@@SAXXZ
     ?init at JSGlobalObject@JSC@@AAEXPAVJSObject at 2@@Z
     ?initializeMainThread at WTF@@YAXXZ
@@ -326,6 +325,7 @@ EXPORTS
     ?toUInt32 at Identifier@JSC@@SAIABVUString at 2@AA_N at Z
     ?tryFastCalloc at WTF@@YA?AUTryMallocReturnValue at 1@II at Z
     ?tryFastMalloc at WTF@@YA?AUTryMallocReturnValue at 1@I at Z
+    ?tryFastRealloc at WTF@@YA?AUTryMallocReturnValue at 1@PAXI at Z
     ?tryLock at Mutex@WTF@@QAE_NXZ
     ?type at DebuggerCallFrame@JSC@@QBE?AW4Type at 12@XZ
     ?unlock at JSLock@JSC@@SAXW4JSLockBehavior at 2@@Z
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index fec5356..8448757 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,13 @@
 2010-10-13  Adam Roben  <aroben at apple.com>
 
+        Start compiling BackingStore on Windows
+
+        Rubber-stamped by Anders Carlsson.
+
+        * win/WebKit2.vcproj: Added BackingStore.
+
+2010-10-13  Adam Roben  <aroben at apple.com>
+
         Rename BackingStoreMac.mm to BackingStoreCG.cpp
 
         There's nothing Mac-specific about this file.
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index 47cf4a7..3629cb5 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -401,6 +401,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Shared\BackingStore.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Shared\BackingStore.h"
+				>
+			</File>
+			<File
 				RelativePath="..\Shared\CacheModel.h"
 				>
 			</File>
@@ -888,6 +896,14 @@
 					</FileConfiguration>
 				</File>
 			</Filter>
+			<Filter
+				Name="cg"
+				>
+				<File
+					RelativePath="..\Shared\cg\BackingStoreCG.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="WebProcess"

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list