| Index: cc/CCDirectRenderer.h
|
| diff --git a/cc/CCDirectRenderer.h b/cc/CCDirectRenderer.h
|
| index 73e6dc685377a53c808385f534aa9c0f48b9e563..3e61292ac6ba9d563f4a77d05f1752f426333915 100644
|
| --- a/cc/CCDirectRenderer.h
|
| +++ b/cc/CCDirectRenderer.h
|
| @@ -2,104 +2,5 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CCDirectRenderer_h
|
| -#define CCDirectRenderer_h
|
| -
|
| -#include "base/basictypes.h"
|
| -#include "CCRenderer.h"
|
| -#include "CCResourceProvider.h"
|
| -#include "CCScopedTexture.h"
|
| -
|
| -namespace cc {
|
| -
|
| -class CCResourceProvider;
|
| -
|
| -// This is the base class for code shared between the GL and software
|
| -// renderer implementations. "Direct" refers to the fact that it does not
|
| -// delegate rendering to another compositor.
|
| -class CCDirectRenderer : public CCRenderer {
|
| -public:
|
| - virtual ~CCDirectRenderer();
|
| -
|
| - CCResourceProvider* resourceProvider() const { return m_resourceProvider; }
|
| -
|
| - virtual void decideRenderPassAllocationsForFrame(const CCRenderPassList& renderPassesInDrawOrder) OVERRIDE;
|
| - virtual bool haveCachedResourcesForRenderPassId(CCRenderPass::Id) const OVERRIDE;
|
| - virtual void drawFrame(const CCRenderPassList& renderPassesInDrawOrder, const CCRenderPassIdHashMap& renderPassesById) OVERRIDE;
|
| -
|
| -protected:
|
| - CCDirectRenderer(CCRendererClient* client, CCResourceProvider* resourceProvider);
|
| -
|
| - struct DrawingFrame {
|
| - DrawingFrame();
|
| - ~DrawingFrame();
|
| -
|
| - const CCRenderPassIdHashMap* renderPassesById;
|
| - const CCRenderPass* rootRenderPass;
|
| - const CCRenderPass* currentRenderPass;
|
| - const CCScopedTexture* currentTexture;
|
| -
|
| - FloatRect rootDamageRect;
|
| -
|
| - WebKit::WebTransformationMatrix projectionMatrix;
|
| - WebKit::WebTransformationMatrix windowMatrix;
|
| - bool flippedY;
|
| - FloatRect scissorRectInRenderPassSpace;
|
| - };
|
| -
|
| - class CachedTexture : public CCScopedTexture {
|
| - public:
|
| - static scoped_ptr<CachedTexture> create(CCResourceProvider* resourceProvider) {
|
| - return make_scoped_ptr(new CachedTexture(resourceProvider));
|
| - }
|
| - virtual ~CachedTexture() {}
|
| -
|
| - bool isComplete() const { return m_isComplete; }
|
| - void setIsComplete(bool isComplete) { m_isComplete = isComplete; }
|
| -
|
| - protected:
|
| - explicit CachedTexture(CCResourceProvider* resourceProvider)
|
| - : CCScopedTexture(resourceProvider)
|
| - , m_isComplete(false)
|
| - {
|
| - }
|
| -
|
| - private:
|
| - bool m_isComplete;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(CachedTexture);
|
| - };
|
| -
|
| - static FloatRect quadVertexRect();
|
| - static void quadRectTransform(WebKit::WebTransformationMatrix* quadRectTransform, const WebKit::WebTransformationMatrix& quadTransform, const FloatRect& quadRect);
|
| - static void initializeMatrices(DrawingFrame&, const IntRect& drawRect, bool flipY);
|
| - static IntRect moveScissorToWindowSpace(const DrawingFrame&, FloatRect scissorRect);
|
| -
|
| - bool haveCachedResources(CCRenderPass::Id) const;
|
| - static IntSize renderPassTextureSize(const CCRenderPass*);
|
| - static GC3Denum renderPassTextureFormat(const CCRenderPass*);
|
| -
|
| - void drawRenderPass(DrawingFrame&, const CCRenderPass*);
|
| - bool useRenderPass(DrawingFrame&, const CCRenderPass*);
|
| -
|
| - virtual void bindFramebufferToOutputSurface(DrawingFrame&) = 0;
|
| - virtual bool bindFramebufferToTexture(DrawingFrame&, const CCScopedTexture*, const IntRect& framebufferRect) = 0;
|
| - virtual void setDrawViewportSize(const IntSize&) = 0;
|
| - virtual void enableScissorTestRect(const IntRect& scissorRect) = 0;
|
| - virtual void disableScissorTest() = 0;
|
| - virtual void clearFramebuffer(DrawingFrame&) = 0;
|
| - virtual void drawQuad(DrawingFrame&, const CCDrawQuad*) = 0;
|
| - virtual void beginDrawingFrame(DrawingFrame&) = 0;
|
| - virtual void finishDrawingFrame(DrawingFrame&) = 0;
|
| - virtual bool flippedFramebuffer() const = 0;
|
| -
|
| - ScopedPtrHashMap<CCRenderPass::Id, CachedTexture> m_renderPassTextures;
|
| - CCResourceProvider* m_resourceProvider;
|
| -
|
| -private:
|
| - DISALLOW_COPY_AND_ASSIGN(CCDirectRenderer);
|
| -};
|
| -
|
| -} // namespace cc
|
| -
|
| -#endif // CCDirectRenderer_h
|
| +// Temporary forwarding header
|
| +#include "cc/direct_renderer.h"
|
|
|