[webkit-changes] [148583] trunk/Source/JavaScriptCore

Tue, 16 Apr 2013 17:34:34 -0700

Title: [148583] trunk/Source/_javascript_Core
Revision
148583
Author
[email protected]
Date
2013-04-16 17:21:19 -0700 (Tue, 16 Apr 2013)

Log Message

Unreviewed, rolling out r148576.
http://trac.webkit.org/changeset/148576
https://bugs.webkit.org/show_bug.cgi?id=114714

WebCore is building some of these same files (Requested by
bfulgham on #webkit).


* _javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def:
* _javascript_Core.vcproj/jsc/jsc.vcproj:
* _javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExports.def.in:
* _javascript_Core.vcxproj/jsc/jsc.vcxproj:
* _javascript_Core.vcxproj/jsc/jsc.vcxproj.filters:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (148582 => 148583)


--- trunk/Source/_javascript_Core/ChangeLog	2013-04-17 00:09:49 UTC (rev 148582)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-04-17 00:21:19 UTC (rev 148583)
@@ -1,3 +1,18 @@
+2013-04-16  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r148576.
+        http://trac.webkit.org/changeset/148576
+        https://bugs.webkit.org/show_bug.cgi?id=114714
+
+        WebCore is building some of these same files (Requested by
+        bfulgham on #webkit).
+
+        * _javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def:
+        * _javascript_Core.vcproj/jsc/jsc.vcproj:
+        * _javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExports.def.in:
+        * _javascript_Core.vcxproj/jsc/jsc.vcxproj:
+        * _javascript_Core.vcxproj/jsc/jsc.vcxproj.filters:
+
 2013-04-16  Brent Fulgham  <[email protected]>
 
         [Windows, WinCairo] Stop individually building WTF files in JSC.

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def (148582 => 148583)


--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def	2013-04-17 00:09:49 UTC (rev 148582)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreExports.def	2013-04-17 00:21:19 UTC (rev 148583)
@@ -27,8 +27,6 @@
     ??0SHA1@WTF@@QAE@XZ
     ??0SuperRegion@JSC@@QAE@XZ
     ??0SourceProvider@JSC@@QAE@ABVString@WTF@@ABVTextPosition@3@@Z
-    ??0String@WTF@@QAE@PBD@Z
-    ??0String@WTF@@QAE@PBDI@Z
     ??0StringObject@JSC@@IAE@AAVJSGlobalData@1@PAVStructure@1@@Z
     ??0StringPrintStream@WTF@@QAE@XZ
     ??0Structure@JSC@@AAE@AAVJSGlobalData@1@PAVJSGlobalObject@1@VJSValue@1@ABVTypeInfo@1@PBUClassInfo@1@EI@Z
@@ -54,7 +52,6 @@
     ??1SourceProvider@JSC@@UAE@XZ
     ??1SourceProviderCache@JSC@@QAE@XZ
     ??1StringPrintStream@WTF@@UAE@XZ
-    ??1StringImpl@WTF@@QAE@XZ
     ??1ThreadCondition@WTF@@QAE@XZ
     ??1WeakHandleOwner@JSC@@UAE@XZ
     ??1WTFThreadData@WTF@@QAE@XZ
@@ -116,7 +113,7 @@
     ?changePrototypeTransition@Structure@JSC@@SAPAV12@AAVJSGlobalData@2@PAV12@VJSValue@2@@Z
     ?checkCurrentIdentifierTable@Identifier@JSC@@CAXPAVExecState@2@@Z
     ?checkCurrentIdentifierTable@Identifier@JSC@@CAXPAVJSGlobalData@2@@Z
-    ?checksum@MD5@WTF@@QAEXAAV?$Vector@E$0BA@VCrashOnOverflow@WTF@@@2@@Z
+    ?checksum@MD5@WTF@@QAEXAAV?$Vector@E$0BA@VCrashOnOverflow@WTF@@@2@@Z    
     ?checkSyntax@JSC@@YA_NPAVExecState@1@ABVSourceCode@1@PAVJSValue@1@@Z
     ?className@JSObject@JSC@@SA?AVString@WTF@@PBV12@@Z
     ?className@JSProxy@JSC@@KA?AVString@WTF@@PBVJSObject@2@@Z
@@ -230,11 +227,9 @@
     ?finishCreation@RegExpObject@JSC@@IAEXPAVJSGlobalObject@2@@Z
     ?finishCreation@StringObject@JSC@@IAEXAAVJSGlobalData@2@PAVJSString@2@@Z
     ?focus@Profile@JSC@@QAEXPBVProfileNode@2@@Z
-    ?format@String@WTF@@SA?AV12@PBDZZ
     ?freeFatEntrySlow@SymbolTableEntry@JSC@@AAEXXZ
     ?from@Identifier@JSC@@SA?AV12@PAVExecState@2@H@Z
     ?from@Identifier@JSC@@SA?AV12@PAVExecState@2@I@Z
-    ?fromUTF8WithLatin1Fallback@String@WTF@@SA?AV12@PBEI@Z
     ?functionGetter@PropertySlot@JSC@@ABE?AVJSValue@2@PAVExecState@2@@Z
     ?get@Structure@JSC@@QAEHAAVJSGlobalData@2@VPropertyName@2@AAIAAPAVJSCell@2@@Z
     ?getCalculatedDisplayName@JSC@@YA?AVString@WTF@@PAVExecState@1@PAVJSObject@1@@Z
@@ -439,7 +434,6 @@
     ?unlockAtomicallyInitializedStaticMutex@WTF@@YAXXZ
     ?unprotect@Heap@JSC@@QAE_NVJSValue@2@@Z
     ?updateIndexingType@ArrayAllocationProfile@JSC@@QAEXXZ
-    ?utf8@String@WTF@@QBE?AVCString@2@W4ConversionMode@12@@Z
     ?validate@SlotVisitor@JSC@@CAXPAVJSCell@2@@Z
     ?visitChildren@JSGlobalObject@JSC@@SAXPAVJSCell@2@AAVSlotVisitor@2@@Z
     ?visitChildren@JSObject@JSC@@SAXPAVJSCell@2@AAVSlotVisitor@2@@Z
@@ -464,5 +458,3 @@
     WTFReportError
     WTFReportFatalError
     WTFSetCrashHook
-    ??0WTFThreadData@WTF@@QAE@XZ
-    ??1WTFThreadData@WTF@@QAE@XZ

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/jsc/jsc.vcproj (148582 => 148583)


--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/jsc/jsc.vcproj	2013-04-17 00:09:49 UTC (rev 148582)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/jsc/jsc.vcproj	2013-04-17 00:21:19 UTC (rev 148583)
@@ -448,9 +448,25 @@
 	</References>
 	<Files>
 		<File
+			RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\AtomicString.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\jsc.cpp"
 			>
 		</File>
+		<File
+			RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\StringBuilder.cpp"
+			>
+		</File>
+		<File
+			RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\StringImpl.cpp"
+			>
+		</File>
+		<File
+			RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\WTFString.cpp"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExports.def.in (148582 => 148583)


--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExports.def.in	2013-04-17 00:09:49 UTC (rev 148582)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExports.def.in	2013-04-17 00:21:19 UTC (rev 148583)
@@ -27,8 +27,6 @@
     ??0SHA1@WTF@@QAE@XZ
     ??0SuperRegion@JSC@@QAE@XZ
     ??0SourceProvider@JSC@@QAE@ABVString@WTF@@ABVTextPosition@3@@Z
-    ??0String@WTF@@QAE@PBD@Z
-    ??0String@WTF@@QAE@PBDI@Z
     ??0StringObject@JSC@@IAE@AAVJSGlobalData@1@PAVStructure@1@@Z
     ??0StringPrintStream@WTF@@QAE@XZ
     ??0Structure@JSC@@AAE@AAVJSGlobalData@1@PAVJSGlobalObject@1@VJSValue@1@ABVTypeInfo@1@PBUClassInfo@1@EI@Z
@@ -54,7 +52,6 @@
     ??1SourceProvider@JSC@@UAE@XZ
     ??1SourceProviderCache@JSC@@QAE@XZ
     ??1StringPrintStream@WTF@@UAE@XZ
-    ??1StringImpl@WTF@@QAE@XZ
     ??1ThreadCondition@WTF@@QAE@XZ
     ??1WeakHandleOwner@JSC@@UAE@XZ
     ??1WTFThreadData@WTF@@QAE@XZ
@@ -230,11 +227,9 @@
     ?finishCreation@RegExpObject@JSC@@IAEXPAVJSGlobalObject@2@@Z
     ?finishCreation@StringObject@JSC@@IAEXAAVJSGlobalData@2@PAVJSString@2@@Z
     ?focus@Profile@JSC@@QAEXPBVProfileNode@2@@Z
-    ?format@String@WTF@@SA?AV12@PBDZZ
     ?freeFatEntrySlow@SymbolTableEntry@JSC@@AAEXXZ
     ?from@Identifier@JSC@@SA?AV12@PAVExecState@2@H@Z
     ?from@Identifier@JSC@@SA?AV12@PAVExecState@2@I@Z
-    ?fromUTF8WithLatin1Fallback@String@WTF@@SA?AV12@PBEI@Z
     ?functionGetter@PropertySlot@JSC@@ABE?AVJSValue@2@PAVExecState@2@@Z
     ?get@Structure@JSC@@QAEHAAVJSGlobalData@2@VPropertyName@2@AAIAAPAVJSCell@2@@Z
     ?getCalculatedDisplayName@JSC@@YA?AVString@WTF@@PAVExecState@1@PAVJSObject@1@@Z
@@ -438,7 +433,6 @@
     ?unlockAtomicallyInitializedStaticMutex@WTF@@YAXXZ
     ?unprotect@Heap@JSC@@QAE_NVJSValue@2@@Z
     ?updateIndexingType@ArrayAllocationProfile@JSC@@QAEXXZ
-    ?utf8@String@WTF@@QBE?AVCString@2@W4ConversionMode@12@@Z
     ?validate@SlotVisitor@JSC@@CAXPAVJSCell@2@@Z
     ?visitChildren@JSGlobalObject@JSC@@SAXPAVJSCell@2@AAVSlotVisitor@2@@Z
     ?visitChildren@JSObject@JSC@@SAXPAVJSCell@2@AAVSlotVisitor@2@@Z
@@ -463,5 +457,3 @@
     WTFReportError
     WTFReportFatalError
     WTFSetCrashHook
-    ??0WTFThreadData@WTF@@QAE@XZ
-    ??1WTFThreadData@WTF@@QAE@XZ

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jsc.vcxproj (148582 => 148583)


--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jsc.vcxproj	2013-04-17 00:09:49 UTC (rev 148582)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jsc.vcxproj	2013-04-17 00:21:19 UTC (rev 148583)
@@ -155,6 +155,10 @@
     <Link />
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\AtomicString.cpp" />
+    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\StringBuilder.cpp" />
+    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\StringImpl.cpp" />
+    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\WTFString.cpp" />
     <ClCompile Include="..\..\jsc.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -165,4 +169,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jsc.vcxproj.filters (148582 => 148583)


--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jsc.vcxproj.filters	2013-04-17 00:09:49 UTC (rev 148582)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jsc.vcxproj.filters	2013-04-17 00:21:19 UTC (rev 148583)
@@ -2,10 +2,27 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="..\..\jsc.cpp" />
+    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\AtomicString.cpp">
+      <Filter>wtf/text</Filter>
+    </ClCompile>
+    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\StringBuilder.cpp">
+      <Filter>wtf/text</Filter>
+    </ClCompile>
+    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\StringImpl.cpp">
+      <Filter>wtf/text</Filter>
+    </ClCompile>
+    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\WTFString.cpp">
+      <Filter>wtf/text</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="jscPostBuild.cmd" />
     <None Include="jscPreLink.cmd" />
     <None Include="jscPreBuild.cmd" />
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <Filter Include="wtf/text">
+      <UniqueIdentifier>{a8dbc12e-b03c-45f9-93d3-c74162c2c288}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
\ No newline at end of file

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to