diff options
| author | vollick <vollick@chromium.org> | 2016-03-01 15:44:10 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-01 23:45:35 +0000 |
| commit | cb3f6b13ff8f814e10d67cc548a1cdde69b386db (patch) | |
| tree | f868068adb84a8f59906ac650ae0943857a01589 /cc/trees/layer_tree_host_common.cc | |
| parent | 2f30bc46e457d9d07312af7b79fbb160fb9c81c4 (diff) | |
| download | chromium_src-cb3f6b13ff8f814e10d67cc548a1cdde69b386db.zip chromium_src-cb3f6b13ff8f814e10d67cc548a1cdde69b386db.tar.gz chromium_src-cb3f6b13ff8f814e10d67cc548a1cdde69b386db.tar.bz2 | |
Revert of Introduce LayerListImpl (patchset #11 id:200001 of https://codereview.chromium.org/1746603002/ )
Reason for revert:
I'm going to try another, less code churny approach to the layer list refactor.
Original issue's description:
> Introduce LayerListImpl
>
> In this cl, the LayerTreeImpl constructs a LayerListImpl.
> The idea being that most plumbing won't need to change at
> first to get the list to where it needs to be. The first
> consumer of the LayerTreeImpl that I'm attempting to
> teach to speak LayerListImpl-ese is the LayerImpl. That
> has not been completely finished in this cl so that it
> doesn't become too big and difficult to review.
>
> NB: since the actual storage of the LayerImpls doesn't
> change in this cl (they're still in the LayerTreeImpl),
> there's no need to guard this work behind a flag.
>
> BUG=557194
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
>
> Committed: https://crrev.com/299bf1f63b8253c77530b904874f3435f9bde6d3
> Cr-Commit-Position: refs/heads/master@{#378398}
TBR=weiliangc@chromium.org,ajuma@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=557194
Review URL: https://codereview.chromium.org/1751243002
Cr-Commit-Position: refs/heads/master@{#378608}
Diffstat (limited to 'cc/trees/layer_tree_host_common.cc')
| -rw-r--r-- | cc/trees/layer_tree_host_common.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc index ba55171..c8baceb 100644 --- a/cc/trees/layer_tree_host_common.cc +++ b/cc/trees/layer_tree_host_common.cc @@ -1099,7 +1099,7 @@ static float TranslationFromActiveTreeLayerScreenSpaceTransform( LayerTreeImpl* layer_tree_impl = pending_tree_layer->layer_tree_impl(); if (layer_tree_impl) { LayerImpl* active_tree_layer = - layer_tree_impl->list()->FindActiveLayerById(pending_tree_layer->id()); + layer_tree_impl->FindActiveTreeLayerById(pending_tree_layer->id()); if (active_tree_layer) { gfx::Transform active_tree_screen_space_transform = active_tree_layer->draw_properties().screen_space_transform; @@ -1606,11 +1606,10 @@ void LayerTreeHostCommon::CalculateDrawProperties( if (layer_tree_impl->IsPendingTree() && layer_tree_impl->is_first_frame_after_commit()) { LayerImpl* active_tree_root = - layer_tree_impl->list()->FindActiveLayerById( - inputs->root_layer->id()); + layer_tree_impl->FindActiveTreeLayerById(inputs->root_layer->id()); float jitter = 0.f; if (active_tree_root) { - LayerImpl* last_scrolled_layer = layer_tree_impl->list()->LayerById( + LayerImpl* last_scrolled_layer = layer_tree_impl->LayerById( active_tree_root->layer_tree_impl()->LastScrolledLayerId()); jitter = CalculateFrameJitter(last_scrolled_layer); } |