diff options
| author | loyso <loyso@chromium.org> | 2016-03-01 16:42:56 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-02 00:44:20 +0000 |
| commit | 510a9b6ff13b7d569c98c847b2e83155501a4769 (patch) | |
| tree | 2f7f31f56ae401fed2fb7ed2a3283f0b664187e9 /cc/blink/web_content_layer_impl.cc | |
| parent | fbba117c73585e84dda88fd8e5b3e751e43bc99c (diff) | |
| download | chromium_src-510a9b6ff13b7d569c98c847b2e83155501a4769.zip chromium_src-510a9b6ff13b7d569c98c847b2e83155501a4769.tar.gz chromium_src-510a9b6ff13b7d569c98c847b2e83155501a4769.tar.bz2 | |
Blink Compositor Animation: Erase old animation system.
Basically, specialize all the code as if use_compositor_animation_timelines is always true.
Next CL: Erase cc::LayerSettings everywhere.
BUG=575041
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1739743003
Cr-Commit-Position: refs/heads/master@{#378629}
Diffstat (limited to 'cc/blink/web_content_layer_impl.cc')
| -rw-r--r-- | cc/blink/web_content_layer_impl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cc/blink/web_content_layer_impl.cc b/cc/blink/web_content_layer_impl.cc index 458b398..c55f2ec 100644 --- a/cc/blink/web_content_layer_impl.cc +++ b/cc/blink/web_content_layer_impl.cc @@ -9,6 +9,7 @@ #include "base/command_line.h" #include "cc/base/switches.h" #include "cc/blink/web_display_item_list_impl.h" +#include "cc/layers/layer_settings.h" #include "cc/layers/picture_layer.h" #include "cc/playback/display_item_list_settings.h" #include "third_party/WebKit/public/platform/WebContentLayerClient.h" @@ -51,8 +52,8 @@ PaintingControlToWeb( WebContentLayerImpl::WebContentLayerImpl(blink::WebContentLayerClient* client) : client_(client) { - layer_ = make_scoped_ptr(new WebLayerImpl( - PictureLayer::Create(WebLayerImpl::LayerSettings(), this))); + layer_ = make_scoped_ptr( + new WebLayerImpl(PictureLayer::Create(cc::LayerSettings(), this))); layer_->layer()->SetIsDrawable(true); } |