Unreviewed, rolling out r148576.
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Apr 2013 00:21:19 +0000 (00:21 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Apr 2013 00:21:19 +0000 (00:21 +0000)
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).

* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreExports.def:
* JavaScriptCore.vcproj/jsc/jsc.vcproj:
* JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExports.def.in:
* JavaScriptCore.vcxproj/jsc/jsc.vcxproj:
* JavaScriptCore.vcxproj/jsc/jsc.vcxproj.filters:

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

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreExports.def
Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExports.def.in
Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj
Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj.filters

index 2fa14ab692760041a01af39e404ffae2dec8344c..00454d940a939626b0819f6b12af9992d29fe578 100644 (file)
@@ -1,3 +1,18 @@
+2013-04-16  Commit Queue  <rniwa@webkit.org>
+
+        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).
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreExports.def:
+        * JavaScriptCore.vcproj/jsc/jsc.vcproj:
+        * JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExports.def.in:
+        * JavaScriptCore.vcxproj/jsc/jsc.vcxproj:
+        * JavaScriptCore.vcxproj/jsc/jsc.vcxproj.filters:
+
 2013-04-16  Brent Fulgham  <bfulgham@webkit.org>
 
         [Windows, WinCairo] Stop individually building WTF files in JSC.
index c7345cd6daae17c94551d0172314c03e23251da2..8c98ea1aa58ddcb11ec763c6d424fa1294f0e1d3 100644 (file)
@@ -27,8 +27,6 @@ EXPORTS
     ??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 @@ EXPORTS
     ??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 @@ EXPORTS
     ?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 @@ EXPORTS
     ?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 @@ EXPORTS
     ?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 @@ EXPORTS
     WTFReportError
     WTFReportFatalError
     WTFSetCrashHook
-    ??0WTFThreadData@WTF@@QAE@XZ
-    ??1WTFThreadData@WTF@@QAE@XZ
index 72e1209368dcd435085bb7fb69b5bed8789533e1..9e04fee9cfd5531067bb74c74588480227262125 100644 (file)
        <References>
        </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>
index ae644346903d916558f9925e7b31be3e7039df83..bf5ba16df8370de3b40466e38063e6c3be838a6d 100644 (file)
@@ -27,8 +27,6 @@ EXPORTS
     ??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 @@ EXPORTS
     ??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 @@ EXPORTS
     ?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 @@ EXPORTS
     ?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 @@ EXPORTS
     WTFReportError
     WTFReportFatalError
     WTFSetCrashHook
-    ??0WTFThreadData@WTF@@QAE@XZ
-    ??1WTFThreadData@WTF@@QAE@XZ
index 193a8046e60fad43680f869130ba900a2f43cbd5..9143a5e2affcb8397a659531340b8c0a116c7b1a 100644 (file)
     <Link />\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
+    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\AtomicString.cpp" />\r
+    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\StringBuilder.cpp" />\r
+    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\StringImpl.cpp" />\r
+    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\WTFString.cpp" />\r
     <ClCompile Include="..\..\jsc.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>\r
+</Project>
\ No newline at end of file
index e7fc692f023f43ba260c9460b0a1c310c96f214b..4c8d8154f6c400bbb3d3570a19d818e41f00db1b 100644 (file)
@@ -2,10 +2,27 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup>\r
     <ClCompile Include="..\..\jsc.cpp" />\r
+    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\AtomicString.cpp">\r
+      <Filter>wtf/text</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\StringBuilder.cpp">\r
+      <Filter>wtf/text</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\StringImpl.cpp">\r
+      <Filter>wtf/text</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\WTFString.cpp">\r
+      <Filter>wtf/text</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="jscPostBuild.cmd" />\r
     <None Include="jscPreLink.cmd" />\r
     <None Include="jscPreBuild.cmd" />\r
   </ItemGroup>\r
-</Project>\r
+  <ItemGroup>\r
+    <Filter Include="wtf/text">\r
+      <UniqueIdentifier>{a8dbc12e-b03c-45f9-93d3-c74162c2c288}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file