diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-01 01:15:17 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-01 01:15:17 +0000 |
| commit | 022cbf167d68b3480bda258933d06425403f028b (patch) | |
| tree | ed001f9af1fba38947b1c6b546e35c8c95e90dc4 /cc/CCLayerTreeHostImplTest.cpp | |
| parent | bb53a5aeea4d8f5e19bf6152bb10e17f0af1652f (diff) | |
| download | chromium_src-022cbf167d68b3480bda258933d06425403f028b.zip chromium_src-022cbf167d68b3480bda258933d06425403f028b.tar.gz chromium_src-022cbf167d68b3480bda258933d06425403f028b.tar.bz2 | |
Rolls cc and webkit_compositor up to 127340
With this, webkit_compositor_unittests successfully runs+builds and it's
possible to start implemented WebCompositorSupport
BUG=
Review URL: https://chromiumcodereview.appspot.com/10920059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154559 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/CCLayerTreeHostImplTest.cpp')
| -rw-r--r-- | cc/CCLayerTreeHostImplTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/CCLayerTreeHostImplTest.cpp b/cc/CCLayerTreeHostImplTest.cpp index bad5782..f46cfda 100644 --- a/cc/CCLayerTreeHostImplTest.cpp +++ b/cc/CCLayerTreeHostImplTest.cpp @@ -7,12 +7,12 @@ #include "CCLayerTreeHostImpl.h" #include "CCAnimationTestCommon.h" +#include "CCGeometryTestUtils.h" #include "CCHeadsUpDisplayLayerImpl.h" #include "CCIOSurfaceLayerImpl.h" #include "CCLayerImpl.h" #include "CCLayerTestCommon.h" #include "CCLayerTilingData.h" -#include "CCLayerTreeTestCommon.h" #include "CCQuadSink.h" #include "CCRenderPassDrawQuad.h" #include "CCRendererGL.h" @@ -2800,7 +2800,7 @@ TEST_F(CCLayerTreeHostImplTest, textureCachingWithClipping) EXPECT_LT(quadVisibleRect.width(), 100); // Verify that the render surface texture is *not* clipped. - EXPECT_INT_RECT_EQ(IntRect(0, 0, 100, 100), frame.renderPasses[0]->outputRect()); + EXPECT_RECT_EQ(IntRect(0, 0, 100, 100), frame.renderPasses[0]->outputRect()); EXPECT_EQ(CCDrawQuad::RenderPass, frame.renderPasses[1]->quadList()[0]->material()); CCRenderPassDrawQuad* quad = static_cast<CCRenderPassDrawQuad*>(frame.renderPasses[1]->quadList()[0].get()); |