Rename discardFramebufferEXT to discardBackbufferCHROMIUM to avoid collision with real discardFrame…

cc/gl_renderer.h

 // Copyright 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_GL_RENDERER_H_
 #define CC_GL_RENDERER_H_
 
 #include "cc/cc_export.h"
 #include "cc/checkerboard_draw_quad.h"
 #include "cc/debug_border_draw_quad.h"
@@ skipping 50 matching lines @@
 
     virtual void setVisible(bool) OVERRIDE;
 
     virtual void sendManagedMemoryStats(size_t bytesVisible, size_t bytesVisibleAndNearby, size_t bytesAllocated) OVERRIDE;
 
 protected:
     GLRenderer(RendererClient*, ResourceProvider*);
 
     static void debugGLCall(WebKit::WebGraphicsContext3D*, const char* command, const char* file, int line);
 
-    bool isFramebufferDiscarded() const { return m_isFramebufferDiscarded; }
+    bool isBackbufferDiscarded() const { return m_isBackbufferDiscarded; }
     bool initialize();
 
     const gfx::QuadF& sharedGeometryQuad() const { return m_sharedGeometryQuad; }
     const GeometryBinding* sharedGeometry() const { return m_sharedGeometry.get(); }
 
     bool getFramebufferTexture(ScopedResource*, const gfx::Rect& deviceRect);
     void releaseRenderPassTextures();
 
     virtual void bindFramebufferToOutputSurface(DrawingFrame&) OVERRIDE;
     virtual bool bindFramebufferToTexture(DrawingFrame&, const ScopedResource*, const gfx::Rect& framebufferRect) OVERRIDE;
@@ skipping 41 matching lines @@
     bool makeContextCurrent();
 
     bool initializeSharedObjects();
     void cleanupSharedObjects();
 
     // WebKit::WebGraphicsContext3D::WebGraphicsSwapBuffersCompleteCallbackCHROMIUM implementation.
     virtual void onSwapBuffersComplete() OVERRIDE;
 
     // WebKit::WebGraphicsContext3D::WebGraphicsMemoryAllocationChangedCallbackCHROMIUM implementation.
     virtual void onMemoryAllocationChanged(WebKit::WebGraphicsMemoryAllocation) OVERRIDE;
-    void discardFramebuffer();
-    void ensureFramebuffer();
+    void discardBackbuffer();
+    void ensureBackbuffer();
     void enforceMemoryPolicy();
 
     // WebGraphicsContext3D::WebGraphicsContextLostCallback implementation.
     virtual void onContextLost() OVERRIDE;
 
     RendererCapabilities m_capabilities;
 
     unsigned m_offscreenFramebufferId;
 
     scoped_ptr<GeometryBinding> m_sharedGeometry;
@@ skipping 70 matching lines @@
     scoped_ptr<VideoYUVProgram> m_videoYUVProgram;
     scoped_ptr<VideoStreamTextureProgram> m_videoStreamTextureProgram;
 
     scoped_ptr<SolidColorProgram> m_solidColorProgram;
 
     WebKit::WebGraphicsContext3D* m_context;
 
     gfx::Rect m_swapBufferRect;
     gfx::Rect m_scissorRect;
     bool m_isViewportChanged;
-    bool m_isFramebufferDiscarded;
-    bool m_discardFramebufferWhenNotVisible;
+    bool m_isBackbufferDiscarded;
+    bool m_discardBackbufferWhenNotVisible;
     bool m_isUsingBindUniform;
     bool m_visible;
     bool m_isScissorEnabled;
     bool m_blendShadow;
     unsigned m_programShadow;
     TexturedQuadDrawCache m_drawCache;
 
     scoped_ptr<ResourceProvider::ScopedWriteLockGL> m_currentFramebufferLock;
 
     DISALLOW_COPY_AND_ASSIGN(GLRenderer);
 };
 
 
 // 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, GLRenderer::debugGLCall(&*context, #x, __FILE__, __LINE__))
 #else
 #define GLC(context, x) (x)
 #endif
 
 
 }
 
 #endif  // CC_GL_RENDERER_H_