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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/trees/single_thread_proxy.cc

Issue 1336733002: Re-land: cc: Implement shared worker contexts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: shutdown fix Created 5 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
« cc/trees/layer_tree_host.cc ('K') | « cc/trees/single_thread_proxy.h ('k') | cc/trees/thread_proxy.h » ('j') | content/child/child_process.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/single_thread_proxy.cc
diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
index 72a718c2958addd5fd55e2389925ef4bcbba7de3..11012151f1ca86d2e4f0ab8496290236230f882f 100644
--- a/cc/trees/single_thread_proxy.cc
+++ b/cc/trees/single_thread_proxy.cc
@@ -149,8 +149,7 @@ void SingleThreadProxy::RequestNewOutputSurface() {
layer_tree_host_->RequestNewOutputSurface();
}
-void SingleThreadProxy::SetOutputSurface(
- scoped_ptr<OutputSurface> output_surface) {
+void SingleThreadProxy::SetOutputSurface(OutputSurface* output_surface) {
DCHECK(Proxy::IsMainThread());
DCHECK(layer_tree_host_->output_surface_lost());
DCHECK(output_surface_creation_requested_);
@@ -160,7 +159,7 @@ void SingleThreadProxy::SetOutputSurface(
{
DebugScopedSetMainThreadBlocked main_thread_blocked(this);
DebugScopedSetImplThread impl(this);
- success = layer_tree_host_impl_->InitializeRenderer(output_surface.Pass());
+ success = layer_tree_host_impl_->InitializeRenderer(output_surface);
}
if (success) {
« cc/trees/layer_tree_host.cc ('K') | « cc/trees/single_thread_proxy.h ('k') | cc/trees/thread_proxy.h » ('j') | content/child/child_process.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698