Merge 92520 - [chromium] Accelerated canvas breaks when moving canvases or resources between Pages

Source/WebCore/platform/graphics/gpu/DrawingBuffer.h

 /*
  * Copyright (c) 2010, 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 72 matching lines @@
     
     bool multisample() const { return m_context && m_context->getContextAttributes().antialias && m_multisampleExtensionSupported; }
     
     Platform3DObject platformColorBuffer() const;
 
 #if USE(ACCELERATED_COMPOSITING)
     PlatformLayer* platformLayer();
     void publishToPlatformLayer();
 #endif
 
-#if PLATFORM(CHROMIUM)
-    class WillPublishCallback {
-        WTF_MAKE_NONCOPYABLE(WillPublishCallback);
-    public:
-        WillPublishCallback() { }
-        virtual ~WillPublishCallback() { }
-        
-        virtual void willPublish() = 0;
-    };
-
-    void setWillPublishCallback(PassOwnPtr<WillPublishCallback> callback) { m_callback = callback; }
-#endif
-
 #if USE(SKIA)
     void setGrContext(GrContext* ctx);
     void getGrPlatformSurfaceDesc(GrPlatformSurfaceDesc*);
 #endif
 
     PassRefPtr<GraphicsContext3D> graphicsContext3D() const { return m_context; }
 
 private:
     static PassRefPtr<DrawingBuffer> create(GraphicsContext3D*, const IntSize&);
     
     DrawingBuffer(GraphicsContext3D*, const IntSize&, bool multisampleExtensionSupported, bool packedDepthStencilExtensionSupported);
 
-    // Platform specific function called after reset() so each platform can do extra work if needed
-    void didReset();
-
     RefPtr<GraphicsContext3D> m_context;
     IntSize m_size;
     bool m_multisampleExtensionSupported;
     bool m_packedDepthStencilExtensionSupported;
     Platform3DObject m_fbo;
     Platform3DObject m_colorBuffer;
 
     // This is used when we have OES_packed_depth_stencil.
     Platform3DObject m_depthStencilBuffer;
 
     // These are used when we don't.
     Platform3DObject m_depthBuffer;
     Platform3DObject m_stencilBuffer;
 
     // For multisampling
     Platform3DObject m_multisampleFBO;
     Platform3DObject m_multisampleColorBuffer;
 
 #if PLATFORM(CHROMIUM)
-    OwnPtr<WillPublishCallback> m_callback;
 #if USE(ACCELERATED_COMPOSITING)
     RefPtr<Canvas2DLayerChromium> m_platformLayer;
 #endif
 #endif
 
 #if PLATFORM(MAC)
     RetainPtr<WebGLLayer> m_platformLayer;
 #endif
 
 #if USE(SKIA)
     GrContext* m_grContext;
 #endif
 };
 
 } // namespace WebCore
 
 #endif // DrawingBuffer_h