Skip to site navigation (Press enter)

[webkit-changes] [158769] branches/safari-537.73-branch/Source/WebCore

lforschler Wed, 06 Nov 2013 12:20:45 -0800

Title: [158769] branches/safari-537.73-branch/Source/WebCore

Revision: 158769
Author: [email protected]
Date: 2013-11-06 12:22:13 -0800 (Wed, 06 Nov 2013)

Log Message

Merged r155997.  <rdar://problem/15390971>


Modified Paths

branches/safari-537.73-branch/Source/WebCore/ChangeLog
branches/safari-537.73-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
branches/safari-537.73-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
branches/safari-537.73-branch/Source/WebCore/css/CSSAllInOne.cpp
branches/safari-537.73-branch/Source/WebCore/rendering/style/StyleAllInOne.cpp

Diff

Modified: branches/safari-537.73-branch/Source/WebCore/ChangeLog (158768 => 158769)


--- branches/safari-537.73-branch/Source/WebCore/ChangeLog	2013-11-06 20:20:57 UTC (rev 158768)
+++ branches/safari-537.73-branch/Source/WebCore/ChangeLog	2013-11-06 20:22:13 UTC (rev 158769)
@@ -1,3 +1,22 @@
+2013-11-06  Lucas Forschler  <[email protected]>
+
+        Merge r154391
+
+    2013-08-21  Brent Fulgham  <[email protected]>
+
+            <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-11-04  Lucas Forschler  <[email protected]>
 
         Merge r155130

Modified: branches/safari-537.73-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (158768 => 158769)


--- branches/safari-537.73-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj	2013-11-06 20:20:57 UTC (rev 158768)
+++ branches/safari-537.73-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj	2013-11-06 20:22:13 UTC (rev 158769)
@@ -151,6 +151,14 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
+    <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>
@@ -4213,6 +4221,14 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">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">
@@ -11079,6 +11095,7 @@
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\XMLViewerJS.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\XPathGrammar.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" />
@@ -11611,6 +11628,7 @@
     <ClInclude Include="..\platform\win\WCDataObject.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" />

Modified: branches/safari-537.73-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (158768 => 158769)


--- branches/safari-537.73-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters	2013-11-06 20:20:57 UTC (rev 158768)
+++ branches/safari-537.73-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters	2013-11-06 20:22:13 UTC (rev 158769)
@@ -3471,9 +3471,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>
@@ -6802,6 +6799,15 @@
     <ClCompile Include="..\platform\win\StructuredExceptionHandlerSuppressor.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">
@@ -10287,9 +10293,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>
@@ -14279,6 +14282,15 @@
     <ClInclude Include="..\platform\graphics\avfoundation\cf\InbandTextTrackPrivateLegacyAVCF.h">
       <Filter>platform\graphics\avfoundation\cf</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">

Modified: branches/safari-537.73-branch/Source/WebCore/css/CSSAllInOne.cpp (158768 => 158769)


--- branches/safari-537.73-branch/Source/WebCore/css/CSSAllInOne.cpp	2013-11-06 20:20:57 UTC (rev 158768)
+++ branches/safari-537.73-branch/Source/WebCore/css/CSSAllInOne.cpp	2013-11-06 20:22:13 UTC (rev 158769)
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -45,6 +45,7 @@
 #include "CSSGroupingRule.cpp"
 #include "CSSHostRule.cpp"
 #include "CSSImageGeneratorValue.cpp"
+#include "CSSImageSetValue.cpp"
 #include "CSSImageValue.cpp"
 #include "CSSImportRule.cpp"
 #include "CSSInheritedValue.cpp"

Modified: branches/safari-537.73-branch/Source/WebCore/rendering/style/StyleAllInOne.cpp (158768 => 158769)


--- branches/safari-537.73-branch/Source/WebCore/rendering/style/StyleAllInOne.cpp	2013-11-06 20:20:57 UTC (rev 158768)
+++ branches/safari-537.73-branch/Source/WebCore/rendering/style/StyleAllInOne.cpp	2013-11-06 20:22:13 UTC (rev 158769)
@@ -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"

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes