Changeset 112278 in webkit

Timestamp:

Mar 27, 2012 10:02:51 AM (12 years ago)

Author:

senorblanco@chromium.org

Message:

Source/WebCore: [chromium] Fix filter context creation to be more conservative.
​https://bugs.webkit.org/show_bug.cgi?id=82349

Reviewed by James Robinson.

Covered by webkit_unit_tests, and css3/filters layout tests.

• platform/graphics/chromium/LayerChromium.cpp:

(WebCore::LayerChromium::setFilters):
Only request a filter context if the filter lists is non-empty.

• platform/graphics/chromium/cc/CCLayerTreeHost.h:

(WebCore::CCLayerTreeHost::setNeedsFilterContext):
Add a bool param, so tests can cancel a request for filter contexts.

Source/WebKit/chromium: [chromium] Fix filter context usage in webkit_unit_tests.
​https://bugs.webkit.org/show_bug.cgi?id=82349

Reviewed by James Robinson.

• tests/CCLayerTreeHostTest.cpp:

(WTF::CCLayerTreeHostTestLayerOcclusionWithFilters::beginTest):
Cancel request for filter context after test run.
(WTF::TEST_F):

• tests/CCOcclusionTrackerTest.cpp:

Re-enable CCLayerTreeHostTestSetSingleLostContext.runMultiThread.
(WebCore::CCOcclusionTrackerTest::TearDown):
Cancel request for filter context after test run.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/chromium/LayerChromium.cpp (modified) (1 diff)
• WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/tests/CCLayerTreeHostTest.cpp (modified) (2 diffs)
• WebKit/chromium/tests/CCOcclusionTrackerTest.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-27  Stephen White  <senorblanco@chromium.org>
+
+        [chromium] Fix filter context creation to be more conservative.
+        https://bugs.webkit.org/show_bug.cgi?id=82349
+
+        Reviewed by James Robinson.
+
+        Covered by webkit_unit_tests, and css3/filters layout tests.
+
+        * platform/graphics/chromium/LayerChromium.cpp:
+        (WebCore::LayerChromium::setFilters):
+        Only request a filter context if the filter lists is non-empty.
+        * platform/graphics/chromium/cc/CCLayerTreeHost.h:
+        (WebCore::CCLayerTreeHost::setNeedsFilterContext):
+        Add a bool param, so tests can cancel a request for filter contexts.
+
 2012-03-27  Stephen Chenney  <schenney@chromium.org>
 

trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp

@@ -319 +319 @@
     m_filters = filters;
     setNeedsCommit();
-    CCLayerTreeHost::setNeedsFilterContext();
+    if (!filters.isEmpty())
+        CCLayerTreeHost::setNeedsFilterContext(true);
 }
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h

@@ -132 +132 @@
 
     static bool needsFilterContext() { return s_needsFilterContext; }
-    static void setNeedsFilterContext() { s_needsFilterContext = true; }
+    static void setNeedsFilterContext(bool needsFilterContext) { s_needsFilterContext = needsFilterContext; }
 
     // CCLayerTreeHost interface to CCProxy.

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-03-27  Stephen White  <senorblanco@chromium.org>
+
+        [chromium] Fix filter context usage in webkit_unit_tests.
+        https://bugs.webkit.org/show_bug.cgi?id=82349
+
+        Reviewed by James Robinson.
+
+        * tests/CCLayerTreeHostTest.cpp:
+        (WTF::CCLayerTreeHostTestLayerOcclusionWithFilters::beginTest):
+        Cancel request for filter context after test run.
+        (WTF::TEST_F):
+        * tests/CCOcclusionTrackerTest.cpp:
+        Re-enable CCLayerTreeHostTestSetSingleLostContext.runMultiThread.
+        (WebCore::CCOcclusionTrackerTest::TearDown):
+        Cancel request for filter context after test run.
+
 2012-03-26  Stephen White  <senorblanco@chromium.org>
 

trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp

@@ -2107 +2107 @@
         m_layerTreeHost.clear();
 
+        CCLayerTreeHost::setNeedsFilterContext(false);
         endTest();
     }
@@ -2202 +2203 @@
 };
 
-TEST_F(CCLayerTreeHostTestSetSingleLostContext, DISABLED_runMultiThread)
+TEST_F(CCLayerTreeHostTestSetSingleLostContext, runMultiThread)
 {
     runTestThreaded();

trunk/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp

@@ -140 +140 @@
         m_renderSurfaceLayerListChromium.clear();
         m_renderSurfaceLayerListImpl.clear();
+        CCLayerTreeHost::setNeedsFilterContext(false);
     }