Merge 95506 - [chromium] ContentLayer's texture updater deleted during paint when compositing tur...

Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.h

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 16 matching lines @@
 #ifndef LayerTextureUpdaterCanvas_h
 #define LayerTextureUpdaterCanvas_h
 
 #if USE(ACCELERATED_COMPOSITING)
 
 #include "GraphicsTypes3D.h"
 #include "LayerTextureSubImage.h"
 #include "LayerTextureUpdater.h"
 #include "PlatformCanvas.h"
 #include <wtf/PassOwnPtr.h>
+#include <wtf/PassRefPtr.h>
 
 #if USE(SKIA)
 #include "SkPicture.h"
 
 class GrContext;
 class SkCanvas;
 class SkPicture;
 #endif
 
 namespace WebCore {
 
 class GraphicsContext3D;
 class LayerPainterChromium;
 
 // A LayerTextureUpdater with an internal canvas.
 class LayerTextureUpdaterCanvas : public LayerTextureUpdater {
-    WTF_MAKE_NONCOPYABLE(LayerTextureUpdaterCanvas);
 protected:
     explicit LayerTextureUpdaterCanvas(PassOwnPtr<LayerPainterChromium>);
 
     void paintContents(GraphicsContext&, const IntRect& contentRect);
     const IntRect& contentRect() const { return m_contentRect; }
 
 private:
 
     IntRect m_contentRect;
     OwnPtr<LayerPainterChromium> m_painter;
 };
 
 // A LayerTextureUpdater with an internal bitmap canvas.
 class LayerTextureUpdaterBitmap : public LayerTextureUpdaterCanvas {
-    WTF_MAKE_NONCOPYABLE(LayerTextureUpdaterBitmap);
 public:
-    static PassOwnPtr<LayerTextureUpdaterBitmap> create(PassOwnPtr<LayerPainterChromium>, bool useMapTexSubImage);
+    static PassRefPtr<LayerTextureUpdaterBitmap> create(PassOwnPtr<LayerPainterChromium>, bool useMapTexSubImage);
 
     virtual Orientation orientation() { return LayerTextureUpdater::BottomUpOrientation; }
     virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat);
     virtual void prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, int borderTexels);
     virtual void updateTextureRect(GraphicsContext3D*, ManagedTexture*, const IntRect& sourceRect, const IntRect& destRect);
 
 private:
     LayerTextureUpdaterBitmap(PassOwnPtr<LayerPainterChromium>, bool useMapTexSubImage);
     PlatformCanvas m_canvas;
     LayerTextureSubImage m_texSubImage;
 };
 
 #if USE(SKIA)
 class LayerTextureUpdaterSkPicture : public LayerTextureUpdaterCanvas {
-    WTF_MAKE_NONCOPYABLE(LayerTextureUpdaterSkPicture);
 public:
-    static PassOwnPtr<LayerTextureUpdaterSkPicture> create(PassOwnPtr<LayerPainterChromium>);
+    static PassRefPtr<LayerTextureUpdaterSkPicture> create(PassOwnPtr<LayerPainterChromium>);
     virtual ~LayerTextureUpdaterSkPicture();
 
     virtual Orientation orientation() { return LayerTextureUpdater::TopDownOrientation; }
     virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat);
     virtual void prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, int borderTexels);
     virtual void updateTextureRect(GraphicsContext3D*, ManagedTexture*, const IntRect& sourceRect, const IntRect& destRect);
 
 private:
     explicit LayerTextureUpdaterSkPicture(PassOwnPtr<LayerPainterChromium>);
     void deleteFrameBuffer();
     bool createFrameBuffer();
     GraphicsContext3D* context() { return m_context; }
 
     GraphicsContext3D* m_context;
 
     bool m_createFrameBuffer; // Need to create FBO if true.
     SkPicture m_picture; // Recording canvas.
     IntSize m_bufferSize; // Frame buffer size.
     Platform3DObject m_fbo; // Frame buffer id.
     Platform3DObject m_depthStencilBuffer;
     OwnPtr<SkCanvas> m_canvas; // GPU accelerated canvas.
 };
 #endif // SKIA
 
 } // namespace WebCore
 #endif // USE(ACCELERATED_COMPOSITING)
 #endif // LayerTextureUpdaterCanvas_h