Merge 193302 "Force GPU switch with CGLSetVirtualScreen only for..."

gpu/command_buffer/service/framebuffer_manager.h

 // Copyright (c) 2012 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 GPU_COMMAND_BUFFER_SERVICE_FRAMEBUFFER_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_FRAMEBUFFER_MANAGER_H_
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
@@ skipping 103 matching lines @@
 
   // Check all attachments are cleared
   bool IsCleared() const;
 
   GLenum GetDrawBuffer(GLenum draw_buffer) const;
 
   void SetDrawBuffers(GLsizei n, const GLenum* bufs);
 
   static void ClearFramebufferCompleteComboMap();
 
+  static bool AllowFramebufferComboCompleteMapForTesting() {
+    return allow_framebuffer_combo_complete_map_;
+  }
+
  private:
   friend class FramebufferManager;
   friend class base::RefCounted<Framebuffer>;
 
   ~Framebuffer();
 
   void MarkAsDeleted();
 
   void MarkAttachmentsAsCleared(
     RenderbufferManager* renderbuffer_manager,
@@ skipping 23 matching lines @@
   unsigned framebuffer_complete_state_count_id_;
 
   // A map of attachments.
   typedef base::hash_map<GLenum, scoped_refptr<Attachment> > AttachmentMap;
   AttachmentMap attachments_;
 
   // A map of successful frame buffer combos. If it's in the map
   // it should be FRAMEBUFFER_COMPLETE.
   typedef base::hash_map<std::string, bool> FramebufferComboCompleteMap;
   static FramebufferComboCompleteMap* framebuffer_combo_complete_map_;
+  static bool allow_framebuffer_combo_complete_map_;
 
   scoped_array<GLenum> draw_buffers_;
 
   DISALLOW_COPY_AND_ASSIGN(Framebuffer);
 };
 
 // This class keeps track of the frambebuffers and their attached renderbuffers
 // so we can correctly clear them.
 class GPU_EXPORT FramebufferManager {
  public:
@@ skipping 54 matching lines @@
   uint32 max_draw_buffers_;
   uint32 max_color_attachments_;
 
   DISALLOW_COPY_AND_ASSIGN(FramebufferManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_FRAMEBUFFER_MANAGER_H_