Title: [104622] trunk
- Revision
- 104622
- Author
- [email protected]
- Date
- 2012-01-10 13:12:45 -0800 (Tue, 10 Jan 2012)
Log Message
Turn off the FilterTrigger in WebKit and WebKit2
https://bugs.webkit.org/show_bug.cgi?id=75914
Reviewed by Simon Fraser.
Source/WebKit/mac:
Implement allowedCompositingTriggers to turn on all compositing triggers except FilterTrigger.
* WebCoreSupport/WebChromeClient.h:
(WebChromeClient::allowedCompositingTriggers):
Source/WebKit2:
Implement allowedCompositingTriggers to turn on all compositing triggers except FilterTrigger.
* WebProcess/WebCoreSupport/WebChromeClient.h:
(WebKit::WebChromeClient::allowedCompositingTriggers):
LayoutTests:
Test to make sure compositing layers are off for filters
* css3/filters/should-not-have-compositing-layer-expected.txt: Added.
* css3/filters/should-not-have-compositing-layer.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (104621 => 104622)
--- trunk/LayoutTests/ChangeLog 2012-01-10 21:05:59 UTC (rev 104621)
+++ trunk/LayoutTests/ChangeLog 2012-01-10 21:12:45 UTC (rev 104622)
@@ -1,3 +1,15 @@
+2012-01-10 Chris Marrin <[email protected]>
+
+ Turn off the FilterTrigger in WebKit and WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=75914
+
+ Reviewed by Simon Fraser.
+
+ Test to make sure compositing layers are off for filters
+
+ * css3/filters/should-not-have-compositing-layer-expected.txt: Added.
+ * css3/filters/should-not-have-compositing-layer.html: Added.
+
2012-01-10 Stephen Chenney <[email protected]>
[Chromium] Rebaseline after r104585
Added: trunk/LayoutTests/css3/filters/should-not-have-compositing-layer-expected.txt (0 => 104622)
--- trunk/LayoutTests/css3/filters/should-not-have-compositing-layer-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/filters/should-not-have-compositing-layer-expected.txt 2012-01-10 21:12:45 UTC (rev 104622)
@@ -0,0 +1,8 @@
+Test to make sure a simple CSS filter does not create a compositing layer. Test is successful of render tree does not show any compositing
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no compositing layers
+
+
Added: trunk/LayoutTests/css3/filters/should-not-have-compositing-layer.html (0 => 104622)
--- trunk/LayoutTests/css3/filters/should-not-have-compositing-layer.html (rev 0)
+++ trunk/LayoutTests/css3/filters/should-not-have-compositing-layer.html 2012-01-10 21:12:45 UTC (rev 104622)
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src=""
+</head>
+<script>
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+ }
+
+ function doTest()
+ {
+ description("Test to make sure a simple CSS filter does not create a compositing layer. Test is successful of render tree does not show any compositing");
+ if (window.layoutTestController) {
+ var layers = layoutTestController.layerTreeAsText();
+ if (layers == "")
+ testPassed("no compositing layers");
+ else
+ testFailed("content has compositing layers");
+ document.getElementById("layertree").innerText = layers;
+ layoutTestController.notifyDone();
+ }
+ }
+
+ window.addEventListener('load', doTest, false);
+
+</script>
+<img style="-webkit-filter: blur(0);" src=""
+<div id="layertree"></div>
\ No newline at end of file
Modified: trunk/Source/WebKit/mac/ChangeLog (104621 => 104622)
--- trunk/Source/WebKit/mac/ChangeLog 2012-01-10 21:05:59 UTC (rev 104621)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-01-10 21:12:45 UTC (rev 104622)
@@ -1,3 +1,15 @@
+2012-01-10 Chris Marrin <[email protected]>
+
+ Turn off the FilterTrigger in WebKit and WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=75914
+
+ Reviewed by Simon Fraser.
+
+ Implement allowedCompositingTriggers to turn on all compositing triggers except FilterTrigger.
+
+ * WebCoreSupport/WebChromeClient.h:
+ (WebChromeClient::allowedCompositingTriggers):
+
2012-01-10 Dan Bernstein <[email protected]>
Change -[WebHistoryItem copyWithZone:] to not use NSCopyObject()
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (104621 => 104622)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2012-01-10 21:05:59 UTC (rev 104621)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2012-01-10 21:12:45 UTC (rev 104622)
@@ -150,6 +150,16 @@
virtual void scheduleCompositingLayerSync() OVERRIDE;
#endif
+ virtual CompositingTriggerFlags allowedCompositingTriggers() const
+ {
+ return static_cast<CompositingTriggerFlags>(
+ ThreeDTransformTrigger |
+ VideoTrigger |
+ PluginTrigger|
+ CanvasTrigger |
+ AnimationTrigger);
+ }
+
#if ENABLE(VIDEO)
virtual bool supportsFullscreenForNode(const WebCore::Node*) OVERRIDE;
virtual void enterFullscreenForNode(WebCore::Node*) OVERRIDE;
Modified: trunk/Source/WebKit2/ChangeLog (104621 => 104622)
--- trunk/Source/WebKit2/ChangeLog 2012-01-10 21:05:59 UTC (rev 104621)
+++ trunk/Source/WebKit2/ChangeLog 2012-01-10 21:12:45 UTC (rev 104622)
@@ -1,3 +1,15 @@
+2012-01-10 Chris Marrin <[email protected]>
+
+ Turn off the FilterTrigger in WebKit and WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=75914
+
+ Reviewed by Simon Fraser.
+
+ Implement allowedCompositingTriggers to turn on all compositing triggers except FilterTrigger.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ (WebKit::WebChromeClient::allowedCompositingTriggers):
+
2012-01-10 Kenneth Rohde Christiansen <[email protected]>
Unreviewed potential Mac WK2 build fix.
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (104621 => 104622)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2012-01-10 21:05:59 UTC (rev 104621)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2012-01-10 21:12:45 UTC (rev 104622)
@@ -184,6 +184,16 @@
virtual void scheduleCompositingLayerSync() OVERRIDE;
#endif
+ virtual CompositingTriggerFlags allowedCompositingTriggers() const
+ {
+ return static_cast<CompositingTriggerFlags>(
+ ThreeDTransformTrigger |
+ VideoTrigger |
+ PluginTrigger|
+ CanvasTrigger |
+ AnimationTrigger);
+ }
+
#if ENABLE(TOUCH_EVENTS)
virtual void needTouchEvents(bool) OVERRIDE;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
