| Index: cc/tiled_layer_impl.h
|
| diff --git a/cc/tiled_layer_impl.h b/cc/tiled_layer_impl.h
|
| index 99206bfc989124a41cdeb6fc656974638c446c76..8048ff5ef3214653dad845848fd0b21e740983f3 100644
|
| --- a/cc/tiled_layer_impl.h
|
| +++ b/cc/tiled_layer_impl.h
|
| @@ -15,28 +15,29 @@ class DrawableTile;
|
|
|
| class CC_EXPORT TiledLayerImpl : public LayerImpl {
|
| public:
|
| - static scoped_ptr<TiledLayerImpl> create(LayerTreeImpl* treeImpl, int id)
|
| + static scoped_ptr<TiledLayerImpl> Create(LayerTreeImpl* treeImpl, int id)
|
| {
|
| return make_scoped_ptr(new TiledLayerImpl(treeImpl, id));
|
| }
|
| virtual ~TiledLayerImpl();
|
|
|
| - virtual scoped_ptr<LayerImpl> createLayerImpl(LayerTreeImpl*) OVERRIDE;
|
| - virtual void pushPropertiesTo(LayerImpl*) OVERRIDE;
|
| + virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl*) OVERRIDE;
|
| + virtual void PushPropertiesTo(LayerImpl*) OVERRIDE;
|
|
|
| - virtual void appendQuads(QuadSink&, AppendQuadsData&) OVERRIDE;
|
| + virtual void AppendQuads(QuadSink* quad_sink,
|
| + AppendQuadsData* append_quads_data) OVERRIDE;
|
|
|
| - virtual ResourceProvider::ResourceId contentsResourceId() const OVERRIDE;
|
| + virtual ResourceProvider::ResourceId ContentsResourceId() const OVERRIDE;
|
|
|
| - virtual void dumpLayerProperties(std::string*, int indent) const OVERRIDE;
|
| + virtual void DumpLayerProperties(std::string*, int indent) const OVERRIDE;
|
|
|
| void setSkipsDraw(bool skipsDraw) { m_skipsDraw = skipsDraw; }
|
| void setTilingData(const LayerTilingData& tiler);
|
| void pushTileProperties(int, int, ResourceProvider::ResourceId, const gfx::Rect& opaqueRect, bool contentsSwizzled);
|
| void pushInvalidTile(int, int);
|
|
|
| - virtual Region visibleContentOpaqueRegion() const OVERRIDE;
|
| - virtual void didLoseOutputSurface() OVERRIDE;
|
| + virtual Region VisibleContentOpaqueRegion() const OVERRIDE;
|
| + virtual void DidLoseOutputSurface() OVERRIDE;
|
|
|
| protected:
|
| TiledLayerImpl(LayerTreeImpl* treeImpl, int id);
|
| @@ -44,11 +45,11 @@ protected:
|
| bool hasTileAt(int, int) const;
|
| bool hasResourceIdForTileAt(int, int) const;
|
|
|
| - virtual void getDebugBorderProperties(SkColor*, float* width) const OVERRIDE;
|
| + virtual void GetDebugBorderProperties(SkColor*, float* width) const OVERRIDE;
|
|
|
| private:
|
|
|
| - virtual const char* layerTypeAsString() const OVERRIDE;
|
| + virtual const char* LayerTypeAsString() const OVERRIDE;
|
|
|
| DrawableTile* tileAt(int, int) const;
|
| DrawableTile* createTile(int, int);
|
|
|