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

Unified Diff: android_webview/browser/scoped_app_gl_state_restore.cc

Issue 25082006: [Android WebView] OnMemoryPressure to drop tile memory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: indent Created 7 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: android_webview/browser/scoped_app_gl_state_restore.cc
diff --git a/android_webview/browser/scoped_app_gl_state_restore.cc b/android_webview/browser/scoped_app_gl_state_restore.cc
index f72c1b4669c365d42b03f5862db98d580d6620ec..6f71eee68669ff57dfea2e150f3844fb9d21ced8 100644
--- a/android_webview/browser/scoped_app_gl_state_restore.cc
+++ b/android_webview/browser/scoped_app_gl_state_restore.cc
@@ -64,7 +64,7 @@ ScopedAppGLStateRestore::ScopedAppGLStateRestore(CallMode mode) : mode_(mode) {
DCHECK_EQ(0, vertex_array_buffer_binding_);
DCHECK_EQ(0, index_array_buffer_binding_);
break;
- case MODE_DETACH_FROM_WINDOW:
+ case MODE_RESOURCE_MANAGEMENT:
glGetBooleanv(GL_BLEND, &blend_enabled_);
glGetIntegerv(GL_BLEND_SRC_RGB, &blend_src_rgb_);
glGetIntegerv(GL_BLEND_SRC_ALPHA, &blend_src_alpha_);
@@ -205,17 +205,22 @@ ScopedAppGLStateRestore::~ScopedAppGLStateRestore() {
enable_sample_alpha_to_coverage_);
GLEnableDisable(GL_SAMPLE_COVERAGE, enable_sample_coverage_);
- if (mode_ == MODE_DETACH_FROM_WINDOW) {
- GLEnableDisable(GL_BLEND, blend_enabled_);
- glBlendFuncSeparate(
- blend_src_rgb_, blend_dest_rgb_, blend_src_alpha_, blend_dest_alpha_);
+ switch(mode_) {
+ case MODE_DRAW:
+ // No-op.
+ break;
+ case MODE_RESOURCE_MANAGEMENT:
+ GLEnableDisable(GL_BLEND, blend_enabled_);
+ glBlendFuncSeparate(
+ blend_src_rgb_, blend_dest_rgb_, blend_src_alpha_, blend_dest_alpha_);
- glViewport(viewport_[0], viewport_[1], viewport_[2], viewport_[3]);
+ glViewport(viewport_[0], viewport_[1], viewport_[2], viewport_[3]);
- GLEnableDisable(GL_SCISSOR_TEST, scissor_test_);
+ GLEnableDisable(GL_SCISSOR_TEST, scissor_test_);
- glScissor(
- scissor_box_[0], scissor_box_[1], scissor_box_[2], scissor_box_[3]);
+ glScissor(
+ scissor_box_[0], scissor_box_[1], scissor_box_[2], scissor_box_[3]);
+ break;
}
GLEnableDisable(GL_STENCIL_TEST, stencil_test_);

Powered by Google App Engine
This is Rietveld 408576698