Merge 112568 - [chromium] Ensure framebuffer exists at the start of beginDrawingFrame.

Source/WebCore/platform/graphics/chromium/LayerRendererChromium.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 43 matching lines @@
 
 namespace WebCore {
 
 class CCHeadsUpDisplay;
 class CCLayerImpl;
 class CCRenderPass;
 class CCTextureDrawQuad;
 class GeometryBinding;
 class GraphicsContext3D;
 class LayerRendererSwapBuffersCompleteCallbackAdapter;
+class LayerRendererGpuMemoryAllocationChangedCallbackAdapter;
 class ScopedEnsureFramebufferAllocation;
 
 class LayerRendererChromiumClient {
 public:
     virtual const IntSize& viewportSize() const = 0;
     virtual const CCSettings& settings() const = 0;
     virtual CCLayerImpl* rootLayer() = 0;
     virtual const CCLayerImpl* rootLayer() const = 0;
     virtual void didLoseContext() = 0;
     virtual void onSwapBuffersComplete() = 0;
@@ skipping 82 matching lines @@
 
     void setVisible(bool);
 
     GC3Denum bestTextureFormat();
 
     static void toGLMatrix(float*, const TransformationMatrix&);
     void drawTexturedQuad(const TransformationMatrix& layerMatrix,
                           float width, float height, float opacity, const FloatQuad&,
                           int matrixLocation, int alphaLocation, int quadLocation);
 
+protected:
+    friend class LayerRendererGpuMemoryAllocationChangedCallbackAdapter;
     void discardFramebuffer();
     void ensureFramebuffer();
     bool isFramebufferDiscarded() const { return m_isFramebufferDiscarded; }
 
-protected:
     LayerRendererChromium(LayerRendererChromiumClient*, PassRefPtr<GraphicsContext3D>);
     bool initialize();
 
 private:
     void drawQuad(const CCDrawQuad*, const FloatRect& surfaceDamageRect);
     void drawDebugBorderQuad(const CCDebugBorderDrawQuad*);
     void drawRenderSurfaceQuad(const CCRenderSurfaceDrawQuad*);
     void drawSolidColorQuad(const CCSolidColorDrawQuad*);
     void drawTextureQuad(const CCTextureDrawQuad*);
     void drawTileQuad(const CCTileDrawQuad*);
@@ skipping 78 matching lines @@
     RefPtr<GraphicsContext3D> m_context;
 
     CCRenderSurface* m_defaultRenderSurface;
 
     FloatQuad m_sharedGeometryQuad;
 
     bool m_isViewportChanged;
     bool m_isFramebufferDiscarded;
 };
 
-// The purpose of this helper is twofold:
-// 1. To ensure that a framebuffer is available for scope lifetime, and
-// 2. To reset framebuffer allocation to previous state on scope exit.
-// If the framebuffer is recreated, its contents are undefined.
-// FIXME: Prevent/delay discarding framebuffer via any means while any
-// instance of this is alive. At the moment, this isn't an issue.
-class ScopedEnsureFramebufferAllocation {
-public:
-    explicit ScopedEnsureFramebufferAllocation(LayerRendererChromium* layerRenderer)
-        : m_layerRenderer(layerRenderer)
-        , m_framebufferWasInitiallyDiscarded(layerRenderer->isFramebufferDiscarded())
-    {
-        if (m_framebufferWasInitiallyDiscarded)
-            m_layerRenderer->ensureFramebuffer();
-    }
-
-    ~ScopedEnsureFramebufferAllocation()
-    {
-        if (m_framebufferWasInitiallyDiscarded)
-            m_layerRenderer->discardFramebuffer();
-    }
-
-private:
-    LayerRendererChromium* m_layerRenderer;
-    bool m_framebufferWasInitiallyDiscarded;
-};
-
 
 // Setting DEBUG_GL_CALLS to 1 will call glGetError() after almost every GL
 // call made by the compositor. Useful for debugging rendering issues but
 // will significantly degrade performance.
 #define DEBUG_GL_CALLS 0
 
 #if DEBUG_GL_CALLS && !defined ( NDEBUG )
 #define GLC(context, x) { (x), LayerRendererChromium::debugGLCall(context, #x, __FILE__, __LINE__); }
 #else
 #define GLC(context, x) (x)
 #endif
 
 
 }
 
 #endif // USE(ACCELERATED_COMPOSITING)
 
 #endif