| Index: webkit/renderer/compositor_bindings/web_layer_impl.cc
|
| diff --git a/webkit/renderer/compositor_bindings/web_layer_impl.cc b/webkit/renderer/compositor_bindings/web_layer_impl.cc
|
| index 85162c678d5f5bc0fafe139aaa6f153613493ea3..950f76e93a3e441b73ec5637a8c943ea2cdc44ab 100644
|
| --- a/webkit/renderer/compositor_bindings/web_layer_impl.cc
|
| +++ b/webkit/renderer/compositor_bindings/web_layer_impl.cc
|
| @@ -24,13 +24,13 @@
|
|
|
| using cc::Animation;
|
| using cc::Layer;
|
| -using WebKit::WebLayer;
|
| -using WebKit::WebFloatPoint;
|
| -using WebKit::WebVector;
|
| -using WebKit::WebRect;
|
| -using WebKit::WebSize;
|
| -using WebKit::WebColor;
|
| -using WebKit::WebFilterOperations;
|
| +using blink::WebLayer;
|
| +using blink::WebFloatPoint;
|
| +using blink::WebVector;
|
| +using blink::WebRect;
|
| +using blink::WebSize;
|
| +using blink::WebColor;
|
| +using blink::WebFilterOperations;
|
|
|
| namespace webkit {
|
|
|
| @@ -52,7 +52,7 @@ WebLayerImpl::~WebLayerImpl() {
|
|
|
| int WebLayerImpl::id() const { return layer_->id(); }
|
|
|
| -void WebLayerImpl::invalidateRect(const WebKit::WebFloatRect& rect) {
|
| +void WebLayerImpl::invalidateRect(const blink::WebFloatRect& rect) {
|
| layer_->SetNeedsDisplayRect(rect);
|
| }
|
|
|
| @@ -179,18 +179,18 @@ void WebLayerImpl::setBackgroundFilters(const WebFilterOperations& filters) {
|
| }
|
|
|
| void WebLayerImpl::setCompositingReasons(
|
| - WebKit::WebCompositingReasons reasons) {
|
| + blink::WebCompositingReasons reasons) {
|
| layer_->SetCompositingReasons(reasons);
|
| }
|
|
|
| void WebLayerImpl::setAnimationDelegate(
|
| - WebKit::WebAnimationDelegate* delegate) {
|
| + blink::WebAnimationDelegate* delegate) {
|
| animation_delegate_adapter_.reset(
|
| new WebToCCAnimationDelegateAdapter(delegate));
|
| layer_->set_layer_animation_delegate(animation_delegate_adapter_.get());
|
| }
|
|
|
| -bool WebLayerImpl::addAnimation(WebKit::WebAnimation* animation) {
|
| +bool WebLayerImpl::addAnimation(blink::WebAnimation* animation) {
|
| bool result = layer_->AddAnimation(
|
| static_cast<WebAnimationImpl*>(animation)->PassAnimation());
|
| delete animation;
|
| @@ -203,7 +203,7 @@ void WebLayerImpl::removeAnimation(int animation_id) {
|
|
|
| void WebLayerImpl::removeAnimation(
|
| int animation_id,
|
| - WebKit::WebAnimation::TargetProperty target_property) {
|
| + blink::WebAnimation::TargetProperty target_property) {
|
| layer_->layer_animation_controller()->RemoveAnimation(
|
| animation_id,
|
| static_cast<Animation::TargetProperty>(target_property));
|
| @@ -219,11 +219,11 @@ void WebLayerImpl::setForceRenderSurface(bool force_render_surface) {
|
| layer_->SetForceRenderSurface(force_render_surface);
|
| }
|
|
|
| -void WebLayerImpl::setScrollPosition(WebKit::WebPoint position) {
|
| +void WebLayerImpl::setScrollPosition(blink::WebPoint position) {
|
| layer_->SetScrollOffset(gfx::Point(position).OffsetFromOrigin());
|
| }
|
|
|
| -WebKit::WebPoint WebLayerImpl::scrollPosition() const {
|
| +blink::WebPoint WebLayerImpl::scrollPosition() const {
|
| return gfx::PointAtOffsetFromOrigin(layer_->scroll_offset());
|
| }
|
|
|
| @@ -328,9 +328,9 @@ bool WebLayerImpl::isContainerForFixedPositionLayers() const {
|
| return layer_->IsContainerForFixedPositionLayers();
|
| }
|
|
|
| -static WebKit::WebLayerPositionConstraint ToWebLayerPositionConstraint(
|
| +static blink::WebLayerPositionConstraint ToWebLayerPositionConstraint(
|
| const cc::LayerPositionConstraint& constraint) {
|
| - WebKit::WebLayerPositionConstraint web_constraint;
|
| + blink::WebLayerPositionConstraint web_constraint;
|
| web_constraint.isFixedPosition = constraint.is_fixed_position();
|
| web_constraint.isFixedToRightEdge = constraint.is_fixed_to_right_edge();
|
| web_constraint.isFixedToBottomEdge = constraint.is_fixed_to_bottom_edge();
|
| @@ -338,7 +338,7 @@ static WebKit::WebLayerPositionConstraint ToWebLayerPositionConstraint(
|
| }
|
|
|
| static cc::LayerPositionConstraint ToLayerPositionConstraint(
|
| - const WebKit::WebLayerPositionConstraint& web_constraint) {
|
| + const blink::WebLayerPositionConstraint& web_constraint) {
|
| cc::LayerPositionConstraint constraint;
|
| constraint.set_is_fixed_position(web_constraint.isFixedPosition);
|
| constraint.set_is_fixed_to_right_edge(web_constraint.isFixedToRightEdge);
|
| @@ -347,19 +347,19 @@ static cc::LayerPositionConstraint ToLayerPositionConstraint(
|
| }
|
|
|
| void WebLayerImpl::setPositionConstraint(
|
| - const WebKit::WebLayerPositionConstraint& constraint) {
|
| + const blink::WebLayerPositionConstraint& constraint) {
|
| layer_->SetPositionConstraint(ToLayerPositionConstraint(constraint));
|
| }
|
|
|
| -WebKit::WebLayerPositionConstraint WebLayerImpl::positionConstraint() const {
|
| +blink::WebLayerPositionConstraint WebLayerImpl::positionConstraint() const {
|
| return ToWebLayerPositionConstraint(layer_->position_constraint());
|
| }
|
|
|
| void WebLayerImpl::setScrollClient(
|
| - WebKit::WebLayerScrollClient* scroll_client) {
|
| + blink::WebLayerScrollClient* scroll_client) {
|
| if (scroll_client) {
|
| layer_->set_did_scroll_callback(
|
| - base::Bind(&WebKit::WebLayerScrollClient::didScroll,
|
| + base::Bind(&blink::WebLayerScrollClient::didScroll,
|
| base::Unretained(scroll_client)));
|
| } else {
|
| layer_->set_did_scroll_callback(base::Closure());
|
| @@ -368,7 +368,7 @@ void WebLayerImpl::setScrollClient(
|
|
|
| bool WebLayerImpl::isOrphan() const { return !layer_->layer_tree_host(); }
|
|
|
| -void WebLayerImpl::setWebLayerClient(WebKit::WebLayerClient* client) {
|
| +void WebLayerImpl::setWebLayerClient(blink::WebLayerClient* client) {
|
| web_layer_client_ = client;
|
| }
|
|
|
| @@ -381,14 +381,14 @@ std::string WebLayerImpl::DebugName() {
|
| return name;
|
| }
|
|
|
| -void WebLayerImpl::setScrollParent(WebKit::WebLayer* parent) {
|
| +void WebLayerImpl::setScrollParent(blink::WebLayer* parent) {
|
| cc::Layer* scroll_parent = NULL;
|
| if (parent)
|
| scroll_parent = static_cast<WebLayerImpl*>(parent)->layer();
|
| layer_->SetScrollParent(scroll_parent);
|
| }
|
|
|
| -void WebLayerImpl::setClipParent(WebKit::WebLayer* parent) {
|
| +void WebLayerImpl::setClipParent(blink::WebLayer* parent) {
|
| cc::Layer* clip_parent = NULL;
|
| if (parent)
|
| clip_parent = static_cast<WebLayerImpl*>(parent)->layer();
|
|
|