Rename discardFramebufferEXT to discardBackbufferCHROMIUM to avoid collision with real discardFrame…

cc/gl_renderer.h

Index: cc/gl_renderer.h
diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h
index 653b4ac7fa3f57646772cb4ff9262810e1f577ae..4cfdfc06a9d4fc7e80ae366d86cba5cbef2fa6b3 100644
--- a/cc/gl_renderer.h
+++ b/cc/gl_renderer.h
@@ -68,7 +68,7 @@ protected:
 
     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; }
@@ -130,8 +130,8 @@ private:
 
     // WebKit::WebGraphicsContext3D::WebGraphicsMemoryAllocationChangedCallbackCHROMIUM implementation.
     virtual void onMemoryAllocationChanged(WebKit::WebGraphicsMemoryAllocation) OVERRIDE;
-    void discardFramebuffer();
-    void ensureFramebuffer();
+    void discardBackbuffer();
+    void ensureBackbuffer();
     void enforceMemoryPolicy();
 
     // WebGraphicsContext3D::WebGraphicsContextLostCallback implementation.
@@ -222,8 +222,8 @@ private:
     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;