Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(626)

Unified Diff: content/common/gpu/gpu_command_buffer_stub.h

Issue 8233027: Support dynamic switching between integrated and discrete GPUs on Mac OS X. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/gpu_command_buffer_stub.h
===================================================================
--- content/common/gpu/gpu_command_buffer_stub.h (revision 105158)
+++ content/common/gpu/gpu_command_buffer_stub.h (working copy)
@@ -15,6 +15,7 @@
#include "base/memory/weak_ptr.h"
#include "base/task.h"
#include "content/common/gpu/media/gpu_video_decode_accelerator.h"
+#include "gpu/command_buffer/common/constants.h"
#include "gpu/command_buffer/service/command_buffer_service.h"
#include "gpu/command_buffer/service/context_group.h"
#include "gpu/command_buffer/service/gpu_scheduler.h"
@@ -22,6 +23,7 @@
#include "ipc/ipc_message.h"
#include "ui/gfx/gl/gl_context.h"
#include "ui/gfx/gl/gl_surface.h"
+#include "ui/gfx/gl/gpu_preference.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/size.h"
#include "ui/gfx/surface/transport_dib.h"
@@ -46,6 +48,7 @@
const gpu::gles2::DisallowedFeatures& disallowed_features,
const std::string& allowed_extensions,
const std::vector<int32>& attribs,
+ gfx::GpuPreference gpu_preference,
int32 route_id,
int32 renderer_id,
int32 render_view_id,
@@ -78,6 +81,8 @@
void ViewResized();
+ gfx::GpuPreference gpu_preference() { return gpu_preference_; }
+
private:
void Destroy();
@@ -140,6 +145,7 @@
gpu::gles2::DisallowedFeatures disallowed_features_;
std::string allowed_extensions_;
std::vector<int32> requested_attribs_;
+ gfx::GpuPreference gpu_preference_;
int32 route_id_;
bool software_;
uint32 last_flush_count_;

Powered by Google App Engine
This is Rietveld 408576698