Index: cc/trees/thread_proxy.cc |
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc |
index ba621e2576d6c8a5a02f0b79c8f4b9680196d4a2..264c11f098a84248ce2cf74a7482083fddd9f478 100644 |
--- a/cc/trees/thread_proxy.cc |
+++ b/cc/trees/thread_proxy.cc |
@@ -32,14 +32,14 @@ const double kSmoothnessTakesPriorityExpirationDelay = 0.25; |
namespace cc { |
scoped_ptr<Proxy> ThreadProxy::Create(LayerTreeHost* layer_tree_host, |
- scoped_ptr<Thread> implThread) { |
+ scoped_ptr<Thread> impl_thread) { |
return make_scoped_ptr( |
- new ThreadProxy(layer_tree_host, implThread.Pass())).PassAs<Proxy>(); |
+ new ThreadProxy(layer_tree_host, impl_thread.Pass())).PassAs<Proxy>(); |
} |
ThreadProxy::ThreadProxy(LayerTreeHost* layer_tree_host, |
- scoped_ptr<Thread> implThread) |
- : Proxy(implThread.Pass()), |
+ scoped_ptr<Thread> impl_thread) |
+ : Proxy(impl_thread.Pass()), |
animate_requested_(false), |
commit_requested_(false), |
commit_request_sent_to_impl_thread_(false), |
@@ -216,7 +216,7 @@ void ThreadProxy::SetVisibleOnImplThread(CompletionEvent* completion, |
bool ThreadProxy::InitializeRenderer() { |
TRACE_EVENT0("cc", "ThreadProxy::InitializeRenderer"); |
- // Make a blocking call to initializeRendererOnImplThread. The results of that |
+ // Make a blocking call to InitializeRendererOnImplThread. The results of that |
// call are pushed into the initialize_succeeded and capabilities local |
// variables. |
CompletionEvent completion; |
@@ -255,7 +255,7 @@ bool ThreadProxy::RecreateOutputSurface() { |
return false; |
} |
- // Make a blocking call to recreateOutputSurfaceOnImplThread. The results of |
+ // Make a blocking call to RecreateOutputSurfaceOnImplThread. The results of |
// that call are pushed into the recreate_succeeded and capabilities local |
// variables. |
CompletionEvent completion; |
@@ -445,7 +445,7 @@ void ThreadProxy::SendManagedMemoryStats() { |
if (!layer_tree_host_->contents_texture_manager()) |
return; |
- // If we are using impl-side painting, then sendManagedMemoryStats is called |
+ // If we are using impl-side painting, then SendManagedMemoryStats is called |
// directly after the tile manager's manage function, and doesn't need to |
// interact with main thread's layer tree. |
if (layer_tree_host_->settings().impl_side_painting) |
@@ -493,7 +493,7 @@ bool ThreadProxy::CommitRequested() const { |
void ThreadProxy::SetNeedsRedrawOnImplThread() { |
DCHECK(IsImplThread()); |
- TRACE_EVENT0("cc", "ThreadProxy::setNeedsRedrawOnImplThread"); |
+ TRACE_EVENT0("cc", "ThreadProxy::SetNeedsRedrawOnImplThread"); |
scheduler_on_impl_thread_->SetNeedsRedraw(); |
} |
@@ -630,14 +630,14 @@ void ThreadProxy::BeginFrame( |
} |
// Do not notify the impl thread of commit requests that occur during |
- // the apply/animate/layout part of the beginFrameAndCommit process since |
+ // the apply/animate/layout part of the BeginFrameAndCommit process since |
// those commit requests will get painted immediately. Once we have done |
// the paint, commit_requested_ will be set to false to allow new commit |
// requests to be scheduled. |
commit_requested_ = true; |
commit_request_sent_to_impl_thread_ = true; |
- // On the other hand, the animationRequested flag needs to be cleared |
+ // On the other hand, the AnimationRequested flag needs to be cleared |
// here so that any animation requests generated by the apply or animate |
// callbacks will trigger another frame. |
animate_requested_ = false; |
@@ -665,7 +665,7 @@ void ThreadProxy::BeginFrame( |
} |
// Unlink any backings that the impl thread has evicted, so that we know to |
- // re-paint them in updateLayers. |
+ // re-paint them in UpdateLayers. |
if (layer_tree_host_->contents_texture_manager()) { |
layer_tree_host_->contents_texture_manager()-> |
UnlinkAndClearEvictedBackings(); |
@@ -674,8 +674,8 @@ void ThreadProxy::BeginFrame( |
layer_tree_host_->Layout(); |
// Clear the commit flag after updating animations and layout here --- objects |
- // that only layout when painted will trigger another setNeedsCommit inside |
- // updateLayers. |
+ // that only layout when painted will trigger another SetNeedsCommit inside |
+ // UpdateLayers. |
commit_requested_ = false; |
commit_request_sent_to_impl_thread_ = false; |
@@ -697,12 +697,12 @@ void ThreadProxy::BeginFrame( |
layer_tree_host_->WillCommit(); |
// Before applying scrolls and calling animate, we set animate_requested_ to |
- // false. If it is true now, it means setNeedAnimate was called again, but |
+ // false. If it is true now, it means SetNeedAnimate was called again, but |
// during a state when commit_request_sent_to_impl_thread_ = true. We need to |
// force that call to happen again now so that the commit request is sent to |
// the impl thread. |
if (animate_requested_) { |
- // Forces setNeedsAnimate to consider posting a commit task. |
+ // Forces SetNeedsAnimate to consider posting a commit task. |
animate_requested_ = false; |
SetNeedsAnimate(); |
} |
@@ -716,7 +716,7 @@ void ThreadProxy::BeginFrame( |
created_offscreen_context_provider_ = true; |
} |
- // Notify the impl thread that the beginFrame has completed. This will |
+ // Notify the impl thread that the BeginFrame has completed. This will |
// begin the commit process, which is blocking from the main thread's |
// point of view, but asynchronously performed on the impl thread, |
// coordinated by the Scheduler. |
@@ -916,7 +916,7 @@ ThreadProxy::ScheduledActionDrawAndSwapInternal(bool forced_draw) { |
completion_event_for_commit_held_on_tree_activation_ = NULL; |
} |
- // Check for a pending compositeAndReadback. |
+ // Check for a pending CompositeAndReadback. |
if (readback_request_on_impl_thread_) { |
readback_request_on_impl_thread_->success = false; |
if (draw_frame) { |
@@ -1060,14 +1060,14 @@ void ThreadProxy::InitializeImplOnImplThread(CompletionEvent* completion, |
TRACE_EVENT0("cc", "ThreadProxy::InitializeImplOnImplThread"); |
DCHECK(IsImplThread()); |
layer_tree_host_impl_ = layer_tree_host_->CreateLayerTreeHostImpl(this); |
- const base::TimeDelta displayRefreshInterval = |
+ const base::TimeDelta display_refresh_interval = |
base::TimeDelta::FromMicroseconds(base::Time::kMicrosecondsPerSecond / |
60); |
scoped_ptr<FrameRateController> frame_rate_controller; |
if (render_vsync_enabled_) { |
frame_rate_controller.reset( |
new FrameRateController(DelayBasedTimeSource::Create( |
- displayRefreshInterval, Proxy::ImplThread()))); |
+ display_refresh_interval, Proxy::ImplThread()))); |
} else { |
frame_rate_controller.reset(new FrameRateController(Proxy::ImplThread())); |
} |
@@ -1108,14 +1108,14 @@ void ThreadProxy::InitializeRendererOnImplThread( |
scheduler_on_impl_thread_->SetSwapBuffersCompleteSupported( |
capabilities->using_swap_complete_callback); |
- int maxFramesPending = layer_tree_host_impl_->output_surface()-> |
+ int max_frames_pending = layer_tree_host_impl_->output_surface()-> |
capabilities().max_frames_pending; |
- if (maxFramesPending <= 0) |
- maxFramesPending = FrameRateController::DEFAULT_MAX_FRAMES_PENDING; |
+ if (max_frames_pending <= 0) |
+ max_frames_pending = FrameRateController::DEFAULT_MAX_FRAMES_PENDING; |
if (layer_tree_host_impl_->output_surface()->capabilities(). |
has_parent_compositor) |
- maxFramesPending = 1; |
- scheduler_on_impl_thread_->SetMaxFramesPending(maxFramesPending); |
+ max_frames_pending = 1; |
+ scheduler_on_impl_thread_->SetMaxFramesPending(max_frames_pending); |
} |
completion->Signal(); |