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

Unified Diff: android_webview/browser/hardware_renderer.cc

Issue 606113003: Revert of Make cc output surface creation async (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 3 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/hardware_renderer.h ('k') | cc/blink/web_layer_impl_fixed_bounds_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/browser/hardware_renderer.cc
diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc
index 60f48af1dac3f3a2b5e91238ab07146d22005e0e..a905cef41bac7298ac33f731d1fd414fff9f6643 100644
--- a/android_webview/browser/hardware_renderer.cc
+++ b/android_webview/browser/hardware_renderer.cc
@@ -245,7 +245,8 @@
gl_surface_->ResetBackingFrameBufferObject();
}
-void HardwareRenderer::RequestNewOutputSurface(bool fallback) {
+scoped_ptr<cc::OutputSurface> HardwareRenderer::CreateOutputSurface(
+ bool fallback) {
// Android webview does not support losing output surface.
DCHECK(!fallback);
scoped_refptr<cc::ContextProvider> context_provider =
@@ -254,8 +255,7 @@
scoped_ptr<ParentOutputSurface> output_surface_holder(
new ParentOutputSurface(context_provider));
output_surface_ = output_surface_holder.get();
- layer_tree_host_->SetOutputSurface(
- output_surface_holder.PassAs<cc::OutputSurface>());
+ return output_surface_holder.PassAs<cc::OutputSurface>();
}
void HardwareRenderer::UnusedResourcesAreAvailable() {
« no previous file with comments | « android_webview/browser/hardware_renderer.h ('k') | cc/blink/web_layer_impl_fixed_bounds_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698