Title: [131801] trunk/Source
- Revision
- 131801
- Author
- [email protected]
- Date
- 2012-10-18 14:16:49 -0700 (Thu, 18 Oct 2012)
Log Message
Unreviewed. Build fix after r131701 and r131777.
* WebKit.vcproj/WebKit.sln:
* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
* win/WebKit2.def:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (131800 => 131801)
--- trunk/Source/_javascript_Core/ChangeLog 2012-10-18 21:16:31 UTC (rev 131800)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-10-18 21:16:49 UTC (rev 131801)
@@ -1,3 +1,9 @@
+2012-10-18 Roger Fong <[email protected]>
+
+ Unreviewed. Build fix after r131701 and r131777.
+
+ * _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
+
2012-10-18 Mark Hahnenberg <[email protected]>
Race condition between GCThread and main thread during copying phase
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def (131800 => 131801)
--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def 2012-10-18 21:16:31 UTC (rev 131800)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def 2012-10-18 21:16:49 UTC (rev 131801)
@@ -119,6 +119,7 @@
?copyBackingStore@JSObject@JSC@@SAXPAVJSCell@2@AAVCopyVisitor@2@@Z
?create@JSFunction@JSC@@SAPAV12@PAVExecState@2@PAVJSGlobalObject@2@HABVString@WTF@@P6I_J0@ZW4Intrinsic@2@3@Z
?create@JSGlobalData@JSC@@SA?AV?$PassRefPtr@VJSGlobalData@JSC@@@WTF@@W4ThreadStackType@2@W4HeapType@2@@Z
+ ?create@OpaqueJSString@@SA?AV?$PassRefPtr@UOpaqueJSString@@@WTF@@ABVString@3@@Z
?create@RegExp@JSC@@SAPAV12@AAVJSGlobalData@2@ABVString@WTF@@W4RegExpFlags@2@@Z
?createEmptyString@SmallStrings@JSC@@AAEXPAVJSGlobalData@2@@Z
?createError@JSC@@YAPAVJSObject@1@PAVExecState@1@ABVString@WTF@@@Z
@@ -354,6 +355,7 @@
?startSampling@JSGlobalData@JSC@@QAEXXZ
?stopProfiling@Profiler@JSC@@QAE?AV?$PassRefPtr@VProfile@JSC@@@WTF@@PAVExecState@2@ABVString@4@@Z
?stopSampling@JSGlobalData@JSC@@QAEXXZ
+ ?string@OpaqueJSString@@QBE?AVString@WTF@@XZ
?StringToDouble@StringToDoubleConverter@double_conversion@WTF@@SANPBDIPAI@Z
?suggestedNewOutOfLineStorageCapacity@Structure@JSC@@QAEIXZ
?sweeper@Heap@JSC@@QAEPAVIncrementalSweeper@2@XZ
Modified: trunk/Source/WebKit/win/ChangeLog (131800 => 131801)
--- trunk/Source/WebKit/win/ChangeLog 2012-10-18 21:16:31 UTC (rev 131800)
+++ trunk/Source/WebKit/win/ChangeLog 2012-10-18 21:16:49 UTC (rev 131801)
@@ -1,3 +1,9 @@
+2012-10-18 Roger Fong <[email protected]>
+
+ Unreviewed. Build fix after r131701 and r131777.
+
+ * WebKit.vcproj/WebKit.sln:
+
2012-10-14 Sam Weinig <[email protected]>
Fix the windows build.
Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln (131800 => 131801)
--- trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln 2012-10-18 21:16:31 UTC (rev 131800)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln 2012-10-18 21:16:49 UTC (rev 131801)
@@ -648,6 +648,42 @@
{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Release|Win32.ActiveCfg = Release|Win32
{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Release|Win32.Build.0 = Release|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Debug_All|Win32.Build.0 = Debug_All|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Debug|Win32.ActiveCfg = Debug|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Debug|Win32.Build.0 = Debug|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Production|Win32.ActiveCfg = Production|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Production|Win32.Build.0 = Production|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Release|Win32.ActiveCfg = Release|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Release|Win32.Build.0 = Release|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug_All|Win32.Build.0 = Debug_All|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug|Win32.Build.0 = Debug|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Production|Win32.ActiveCfg = Production|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Production|Win32.Build.0 = Production|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release|Win32.ActiveCfg = Release|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release|Win32.Build.0 = Release|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug_All|Win32.Build.0 = Debug_All|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug|Win32.Build.0 = Debug|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Production|Win32.ActiveCfg = Production|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Production|Win32.Build.0 = Production|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release|Win32.ActiveCfg = Release|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -665,6 +701,8 @@
{0A324352-B3B6-496C-9E5B-4C7E923E628B} = {63FB6F8A-C601-43E3-BD16-A00A465C2CB6}
{E498CA9D-3BD2-4D52-8E37-C8DC76526325} = {63FB6F8A-C601-43E3-BD16-A00A465C2CB6}
{83414B15-1C0D-490B-990E-03F4D49170E4} = {63FB6F8A-C601-43E3-BD16-A00A465C2CB6}
+ {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {A671AE22-FBCE-4C41-A723-82939FCA3E92}
+ {5AE5F5E4-782D-4F63-B4D7-3977B52B9950} = {A671AE22-FBCE-4C41-A723-82939FCA3E92}
{2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD} = {9AB9C96C-9039-4FA9-8F83-BBFC8F8B2182}
{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB} = {9AB9C96C-9039-4FA9-8F83-BBFC8F8B2182}
{AAE88FEF-509E-4D49-870B-7357922C276F} = {9AB9C96C-9039-4FA9-8F83-BBFC8F8B2182}
@@ -690,7 +728,5 @@
{DD7949B6-F2B4-47C2-9C42-E21E84CB1017} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
{2974EA02-840B-4995-8719-8920A61006F1} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
{C13FA6EF-B531-4BAD-9A23-18E2BEB8B040} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
- {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {A671AE22-FBCE-4C41-A723-82939FCA3E92}
- {5AE5F5E4-782D-4F63-B4D7-3977B52B9950} = {A671AE22-FBCE-4C41-A723-82939FCA3E92}
EndGlobalSection
EndGlobal
Modified: trunk/Source/WebKit2/ChangeLog (131800 => 131801)
--- trunk/Source/WebKit2/ChangeLog 2012-10-18 21:16:31 UTC (rev 131800)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-18 21:16:49 UTC (rev 131801)
@@ -1,3 +1,9 @@
+2012-10-18 Roger Fong <[email protected]>
+
+ Unreviewed. Build fix after r131701 and r131777.
+
+ * win/WebKit2.def:
+
2012-10-18 Anders Carlsson <[email protected]>
Build fix.
Modified: trunk/Source/WebKit2/win/WebKit2.def (131800 => 131801)
--- trunk/Source/WebKit2/win/WebKit2.def 2012-10-18 21:16:31 UTC (rev 131800)
+++ trunk/Source/WebKit2/win/WebKit2.def 2012-10-18 21:16:49 UTC (rev 131801)
@@ -167,7 +167,6 @@
?create@Range@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@V?$PassRefPtr@VDocument@WebCore@@@4@V?$PassRefPtr@VNode@WebCore@@@4@H1H@Z
?create@ShadowRoot@WebCore@@SA?AV?$PassRefPtr@VShadowRoot@WebCore@@@WTF@@PAVElement@2@AAH@Z
?createWrapper@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNode@1@@Z
- ?distributedNodes@InsertionPoint@WebCore@@QBE?AV?$PassRefPtr@VNodeList@WebCore@@@WTF@@XZ
?documentState@HistoryItem@WebCore@@QBEABV?$Vector@VString@WTF@@$0A@@WTF@@XZ
?equal@WTF@@YA_NPBVStringImpl@1@PBE@Z
?equal@WTF@@YA_NPBVStringImpl@1@0@Z
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
