chromium/src
0
Fork 0
Code Activity

Android WebView: Crash on compositor context loss

Browse Source 
Android webview does not, and in some cases cannot correctly handle
context loss. Explicitly crash on context loss so they generate
consistent crash stacks.

CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1441273002

Cr-Commit-Position: refs/heads/master@{#367371}
This commit is contained in:
boliu
2016-01-04 13:24:19 -08:00
committed by Commit bot
parent a45c0ddbd4
commit b354724cc2
6 changed files with 14 additions and 2 deletions

2
android_webview/browser/aw_render_thread_context_provider.cc

@ -59,7 +59,7 @@ AwRenderThreadContextProvider::AwRenderThreadContextProvider(
gpu::gles2::ContextCreationAttribHelper attribs_for_gles2;
gpu_blink::WebGraphicsContext3DImpl::ConvertAttributes(attributes,
&attribs_for_gles2);
attribs_for_gles2.lose_context_when_out_of_memory = true;
attribs_for_gles2.lose_context_when_out_of_memory = false;
context_.reset(gpu::GLInProcessContext::Create(
service,

5
android_webview/browser/parent_output_surface.cc

@ -17,6 +17,11 @@ ParentOutputSurface::ParentOutputSurface(
ParentOutputSurface::~ParentOutputSurface() {
}
void ParentOutputSurface::DidLoseOutputSurface() {
// Android WebView does not handle context loss.
LOG(FATAL) << "Render thread context loss";
}
void ParentOutputSurface::Reshape(const gfx::Size& size,
float scale_factor,
bool has_alpha) {

1
android_webview/browser/parent_output_surface.h

@ -17,6 +17,7 @@ class ParentOutputSurface : NON_EXPORTED_BASE(public cc::OutputSurface) {
~ParentOutputSurface() override;
// OutputSurface overrides.
void DidLoseOutputSurface() override;
void Reshape(const gfx::Size& size,
float scale_factor,
bool has_alpha) override;

2
cc/output/output_surface.h

@ -151,7 +151,7 @@ class CC_EXPORT OutputSurface : public base::trace_event::MemoryDumpProvider {
// Get the texture for the main image's overlay.
virtual unsigned GetOverlayTextureId() const;
void DidLoseOutputSurface();
virtual void DidLoseOutputSurface();
void SetMemoryPolicy(const ManagedMemoryPolicy& policy);
// Support for a pull-model where draws are requested by the output surface.

5
content/renderer/android/synchronous_compositor_output_surface.cc

@ -92,6 +92,11 @@ void SynchronousCompositorOutputSurface::SetSyncClient(
sync_client_ = compositor;
}
void SynchronousCompositorOutputSurface::DidLoseOutputSurface() {
// Android WebView does not handle context loss.
LOG(FATAL) << "Renderer compositor context loss";
}
bool SynchronousCompositorOutputSurface::BindToClient(
cc::OutputSurfaceClient* surface_client) {
DCHECK(CalledOnValidThread());

1
content/renderer/android/synchronous_compositor_output_surface.h

@ -67,6 +67,7 @@ class SynchronousCompositorOutputSurface
void SetSyncClient(SynchronousCompositorOutputSurfaceClient* compositor);
// OutputSurface.
void DidLoseOutputSurface() override;
bool BindToClient(cc::OutputSurfaceClient* surface_client) override;
void DetachFromClient() override;
void Reshape(const gfx::Size& size,