Commit 5b568441 authored by bfulgham@apple.com's avatar bfulgham@apple.com

[Windows] Build fix after r156622. Build RenderLayerModelObject.cpp in a separate compilation unit

from the RenderLayerAllnOne file so that the scalar and vector destructors are visible to other
elements of WebCore during the build.

* WebCore.vcxproj/WebCore.vcxproj: Compile RenderLayerModelObject outside of the all-in-one file.
* WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
* rendering/RenderingAllInOne.cpp: Remove RenderLayerModelObject.cpp.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156669 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 8662c390
2013-09-30 Brent Fulgham <bfulgham@apple.com>
[Windows] Build fix after r156622. Build RenderLayerModelObject.cpp in a separate compilation unit
from the RenderLayerAllnOne file so that the scalar and vector destructors are visible to other
elements of WebCore during the build.
* WebCore.vcxproj/WebCore.vcxproj: Compile RenderLayerModelObject outside of the all-in-one file.
* WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
* rendering/RenderingAllInOne.cpp: Remove RenderLayerModelObject.cpp.
2013-09-30 Mark Rowe <mrowe@apple.com>
Fix the build when building against an SDK.
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="DebugSuffix|Win32">
......@@ -9832,18 +9832,18 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\rendering\RenderElement.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\rendering\RenderEmbeddedObject.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
......@@ -10050,17 +10050,11 @@
</ClCompile>
<ClCompile Include="..\rendering\RenderLayerFilterInfo.cpp" />
<ClCompile Include="..\rendering\RenderLayerModelObject.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\rendering\RenderLineBoxList.cpp">
......@@ -21201,4 +21195,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
</Project>
</Project>
\ No newline at end of file
......@@ -390,21 +390,12 @@
<ClCompile Include="..\Modules\indexeddb\IDBCursor.cpp">
<Filter>Modules\indexeddb</Filter>
</ClCompile>
<ClCompile Include="..\Modules\indexeddb\IDBCursorBackendImpl.cpp">
<Filter>Modules\indexeddb</Filter>
</ClCompile>
<ClCompile Include="..\Modules\indexeddb\IDBDatabase.cpp">
<Filter>Modules\indexeddb</Filter>
</ClCompile>
<ClCompile Include="..\Modules\indexeddb\IDBDatabaseBackendImpl.cpp">
<Filter>Modules\indexeddb</Filter>
</ClCompile>
<ClCompile Include="..\Modules\indexeddb\IDBFactory.cpp">
<Filter>Modules\indexeddb</Filter>
</ClCompile>
<ClCompile Include="..\Modules\indexeddb\IDBFactoryBackendImpl.cpp">
<Filter>Modules\indexeddb</Filter>
</ClCompile>
<ClCompile Include="..\Modules\indexeddb\IDBFactoryBackendInterface.cpp">
<Filter>Modules\indexeddb</Filter>
</ClCompile>
......@@ -420,9 +411,6 @@
<ClCompile Include="..\Modules\indexeddb\IDBObjectStore.cpp">
<Filter>Modules\indexeddb</Filter>
</ClCompile>
<ClCompile Include="..\Modules\indexeddb\IDBObjectStoreBackendImpl.cpp">
<Filter>Modules\indexeddb</Filter>
</ClCompile>
<ClCompile Include="..\Modules\indexeddb\IDBRequest.cpp">
<Filter>Modules\indexeddb</Filter>
</ClCompile>
......@@ -450,9 +438,6 @@
<ClCompile Include="..\Modules\quota\StorageInfo.cpp">
<Filter>Modules\quota</Filter>
</ClCompile>
<ClCompile Include="..\Modules\mediacontrols\MediaControlsHost.cpp">
<Filter>Modules\mediacontrols</Filter>
</ClCompile>
<ClCompile Include="..\Modules\mediasource\MediaSource.cpp">
<Filter>Modules\mediasource</Filter>
</ClCompile>
......@@ -2109,9 +2094,6 @@
<ClCompile Include="..\platform\text\win\TextBreakIteratorInternalICUWin.cpp">
<Filter>platform\text\win</Filter>
</ClCompile>
<ClCompile Include="..\platform\text\transcoder\FontTranscoder.cpp">
<Filter>platform\text\transcoder</Filter>
</ClCompile>
<ClCompile Include="..\platform\image-decoders\cairo\ImageDecoderCairo.cpp">
<Filter>platform\image-decoders\cairo</Filter>
</ClCompile>
......@@ -2511,9 +2493,6 @@
<ClCompile Include="..\rendering\RenderBoxModelObject.cpp">
<Filter>rendering</Filter>
</ClCompile>
<ClCompile Include="..\rendering\RenderBR.cpp">
<Filter>rendering</Filter>
</ClCompile>
<ClCompile Include="..\rendering\RenderButton.cpp">
<Filter>rendering</Filter>
</ClCompile>
......@@ -2643,9 +2622,6 @@
<ClCompile Include="..\rendering\RenderObject.cpp">
<Filter>rendering</Filter>
</ClCompile>
<ClCompile Include="..\rendering\RenderObjectChildList.cpp">
<Filter>rendering</Filter>
</ClCompile>
<ClCompile Include="..\rendering\RenderProgress.cpp">
<Filter>rendering</Filter>
</ClCompile>
......@@ -2814,9 +2790,6 @@
<ClCompile Include="..\rendering\RenderWidget.cpp">
<Filter>rendering</Filter>
</ClCompile>
<ClCompile Include="..\rendering\RenderWordBreak.cpp">
<Filter>rendering</Filter>
</ClCompile>
<ClCompile Include="..\rendering\RootInlineBox.cpp">
<Filter>rendering</Filter>
</ClCompile>
......@@ -4290,9 +4263,6 @@
<ClCompile Include="..\html\shadow\DetailsMarkerControl.cpp">
<Filter>html\shadow</Filter>
</ClCompile>
<ClCompile Include="..\html\shadow\HTMLContentElement.cpp">
<Filter>html\shadow</Filter>
</ClCompile>
<ClCompile Include="..\html\shadow\InsertionPoint.cpp">
<Filter>html\shadow</Filter>
</ClCompile>
......@@ -5737,9 +5707,6 @@
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLCollection.cpp">
<Filter>DerivedSources</Filter>
</ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLContentElement.cpp">
<Filter>DerivedSources</Filter>
</ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLDataListElement.cpp">
<Filter>DerivedSources</Filter>
</ClCompile>
......@@ -5980,7 +5947,7 @@
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSMediaControlsHost.cpp">
<Filter>DerivedSources</Filter>
</ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSMediaError.cpp">
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSMediaError.cpp">
<Filter>DerivedSources</Filter>
</ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSMediaList.cpp">
......@@ -7054,6 +7021,15 @@
</ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSBeforeUnloadEvent.cpp" />
<ClCompile Include="..\rendering\FloatingObjects.cpp" />
<ClCompile Include="..\Modules\indexeddb\leveldb\IDBCursorBackendLevelDB.cpp" />
<ClCompile Include="..\Modules\indexeddb\leveldb\IDBDatabaseBackendLevelDB.cpp" />
<ClCompile Include="..\Modules\indexeddb\leveldb\IDBFactoryBackendLevelDB.cpp" />
<ClCompile Include="..\Modules\indexeddb\leveldb\IDBObjectStoreBackendLevelDB.cpp" />
<ClCompile Include="..\platform\graphics\FloatPolygon.cpp" />
<ClCompile Include="..\rendering\LineWidth.cpp" />
<ClCompile Include="..\rendering\RenderLineBreak.cpp" />
<ClCompile Include="..\rendering\RenderElement.cpp" />
<ClCompile Include="..\rendering\shapes\ShapeInfo.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Modules\filesystem\AsyncFileWriter.h">
......@@ -9045,9 +9021,6 @@
<ClInclude Include="..\platform\text\WritingMode.h">
<Filter>platform\text</Filter>
</ClInclude>
<ClInclude Include="..\platform\text\transcoder\FontTranscoder.h">
<Filter>platform\text\transcoder</Filter>
</ClInclude>
<ClInclude Include="..\platform\animation\Animation.h">
<Filter>platform\animation</Filter>
</ClInclude>
......@@ -9462,9 +9435,6 @@
<ClInclude Include="..\rendering\RenderBoxModelObject.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\rendering\RenderBR.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\rendering\RenderButton.h">
<Filter>rendering</Filter>
</ClInclude>
......@@ -9585,9 +9555,6 @@
<ClInclude Include="..\rendering\RenderObject.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\rendering\RenderObjectChildList.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\rendering\RenderProgress.h">
<Filter>rendering</Filter>
</ClInclude>
......@@ -9750,9 +9717,6 @@
<ClInclude Include="..\rendering\RenderWidget.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\rendering\RenderWordBreak.h">
<Filter>rendering</Filter>
</ClInclude>
<ClInclude Include="..\rendering\RootInlineBox.h">
<Filter>rendering</Filter>
</ClInclude>
......@@ -11424,9 +11388,6 @@
<ClInclude Include="..\html\shadow\DetailsMarkerControl.h">
<Filter>html\shadow</Filter>
</ClInclude>
<ClInclude Include="..\html\shadow\HTMLContentElement.h">
<Filter>html\shadow</Filter>
</ClInclude>
<ClInclude Include="..\html\shadow\InsertionPoint.h">
<Filter>html\shadow</Filter>
</ClInclude>
......@@ -13511,9 +13472,6 @@
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLCollection.h">
<Filter>DerivedSources</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLContentElement.h">
<Filter>DerivedSources</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLDataListElement.h">
<Filter>DerivedSources</Filter>
</ClInclude>
......@@ -14847,6 +14805,14 @@
<ClInclude Include="..\platform\graphics\win\SharedGDIObject.h">
<Filter>platform\graphics\win</Filter>
</ClInclude>
<ClInclude Include="..\Modules\mediacontrols\MediaControlsHost.cpp" />
<ClInclude Include="..\platform\graphics\FloatPolygon.h" />
<ClInclude Include="..\rendering\LineInfo.h" />
<ClInclude Include="..\rendering\LineLayoutState.h" />
<ClInclude Include="..\rendering\LineWidth.h" />
<ClInclude Include="..\rendering\RenderElement.h" />
<ClInclude Include="..\rendering\RenderLineBreak.h" />
<ClInclude Include="..\rendering\shapes\ShapeInfo.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\css\CSSGrammar.y.in">
......@@ -14864,9 +14830,6 @@
<None Include="..\css\fullscreen.css">
<Filter>css</Filter>
</None>
<None Include="..\css\fullscreenQuickTime.css">
<Filter>css</Filter>
</None>
<None Include="..\css\html.css">
<Filter>css</Filter>
</None>
......@@ -15685,9 +15648,6 @@
<None Include="..\css\view-source.css">
<Filter>css</Filter>
</None>
<None Include="..\css\mediaControlsQuickTime.css">
<Filter>css</Filter>
</None>
<None Include="..\css\svg.css">
<Filter>css</Filter>
</None>
......@@ -15822,4 +15782,4 @@
<Filter>platform\win</Filter>
</MASM>
</ItemGroup>
</Project>
</Project>
\ No newline at end of file
......@@ -68,7 +68,6 @@
#include "RenderInline.cpp"
#include "RenderLayer.cpp"
#include "RenderLayerCompositor.cpp"
#include "RenderLayerModelObject.cpp"
#include "RenderLineBoxList.cpp"
#include "RenderLineBreak.cpp"
#include "RenderListBox.cpp"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment