| Index: cc/tiled_layer_impl.cc
|
| diff --git a/cc/tiled_layer_impl.cc b/cc/tiled_layer_impl.cc
|
| index 84af8bc23b8e291eb59ecb880eadaf42aeda5c07..46e59c82464386230745c69ff67f3efd557bc1f9 100644
|
| --- a/cc/tiled_layer_impl.cc
|
| +++ b/cc/tiled_layer_impl.cc
|
| @@ -44,33 +44,33 @@ static const int debugTileInvalidatedCheckerboardColorRed = 128;
|
| static const int debugTileInvalidatedCheckerboardColorGreen = 200;
|
| static const int debugTileInvalidatedCheckerboardColorBlue = 245;
|
|
|
| -class DrawableTile : public CCLayerTilingData::Tile {
|
| +class DrawableTile : public LayerTilingData::Tile {
|
| public:
|
| static scoped_ptr<DrawableTile> create() { return make_scoped_ptr(new DrawableTile()); }
|
|
|
| - CCResourceProvider::ResourceId resourceId() const { return m_resourceId; }
|
| - void setResourceId(CCResourceProvider::ResourceId resourceId) { m_resourceId = resourceId; }
|
| + ResourceProvider::ResourceId resourceId() const { return m_resourceId; }
|
| + void setResourceId(ResourceProvider::ResourceId resourceId) { m_resourceId = resourceId; }
|
|
|
| private:
|
| DrawableTile() : m_resourceId(0) { }
|
|
|
| - CCResourceProvider::ResourceId m_resourceId;
|
| + ResourceProvider::ResourceId m_resourceId;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DrawableTile);
|
| };
|
|
|
| -CCTiledLayerImpl::CCTiledLayerImpl(int id)
|
| - : CCLayerImpl(id)
|
| +TiledLayerImpl::TiledLayerImpl(int id)
|
| + : LayerImpl(id)
|
| , m_skipsDraw(true)
|
| , m_contentsSwizzled(false)
|
| {
|
| }
|
|
|
| -CCTiledLayerImpl::~CCTiledLayerImpl()
|
| +TiledLayerImpl::~TiledLayerImpl()
|
| {
|
| }
|
|
|
| -CCResourceProvider::ResourceId CCTiledLayerImpl::contentsResourceId() const
|
| +ResourceProvider::ResourceId TiledLayerImpl::contentsResourceId() const
|
| {
|
| // This function is only valid for single texture layers, e.g. masks.
|
| ASSERT(m_tiler);
|
| @@ -78,48 +78,48 @@ CCResourceProvider::ResourceId CCTiledLayerImpl::contentsResourceId() const
|
| ASSERT(m_tiler->numTilesY() == 1);
|
|
|
| DrawableTile* tile = tileAt(0, 0);
|
| - CCResourceProvider::ResourceId resourceId = tile ? tile->resourceId() : 0;
|
| + ResourceProvider::ResourceId resourceId = tile ? tile->resourceId() : 0;
|
| return resourceId;
|
| }
|
|
|
| -void CCTiledLayerImpl::dumpLayerProperties(std::string* str, int indent) const
|
| +void TiledLayerImpl::dumpLayerProperties(std::string* str, int indent) const
|
| {
|
| str->append(indentString(indent));
|
| base::StringAppendF(str, "skipsDraw: %d\n", (!m_tiler || m_skipsDraw));
|
| - CCLayerImpl::dumpLayerProperties(str, indent);
|
| + LayerImpl::dumpLayerProperties(str, indent);
|
| }
|
|
|
| -bool CCTiledLayerImpl::hasTileAt(int i, int j) const
|
| +bool TiledLayerImpl::hasTileAt(int i, int j) const
|
| {
|
| return m_tiler->tileAt(i, j);
|
| }
|
|
|
| -bool CCTiledLayerImpl::hasResourceIdForTileAt(int i, int j) const
|
| +bool TiledLayerImpl::hasResourceIdForTileAt(int i, int j) const
|
| {
|
| return hasTileAt(i, j) && tileAt(i, j)->resourceId();
|
| }
|
|
|
| -DrawableTile* CCTiledLayerImpl::tileAt(int i, int j) const
|
| +DrawableTile* TiledLayerImpl::tileAt(int i, int j) const
|
| {
|
| return static_cast<DrawableTile*>(m_tiler->tileAt(i, j));
|
| }
|
|
|
| -DrawableTile* CCTiledLayerImpl::createTile(int i, int j)
|
| +DrawableTile* TiledLayerImpl::createTile(int i, int j)
|
| {
|
| scoped_ptr<DrawableTile> tile(DrawableTile::create());
|
| DrawableTile* addedTile = tile.get();
|
| - m_tiler->addTile(tile.PassAs<CCLayerTilingData::Tile>(), i, j);
|
| + m_tiler->addTile(tile.PassAs<LayerTilingData::Tile>(), i, j);
|
| return addedTile;
|
| }
|
|
|
| -void CCTiledLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appendQuadsData)
|
| +void TiledLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQuadsData)
|
| {
|
| const IntRect& contentRect = visibleContentRect();
|
|
|
| if (!m_tiler || m_tiler->hasEmptyBounds() || contentRect.isEmpty())
|
| return;
|
|
|
| - CCSharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQuadState());
|
| + SharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQuadState());
|
| appendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData);
|
|
|
| int left, top, right, bottom;
|
| @@ -136,7 +136,7 @@ void CCTiledLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appe
|
| borderColor = SkColorSetARGB(debugTileBorderAlpha, debugTileBorderMissingTileColorRed, debugTileBorderMissingTileColorGreen, debugTileBorderMissingTileColorBlue);
|
| else
|
| borderColor = SkColorSetARGB(debugTileBorderAlpha, debugTileBorderColorRed, debugTileBorderColorGreen, debugTileBorderColorBlue);
|
| - quadSink.append(CCDebugBorderDrawQuad::create(sharedQuadState, tileRect, borderColor, debugTileBorderWidth).PassAs<CCDrawQuad>(), appendQuadsData);
|
| + quadSink.append(DebugBorderDrawQuad::create(sharedQuadState, tileRect, borderColor, debugTileBorderWidth).PassAs<DrawQuad>(), appendQuadsData);
|
| }
|
| }
|
| }
|
| @@ -167,9 +167,9 @@ void CCTiledLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appe
|
| else
|
| checkerColor = defaultColor;
|
|
|
| - appendQuadsData.hadMissingTiles |= quadSink.append(CCCheckerboardDrawQuad::create(sharedQuadState, tileRect, checkerColor).PassAs<CCDrawQuad>(), appendQuadsData);
|
| + appendQuadsData.hadMissingTiles |= quadSink.append(CheckerboardDrawQuad::create(sharedQuadState, tileRect, checkerColor).PassAs<DrawQuad>(), appendQuadsData);
|
| } else
|
| - appendQuadsData.hadMissingTiles |= quadSink.append(CCSolidColorDrawQuad::create(sharedQuadState, tileRect, backgroundColor()).PassAs<CCDrawQuad>(), appendQuadsData);
|
| + appendQuadsData.hadMissingTiles |= quadSink.append(SolidColorDrawQuad::create(sharedQuadState, tileRect, backgroundColor()).PassAs<DrawQuad>(), appendQuadsData);
|
| continue;
|
| }
|
|
|
| @@ -185,7 +185,7 @@ void CCTiledLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appe
|
| IntSize textureSize(tileWidth, tileHeight);
|
|
|
| bool clipped = false;
|
| - FloatQuad visibleContentInTargetQuad = CCMathUtil::mapQuad(drawTransform(), FloatQuad(visibleContentRect()), clipped);
|
| + FloatQuad visibleContentInTargetQuad = MathUtil::mapQuad(drawTransform(), FloatQuad(visibleContentRect()), clipped);
|
| bool isAxisAlignedInTarget = !clipped && visibleContentInTargetQuad.isRectilinear();
|
| bool useAA = m_tiler->hasBorderTexels() && !isAxisAlignedInTarget;
|
|
|
| @@ -195,21 +195,21 @@ void CCTiledLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appe
|
| bool bottomEdgeAA = j == m_tiler->numTilesY() - 1 && useAA;
|
|
|
| const GC3Dint textureFilter = m_tiler->hasBorderTexels() ? GraphicsContext3D::LINEAR : GraphicsContext3D::NEAREST;
|
| - quadSink.append(CCTileDrawQuad::create(sharedQuadState, tileRect, tileOpaqueRect, tile->resourceId(), textureOffset, textureSize, textureFilter, contentsSwizzled(), leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA).PassAs<CCDrawQuad>(), appendQuadsData);
|
| + quadSink.append(TileDrawQuad::create(sharedQuadState, tileRect, tileOpaqueRect, tile->resourceId(), textureOffset, textureSize, textureFilter, contentsSwizzled(), leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA).PassAs<DrawQuad>(), appendQuadsData);
|
| }
|
| }
|
| }
|
|
|
| -void CCTiledLayerImpl::setTilingData(const CCLayerTilingData& tiler)
|
| +void TiledLayerImpl::setTilingData(const LayerTilingData& tiler)
|
| {
|
| if (m_tiler)
|
| m_tiler->reset();
|
| else
|
| - m_tiler = CCLayerTilingData::create(tiler.tileSize(), tiler.hasBorderTexels() ? CCLayerTilingData::HasBorderTexels : CCLayerTilingData::NoBorderTexels);
|
| + m_tiler = LayerTilingData::create(tiler.tileSize(), tiler.hasBorderTexels() ? LayerTilingData::HasBorderTexels : LayerTilingData::NoBorderTexels);
|
| *m_tiler = tiler;
|
| }
|
|
|
| -void CCTiledLayerImpl::pushTileProperties(int i, int j, CCResourceProvider::ResourceId resourceId, const IntRect& opaqueRect)
|
| +void TiledLayerImpl::pushTileProperties(int i, int j, ResourceProvider::ResourceId resourceId, const IntRect& opaqueRect)
|
| {
|
| DrawableTile* tile = tileAt(i, j);
|
| if (!tile)
|
| @@ -218,7 +218,7 @@ void CCTiledLayerImpl::pushTileProperties(int i, int j, CCResourceProvider::Reso
|
| tile->setOpaqueRect(opaqueRect);
|
| }
|
|
|
| -void CCTiledLayerImpl::pushInvalidTile(int i, int j)
|
| +void TiledLayerImpl::pushInvalidTile(int i, int j)
|
| {
|
| DrawableTile* tile = tileAt(i, j);
|
| if (!tile)
|
| @@ -227,7 +227,7 @@ void CCTiledLayerImpl::pushInvalidTile(int i, int j)
|
| tile->setOpaqueRect(IntRect());
|
| }
|
|
|
| -Region CCTiledLayerImpl::visibleContentOpaqueRegion() const
|
| +Region TiledLayerImpl::visibleContentOpaqueRegion() const
|
| {
|
| if (m_skipsDraw)
|
| return Region();
|
| @@ -236,12 +236,12 @@ Region CCTiledLayerImpl::visibleContentOpaqueRegion() const
|
| return m_tiler->opaqueRegionInContentRect(visibleContentRect());
|
| }
|
|
|
| -void CCTiledLayerImpl::didLoseContext()
|
| +void TiledLayerImpl::didLoseContext()
|
| {
|
| m_tiler->reset();
|
| }
|
|
|
| -const char* CCTiledLayerImpl::layerTypeAsString() const
|
| +const char* TiledLayerImpl::layerTypeAsString() const
|
| {
|
| return "ContentLayer";
|
| }
|
|
|