| Index: cc/resources/picture.cc
|
| diff --git a/cc/resources/picture.cc b/cc/resources/picture.cc
|
| index a34323757e3a8f738ef3f56151847f1dd817e387..d3a9ce8595159bb1abd9b425b2b9145524dc6277 100644
|
| --- a/cc/resources/picture.cc
|
| +++ b/cc/resources/picture.cc
|
| @@ -15,7 +15,7 @@
|
|
|
| namespace {
|
| // URI label for a lazily decoded SkPixelRef.
|
| -const char labelLazyDecoded[] = "lazy";
|
| +const char kLabelLazyDecoded[] = "lazy";
|
| }
|
|
|
| namespace cc {
|
| @@ -66,15 +66,15 @@ void Picture::CloneForDrawing(int num_threads) {
|
|
|
| void Picture::Record(ContentLayerClient* painter,
|
| RenderingStats* stats,
|
| - const SkTileGridPicture::TileGridInfo& tileGridInfo) {
|
| + const SkTileGridPicture::TileGridInfo& tile_grid_info) {
|
| TRACE_EVENT2("cc", "Picture::Record",
|
| "width", layer_rect_.width(), "height", layer_rect_.height());
|
|
|
| // Record() should only be called once.
|
| DCHECK(!picture_);
|
| - DCHECK(!tileGridInfo.fTileInterval.isEmpty());
|
| + DCHECK(!tile_grid_info.fTileInterval.isEmpty());
|
| picture_ = skia::AdoptRef(new SkTileGridPicture(
|
| - layer_rect_.width(), layer_rect_.height(), tileGridInfo));
|
| + layer_rect_.width(), layer_rect_.height(), tile_grid_info));
|
|
|
| SkCanvas* canvas = picture_->beginRecording(
|
| layer_rect_.width(),
|
| @@ -150,7 +150,7 @@ void Picture::GatherPixelRefs(const gfx::Rect& layer_rect,
|
| SkPixelRef** refs = reinterpret_cast<SkPixelRef**>(data);
|
| for (unsigned int i = 0; i < pixel_refs->size() / sizeof(SkPixelRef*); ++i) {
|
| if (*refs && (*refs)->getURI() && !strncmp(
|
| - (*refs)->getURI(), labelLazyDecoded, 4)) {
|
| + (*refs)->getURI(), kLabelLazyDecoded, 4)) {
|
| pixel_ref_list.push_back(static_cast<skia::LazyPixelRef*>(*refs));
|
| }
|
| refs++;
|
|
|