diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 17:06:30 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 17:06:30 +0000 |
| commit | 94cd23b8f0a3d9fa87ba0788d02f8ec1394b7510 (patch) | |
| tree | 50b49f35a30c39adb3c89a98380ce126b1687463 /android_webview | |
| parent | 97af21ce3e19c147b16c3f3e37284fac252ad51a (diff) | |
| download | chromium_src-94cd23b8f0a3d9fa87ba0788d02f8ec1394b7510.zip chromium_src-94cd23b8f0a3d9fa87ba0788d02f8ec1394b7510.tar.gz chromium_src-94cd23b8f0a3d9fa87ba0788d02f8ec1394b7510.tar.bz2 | |
aw: Flush idle queue on hardware teardown
Not flushing idle queue on tear down could lead to deadlocks.
BUG=399311
Review URL: https://codereview.chromium.org/436473002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/native/aw_contents.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc index 5cecb00..fdddf9f 100644 --- a/android_webview/native/aw_contents.cc +++ b/android_webview/native/aw_contents.cc @@ -364,6 +364,9 @@ void AwContents::DrawGL(AwDrawGLInfo* draw_info) { if (shared_renderer_state_.IsInsideHardwareRelease()) { hardware_renderer_.reset(); + // Flush the idle queue in tear down. + DeferredGpuCommandService::GetInstance()->PerformIdleWork(true); + DCHECK(!DeferredGpuCommandService::GetInstance()->HasIdleWork()); return; } |