Changeset 110635 in webkit

Timestamp:

Mar 13, 2012, 4:28:38 PM (15 years ago)

Author:

shawnsingh@chromium.org

Message:

[chromium] wrong transform causing incorrect culling
​https://bugs.webkit.org/show_bug.cgi?id=80471

Reviewed by James Robinson.

Source/WebCore:

Unit test added to CCRenderSurfaceTest.cpp

In addition to using originTransform() instead of drawTransform(),
this patch shuffles a bit of code so that a unit test can be
easily added.

• platform/graphics/chromium/cc/CCRenderPass.cpp:

(WebCore::CCRenderPass::appendQuadsForRenderSurfaceLayer):

• platform/graphics/chromium/cc/CCRenderSurface.cpp:

(WebCore::CCRenderSurface::createSharedQuadState):
(WebCore):

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

(CCRenderSurface):

Source/WebKit/chromium:

• tests/CCRenderSurfaceTest.cpp:

(WebCore::TEST):
(WebCore):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/chromium/cc/CCRenderPass.cpp (modified) (1 diff)
• WebCore/platform/graphics/chromium/cc/CCRenderSurface.cpp (modified) (2 diffs)
• WebCore/platform/graphics/chromium/cc/CCRenderSurface.h (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/tests/CCRenderSurfaceTest.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-13  Shawn Singh  <shawnsingh@chromium.org>
+
+        [chromium] wrong transform causing incorrect culling
+        https://bugs.webkit.org/show_bug.cgi?id=80471
+
+        Reviewed by James Robinson.
+
+        Unit test added to CCRenderSurfaceTest.cpp
+
+        In addition to using originTransform() instead of drawTransform(),
+        this patch shuffles a bit of code so that a unit test can be
+        easily added.
+
+        * platform/graphics/chromium/cc/CCRenderPass.cpp:
+        (WebCore::CCRenderPass::appendQuadsForRenderSurfaceLayer):
+        * platform/graphics/chromium/cc/CCRenderSurface.cpp:
+        (WebCore::CCRenderSurface::createSharedQuadState):
+        (WebCore):
+        * platform/graphics/chromium/cc/CCRenderSurface.h:
+        (CCRenderSurface):
+
 2012-03-13  Dave Tharp  <dtharp@codeaurora.org>
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderPass.cpp

@@ -62 +62 @@
     // not be handled specially here.
     CCRenderSurface* surface = layer->renderSurface();
-    bool isOpaque = false;
-    OwnPtr<CCSharedQuadState> sharedQuadState = CCSharedQuadState::create(surface->drawTransform(), surface->drawTransform(), surface->contentRect(), surface->clipRect(), surface->drawOpacity(), isOpaque);
+    OwnPtr<CCSharedQuadState> sharedQuadState = surface->createSharedQuadState();
     m_quadList.append(CCRenderSurfaceDrawQuad::create(sharedQuadState.get(), surface->contentRect(), layer, surfaceDamageRect()));
     m_sharedQuadStateList.append(sharedQuadState.release());

trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderSurface.cpp

@@ -42 +42 @@
 #include "cc/CCProxy.h"
 #include "cc/CCRenderSurfaceFilters.h"
+#include "cc/CCSharedQuadState.h"
 #include <wtf/text/CString.h>
 
@@ -302 +303 @@
 }
 
+PassOwnPtr<CCSharedQuadState> CCRenderSurface::createSharedQuadState() const
+{
+    bool isOpaque = false;
+    return CCSharedQuadState::create(originTransform(), drawTransform(), contentRect(), clipRect(), drawOpacity(), isOpaque);
+}
+
 }
 #endif // USE(ACCELERATED_COMPOSITING)

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

@@ -44 +44 @@
 
 class CCDamageTracker;
+class CCSharedQuadState;
 class CCLayerImpl;
 class LayerRendererChromium;
@@ -115 +116 @@
     CCDamageTracker* damageTracker() const { return m_damageTracker.get(); }
 
+    PassOwnPtr<CCSharedQuadState> createSharedQuadState() const;
+
 private:
     void drawLayer(LayerRendererChromium*, CCLayerImpl*, const TransformationMatrix&, const SkBitmap& filterBitmap);

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-03-13  Shawn Singh  <shawnsingh@chromium.org>
+
+        [chromium] wrong transform causing incorrect culling
+        https://bugs.webkit.org/show_bug.cgi?id=80471
+
+        Reviewed by James Robinson.
+
+        * tests/CCRenderSurfaceTest.cpp:
+        (WebCore::TEST):
+        (WebCore):
+
 2012-03-13  Nat Duca  <nduca@chromium.org>
 

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

@@ -27 +27 @@
 #include "cc/CCRenderSurface.h"
 
+#include "TransformationMatrix.h"
 #include "cc/CCLayerImpl.h"
+#include "cc/CCSharedQuadState.h"
 #include "cc/CCSingleThreadProxy.h"
 #include <gmock/gmock.h>
@@ -90 +92 @@
 }
 
+TEST(CCRenderSurfaceTest, sanityCheckSurfaceCreatesCorrectSharedQuadState)
+{
+    // This will fake that we are on the correct thread for testing purposes.
+    DebugScopedSetImplThread setImplThread;
+
+    OwnPtr<CCLayerImpl> owningLayer = CCLayerImpl::create(0);
+    owningLayer->createRenderSurface();
+    ASSERT_TRUE(owningLayer->renderSurface());
+    CCRenderSurface* renderSurface = owningLayer->renderSurface();
+
+    IntRect contentRect = IntRect(IntPoint::zero(), IntSize(50, 50));
+    IntRect clipRect = IntRect(IntPoint(5, 5), IntSize(40, 40));
+    TransformationMatrix draw;
+    TransformationMatrix origin;
+
+    draw.translate(30, 40);
+
+    renderSurface->setDrawTransform(draw);
+    renderSurface->setOriginTransform(origin);
+    renderSurface->setContentRect(contentRect);
+    renderSurface->setClipRect(clipRect);
+    renderSurface->setDrawOpacity(1);
+
+    OwnPtr<CCSharedQuadState> sharedQuadState = renderSurface->createSharedQuadState();
+
+    EXPECT_TRUE(sharedQuadState->quadTransform().isIdentity());
+    EXPECT_EQ(30, sharedQuadState->layerTransform().m41());
+    EXPECT_EQ(40, sharedQuadState->layerTransform().m42());
+    EXPECT_EQ(contentRect, sharedQuadState->layerRect());
+    EXPECT_EQ(clipRect, sharedQuadState->clipRect());
+    EXPECT_EQ(1, sharedQuadState->opacity());
+    EXPECT_FALSE(sharedQuadState->isOpaque());
+}
+
 } // namespace