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

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: comments 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
« no previous file with comments | « android_webview/browser/shared_renderer_state.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..825843e6942256f33bfae5ed4fd5dca9332923fb 100644
--- a/android_webview/browser/shared_renderer_state.cc
+++ b/android_webview/browser/shared_renderer_state.cc
@@ -285,11 +285,22 @@ void SharedRendererState::DrawGL(AwDrawGLInfo* draw_info) {
}
void SharedRendererState::ReleaseHardwareDrawIfNeededOnUI() {
+ ReleaseCompositorResourcesIfNeededOnUI(true);
+}
+
+void SharedRendererState::DeleteHardwareRendererOnUI() {
+ ReleaseCompositorResourcesIfNeededOnUI(false);
+}
+
+void SharedRendererState::ReleaseCompositorResourcesIfNeededOnUI(
+ bool release_hardware_draw) {
DCHECK(ui_loop_->BelongsToCurrentThread());
InsideHardwareReleaseReset auto_inside_hardware_release_reset(this);
browser_view_renderer_->DetachFunctorFromView();
bool hardware_initialized = browser_view_renderer_->hardware_enabled();
+ // If the WebView gets onTrimMemory >= MODERATE twice in a row, the 2nd
+ // onTrimMemory will result in an unnecessary Render Thread DrawGL call.
if (hardware_initialized) {
bool draw_functor_succeeded = browser_view_renderer_->RequestDrawGL(true);
if (!draw_functor_succeeded) {
@@ -300,7 +311,8 @@ void SharedRendererState::ReleaseHardwareDrawIfNeededOnUI() {
DrawGL(&info);
}
- browser_view_renderer_->ReleaseHardware();
+ if (release_hardware_draw)
+ browser_view_renderer_->ReleaseHardware();
}
GLViewRendererManager* manager = GLViewRendererManager::GetInstance();
« no previous file with comments | « android_webview/browser/shared_renderer_state.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698