| Index: cc/blink/web_layer_impl.cc
|
| diff --git a/content/renderer/compositor_bindings/web_layer_impl.cc b/cc/blink/web_layer_impl.cc
|
| similarity index 94%
|
| rename from content/renderer/compositor_bindings/web_layer_impl.cc
|
| rename to cc/blink/web_layer_impl.cc
|
| index aeb7e0e6c36ad74790162c2902706be1ae2815c6..c1f67fbed3af08fbe712b402c8c9e47b58a24ddb 100644
|
| --- a/content/renderer/compositor_bindings/web_layer_impl.cc
|
| +++ b/cc/blink/web_layer_impl.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "content/renderer/compositor_bindings/web_layer_impl.h"
|
| +#include "cc/blink/web_layer_impl.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/debug/trace_event_impl.h"
|
| @@ -12,13 +12,13 @@
|
| #include "cc/animation/animation.h"
|
| #include "cc/base/region.h"
|
| #include "cc/base/switches.h"
|
| +#include "cc/blink/web_animation_impl.h"
|
| +#include "cc/blink/web_blend_mode.h"
|
| +#include "cc/blink/web_filter_operations_impl.h"
|
| +#include "cc/blink/web_to_cc_animation_delegate_adapter.h"
|
| #include "cc/layers/layer.h"
|
| #include "cc/layers/layer_position_constraint.h"
|
| #include "cc/trees/layer_tree_host.h"
|
| -#include "content/renderer/compositor_bindings/web_animation_impl.h"
|
| -#include "content/renderer/compositor_bindings/web_blend_mode.h"
|
| -#include "content/renderer/compositor_bindings/web_filter_operations_impl.h"
|
| -#include "content/renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.h"
|
| #include "third_party/WebKit/public/platform/WebFloatPoint.h"
|
| #include "third_party/WebKit/public/platform/WebFloatRect.h"
|
| #include "third_party/WebKit/public/platform/WebGraphicsLayerDebugInfo.h"
|
| @@ -38,7 +38,7 @@ using blink::WebSize;
|
| using blink::WebColor;
|
| using blink::WebFilterOperations;
|
|
|
| -namespace content {
|
| +namespace cc_blink {
|
| namespace {
|
|
|
| bool g_impl_side_painting_enabled = false;
|
| @@ -104,7 +104,9 @@ void WebLayerImpl::removeAllChildren() {
|
| layer_->RemoveAllChildren();
|
| }
|
|
|
| -void WebLayerImpl::setBounds(const WebSize& size) { layer_->SetBounds(size); }
|
| +void WebLayerImpl::setBounds(const WebSize& size) {
|
| + layer_->SetBounds(size);
|
| +}
|
|
|
| WebSize WebLayerImpl::bounds() const {
|
| return layer_->bounds();
|
| @@ -183,18 +185,6 @@ blink::WebFloatPoint3D WebLayerImpl::transformOrigin() const {
|
| return layer_->transform_origin();
|
| }
|
|
|
| -void WebLayerImpl::setAnchorPoint(const blink::WebFloatPoint&) {}
|
| -
|
| -blink::WebFloatPoint WebLayerImpl::anchorPoint() const {
|
| - return blink::WebFloatPoint();
|
| -}
|
| -
|
| -void WebLayerImpl::setAnchorPointZ(float) {}
|
| -
|
| -float WebLayerImpl::anchorPointZ() const {
|
| - return 0.f;
|
| -}
|
| -
|
| SkMatrix44 WebLayerImpl::transform() const {
|
| return layer_->transform().matrix();
|
| }
|
| @@ -486,5 +476,4 @@ Layer* WebLayerImpl::layer() const {
|
| return layer_.get();
|
| }
|
|
|
| -} // namespace content
|
| -
|
| +} // namespace cc_blink
|
|
|