Update Chromium to branch 1650 (31.0.1650.63)

Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

1 files changed, 9 insertions, 4 deletions

diff --git a/chromium/gpu/command_buffer/service/renderbuffer_manager.h b/chromium/gpu/command_buffer/service/renderbuffer_manager.h
index 73fc2cb1974..707d2638d08 100644
--- a/chromium/gpu/command_buffer/service/renderbuffer_manager.h
+++ b/chromium/gpu/command_buffer/service/renderbuffer_manager.h
@@ -126,7 +126,8 @@ class GPU_EXPORT RenderbufferManager {
  public:
   RenderbufferManager(MemoryTracker* memory_tracker,
                       GLint max_renderbuffer_size,
-                      GLint max_samples);
+                      GLint max_samples,
+                      bool depth24_supported);
   ~RenderbufferManager();
 
   GLint max_renderbuffer_size() const {
@@ -163,9 +164,12 @@ class GPU_EXPORT RenderbufferManager {
     return memory_tracker_->GetMemRepresented();
   }
 
-  static bool ComputeEstimatedRenderbufferSize(
-      int width, int height, int samples, int internal_format, uint32* size);
-  static GLenum InternalRenderbufferFormatToImplFormat(GLenum impl_format);
+  bool ComputeEstimatedRenderbufferSize(int width,
+                                        int height,
+                                        int samples,
+                                        int internal_format,
+                                        uint32* size) const;
+  GLenum InternalRenderbufferFormatToImplFormat(GLenum impl_format) const;
 
  private:
   friend class Renderbuffer;
@@ -177,6 +181,7 @@ class GPU_EXPORT RenderbufferManager {
 
   GLint max_renderbuffer_size_;
   GLint max_samples_;
+  bool depth24_supported_;
 
   int num_uncleared_renderbuffers_;