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

Unified Diff: ui/gl/gl_gl_api_implementation.cc

Issue 1880923002: GLContext: Remove WasDirtiedExternally methods (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « ui/gl/gl_context.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_gl_api_implementation.cc
diff --git a/ui/gl/gl_gl_api_implementation.cc b/ui/gl/gl_gl_api_implementation.cc
index 3f3b0cded0f01d98155ea195db2c883f14bd53fa..369c3952808d1f3c86885415325bb8f7939fb0c8 100644
--- a/ui/gl/gl_gl_api_implementation.cc
+++ b/ui/gl/gl_gl_api_implementation.cc
@@ -544,15 +544,11 @@ bool VirtualGLApi::MakeCurrent(GLContext* virtual_context, GLSurface* surface) {
}
}
- bool state_dirtied_externally = real_context_->GetStateWasDirtiedExternally();
- real_context_->SetStateWasDirtiedExternally(false);
-
DCHECK_EQ(real_context_, GLContext::GetRealCurrent());
DCHECK(real_context_->IsCurrent(NULL));
DCHECK(virtual_context->IsCurrent(surface));
- if (state_dirtied_externally || switched_contexts ||
- virtual_context != current_context_) {
+ if (switched_contexts || virtual_context != current_context_) {
#if DCHECK_IS_ON()
GLenum error = glGetErrorFn();
// Accepting a context loss error here enables using debug mode to work on
@@ -578,9 +574,7 @@ bool VirtualGLApi::MakeCurrent(GLContext* virtual_context, GLSurface* surface) {
}
virtual_state->RestoreState(
- (current_state && !state_dirtied_externally && !switched_contexts)
- ? current_state
- : NULL);
+ (current_state && !switched_contexts) ? current_state : NULL);
}
SetGLApi(temp);
current_context_ = virtual_context;
« no previous file with comments | « ui/gl/gl_context.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698