diff options
| author | vollick <vollick@chromium.org> | 2016-03-22 11:33:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-22 18:35:30 +0000 |
| commit | 83fbfc832bb24abbea9c9dfa4ff17ad20bc047f4 (patch) | |
| tree | fbb9da14d918cda98c34b7ae441a684a0293650a /chrome/browser/android | |
| parent | b08686b8c95ece5c34b49904496fdaa06094c0ff (diff) | |
| download | chromium_src-83fbfc832bb24abbea9c9dfa4ff17ad20bc047f4.zip chromium_src-83fbfc832bb24abbea9c9dfa4ff17ad20bc047f4.tar.gz chromium_src-83fbfc832bb24abbea9c9dfa4ff17ad20bc047f4.tar.bz2 | |
Transfer LayerImpl ownership to LayerTreeImpl
I have taken a very simple strategy. I have
retained all LayerImpl functions related to
transfer of ownership (AddChild, etc). These now
update raw pointers on the LayerImpl as well as
updating true ownership by talking to the LTI.
This allows most unit test code to remain as is.
LayerImpl's may be constructed and ownership may
be transferred just as it had been.
BUG=594026
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1801853002
Cr-Commit-Position: refs/heads/master@{#382619}
Diffstat (limited to 'chrome/browser/android')
4 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/android/compositor/compositor_view.cc b/chrome/browser/android/compositor/compositor_view.cc index 8c9971b..ff253cf 100644 --- a/chrome/browser/android/compositor/compositor_view.cc +++ b/chrome/browser/android/compositor/compositor_view.cc @@ -18,7 +18,7 @@ #include "base/rand_util.h" #include "base/trace_event/trace_event.h" #include "cc/layers/layer.h" -#include "cc/layers/layer_lists.h" +#include "cc/layers/layer_collections.h" #include "cc/layers/solid_color_layer.h" #include "cc/layers/texture_layer.h" #include "chrome/browser/android/compositor/layer/toolbar_layer.h" diff --git a/chrome/browser/android/compositor/compositor_view.h b/chrome/browser/android/compositor/compositor_view.h index 1d7f4bb..3b06e2b 100644 --- a/chrome/browser/android/compositor/compositor_view.h +++ b/chrome/browser/android/compositor/compositor_view.h @@ -12,7 +12,7 @@ #include "base/containers/scoped_ptr_hash_map.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" -#include "cc/layers/layer_lists.h" +#include "cc/layers/layer_collections.h" #include "cc/resources/ui_resource_client.h" #include "content/public/browser/android/compositor_client.h" #include "content/public/browser/browser_child_process_observer.h" diff --git a/chrome/browser/android/compositor/layer/content_layer.cc b/chrome/browser/android/compositor/layer/content_layer.cc index 5792883..16e67e9 100644 --- a/chrome/browser/android/compositor/layer/content_layer.cc +++ b/chrome/browser/android/compositor/layer/content_layer.cc @@ -6,7 +6,7 @@ #include "base/lazy_instance.h" #include "cc/layers/layer.h" -#include "cc/layers/layer_lists.h" +#include "cc/layers/layer_collections.h" #include "chrome/browser/android/compositor/layer/thumbnail_layer.h" #include "chrome/browser/android/compositor/tab_content_manager.h" #include "content/public/browser/android/compositor.h" diff --git a/chrome/browser/android/compositor/layer/tab_layer.cc b/chrome/browser/android/compositor/layer/tab_layer.cc index dcdc3d8..b091a49 100644 --- a/chrome/browser/android/compositor/layer/tab_layer.cc +++ b/chrome/browser/android/compositor/layer/tab_layer.cc @@ -6,7 +6,7 @@ #include "base/i18n/rtl.h" #include "cc/layers/layer.h" -#include "cc/layers/layer_lists.h" +#include "cc/layers/layer_collections.h" #include "cc/layers/nine_patch_layer.h" #include "cc/layers/solid_color_layer.h" #include "cc/layers/ui_resource_layer.h" |