cc: Store tiles, painters, tiling data in scoped_ptr

cc: Store tiles, painters, tiling data in scoped_ptr

BUG=154451
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=161994

[jamesr, 2012-10-15 20:52:33]

lgtm

[commit-bot: I haz the power, 2012-10-15 20:58:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/enne@chromium.org/11144023/1

[commit-bot: I haz the power, 2012-10-15 20:59:05]

Failed to apply patch for cc/bitmap_canvas_layer_texture_updater.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/bitmap_canvas_layer_texture_updater.h
  Hunk #1 succeeded at 32 (offset -2 lines).
  Hunk #2 FAILED at 45.
  1 out of 2 hunks FAILED -- saving rejects to file
cc/bitmap_canvas_layer_texture_updater.h.rej

Patch:       cc/bitmap_canvas_layer_texture_updater.h
Index: cc/bitmap_canvas_layer_texture_updater.h
diff --git a/cc/bitmap_canvas_layer_texture_updater.h
b/cc/bitmap_canvas_layer_texture_updater.h
index
9214b8489b1bf9849d9f342886891be19a5f8c65..d2a367c751c6a14233564bfb7a43767d92fc5438
100644
--- a/cc/bitmap_canvas_layer_texture_updater.h
+++ b/cc/bitmap_canvas_layer_texture_updater.h
@@ -34,7 +34,7 @@ public:
         BitmapCanvasLayerTextureUpdater* m_textureUpdater;
     };
 
-    static PassRefPtr<BitmapCanvasLayerTextureUpdater>
create(PassOwnPtr<LayerPainterChromium>);
+    static PassRefPtr<BitmapCanvasLayerTextureUpdater>
create(scoped_ptr<LayerPainterChromium>);
     virtual ~BitmapCanvasLayerTextureUpdater();
 
     virtual PassOwnPtr<LayerTextureUpdater::Texture>
createTexture(CCPrioritizedTextureManager*) OVERRIDE;
@@ -45,13 +45,14 @@ public:
     virtual void setOpaque(bool) OVERRIDE;
 
 protected:
-    explicit BitmapCanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium>);
+    explicit BitmapCanvasLayerTextureUpdater(scoped_ptr<LayerPainterChromium>);
 
     OwnPtr<SkCanvas> m_canvas;
     IntSize m_canvasSize;
     bool m_opaque;
 };
 
-} // namespace cc
+}  // namespace cc
+
 #endif // USE(ACCELERATED_COMPOSITING)
 #endif // BitmapCanvasLayerTextureUpdater_h

[jamesr, 2012-10-15 21:01:05]

Removing USE(ACCELERATED_COMPOSITING) might have killed this one, sorry!

[commit-bot: I haz the power, 2012-10-15 21:14:44]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/enne@chromium.org/11144023/6001

[enne (OOO), 2012-10-15 21:16:23]

On 2012/10/15 21:01:05, jamesr wrote:
> Removing USE(ACCELERATED_COMPOSITING) might have killed this one, sorry!

No problem! I'm happy to see that finally land.  :)

[commit-bot: I haz the power, 2012-10-15 23:16:51]

Change committed as 161994