summaryrefslogtreecommitdiffstats
path: root/cc/blink
diff options
context:
space:
mode:
authorloyso <loyso@chromium.org>2016-03-13 18:30:31 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-14 01:32:31 +0000
commit0940d410fd6f1da81a07a963a8b485cee310918f (patch)
tree4d8d164bd8319181d8d3374c66e1338a5a9d963c /cc/blink
parent90f8fccd97c06ddfd0c0e9b7350a4f7fffccfb36 (diff)
downloadchromium_src-0940d410fd6f1da81a07a963a8b485cee310918f.zip
chromium_src-0940d410fd6f1da81a07a963a8b485cee310918f.tar.gz
chromium_src-0940d410fd6f1da81a07a963a8b485cee310918f.tar.bz2
CC Animation: Erase cc::LayerSettings everywhere.
Also, erase LayerTreeSettings::use_compositor_animation_timelines flag. BUG=575041 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1783613004 Cr-Commit-Position: refs/heads/master@{#380914}
Diffstat (limited to 'cc/blink')
-rw-r--r--cc/blink/web_content_layer_impl.cc4
-rw-r--r--cc/blink/web_external_texture_layer_impl.cc4
-rw-r--r--cc/blink/web_image_layer_impl.cc4
-rw-r--r--cc/blink/web_layer_impl.cc4
-rw-r--r--cc/blink/web_layer_impl.h1
-rw-r--r--cc/blink/web_layer_impl_fixed_bounds_unittest.cc8
-rw-r--r--cc/blink/web_scrollbar_layer_impl.cc6
7 files changed, 9 insertions, 22 deletions
diff --git a/cc/blink/web_content_layer_impl.cc b/cc/blink/web_content_layer_impl.cc
index c55f2ec..b7a855c 100644
--- a/cc/blink/web_content_layer_impl.cc
+++ b/cc/blink/web_content_layer_impl.cc
@@ -9,7 +9,6 @@
#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"
@@ -52,8 +51,7 @@ PaintingControlToWeb(
WebContentLayerImpl::WebContentLayerImpl(blink::WebContentLayerClient* client)
: client_(client) {
- layer_ = make_scoped_ptr(
- new WebLayerImpl(PictureLayer::Create(cc::LayerSettings(), this)));
+ layer_ = make_scoped_ptr(new WebLayerImpl(PictureLayer::Create(this)));
layer_->layer()->SetIsDrawable(true);
}
diff --git a/cc/blink/web_external_texture_layer_impl.cc b/cc/blink/web_external_texture_layer_impl.cc
index c2f2a45..03f6e18 100644
--- a/cc/blink/web_external_texture_layer_impl.cc
+++ b/cc/blink/web_external_texture_layer_impl.cc
@@ -6,7 +6,6 @@
#include "cc/blink/web_external_bitmap_impl.h"
#include "cc/blink/web_layer_impl.h"
-#include "cc/layers/layer_settings.h"
#include "cc/layers/texture_layer.h"
#include "cc/resources/single_release_callback.h"
#include "cc/resources/texture_mailbox.h"
@@ -25,8 +24,7 @@ WebExternalTextureLayerImpl::WebExternalTextureLayerImpl(
blink::WebExternalTextureLayerClient* client)
: client_(client) {
cc::TextureLayerClient* cc_client = client_ ? this : nullptr;
- scoped_refptr<TextureLayer> layer =
- TextureLayer::CreateForMailbox(cc::LayerSettings(), cc_client);
+ scoped_refptr<TextureLayer> layer = TextureLayer::CreateForMailbox(cc_client);
layer->SetIsDrawable(true);
layer_.reset(new WebLayerImpl(layer));
}
diff --git a/cc/blink/web_image_layer_impl.cc b/cc/blink/web_image_layer_impl.cc
index e3b7421..68f6198 100644
--- a/cc/blink/web_image_layer_impl.cc
+++ b/cc/blink/web_image_layer_impl.cc
@@ -6,15 +6,13 @@
#include "cc/blink/web_layer_impl.h"
#include "cc/blink/web_layer_impl_fixed_bounds.h"
-#include "cc/layers/layer_settings.h"
#include "cc/layers/picture_image_layer.h"
#include "third_party/skia/include/core/SkImage.h"
namespace cc_blink {
WebImageLayerImpl::WebImageLayerImpl() {
- layer_.reset(new WebLayerImplFixedBounds(
- cc::PictureImageLayer::Create(cc::LayerSettings())));
+ layer_.reset(new WebLayerImplFixedBounds(cc::PictureImageLayer::Create()));
}
WebImageLayerImpl::~WebImageLayerImpl() {
diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc
index 2d578fc..667a848 100644
--- a/cc/blink/web_layer_impl.cc
+++ b/cc/blink/web_layer_impl.cc
@@ -19,7 +19,6 @@
#include "cc/blink/web_blend_mode.h"
#include "cc/layers/layer.h"
#include "cc/layers/layer_position_constraint.h"
-#include "cc/layers/layer_settings.h"
#include "cc/trees/layer_tree_host.h"
#include "third_party/WebKit/public/platform/WebFloatPoint.h"
#include "third_party/WebKit/public/platform/WebFloatRect.h"
@@ -41,8 +40,7 @@ using blink::WebColor;
namespace cc_blink {
WebLayerImpl::WebLayerImpl()
- : layer_(Layer::Create(cc::LayerSettings())),
- contents_opaque_is_fixed_(false) {}
+ : layer_(Layer::Create()), contents_opaque_is_fixed_(false) {}
WebLayerImpl::WebLayerImpl(scoped_refptr<Layer> layer)
: layer_(layer), contents_opaque_is_fixed_(false) {
diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h
index 85726d2..a955fcb 100644
--- a/cc/blink/web_layer_impl.h
+++ b/cc/blink/web_layer_impl.h
@@ -41,7 +41,6 @@ class ConvertableToTraceFormat;
namespace cc {
class FilterOperations;
class Layer;
-class LayerSettings;
}
namespace cc_blink {
diff --git a/cc/blink/web_layer_impl_fixed_bounds_unittest.cc b/cc/blink/web_layer_impl_fixed_bounds_unittest.cc
index ad9b1e1..01a1a38 100644
--- a/cc/blink/web_layer_impl_fixed_bounds_unittest.cc
+++ b/cc/blink/web_layer_impl_fixed_bounds_unittest.cc
@@ -4,7 +4,6 @@
#include <vector>
#include "cc/blink/web_layer_impl_fixed_bounds.h"
-#include "cc/layers/layer_settings.h"
#include "cc/layers/picture_image_layer.h"
#include "cc/test/fake_layer_tree_host.h"
#include "cc/test/geometry_test_utils.h"
@@ -90,16 +89,15 @@ void CompareFixedBoundsLayerAndNormalLayer(const WebFloatPoint& anchor_point,
scoped_ptr<WebLayerImplFixedBounds> root_layer(new WebLayerImplFixedBounds());
- WebLayerImplFixedBounds* fixed_bounds_layer = new WebLayerImplFixedBounds(
- cc::PictureImageLayer::Create(cc::LayerSettings()));
+ WebLayerImplFixedBounds* fixed_bounds_layer =
+ new WebLayerImplFixedBounds(cc::PictureImageLayer::Create());
fixed_bounds_layer->setBounds(bounds);
fixed_bounds_layer->SetFixedBounds(fixed_bounds);
fixed_bounds_layer->setTransform(transform.matrix());
fixed_bounds_layer->setPosition(position);
root_layer->addChild(fixed_bounds_layer);
- WebLayerImpl* normal_layer(
- new WebLayerImpl(cc::PictureImageLayer::Create(cc::LayerSettings())));
+ WebLayerImpl* normal_layer(new WebLayerImpl(cc::PictureImageLayer::Create()));
normal_layer->setBounds(bounds);
normal_layer->setTransform(transform.matrix());
diff --git a/cc/blink/web_scrollbar_layer_impl.cc b/cc/blink/web_scrollbar_layer_impl.cc
index 905d36b..e31f5c6 100644
--- a/cc/blink/web_scrollbar_layer_impl.cc
+++ b/cc/blink/web_scrollbar_layer_impl.cc
@@ -7,7 +7,6 @@
#include "cc/blink/scrollbar_impl.h"
#include "cc/blink/web_layer_impl.h"
#include "cc/layers/layer.h"
-#include "cc/layers/layer_settings.h"
#include "cc/layers/painted_scrollbar_layer.h"
#include "cc/layers/scrollbar_layer_interface.h"
#include "cc/layers/solid_color_scrollbar_layer.h"
@@ -32,7 +31,7 @@ WebScrollbarLayerImpl::WebScrollbarLayerImpl(
blink::WebScrollbarThemePainter painter,
blink::WebScrollbarThemeGeometry* geometry)
: layer_(new WebLayerImpl(PaintedScrollbarLayer::Create(
- cc::LayerSettings(),
+
scoped_ptr<cc::Scrollbar>(
new ScrollbarImpl(make_scoped_ptr(scrollbar),
painter,
@@ -45,8 +44,7 @@ WebScrollbarLayerImpl::WebScrollbarLayerImpl(
int track_start,
bool is_left_side_vertical_scrollbar)
: layer_(new WebLayerImpl(
- SolidColorScrollbarLayer::Create(cc::LayerSettings(),
- ConvertOrientation(orientation),
+ SolidColorScrollbarLayer::Create(ConvertOrientation(orientation),
thumb_thickness,
track_start,
is_left_side_vertical_scrollbar,