Commit f491c1f8 authored by bfulgham@apple.com's avatar bfulgham@apple.com
Browse files

<https://webkit.org/b/120113> [Windows] Enable CSS_IMAGE_SET

Reviewed by Anders Carlsson.

We can now activate:
fast/css/image-set-parsing.html
fast/css/image-set-parsing-invalid.html

* WebCore.vcxproj/WebCore.vcxproj: Add missing image set implementation files.
* WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
* css/CSSAllInOne.cpp: Add missing CSSImageSetValue.cpp
* rendering/style/StyleAllInOne.cpp: Add missing StyeCachedImageSet.cpp



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154391 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent e6e15169
2013-08-21 Brent Fulgham <bfulgham@apple.com>
<https://webkit.org/b/120113> [Windows] Enable CSS_IMAGE_SET
Reviewed by Anders Carlsson.
We can now activate:
fast/css/image-set-parsing.html
fast/css/image-set-parsing-invalid.html
* WebCore.vcxproj/WebCore.vcxproj: Add missing image set implementation files.
* WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
* css/CSSAllInOne.cpp: Add missing CSSImageSetValue.cpp
* rendering/style/StyleAllInOne.cpp: Add missing StyeCachedImageSet.cpp
2013-08-21 Robert Hogan <robert@webkit.org>
 
In RenderTableCell::paintCollapsedBorders() check surrounding cells using physical rather than logical direction
......@@ -663,6 +663,14 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\bindings\js\JSWebGLRenderingContextCustom.cpp" />
<ClCompile Include="..\css\CSSImageSetValue.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\DerivedSources.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</PrecompiledHeader>
......@@ -7542,6 +7550,14 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\rendering\style\StyleCachedImageSet.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\storage\StorageStrategy.cpp" />
<ClCompile Include="..\svg\graphics\SVGImageForContainer.cpp" />
<ClCompile Include="..\WebCorePrefix.cpp">
......@@ -13378,18 +13394,18 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\dom\TextNodeTraversal.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="..\dom\TransformSourceLibxslt.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
......@@ -18719,6 +18735,7 @@
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLUniformLocation.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLVertexArrayObjectOES.h" />
<ClInclude Include="..\accessibility\AccessibilityNodeObject.h" />
<ClInclude Include="..\css\CSSImageSetValue.h" />
<ClInclude Include="..\ForwardingHeaders\heap\AllocationSpace.h" />
<ClInclude Include="..\ForwardingHeaders\heap\Heap.h" />
<ClInclude Include="..\ForwardingHeaders\heap\SlotVisitor.h" />
......@@ -19315,6 +19332,7 @@
<ClInclude Include="..\platform\win\WebCoreBundleWin.h" />
<ClInclude Include="..\platform\win\WebCoreInstanceHandle.h" />
<ClInclude Include="..\rendering\HitTestLocation.h" />
<ClInclude Include="..\rendering\style\StyleCachedImageSet.h" />
<ClInclude Include="..\storage\StorageStrategy.h" />
<ClInclude Include="..\svg\graphics\SVGImageForContainer.h" />
<ClInclude Include="..\WebCorePrefix.h" />
......@@ -21374,4 +21392,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
</Project>
</Project>
\ No newline at end of file
......@@ -3474,9 +3474,6 @@
<ClCompile Include="..\dom\StyledElement.cpp">
<Filter>dom</Filter>
</ClCompile>
<ClCompile Include="..\dom\StyleElement.cpp">
<Filter>dom</Filter>
</ClCompile>
<ClCompile Include="..\dom\TagNodeList.cpp">
<Filter>dom</Filter>
</ClCompile>
......@@ -7064,6 +7061,15 @@
<ClCompile Include="..\platform\win\WebCoreBundleWin.cpp">
<Filter>platform\win</Filter>
</ClCompile>
<ClCompile Include="..\dom\ElementData.cpp" />
<ClCompile Include="..\dom\InlineStyleSheetOwner.cpp" />
<ClCompile Include="..\dom\TextNodeTraversal.cpp" />
<ClCompile Include="..\css\CSSImageSetValue.cpp">
<Filter>css</Filter>
</ClCompile>
<ClCompile Include="..\rendering\style\StyleCachedImageSet.cpp">
<Filter>rendering\style</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Modules\filesystem\AsyncFileWriter.h">
......@@ -10543,9 +10549,6 @@
<ClInclude Include="..\dom\StyledElement.h">
<Filter>dom</Filter>
</ClInclude>
<ClInclude Include="..\dom\StyleElement.h">
<Filter>dom</Filter>
</ClInclude>
<ClInclude Include="..\dom\TagNodeList.h">
<Filter>dom</Filter>
</ClInclude>
......@@ -14817,6 +14820,15 @@
<ClInclude Include="..\platform\graphics\ca\PlatformCAFilters.h">
<Filter>platform\graphics\ca</Filter>
</ClInclude>
<ClInclude Include="..\dom\ElementData.h" />
<ClInclude Include="..\dom\InlineStyleSheetOwner.h" />
<ClInclude Include="..\dom\TextNodeTraversal.h" />
<ClInclude Include="..\css\CSSImageSetValue.h">
<Filter>css</Filter>
</ClInclude>
<ClInclude Include="..\rendering\style\StyleCachedImageSet.h">
<Filter>rendering\style</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\css\CSSGrammar.y.in">
......
/*
* Copyright (C) 2011 Apple Inc. All rights reserved.
* Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
......@@ -46,6 +46,7 @@
#include "CSSGroupingRule.cpp"
#include "CSSHostRule.cpp"
#include "CSSImageGeneratorValue.cpp"
#include "CSSImageSetValue.cpp"
#include "CSSImageValue.cpp"
#include "CSSImportRule.cpp"
#include "CSSInheritedValue.cpp"
......
......@@ -38,6 +38,7 @@
#include "StyleBackgroundData.cpp"
#include "StyleBoxData.cpp"
#include "StyleCachedImage.cpp"
#include "StyleCachedImageSet.cpp"
#include "StyleDeprecatedFlexibleBoxData.cpp"
#include "StyleFilterData.cpp"
#include "StyleFlexibleBoxData.cpp"
......
Supports Markdown
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