diff options
author | dominikg@chromium.org <dominikg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 17:04:50 +0000 |
---|---|---|
committer | dominikg@chromium.org <dominikg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 17:04:50 +0000 |
commit | daea3d424f865ae7fc5720dea7b3c9565952a968 (patch) | |
tree | 0c6bf0ade3676ee7b735fbc0aa5e1872cef9475f /cc/layers | |
parent | f54f8ce7166114c58c6ecb92b6cc2a0f8bac0a2b (diff) | |
download | chromium_src-daea3d424f865ae7fc5720dea7b3c9565952a968.zip chromium_src-daea3d424f865ae7fc5720dea7b3c9565952a968.tar.gz chromium_src-daea3d424f865ae7fc5720dea7b3c9565952a968.tar.bz2 |
Rename BeginFrame to BeginMainFrame and BeginImplFrame (part 3).
Third patch in a series to rename BeginFrame. This patch focuses on
cc::ThreadProxy, cc::LayerTreeHost, cc::LayerTreeHostImpl, cc::OutputSurface
and it's related (sub)classes.
In the scheduler, the term 'BeginFrame' is used for both the main thread and the
impl thread. This can cause confusion if it's not obvious which one is being
refered to. To clarify this, we rename BeginFrame to BeginMainFrame and
BeginImplFrame, respectively.
BUG=261765
Review URL: https://codereview.chromium.org/35023002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230453 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layers')
-rw-r--r-- | cc/layers/layer.cc | 6 | ||||
-rw-r--r-- | cc/layers/layer_impl.cc | 2 | ||||
-rw-r--r-- | cc/layers/layer_impl.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc index 5fa40dd..b10112a 100644 --- a/cc/layers/layer.cc +++ b/cc/layers/layer.cc @@ -619,7 +619,7 @@ void Layer::SetScrollOffset(gfx::Vector2d scroll_offset) { void Layer::SetScrollOffsetFromImplSide(gfx::Vector2d scroll_offset) { DCHECK(IsPropertyChangeAllowed()); - // This function only gets called during a begin frame, so there + // This function only gets called during a BeginMainFrame, so there // is no need to call SetNeedsUpdate here. DCHECK(layer_tree_host_ && layer_tree_host_->CommitRequested()); if (scroll_offset_ == scroll_offset) @@ -881,8 +881,8 @@ void Layer::PushPropertiesTo(LayerImpl* layer) { } // Adjust the scroll delta to be just the scrolls that have happened since - // the begin frame was sent. This happens for impl-side painting - // in LayerImpl::ApplyScrollDeltasSinceBeginFrame in a separate tree walk. + // the BeginMainFrame was sent. This happens for impl-side painting + // in LayerImpl::ApplyScrollDeltasSinceBeginMainFrame in a separate tree walk. if (layer->layer_tree_impl()->settings().impl_side_painting) { layer->SetScrollOffset(scroll_offset_); } else { diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc index 14f3e2a..ede4719 100644 --- a/cc/layers/layer_impl.cc +++ b/cc/layers/layer_impl.cc @@ -385,7 +385,7 @@ void LayerImpl::ApplySentScrollDeltasFromAbortedCommit() { sent_scroll_delta_ = gfx::Vector2d(); } -void LayerImpl::ApplyScrollDeltasSinceBeginFrame() { +void LayerImpl::ApplyScrollDeltasSinceBeginMainFrame() { // Only the pending tree can have missing scrolls. DCHECK(layer_tree_impl()->IsPendingTree()); if (!scrollable()) diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h index 4bd91da..9d3951b 100644 --- a/cc/layers/layer_impl.h +++ b/cc/layers/layer_impl.h @@ -382,7 +382,7 @@ class CC_EXPORT LayerImpl : LayerAnimationValueObserver { } void ApplySentScrollDeltasFromAbortedCommit(); - void ApplyScrollDeltasSinceBeginFrame(); + void ApplyScrollDeltasSinceBeginMainFrame(); void SetShouldScrollOnMainThread(bool should_scroll_on_main_thread) { should_scroll_on_main_thread_ = should_scroll_on_main_thread; |