Title: [170698] trunk/Source
- Revision
- 170698
- Author
- achristen...@apple.com
- Date
- 2014-07-01 22:57:33 -0700 (Tue, 01 Jul 2014)
Log Message
[Win64] Unreviewed build fix.
Source/WebCore:
* WebCore.vcxproj/WebCore.vcxproj:
Exclude CA files from 32 and 64 bit WinCairo builds.
* WebCore.vcxproj/WebCoreTestSupport.vcxproj:
Don't use a precompiled header in 32 or 63 bit builds of MockCDM.cpp.
Source/WebKit:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
Corrected 64-bit linker symbols.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (170697 => 170698)
--- trunk/Source/WebCore/ChangeLog 2014-07-02 04:49:39 UTC (rev 170697)
+++ trunk/Source/WebCore/ChangeLog 2014-07-02 05:57:33 UTC (rev 170698)
@@ -1,5 +1,14 @@
2014-07-01 Alex Christensen <achristen...@webkit.org>
+ [Win64] Unreviewed build fix.
+
+ * WebCore.vcxproj/WebCore.vcxproj:
+ Exclude CA files from 32 and 64 bit WinCairo builds.
+ * WebCore.vcxproj/WebCoreTestSupport.vcxproj:
+ Don't use a precompiled header in 32 or 63 bit builds of MockCDM.cpp.
+
+2014-07-01 Alex Christensen <achristen...@webkit.org>
+
Reduce dynamic memory allocation in css jit.
https://bugs.webkit.org/show_bug.cgi?id=134416
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (170697 => 170698)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-07-02 04:49:39 UTC (rev 170697)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-07-02 05:57:33 UTC (rev 170698)
@@ -7356,7 +7356,12 @@
<ClCompile Include="..\platform\graphics\avfoundation\cf\InbandTextTrackPrivateAVCF.cpp" />
<ClCompile Include="..\platform\graphics\avfoundation\cf\InbandTextTrackPrivateLegacyAVCF.cpp" />
<ClCompile Include="..\platform\graphics\avfoundation\InbandTextTrackPrivateAVF.cpp" />
- <ClCompile Include="..\platform\graphics\ca\LayerPool.cpp" />
+ <ClCompile Include="..\platform\graphics\ca\LayerPool.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\platform\graphics\ca\PlatformCALayer.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
@@ -7365,15 +7370,21 @@
</ClCompile>
<ClCompile Include="..\platform\graphics\ca\TileController.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\platform\graphics\ca\TileCoverageMap.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\platform\graphics\ca\TileGrid.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\platform\graphics\GLContext.cpp" />
<ClCompile Include="..\platform\graphics\cairo\GraphicsContext3DCairo.cpp">
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj (170697 => 170698)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj 2014-07-02 04:49:39 UTC (rev 170697)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj 2014-07-02 05:57:33 UTC (rev 170698)
@@ -832,11 +832,17 @@
</ClCompile>
<ClCompile Include="..\testing\MockCDM.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Production|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
Modified: trunk/Source/WebKit/ChangeLog (170697 => 170698)
--- trunk/Source/WebKit/ChangeLog 2014-07-02 04:49:39 UTC (rev 170697)
+++ trunk/Source/WebKit/ChangeLog 2014-07-02 05:57:33 UTC (rev 170698)
@@ -1,3 +1,10 @@
+2014-07-01 Alex Christensen <achristen...@webkit.org>
+
+ [Win64] Unreviewed build fix.
+
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
+ Corrected 64-bit linker symbols.
+
2014-06-27 Brent Fulgham <bfulg...@apple.com>
[Win] Implement parts of the AVFOUNDATION_LOADER_DELEGATE logic for Windows
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (170697 => 170698)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-07-02 04:49:39 UTC (rev 170697)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-07-02 05:57:33 UTC (rev 170698)
@@ -179,7 +179,7 @@
symbolWithPointer(?create@SerializedScriptValue@WebCore@@SA?AV?$PassRefPtr@VSerializedScriptValue@WebCore@@@WTF@@ABVString@4@@Z, ?create@SerializedScriptValue@WebCore@@SA?AV?$PassRefPtr@VSerializedScriptValue@WebCore@@@WTF@@AEBVString@4@@Z)
#if USE(CF)
symbolWithPointer(?createCFString@String@WTF@@QBE?AV?$RetainPtr@PBU__CFString@@@2@XZ, ?createCFString@String@WTF@@QEBA?AV?$RetainPtr@PEBU__CFString@@@2@XZ)
- symbolWithPointer(?dictionary@CFDictionaryPropertyBag@@QBEPAU__CFDictionary@@XZ, )
+ symbolWithPointer(?dictionary@CFDictionaryPropertyBag@@QBEPAU__CFDictionary@@XZ, ?dictionary@CFDictionaryPropertyBag@@QEBAPEAU__CFDictionary@@XZ)
#endif
symbolWithPointer(?createShadowRoot@Element@WebCore@@QAE?AV?$PassRefPtr@VShadowRoot@WebCore@@@WTF@@AAH@Z, ?createShadowRoot@Element@WebCore@@QEAA?AV?$PassRefPtr@VShadowRoot@WebCore@@@WTF@@AEAH@Z)
symbolWithPointer(?createWrapper@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNode@1@@Z, ?createWrapper@WebCore@@YA?AVJSValue@JSC@@PEAVExecState@3@PEAVJSDOMGlobalObject@1@PEAVNode@1@@Z)
@@ -211,7 +211,7 @@
?selectTag@HTMLNames@WebCore@@3VHTMLQualifiedName@2@B
#if ENABLE(INSPECTOR)
symbolWithPointer(?buildObjectForHighlightedNode@InspectorController@WebCore@@QBE?AV?$PassRefPtr@VInspectorObject@Inspector@@@WTF@@XZ, ?buildObjectForHighlightedNode@InspectorController@WebCore@@QEBA?AV?$PassRefPtr@VInspectorObject@Inspector@@@WTF@@XZ)
- symbolWithPointer(?getHighlight@InspectorController@WebCore@@QBEXPAUHighlight@2@W4CoordinateSystem@InspectorOverlay@2@@Z, ?getHighlight@InspectorController@WebCore@@QBEXPAUHighlight@2@W4CoordinateSystem@InspectorOverlay@2@@Z)
+ symbolWithPointer(?getHighlight@InspectorController@WebCore@@QBEXPAUHighlight@2@W4CoordinateSystem@InspectorOverlay@2@@Z, ?getHighlight@InspectorController@WebCore@@QEBAXPEAUHighlight@2@W4CoordinateSystem@InspectorOverlay@2@@Z)
symbolWithPointer(?instrumentingAgentsForPage@InspectorInstrumentation@WebCore@@CAPAVInstrumentingAgents@2@PAVPage@2@@Z, ?instrumentingAgentsForPage@InspectorInstrumentation@WebCore@@CAPEAVInstrumentingAgents@2@PEAVPage@2@@Z)
?s_frontendCounter@InspectorInstrumentation@WebCore@@0HA
symbolWithPointer(?isUnderTest@InspectorFrontendClientLocal@WebCore@@UAE_NXZ, ?isUnderTest@InspectorFrontendClientLocal@WebCore@@UEAA_NXZ)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
