diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 06:13:20 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 06:13:20 +0000 |
| commit | 3be2171df16267e9fa5644f1e7ea09edd45e13ca (patch) | |
| tree | 4cd9165ad8d7e624bf4e33bea7c0fb36b1dcc688 /cc/layer_tree_host_impl.h | |
| parent | 51e5bdcb18a9b316761e4361fc0befa9767de0a0 (diff) | |
| download | chromium_src-3be2171df16267e9fa5644f1e7ea09edd45e13ca.zip chromium_src-3be2171df16267e9fa5644f1e7ea09edd45e13ca.tar.gz chromium_src-3be2171df16267e9fa5644f1e7ea09edd45e13ca.tar.bz2 | |
cc: Finish the rename from cc::GraphicsContext to cc::OutputSurface
It is far too confusing to deal with OutputSurface code when half the time it is
called a GraphicsContext incorrectly. Cleaning this up so I can think about the
code properly as I upstream the Ubercomp CL.
R=jamesr,piman
BUG=146080
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=171403
Review URL: https://codereview.chromium.org/11450019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_tree_host_impl.h')
| -rw-r--r-- | cc/layer_tree_host_impl.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h index d4aa8f5..675d765 100644 --- a/cc/layer_tree_host_impl.h +++ b/cc/layer_tree_host_impl.h @@ -37,7 +37,7 @@ struct RenderingStats; // LayerTreeHost->Proxy callback interface. class LayerTreeHostImplClient { public: - virtual void didLoseContextOnImplThread() = 0; + virtual void didLoseOutputSurfaceOnImplThread() = 0; virtual void onSwapBuffersCompleteOnImplThread() = 0; virtual void onVSyncParametersChanged(base::TimeTicks timebase, base::TimeDelta interval) = 0; virtual void onCanDrawStateChanged(bool canDraw) = 0; @@ -165,7 +165,7 @@ public: // RendererClient implementation virtual const gfx::Size& deviceViewportSize() const OVERRIDE; virtual const LayerTreeSettings& settings() const OVERRIDE; - virtual void didLoseContext() OVERRIDE; + virtual void didLoseOutputSurface() OVERRIDE; virtual void onSwapBuffersComplete() OVERRIDE; virtual void setFullRootLayerDamage() OVERRIDE; virtual void setManagedMemoryPolicy(const ManagedMemoryPolicy& policy) OVERRIDE; @@ -181,14 +181,14 @@ public: // Implementation bool canDraw(); - GraphicsContext* context() const; + OutputSurface* outputSurface() const; std::string layerTreeAsText() const; void finishAllRendering(); int sourceAnimationFrameNumber() const; - bool initializeRenderer(scoped_ptr<GraphicsContext>); + bool initializeRenderer(scoped_ptr<OutputSurface>); bool isContextLost(); TileManager* tileManager() { return m_tileManager.get(); } Renderer* renderer() { return m_renderer.get(); } @@ -324,7 +324,7 @@ private: void setBackgroundTickingEnabled(bool); gfx::Size contentSize() const; - void sendDidLoseContextRecursive(LayerImpl*); + void sendDidLoseOutputSurfaceRecursive(LayerImpl*); void clearRenderSurfaces(); bool ensureRenderSurfaceLayerList(); void clearCurrentlyScrollingLayer(); @@ -333,7 +333,7 @@ private: void dumpRenderSurfaces(std::string*, int indent, const LayerImpl*) const; - scoped_ptr<GraphicsContext> m_context; + scoped_ptr<OutputSurface> m_outputSurface; scoped_ptr<ResourceProvider> m_resourceProvider; scoped_ptr<Renderer> m_renderer; scoped_ptr<TileManager> m_tileManager; |