Index: cc/resources/resource_update_controller.cc |
diff --git a/cc/resources/resource_update_controller.cc b/cc/resources/resource_update_controller.cc |
index baae7a96bc99f125bc537e7af244a64e980b4f0b..3936b4d630009032e898a5247d17f9a4ca6e3ca6 100644 |
--- a/cc/resources/resource_update_controller.cc |
+++ b/cc/resources/resource_update_controller.cc |
@@ -34,13 +34,13 @@ const double kUploaderBusyTickRate = 0.001; |
const size_t kMaxBlockingUpdateIntervals = 4; |
skia::RefPtr<SkCanvas> CreateAcceleratedCanvas( |
- GrContext* gr_context, gfx::Size canvasSize, unsigned textureId) { |
+ GrContext* gr_context, gfx::Size canvas_size, unsigned texture_id) { |
GrBackendTextureDesc texture_desc; |
texture_desc.fFlags = kRenderTarget_GrBackendTextureFlag; |
- texture_desc.fWidth = canvasSize.width(); |
- texture_desc.fHeight = canvasSize.height(); |
+ texture_desc.fWidth = canvas_size.width(); |
+ texture_desc.fHeight = canvas_size.height(); |
texture_desc.fConfig = kSkia8888_GrPixelConfig; |
- texture_desc.fTextureHandle = textureId; |
+ texture_desc.fTextureHandle = texture_id; |
skia::RefPtr<GrTexture> target = |
skia::AdoptRef(gr_context->wrapBackendTexture(texture_desc)); |
skia::RefPtr<SkDevice> device = |
@@ -81,8 +81,8 @@ ResourceUpdateController::ResourceUpdateController( |
ResourceUpdateController::~ResourceUpdateController() {} |
void ResourceUpdateController::PerformMoreUpdates( |
- base::TimeTicks timeLimit) { |
- time_limit_ = timeLimit; |
+ base::TimeTicks time_limit) { |
+ time_limit_ = time_limit; |
// Update already in progress. |
if (task_posted_) |