diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 02:53:56 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 02:53:56 +0000 |
| commit | 234de4c25bfff2f754bd4b01890803931d9c769e (patch) | |
| tree | cdae7647945b090b057ffdf6755f0914730ccc05 /cc/CCRenderPassTest.cpp | |
| parent | 8781cc17e2df8f17a8c2ab7cde2e75e285086a23 (diff) | |
| download | chromium_src-234de4c25bfff2f754bd4b01890803931d9c769e.zip chromium_src-234de4c25bfff2f754bd4b01890803931d9c769e.tar.gz chromium_src-234de4c25bfff2f754bd4b01890803931d9c769e.tar.bz2 | |
Remove WTF HashMap and PassOwnPtr dependencies for CCRenderPass
We add a ScopedPtrHashMap and ScopedPtrVector which preserve the behaviour
of HashMap<T, OwnPtr<V> > and Vector<OwnPtr<T>> and use these for CCRenderPass
and any code that creates CCRenderPass objects.
R=enne,jamesr
BUG=152049
Review URL: https://chromiumcodereview.appspot.com/10979010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/CCRenderPassTest.cpp')
| -rw-r--r-- | cc/CCRenderPassTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/CCRenderPassTest.cpp b/cc/CCRenderPassTest.cpp index 0d5bad4..23376ec 100644 --- a/cc/CCRenderPassTest.cpp +++ b/cc/CCRenderPassTest.cpp @@ -46,7 +46,7 @@ TEST(CCRenderPassTest, copyShouldBeIdenticalExceptIdAndQuads) IntRect outputRect(45, 22, 120, 13); WebTransformationMatrix transformToRoot(1, 0.5, 0.5, -0.5, -1, 0); - OwnPtr<CCRenderPass> pass(CCRenderPass::create(id, outputRect, transformToRoot)); + scoped_ptr<CCRenderPass> pass = CCRenderPass::create(id, outputRect, transformToRoot); IntRect damageRect(56, 123, 19, 43); bool hasTransparentBackground = true; @@ -70,7 +70,7 @@ TEST(CCRenderPassTest, copyShouldBeIdenticalExceptIdAndQuads) CCRenderPass::Id newId(63, 4); - OwnPtr<CCRenderPass> copy(pass->copy(newId)); + scoped_ptr<CCRenderPass> copy = pass->copy(newId); EXPECT_EQ(newId, copy->id()); EXPECT_RECT_EQ(pass->outputRect(), copy->outputRect()); EXPECT_EQ(pass->transformToRootTarget(), copy->transformToRootTarget()); |