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

Unified Diff: ui/gl/gl_context_cgl.cc

Issue 2497503004: Revert of Refactor context creation parameters into a struct. (Closed)
Patch Set: Created 4 years, 1 month 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
« no previous file with comments | « ui/gl/gl_context_cgl.h ('k') | ui/gl/gl_context_egl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_context_cgl.cc
diff --git a/ui/gl/gl_context_cgl.cc b/ui/gl/gl_context_cgl.cc
index 2a105c4983d0fb1ee86e2e75ccf5336afbde3b44..8ad268996ab7fdd872df55cc891e9a036d34b673 100644
--- a/ui/gl/gl_context_cgl.cc
+++ b/ui/gl/gl_context_cgl.cc
@@ -91,17 +91,11 @@
}
bool GLContextCGL::Initialize(GLSurface* compatible_surface,
- const GLContextAttribs& attribs) {
+ GpuPreference gpu_preference) {
DCHECK(compatible_surface);
- // webgl_compatibility_context and disabling bind_generates_resource are not
- // supported.
- DCHECK(!attribs.webgl_compatibility_context &&
- attribs.bind_generates_resource);
-
- GpuPreference gpu_preference =
- ui::GpuSwitchingManager::GetInstance()->AdjustGpuPreference(
- attribs.gpu_preference);
+ gpu_preference = ui::GpuSwitchingManager::GetInstance()->AdjustGpuPreference(
+ gpu_preference);
GLContextCGL* share_context = share_group() ?
static_cast<GLContextCGL*>(share_group()->GetContext()) : nullptr;
« no previous file with comments | « ui/gl/gl_context_cgl.h ('k') | ui/gl/gl_context_egl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698