Title: [110741] trunk
Revision
110741
Author
[email protected]
Date
2012-03-14 13:52:42 -0700 (Wed, 14 Mar 2012)

Log Message

[Chromium] Layout Test compositing/repaint/opacity-between-absolute.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=79823

Reviewed by Adrienne Walker.

Source/WebCore:

LayerRendererChromium was storing a weak pointer to the current render surface in m_currentRenderSurface and
using this in useRenderSurface() to avoid rebinding if we called useRenderSurface() multiple times in a row on
the same surface. This pointer was never cleared, so if any subsequent surface landed at the same address this
caching would misbehave and we'd fail to correctly initialize the new render surface. The caching wasn't
actually buying us anything anyway since we only call useRenderSurface() once per surface per frame and we
always set the viewport for the default render surface.

* platform/graphics/chromium/LayerRendererChromium.cpp:
(WebCore::LayerRendererChromium::beginDrawingFrame):
(WebCore::LayerRendererChromium::useRenderSurface):

LayoutTests:

* platform/chromium/test_expectations.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (110740 => 110741)


--- trunk/LayoutTests/ChangeLog	2012-03-14 20:38:09 UTC (rev 110740)
+++ trunk/LayoutTests/ChangeLog	2012-03-14 20:52:42 UTC (rev 110741)
@@ -1,10 +1,11 @@
-2012-03-14  Jessie Berlin  <[email protected]>
+2012-03-14  James Robinson  <[email protected]>
 
-        WKTR doesn't have an implemenation of hasSpellingMarker yet.
+        [Chromium] Layout Test compositing/repaint/opacity-between-absolute.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=79823
 
-        Add more tests that rely on it to the WK2 Skipped list.
+        Reviewed by Adrienne Walker.
 
-        * platform/wk2/Skipped:
+        * platform/chromium/test_expectations.txt:
 
 2012-03-14  Zalan Bujtas  <[email protected]>
 
@@ -109,6 +110,14 @@
 
 2012-03-14  Jessie Berlin  <[email protected]>
 
+        WKTR doesn't have an implemenation of hasSpellingMarker yet.
+
+        Add more tests that rely on it to the WK2 Skipped list.
+
+        * platform/wk2/Skipped:
+
+2012-03-14  Jessie Berlin  <[email protected]>
+
         Support drag in mouse events for WebKit2 EventSender
         https://bugs.webkit.org/show_bug.cgi?id=68552
         https://bugs.webkit.org/show_bug.cgi?id=69946

Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (110740 => 110741)


--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-03-14 20:38:09 UTC (rev 110740)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-03-14 20:52:42 UTC (rev 110741)
@@ -2614,17 +2614,20 @@
 BUGWK47949 LINUX WIN : compositing/reflections/nested-reflection-anchor-point.html = IMAGE+TEXT
 BUGWK47949 MAC : compositing/reflections/nested-reflection-anchor-point.html = IMAGE
 BUGWK47949 LINUX WIN : compositing/reflections/reflection-opacity.html = IMAGE+TEXT
+
 // The following are flaky on Mac 10.6; occasionally the layers fail to show up.
 BUGWK47949 MAC : compositing/reflections/nested-reflection.html = IMAGE PASS
-BUGWK47949 : compositing/reflections/nested-reflection-transformed.html = IMAGE PASS
 BUGWK47949 MAC : compositing/reflections/reflection-opacity.html = IMAGE PASS
 BUGWK47949 : compositing/reflections/reflection-positioning.html = IMAGE PASS
-BUGWK47949 : compositing/reflections/nested-reflection-transformed2.html = IMAGE PASS
 BUGWK47949 : compositing/reflections/nested-reflection-transition.html = IMAGE PASS
 BUGWK47949 MAC : compositing/reflections/nested-reflection-size-change.html = IMAGE PASS
 BUGWK79647 WIN MAC : compositing/reflections/reflection-ordering.html = IMAGE PASS
 BUGWK79647 WIN LINUX : compositing/reflections/remove-add-reflection.html = IMAGE PASS
 
+// Need rebaselines
+BUGWK47949 : compositing/reflections/nested-reflection-transformed.html = IMAGE
+BUGWK47949 : compositing/reflections/nested-reflection-transformed2.html = IMAGE
+
 // Flaky because these are a poorly written tests. Need dino's new animation API
 BUGWK54306 : compositing/reflections/animation-inside-reflection.html = PASS IMAGE IMAGE+TEXT
 BUGWK54306 : compositing/reflections/nested-reflection-animated.html = PASS IMAGE
@@ -3538,8 +3541,6 @@
 
 BUGWK74634 WIN : compositing/absolute-position-changed-with-composited-parent-layer.html = IMAGE
 
-BUGWK74731 : compositing/reflections/reflection-positioning2.html = PASS IMAGE
-
 BUGWK74746 : fast/filesystem/workers/file-from-file-entry-sync.html = PASS CRASH
 BUGWK74746 : fast/filesystem/workers/file-entry-to-uri-sync.html = PASS CRASH
 BUGWK74746 WIN : http/tests/xmlhttprequest/workers/methods.html = FAIL
@@ -3672,9 +3673,6 @@
 
 // Will need rebaselines for mock scrollbars
 
-// Flaky, needs investigation
-BUGJAMESR : compositing/masks/masked-ancestor.html = IMAGE PASS
-
 BUGWK77534 LINUX : plugins/createScriptableObject-before-start.html = PASS MISSING
 
 BUGWK77889 WIN DEBUG : fast/forms/listbox-clear-restore.html = PASS IMAGE
@@ -3773,29 +3771,12 @@
 BUGWK79540 DEBUG : fast/files/workers/worker-read-blob-sync.html = PASS CRASH
 BUGWK79540 LEOPARD DEBUG : fast/files/workers/worker-read-file-async.html = PASS CRASH
 
-BUGWK79572 : css3/filters/effect-drop-shadow-hw.html = PASS IMAGE
-BUGWK80007 : css3/filters/filtered-compositing-descendant.html = PASS IMAGE
-
 BUGWK79642 : accessibility/aria-describedby-on-input.html = TIMEOUT
 BUGWK79642 : fast/loader/subresource-willSendRequest-null.html = TIMEOUT
 
 BUGWK79702 : fast/regex/lastIndex.html = TEXT
 BUGWK79703 : fast/regex/overflow.html = TEXT
 
-BUGWK79823 : compositing/repaint/opacity-between-absolute.html = PASS IMAGE
-BUGWK79823 : compositing/reflections/masked-reflection-on-composited.html = PASS IMAGE
-BUGWK79823 : compositing/reflections/reflection-on-composited.html = PASS IMAGE
-BUGWK79823 : compositing/geometry/fixed-position.html = PASS IMAGE
-BUGWK79823 : compositing/reflections/compositing-change-inside-reflection.html = PASS IMAGE
-BUGWK79823 : compositing/webgl/webgl-reflection.html = PASS IMAGE
-BUGWK79823 : compositing/masks/direct-image-mask.html = PASS IMAGE
-BUGWK79823 : platform/chromium/compositing/render-surface-alpha-blending.html = PASS IMAGE
-BUGWK79823 : platform/chromium/compositing/child-layer-3d-sorting.html = PASS IMAGE
-BUGWK79823 : platform/chromium/compositing/plugins/webplugin-reflection.html = PASS IMAGE
-
-// Already associated with bug 47949 on Mac.
-BUGWK79823 WIN LINUX : compositing/reflections/nested-reflection.html = PASS IMAGE
-
 BUGWK79862 : fast/js/primitive-property-access-edge-cases.html = TEXT
 BUGWK79862 : fast/js/read-modify-eval.html = TEXT
 
@@ -3888,11 +3869,6 @@
 BUGWK80743 WIN MAC : compositing/direct-image-compositing.html = PASS IMAGE
 BUGWK80743 WIN MAC : platform/chromium/compositing/huge-layer-rotated.html = PASS IMAGE
 
-BUGWK80563 : css3/filters/effect-combined-hw.html = PASS IMAGE
-BUGWK80563 : css3/filters/effect-hue-rotate-hw.html = PASS IMAGE
-BUGWK80563 : css3/filters/effect-opacity-hw.html = PASS IMAGE
-BUGWK80563 : compositing/reflections/nested-reflection-opacity.html = PASS IMAGE
-
 BUGWK80665 : fast/js/string-match.html = TEXT
 BUGWK80665 : fast/js/string-replace-2.html = TEXT
 

Modified: trunk/Source/WebCore/ChangeLog (110740 => 110741)


--- trunk/Source/WebCore/ChangeLog	2012-03-14 20:38:09 UTC (rev 110740)
+++ trunk/Source/WebCore/ChangeLog	2012-03-14 20:52:42 UTC (rev 110741)
@@ -1,3 +1,21 @@
+2012-03-14  James Robinson  <[email protected]>
+
+        [Chromium] Layout Test compositing/repaint/opacity-between-absolute.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=79823
+
+        Reviewed by Adrienne Walker.
+
+        LayerRendererChromium was storing a weak pointer to the current render surface in m_currentRenderSurface and
+        using this in useRenderSurface() to avoid rebinding if we called useRenderSurface() multiple times in a row on
+        the same surface. This pointer was never cleared, so if any subsequent surface landed at the same address this
+        caching would misbehave and we'd fail to correctly initialize the new render surface. The caching wasn't
+        actually buying us anything anyway since we only call useRenderSurface() once per surface per frame and we
+        always set the viewport for the default render surface.
+
+        * platform/graphics/chromium/LayerRendererChromium.cpp:
+        (WebCore::LayerRendererChromium::beginDrawingFrame):
+        (WebCore::LayerRendererChromium::useRenderSurface):
+
 2012-03-14  Zalan Bujtas  <[email protected]>
 
         Frame flattening ASSERT(!needsLayout()) in FrameView::paintContents()

Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (110740 => 110741)


--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp	2012-03-14 20:38:09 UTC (rev 110740)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp	2012-03-14 20:52:42 UTC (rev 110741)
@@ -389,10 +389,6 @@
     }
 
     makeContextCurrent();
-    // The GL viewport covers the entire visible area, including the scrollbars.
-    GLC(m_context.get(), m_context->viewport(0, 0, viewportWidth(), viewportHeight()));
-    m_windowMatrix = screenMatrix(0, 0, viewportWidth(), viewportHeight());
-
     // Bind the common vertex attributes used for drawing all the layers.
     m_sharedGeometry->prepareForDraw();
 
@@ -1143,9 +1139,6 @@
 
 bool LayerRendererChromium::useRenderSurface(CCRenderSurface* renderSurface)
 {
-    if (m_currentRenderSurface == renderSurface)
-        return true;
-
     m_currentRenderSurface = renderSurface;
 
     if ((renderSurface == m_defaultRenderSurface && !settings().compositeOffscreen) || (!renderSurface && settings().compositeOffscreen)) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to