Index: cc/direct_renderer.cc |
diff --git a/cc/direct_renderer.cc b/cc/direct_renderer.cc |
index 23fa1d31790c50b77d739621151e23de6bdfdc3d..7879f652a2c2c94844cc8683e66129ccde51b0e3 100644 |
--- a/cc/direct_renderer.cc |
+++ b/cc/direct_renderer.cc |
@@ -50,7 +50,7 @@ static WebTransformationMatrix windowMatrix(int x, int y, int width, int height) |
namespace cc { |
-CCDirectRenderer::DrawingFrame::DrawingFrame() |
+DirectRenderer::DrawingFrame::DrawingFrame() |
: rootRenderPass(0) |
, currentRenderPass(0) |
, currentTexture(0) |
@@ -58,19 +58,19 @@ CCDirectRenderer::DrawingFrame::DrawingFrame() |
{ |
} |
-CCDirectRenderer::DrawingFrame::~DrawingFrame() |
+DirectRenderer::DrawingFrame::~DrawingFrame() |
{ |
} |
// |
// static |
-FloatRect CCDirectRenderer::quadVertexRect() |
+FloatRect DirectRenderer::quadVertexRect() |
{ |
return FloatRect(-0.5, -0.5, 1, 1); |
} |
// static |
-void CCDirectRenderer::quadRectTransform(WebKit::WebTransformationMatrix* quadRectTransform, const WebKit::WebTransformationMatrix& quadTransform, const FloatRect& quadRect) |
+void DirectRenderer::quadRectTransform(WebKit::WebTransformationMatrix* quadRectTransform, const WebKit::WebTransformationMatrix& quadTransform, const FloatRect& quadRect) |
{ |
*quadRectTransform = quadTransform; |
quadRectTransform->translate(0.5 * quadRect.width() + quadRect.x(), 0.5 * quadRect.height() + quadRect.y()); |
@@ -78,7 +78,7 @@ void CCDirectRenderer::quadRectTransform(WebKit::WebTransformationMatrix* quadRe |
} |
// static |
-void CCDirectRenderer::initializeMatrices(DrawingFrame& frame, const IntRect& drawRect, bool flipY) |
+void DirectRenderer::initializeMatrices(DrawingFrame& frame, const IntRect& drawRect, bool flipY) |
{ |
if (flipY) |
frame.projectionMatrix = orthoProjectionMatrix(drawRect.x(), drawRect.maxX(), drawRect.maxY(), drawRect.y()); |
@@ -89,7 +89,7 @@ void CCDirectRenderer::initializeMatrices(DrawingFrame& frame, const IntRect& dr |
} |
// static |
-IntRect CCDirectRenderer::moveScissorToWindowSpace(const DrawingFrame& frame, FloatRect scissorRect) |
+IntRect DirectRenderer::moveScissorToWindowSpace(const DrawingFrame& frame, FloatRect scissorRect) |
{ |
IntRect scissorRectInCanvasSpace = enclosingIntRect(scissorRect); |
// The scissor coordinates must be supplied in viewport space so we need to offset |
@@ -103,32 +103,32 @@ IntRect CCDirectRenderer::moveScissorToWindowSpace(const DrawingFrame& frame, Fl |
return scissorRectInCanvasSpace; |
} |
-CCDirectRenderer::CCDirectRenderer(CCRendererClient* client, CCResourceProvider* resourceProvider) |
- : CCRenderer(client) |
+DirectRenderer::DirectRenderer(RendererClient* client, ResourceProvider* resourceProvider) |
+ : Renderer(client) |
, m_resourceProvider(resourceProvider) |
{ |
} |
-CCDirectRenderer::~CCDirectRenderer() |
+DirectRenderer::~DirectRenderer() |
{ |
} |
-void CCDirectRenderer::decideRenderPassAllocationsForFrame(const CCRenderPassList& renderPassesInDrawOrder) |
+void DirectRenderer::decideRenderPassAllocationsForFrame(const RenderPassList& renderPassesInDrawOrder) |
{ |
- base::hash_map<CCRenderPass::Id, const CCRenderPass*> renderPassesInFrame; |
+ base::hash_map<RenderPass::Id, const RenderPass*> renderPassesInFrame; |
for (size_t i = 0; i < renderPassesInDrawOrder.size(); ++i) |
- renderPassesInFrame.insert(std::pair<CCRenderPass::Id, const CCRenderPass*>(renderPassesInDrawOrder[i]->id(), renderPassesInDrawOrder[i])); |
+ renderPassesInFrame.insert(std::pair<RenderPass::Id, const RenderPass*>(renderPassesInDrawOrder[i]->id(), renderPassesInDrawOrder[i])); |
- std::vector<CCRenderPass::Id> passesToDelete; |
- ScopedPtrHashMap<CCRenderPass::Id, CachedTexture>::const_iterator passIterator; |
+ std::vector<RenderPass::Id> passesToDelete; |
+ ScopedPtrHashMap<RenderPass::Id, CachedTexture>::const_iterator passIterator; |
for (passIterator = m_renderPassTextures.begin(); passIterator != m_renderPassTextures.end(); ++passIterator) { |
- base::hash_map<CCRenderPass::Id, const CCRenderPass*>::const_iterator it = renderPassesInFrame.find(passIterator->first); |
+ base::hash_map<RenderPass::Id, const RenderPass*>::const_iterator it = renderPassesInFrame.find(passIterator->first); |
if (it == renderPassesInFrame.end()) { |
passesToDelete.push_back(passIterator->first); |
continue; |
} |
- const CCRenderPass* renderPassInFrame = it->second; |
+ const RenderPass* renderPassInFrame = it->second; |
const IntSize& requiredSize = renderPassTextureSize(renderPassInFrame); |
GC3Denum requiredFormat = renderPassTextureFormat(renderPassInFrame); |
CachedTexture* texture = passIterator->second; |
@@ -150,9 +150,9 @@ void CCDirectRenderer::decideRenderPassAllocationsForFrame(const CCRenderPassLis |
} |
} |
-void CCDirectRenderer::drawFrame(const CCRenderPassList& renderPassesInDrawOrder, const CCRenderPassIdHashMap& renderPassesById) |
+void DirectRenderer::drawFrame(const RenderPassList& renderPassesInDrawOrder, const RenderPassIdHashMap& renderPassesById) |
{ |
- const CCRenderPass* rootRenderPass = renderPassesInDrawOrder.back(); |
+ const RenderPass* rootRenderPass = renderPassesInDrawOrder.back(); |
ASSERT(rootRenderPass); |
DrawingFrame frame; |
@@ -167,7 +167,7 @@ void CCDirectRenderer::drawFrame(const CCRenderPassList& renderPassesInDrawOrder |
finishDrawingFrame(frame); |
} |
-void CCDirectRenderer::drawRenderPass(DrawingFrame& frame, const CCRenderPass* renderPass) |
+void DirectRenderer::drawRenderPass(DrawingFrame& frame, const RenderPass* renderPass) |
{ |
if (!useRenderPass(frame, renderPass)) |
return; |
@@ -175,14 +175,14 @@ void CCDirectRenderer::drawRenderPass(DrawingFrame& frame, const CCRenderPass* r |
frame.scissorRectInRenderPassSpace = frame.currentRenderPass->outputRect(); |
if (frame.rootDamageRect != frame.rootRenderPass->outputRect()) { |
WebTransformationMatrix inverseTransformToRoot = frame.currentRenderPass->transformToRootTarget().inverse(); |
- frame.scissorRectInRenderPassSpace.intersect(CCMathUtil::projectClippedRect(inverseTransformToRoot, frame.rootDamageRect)); |
+ frame.scissorRectInRenderPassSpace.intersect(MathUtil::projectClippedRect(inverseTransformToRoot, frame.rootDamageRect)); |
} |
enableScissorTestRect(moveScissorToWindowSpace(frame, frame.scissorRectInRenderPassSpace)); |
clearFramebuffer(frame); |
- const CCQuadList& quadList = renderPass->quadList(); |
- for (CCQuadList::constBackToFrontIterator it = quadList.backToFrontBegin(); it != quadList.backToFrontEnd(); ++it) { |
+ const QuadList& quadList = renderPass->quadList(); |
+ for (QuadList::constBackToFrontIterator it = quadList.backToFrontBegin(); it != quadList.backToFrontEnd(); ++it) { |
FloatRect quadScissorRect = frame.scissorRectInRenderPassSpace; |
quadScissorRect.intersect((*it)->clippedRectInTarget()); |
if (!quadScissorRect.isEmpty()) { |
@@ -196,7 +196,7 @@ void CCDirectRenderer::drawRenderPass(DrawingFrame& frame, const CCRenderPass* r |
texture->setIsComplete(!renderPass->hasOcclusionFromOutsideTargetSurface()); |
} |
-bool CCDirectRenderer::useRenderPass(DrawingFrame& frame, const CCRenderPass* renderPass) |
+bool DirectRenderer::useRenderPass(DrawingFrame& frame, const RenderPass* renderPass) |
{ |
frame.currentRenderPass = renderPass; |
frame.currentTexture = 0; |
@@ -210,26 +210,26 @@ bool CCDirectRenderer::useRenderPass(DrawingFrame& frame, const CCRenderPass* re |
CachedTexture* texture = m_renderPassTextures.get(renderPass->id()); |
ASSERT(texture); |
- if (!texture->id() && !texture->allocate(CCRenderer::ImplPool, renderPassTextureSize(renderPass), renderPassTextureFormat(renderPass), CCResourceProvider::TextureUsageFramebuffer)) |
+ if (!texture->id() && !texture->allocate(Renderer::ImplPool, renderPassTextureSize(renderPass), renderPassTextureFormat(renderPass), ResourceProvider::TextureUsageFramebuffer)) |
return false; |
return bindFramebufferToTexture(frame, texture, renderPass->outputRect()); |
} |
-bool CCDirectRenderer::haveCachedResourcesForRenderPassId(CCRenderPass::Id id) const |
+bool DirectRenderer::haveCachedResourcesForRenderPassId(RenderPass::Id id) const |
{ |
CachedTexture* texture = m_renderPassTextures.get(id); |
return texture && texture->id() && texture->isComplete(); |
} |
// static |
-IntSize CCDirectRenderer::renderPassTextureSize(const CCRenderPass* pass) |
+IntSize DirectRenderer::renderPassTextureSize(const RenderPass* pass) |
{ |
return pass->outputRect().size(); |
} |
// static |
-GC3Denum CCDirectRenderer::renderPassTextureFormat(const CCRenderPass*) |
+GC3Denum DirectRenderer::renderPassTextureFormat(const RenderPass*) |
{ |
return GraphicsContext3D::RGBA; |
} |