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

Unified Diff: cc/trees/thread_proxy.h

Issue 1336733002: Re-land: cc: Implement shared worker contexts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove bad ChildProcess::current() call 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
Index: cc/trees/thread_proxy.h
diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
index 35db6fc3a7a65f5aabb75ceb65ee5aa8b319e6e3..6fff58230004154fcaf5234ae25772f38226a97e 100644
--- a/cc/trees/thread_proxy.h
+++ b/cc/trees/thread_proxy.h
@@ -155,7 +155,7 @@ class CC_EXPORT ThreadProxy : public Proxy,
void FinishAllRendering() override;
bool IsStarted() const override;
bool CommitToActiveTree() const override;
- void SetOutputSurface(scoped_ptr<OutputSurface>) override;
+ void SetOutputSurface(OutputSurface* output_surface) override;
void SetLayerTreeHostClientReady() override;
void SetVisible(bool visible) override;
void SetThrottleFrameProduction(bool throttle) override;
@@ -272,8 +272,7 @@ class CC_EXPORT ThreadProxy : public Proxy,
CompletionEvent* completion,
bool* has_initialized_output_surface);
void DeleteContentsTexturesOnImplThread(CompletionEvent* completion);
- void InitializeOutputSurfaceOnImplThread(
- scoped_ptr<OutputSurface> output_surface);
+ void InitializeOutputSurfaceOnImplThread(OutputSurface* output_surface);
void FinishGLOnImplThread(CompletionEvent* completion);
void LayerTreeHostClosedOnImplThread(CompletionEvent* completion);
DrawResult DrawSwapInternal(bool forced_draw);

Powered by Google App Engine
This is Rietveld 408576698