Title: [106593] trunk
Revision
106593
Author
[email protected]
Date
2012-02-02 14:50:42 -0800 (Thu, 02 Feb 2012)

Log Message

Turn on CSS Filters on Windows
https://bugs.webkit.org/show_bug.cgi?id=76667

Source/WebCore:

Turning on CSS_FILTERS flag for Windows and fixed a couple of resultant build errors

Patch by Chris Marrin <[email protected]> on 2012-02-02
Reviewed by Adele Peterson.

* WebCore.vcproj/copyForwardingHeaders.cmd:
* platform/graphics/ca/win/PlatformCALayerWin.cpp:
(PlatformCALayer::setFilters):
(PlatformCALayer::filtersCanBeComposited):

WebKitLibraries:

Turned on CSS_FILTERS for Windows

Patch by Chris Marrin <[email protected]> on 2012-02-02
Reviewed by Adele Peterson.

* win/tools/vsprops/FeatureDefines.vsprops:

LayoutTests:

Skipped filter test files not supported on Windows

Patch by Chris Marrin <[email protected]> on 2012-02-02
Reviewed by Adele Peterson.

* platform/win/Skipped:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (106592 => 106593)


--- trunk/LayoutTests/ChangeLog	2012-02-02 22:16:14 UTC (rev 106592)
+++ trunk/LayoutTests/ChangeLog	2012-02-02 22:50:42 UTC (rev 106593)
@@ -1,3 +1,14 @@
+2012-02-02  Chris Marrin  <[email protected]>
+
+        Turn on CSS Filters on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=76667
+
+        Skipped filter test files not supported on Windows
+
+        Reviewed by Adele Peterson.
+
+        * platform/win/Skipped:
+
 2012-02-02  Oliver Hunt  <[email protected]>
 
         Getters and setters cause line numbers in errors/console.log to be offset for the whole file

Modified: trunk/LayoutTests/platform/win/Skipped (106592 => 106593)


--- trunk/LayoutTests/platform/win/Skipped	2012-02-02 22:16:14 UTC (rev 106592)
+++ trunk/LayoutTests/platform/win/Skipped	2012-02-02 22:50:42 UTC (rev 106593)
@@ -37,6 +37,15 @@
 css3/filters/effect-saturate-hw.html
 css3/filters/effect-sepia-hw.html
 
+# Custom filters not yet supported on Windows
+css3/filters/custom-filter-property-computed-style.html
+css3/filters/custom-filter-property-parsing.html
+css3/filters/custom-filter-property-parsing-invalid.html
+css3/filters/custom-filter-shader-cache.html
+
+# https://bugs.webkit.org/show_bug.cgi?id=77645
+css3/filters/filtered-compositing-descendant.html
+
 # Should be moved to platform/mac <rdar://5621425>
 http/tests/misc/willCacheResponse-delegate-callback.html
 

Modified: trunk/Source/WebCore/ChangeLog (106592 => 106593)


--- trunk/Source/WebCore/ChangeLog	2012-02-02 22:16:14 UTC (rev 106592)
+++ trunk/Source/WebCore/ChangeLog	2012-02-02 22:50:42 UTC (rev 106593)
@@ -1,3 +1,17 @@
+2012-02-02  Chris Marrin  <[email protected]>
+
+        Turn on CSS Filters on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=76667
+
+        Turning on CSS_FILTERS flag for Windows and fixed a couple of resultant build errors
+
+        Reviewed by Adele Peterson.
+
+        * WebCore.vcproj/copyForwardingHeaders.cmd:
+        * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+        (PlatformCALayer::setFilters):
+        (PlatformCALayer::filtersCanBeComposited):
+
 2012-02-02  Jon Lee  <[email protected]>
 
         Clear shown notifications when context is no longer active

Modified: trunk/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd (106592 => 106593)


--- trunk/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd	2012-02-02 22:16:14 UTC (rev 106592)
+++ trunk/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd	2012-02-02 22:50:42 UTC (rev 106593)
@@ -40,6 +40,7 @@
 xcopy /y /d "%ProjectDir%..\platform\cf\win\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\platform\graphics\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\platform\graphics\%1\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
+xcopy /y /d "%ProjectDir%..\platform\graphics\filters\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\platform\graphics\transforms\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\platform\graphics\ca\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\platform\graphics\ca\win\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"

Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (106592 => 106593)


--- trunk/Source/WebCore/css/CSSPropertyNames.in	2012-02-02 22:16:14 UTC (rev 106592)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in	2012-02-02 22:50:42 UTC (rev 106593)
@@ -375,4 +375,4 @@
 #if defined(ENABLE_CSS_GRID_LAYOUT) && ENABLE_CSS_GRID_LAYOUT
 -webkit-grid-columns
 -webkit-grid-rows
-#endif
+#endif
\ No newline at end of file

Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (106592 => 106593)


--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp	2012-02-02 22:16:14 UTC (rev 106592)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp	2012-02-02 22:50:42 UTC (rev 106593)
@@ -566,6 +566,15 @@
     setNeedsCommit();
 }
 
+void PlatformCALayer::setFilters(const FilterOperations&)
+{
+}
+
+bool PlatformCALayer::filtersCanBeComposited(const FilterOperations&)
+{
+    return false;
+}
+
 String PlatformCALayer::name() const
 {
     return CACFLayerGetName(m_layer.get());

Modified: trunk/WebKitLibraries/ChangeLog (106592 => 106593)


--- trunk/WebKitLibraries/ChangeLog	2012-02-02 22:16:14 UTC (rev 106592)
+++ trunk/WebKitLibraries/ChangeLog	2012-02-02 22:50:42 UTC (rev 106593)
@@ -1,3 +1,14 @@
+2012-02-02  Chris Marrin  <[email protected]>
+
+        Turn on CSS Filters on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=76667
+
+        Turned on CSS_FILTERS for Windows
+
+        Reviewed by Adele Peterson.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+
 2012-02-02  Sheriff Bot  <[email protected]>
 
         Unreviewed, rolling out r106566.

Modified: trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops (106592 => 106593)


--- trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops	2012-02-02 22:16:14 UTC (rev 106592)
+++ trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops	2012-02-02 22:50:42 UTC (rev 106593)
@@ -48,7 +48,7 @@
 	/>
   <UserMacro
 		Name="ENABLE_CSS_FILTERS"
-		Value=""
+		Value="ENABLE_CSS_FILTERS"
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to