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

Side by Side Diff: android_webview/browser/parent_output_surface.cc

Issue 1441273002: Android WebView: Crash on compositor context loss (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: don't lose on memory Created 5 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "android_webview/browser/parent_output_surface.h" 5 #include "android_webview/browser/parent_output_surface.h"
6 6
7 #include "cc/output/output_surface_client.h" 7 #include "cc/output/output_surface_client.h"
8 #include "gpu/command_buffer/client/gles2_interface.h" 8 #include "gpu/command_buffer/client/gles2_interface.h"
9 9
10 namespace android_webview { 10 namespace android_webview {
11 11
12 ParentOutputSurface::ParentOutputSurface( 12 ParentOutputSurface::ParentOutputSurface(
13 scoped_refptr<cc::ContextProvider> context_provider) 13 scoped_refptr<cc::ContextProvider> context_provider)
14 : cc::OutputSurface(context_provider) { 14 : cc::OutputSurface(context_provider) {
15 } 15 }
16 16
17 ParentOutputSurface::~ParentOutputSurface() { 17 ParentOutputSurface::~ParentOutputSurface() {
18 } 18 }
19 19
20 void ParentOutputSurface::DidLoseOutputSurface() {
21 // Android WebView does not handle context loss.
22 LOG(FATAL) << "Render thread context loss";
23 }
24
20 void ParentOutputSurface::Reshape(const gfx::Size& size, float scale_factor) { 25 void ParentOutputSurface::Reshape(const gfx::Size& size, float scale_factor) {
21 DCHECK_EQ(1.f, scale_factor); 26 DCHECK_EQ(1.f, scale_factor);
22 surface_size_ = size; 27 surface_size_ = size;
23 } 28 }
24 29
25 void ParentOutputSurface::SwapBuffers(cc::CompositorFrame* frame) { 30 void ParentOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
26 context_provider_->ContextGL()->ShallowFlushCHROMIUM(); 31 context_provider_->ContextGL()->ShallowFlushCHROMIUM();
27 client_->DidSwapBuffers(); 32 client_->DidSwapBuffers();
28 } 33 }
29 34
30 } // namespace android_webview 35 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698