summaryrefslogtreecommitdiffstats
path: root/cc/content_layer_unittest.cc
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-15 23:16:49 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-15 23:16:49 +0000
commit0def90db5ab7232ae4848e7960ab70e88adab468 (patch)
tree5305d9f2065484e38c90336445e9a021f05ae133 /cc/content_layer_unittest.cc
parentd28a1a25b7dc2a7c0708005ce272900d50e85667 (diff)
downloadchromium_src-0def90db5ab7232ae4848e7960ab70e88adab468.zip
chromium_src-0def90db5ab7232ae4848e7960ab70e88adab468.tar.gz
chromium_src-0def90db5ab7232ae4848e7960ab70e88adab468.tar.bz2
cc: Store tiles, painters, tiling data in scoped_ptr
BUG=154451 Review URL: https://chromiumcodereview.appspot.com/11144023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161994 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/content_layer_unittest.cc')
-rw-r--r--cc/content_layer_unittest.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/cc/content_layer_unittest.cc b/cc/content_layer_unittest.cc
index 8e6e7e6..dc84df7 100644
--- a/cc/content_layer_unittest.cc
+++ b/cc/content_layer_unittest.cc
@@ -14,8 +14,6 @@
#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebFloatRect.h>
#include <public/WebRect.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/RefPtr.h>
using namespace cc;
using namespace WebKit;
@@ -45,9 +43,8 @@ TEST(ContentLayerChromiumTest, ContentLayerPainterWithDeviceScale)
IntRect opaqueRectInLayerSpace(5, 5, 20, 20);
IntRect opaqueRectInContentSpace = opaqueRectInLayerSpace;
opaqueRectInContentSpace.scale(contentsScale);
- OwnPtr<SkCanvas> canvas = adoptPtr(skia::CreateBitmapCanvas(contentRect.width(), contentRect.height(), false));
MockContentLayerChromiumClient client(opaqueRectInLayerSpace);
- RefPtr<BitmapCanvasLayerTextureUpdater> updater = BitmapCanvasLayerTextureUpdater::create(ContentLayerPainter::create(&client));
+ RefPtr<BitmapCanvasLayerTextureUpdater> updater = BitmapCanvasLayerTextureUpdater::create(ContentLayerPainter::create(&client).PassAs<LayerPainterChromium>());
IntRect resultingOpaqueRect;
CCRenderingStats stats;