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

Unified Diff: android_webview/browser/shared_renderer_state.cc

Issue 1082393003: TrimMemory strategy while offscreenPreRaster is on. (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: Created 5 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
Index: android_webview/browser/shared_renderer_state.cc
diff --git a/android_webview/browser/shared_renderer_state.cc b/android_webview/browser/shared_renderer_state.cc
index 1d9874ee2d6c4962b57588e552183b1b29255d76..7fecf87a2c16b24316679a4a98d472f6539c1890 100644
--- a/android_webview/browser/shared_renderer_state.cc
+++ b/android_webview/browser/shared_renderer_state.cc
@@ -287,6 +287,7 @@ void SharedRendererState::DrawGL(AwDrawGLInfo* draw_info) {
void SharedRendererState::ReleaseHardwareDrawIfNeededOnUI() {
DCHECK(ui_loop_->BelongsToCurrentThread());
InsideHardwareReleaseReset auto_inside_hardware_release_reset(this);
+ bool offscreen_pre_raster = browser_view_renderer_->offscreen_pre_raster();
browser_view_renderer_->DetachFunctorFromView();
bool hardware_initialized = browser_view_renderer_->hardware_enabled();
@@ -300,7 +301,8 @@ void SharedRendererState::ReleaseHardwareDrawIfNeededOnUI() {
DrawGL(&info);
}
- browser_view_renderer_->ReleaseHardware();
+ if (!offscreen_pre_raster)
+ browser_view_renderer_->ReleaseHardware();
boliu 2015/04/15 00:31:01 Then this is also skipping ReleaseHardware in deta
hush (inactive) 2015/04/15 21:35:48 Yeah. That is a problem. And it actually caused so
}
GLViewRendererManager* manager = GLViewRendererManager::GetInstance();
@@ -313,7 +315,7 @@ void SharedRendererState::ReleaseHardwareDrawIfNeededOnUI() {
}
}
- if (hardware_initialized) {
+ if (hardware_initialized && !offscreen_pre_raster) {
// Flush any invoke functors that's caused by ReleaseHardware.
browser_view_renderer_->RequestDrawGL(true);
}

Powered by Google App Engine
This is Rietveld 408576698