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

Unified Diff: cc/CCDirectRenderer.h

Issue 10917153: Update cc snapshot to r127918 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | « cc/CCActiveGestureAnimation.cpp ('k') | cc/CCDirectRenderer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCDirectRenderer.h
diff --git a/cc/CCDirectRenderer.h b/cc/CCDirectRenderer.h
index 097d5fa1a773b8fb5155056767a93269d53a720f..acf44d4380c170f13f2b77d9be9edb085f7a10dc 100644
--- a/cc/CCDirectRenderer.h
+++ b/cc/CCDirectRenderer.h
@@ -24,7 +24,7 @@ public:
CCResourceProvider* resourceProvider() const { return m_resourceProvider; }
virtual void decideRenderPassAllocationsForFrame(const CCRenderPassList& renderPassesInDrawOrder) OVERRIDE;
- virtual bool haveCachedResourcesForRenderPassId(int id) const OVERRIDE;
+ virtual bool haveCachedResourcesForRenderPassId(CCRenderPass::Id) const OVERRIDE;
virtual void drawFrame(const CCRenderPassList& renderPassesInDrawOrder, const CCRenderPassIdHashMap& renderPassesById) OVERRIDE;
protected:
@@ -80,7 +80,7 @@ protected:
static void initializeMatrices(DrawingFrame&, const IntRect& drawRect, bool flipY);
static IntRect moveScissorToWindowSpace(const DrawingFrame&, FloatRect scissorRect);
- bool haveCachedResources(int renderPassId) const;
+ bool haveCachedResources(CCRenderPass::Id) const;
static IntSize renderPassTextureSize(const CCRenderPass*);
static GC3Denum renderPassTextureFormat(const CCRenderPass*);
@@ -97,7 +97,7 @@ protected:
virtual void beginDrawingFrame(DrawingFrame&) = 0;
virtual void finishDrawingFrame(DrawingFrame&) = 0;
- HashMap<int, OwnPtr<CachedTexture> > m_renderPassTextures;
+ HashMap<CCRenderPass::Id, OwnPtr<CachedTexture> > m_renderPassTextures;
CCResourceProvider* m_resourceProvider;
};
« no previous file with comments | « cc/CCActiveGestureAnimation.cpp ('k') | cc/CCDirectRenderer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698