| 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;
|
| };
|
|
|
|
|