diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-08 01:45:24 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-08 01:45:24 +0000 |
| commit | 0f077a5f3e29d65a06794f44c31703421e1099b5 (patch) | |
| tree | e03e164915723038aae056b913078d5ece62679b /cc/CCDirectRenderer.h | |
| parent | 495972babd62847cc623537adfadefe95bb728f7 (diff) | |
| download | chromium_src-0f077a5f3e29d65a06794f44c31703421e1099b5.zip chromium_src-0f077a5f3e29d65a06794f44c31703421e1099b5.tar.gz chromium_src-0f077a5f3e29d65a06794f44c31703421e1099b5.tar.bz2 | |
Update cc snapshot to r127918
TBR=nduca@chromium.org
BUG=
Review URL: https://chromiumcodereview.appspot.com/10917153
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155554 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/CCDirectRenderer.h')
| -rw-r--r-- | cc/CCDirectRenderer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/CCDirectRenderer.h b/cc/CCDirectRenderer.h index 097d5fa..acf44d4 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; }; |