Title: [146165] trunk/Source/WebCore
- Revision
- 146165
- Author
- bfulg...@webkit.org
- Date
- 2013-03-18 17:46:16 -0700 (Mon, 18 Mar 2013)
Log Message
[WinCairo] Unreviewed build correction.
The "ImageDecoder.h" file was improperly tagged as a source file to
build, causing a build failure on initial build attempts. Subsequent
or incremental builds would work.
* WebCore.vcxproj/WebCore.vcxproj: Exclude CG-specific font files.
Switch 'ImageDecoder.h' to proper source file type.
* WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (146164 => 146165)
--- trunk/Source/WebCore/ChangeLog 2013-03-19 00:44:57 UTC (rev 146164)
+++ trunk/Source/WebCore/ChangeLog 2013-03-19 00:46:16 UTC (rev 146165)
@@ -1,3 +1,15 @@
+2013-03-18 Brent Fulgham <bfulg...@webkit.org>
+
+ [WinCairo] Unreviewed build correction.
+
+ The "ImageDecoder.h" file was improperly tagged as a source file to
+ build, causing a build failure on initial build attempts. Subsequent
+ or incremental builds would work.
+
+ * WebCore.vcxproj/WebCore.vcxproj: Exclude CG-specific font files.
+ Switch 'ImageDecoder.h' to proper source file type.
+ * WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
+
2013-03-18 James Robinson <jam...@chromium.org>
[chromium] Remove unused type WebTransformationMatrix
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (146164 => 146165)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-03-19 00:44:57 UTC (rev 146164)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-03-19 00:46:16 UTC (rev 146165)
@@ -4289,8 +4289,14 @@
<ClCompile Include="..\platform\graphics\WOFFFileFormat.cpp" />
<ClCompile Include="..\platform\graphics\win\DIBPixelData.cpp" />
<ClCompile Include="..\platform\graphics\win\FontCacheWin.cpp" />
- <ClCompile Include="..\platform\graphics\win\FontCGWin.cpp" />
- <ClCompile Include="..\platform\graphics\win\FontCustomPlatformData.cpp" />
+ <ClCompile Include="..\platform\graphics\win\FontCGWin.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\platform\graphics\win\FontCustomPlatformData.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\platform\graphics\win\FontCustomPlatformDataCairo.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
@@ -12035,12 +12041,12 @@
<ClInclude Include="..\platform\graphics\WidthIterator.h" />
<ClInclude Include="..\platform\text\WritingMode.h" />
<ClInclude Include="..\platform\text\transcoder\FontTranscoder.h" />
- <ClCompile Include="..\platform\image-decoders\ImageDecoder.h">
+ <ClInclude Include="..\platform\image-decoders\ImageDecoder.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- </ClCompile>
+ </ClInclude>
<CustomBuildStep Include="..\platform\image-decoders\gif\GIFImageDecoder.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (146164 => 146165)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-03-19 00:44:57 UTC (rev 146164)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-03-19 00:46:16 UTC (rev 146165)
@@ -6862,9 +6862,6 @@
<ClCompile Include="..\platform\image-decoders\ImageDecoder.cpp">
<Filter>platform\image-decoders</Filter>
</ClCompile>
- <ClCompile Include="..\platform\image-decoders\ImageDecoder.h">
- <Filter>platform\image-decoders</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\CSSGrammar.h">
@@ -14399,6 +14396,9 @@
<ClInclude Include="..\rendering\HitTestLocation.h">
<Filter>rendering</Filter>
</ClInclude>
+ <ClInclude Include="..\platform\image-decoders\ImageDecoder.h">
+ <Filter>platform\image-decoders</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\css\CSSGrammar.y.in">
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
