| Index: webkit/compositor_bindings/web_layer_impl.cc
|
| diff --git a/webkit/compositor_bindings/web_layer_impl.cc b/webkit/compositor_bindings/web_layer_impl.cc
|
| deleted file mode 100644
|
| index 8eec32192a7672bbf8184788c4665080f93a6841..0000000000000000000000000000000000000000
|
| --- a/webkit/compositor_bindings/web_layer_impl.cc
|
| +++ /dev/null
|
| @@ -1,352 +0,0 @@
|
| -// Copyright 2011 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "webkit/compositor_bindings/web_layer_impl.h"
|
| -
|
| -#include "base/string_util.h"
|
| -#include "cc/animation/animation.h"
|
| -#include "cc/base/region.h"
|
| -#include "cc/layers/layer.h"
|
| -#include "cc/layers/layer_position_constraint.h"
|
| -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h"
|
| -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h"
|
| -#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerPositionConstraint.h"
|
| -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
|
| -#include "third_party/skia/include/utils/SkMatrix44.h"
|
| -#include "webkit/compositor_bindings/web_animation_impl.h"
|
| -
|
| -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;
|
| -
|
| -namespace webkit {
|
| -
|
| -WebLayerImpl::WebLayerImpl() : layer_(Layer::Create()) {}
|
| -
|
| -WebLayerImpl::WebLayerImpl(scoped_refptr<Layer> layer) : layer_(layer) {}
|
| -
|
| -WebLayerImpl::~WebLayerImpl() {
|
| - layer_->ClearRenderSurface();
|
| - layer_->set_layer_animation_delegate(NULL);
|
| -}
|
| -
|
| -int WebLayerImpl::id() const { return layer_->id(); }
|
| -
|
| -void WebLayerImpl::invalidateRect(const WebKit::WebFloatRect& rect) {
|
| - layer_->SetNeedsDisplayRect(rect);
|
| -}
|
| -
|
| -void WebLayerImpl::invalidate() { layer_->SetNeedsDisplay(); }
|
| -
|
| -void WebLayerImpl::addChild(WebLayer* child) {
|
| - layer_->AddChild(static_cast<WebLayerImpl*>(child)->layer());
|
| -}
|
| -
|
| -void WebLayerImpl::insertChild(WebLayer* child, size_t index) {
|
| - layer_->InsertChild(static_cast<WebLayerImpl*>(child)->layer(), index);
|
| -}
|
| -
|
| -void WebLayerImpl::replaceChild(WebLayer* reference, WebLayer* new_layer) {
|
| - layer_->ReplaceChild(static_cast<WebLayerImpl*>(reference)->layer(),
|
| - static_cast<WebLayerImpl*>(new_layer)->layer());
|
| -}
|
| -
|
| -void WebLayerImpl::removeFromParent() { layer_->RemoveFromParent(); }
|
| -
|
| -void WebLayerImpl::removeAllChildren() { layer_->RemoveAllChildren(); }
|
| -
|
| -void WebLayerImpl::setAnchorPoint(const WebFloatPoint& anchor_point) {
|
| - layer_->SetAnchorPoint(anchor_point);
|
| -}
|
| -
|
| -WebFloatPoint WebLayerImpl::anchorPoint() const {
|
| - return layer_->anchor_point();
|
| -}
|
| -
|
| -void WebLayerImpl::setAnchorPointZ(float anchor_point_z) {
|
| - layer_->SetAnchorPointZ(anchor_point_z);
|
| -}
|
| -
|
| -float WebLayerImpl::anchorPointZ() const { return layer_->anchor_point_z(); }
|
| -
|
| -void WebLayerImpl::setBounds(const WebSize& size) { layer_->SetBounds(size); }
|
| -
|
| -WebSize WebLayerImpl::bounds() const { return layer_->bounds(); }
|
| -
|
| -void WebLayerImpl::setMasksToBounds(bool masks_to_bounds) {
|
| - layer_->SetMasksToBounds(masks_to_bounds);
|
| -}
|
| -
|
| -bool WebLayerImpl::masksToBounds() const { return layer_->masks_to_bounds(); }
|
| -
|
| -void WebLayerImpl::setMaskLayer(WebLayer* maskLayer) {
|
| - layer_->SetMaskLayer(
|
| - maskLayer ? static_cast<WebLayerImpl*>(maskLayer)->layer() : 0);
|
| -}
|
| -
|
| -void WebLayerImpl::setReplicaLayer(WebLayer* replica_layer) {
|
| - layer_->SetReplicaLayer(
|
| - replica_layer ? static_cast<WebLayerImpl*>(replica_layer)->layer() : 0);
|
| -}
|
| -
|
| -void WebLayerImpl::setOpacity(float opacity) { layer_->SetOpacity(opacity); }
|
| -
|
| -float WebLayerImpl::opacity() const { return layer_->opacity(); }
|
| -
|
| -void WebLayerImpl::setOpaque(bool opaque) { layer_->SetContentsOpaque(opaque); }
|
| -
|
| -bool WebLayerImpl::opaque() const { return layer_->contents_opaque(); }
|
| -
|
| -void WebLayerImpl::setPosition(const WebFloatPoint& position) {
|
| - layer_->SetPosition(position);
|
| -}
|
| -
|
| -WebFloatPoint WebLayerImpl::position() const { return layer_->position(); }
|
| -
|
| -void WebLayerImpl::setSublayerTransform(const SkMatrix44& matrix) {
|
| - gfx::Transform sub_layer_transform;
|
| - sub_layer_transform.matrix() = matrix;
|
| - layer_->SetSublayerTransform(sub_layer_transform);
|
| -}
|
| -
|
| -SkMatrix44 WebLayerImpl::sublayerTransform() const {
|
| - return layer_->sublayer_transform().matrix();
|
| -}
|
| -
|
| -void WebLayerImpl::setTransform(const SkMatrix44& matrix) {
|
| - gfx::Transform transform;
|
| - transform.matrix() = matrix;
|
| - layer_->SetTransform(transform);
|
| -}
|
| -
|
| -SkMatrix44 WebLayerImpl::transform() const {
|
| - return layer_->transform().matrix();
|
| -}
|
| -
|
| -void WebLayerImpl::setDrawsContent(bool draws_content) {
|
| - layer_->SetIsDrawable(draws_content);
|
| -}
|
| -
|
| -bool WebLayerImpl::drawsContent() const { return layer_->DrawsContent(); }
|
| -
|
| -void WebLayerImpl::setPreserves3D(bool preserve3D) {
|
| - layer_->SetPreserves3d(preserve3D);
|
| -}
|
| -
|
| -void WebLayerImpl::setUseParentBackfaceVisibility(
|
| - bool use_parent_backface_visibility) {
|
| - layer_->set_use_parent_backface_visibility(use_parent_backface_visibility);
|
| -}
|
| -
|
| -void WebLayerImpl::setBackgroundColor(WebColor color) {
|
| - layer_->SetBackgroundColor(color);
|
| -}
|
| -
|
| -WebColor WebLayerImpl::backgroundColor() const {
|
| - return layer_->background_color();
|
| -}
|
| -
|
| -void WebLayerImpl::setFilters(const WebFilterOperations& filters) {
|
| - layer_->SetFilters(filters);
|
| -}
|
| -
|
| -void WebLayerImpl::setBackgroundFilters(const WebFilterOperations& filters) {
|
| - layer_->SetBackgroundFilters(filters);
|
| -}
|
| -
|
| -void WebLayerImpl::setFilter(SkImageFilter* filter) {
|
| - SkSafeRef(filter); // Claim a reference for the compositor.
|
| - layer_->SetFilter(skia::AdoptRef(filter));
|
| -}
|
| -
|
| -void WebLayerImpl::setDebugName(WebKit::WebString name) {
|
| - layer_->SetDebugName(
|
| - UTF16ToASCII(base::string16(name.data(), name.length())));
|
| -}
|
| -
|
| -void WebLayerImpl::setAnimationDelegate(
|
| - WebKit::WebAnimationDelegate* delegate) {
|
| - layer_->set_layer_animation_delegate(delegate);
|
| -}
|
| -
|
| -bool WebLayerImpl::addAnimation(WebKit::WebAnimation* animation) {
|
| - return layer_->AddAnimation(
|
| - static_cast<WebAnimationImpl*>(animation)->CloneToAnimation());
|
| -}
|
| -
|
| -void WebLayerImpl::removeAnimation(int animation_id) {
|
| - layer_->RemoveAnimation(animation_id);
|
| -}
|
| -
|
| -void WebLayerImpl::removeAnimation(
|
| - int animation_id,
|
| - WebKit::WebAnimation::TargetProperty target_property) {
|
| - layer_->layer_animation_controller()->RemoveAnimation(
|
| - animation_id,
|
| - static_cast<Animation::TargetProperty>(target_property));
|
| -}
|
| -
|
| -void WebLayerImpl::pauseAnimation(int animation_id, double time_offset) {
|
| - layer_->PauseAnimation(animation_id, time_offset);
|
| -}
|
| -
|
| -void WebLayerImpl::suspendAnimations(double monotonic_time) {
|
| - layer_->SuspendAnimations(monotonic_time);
|
| -}
|
| -
|
| -void WebLayerImpl::resumeAnimations(double monotonic_time) {
|
| - layer_->ResumeAnimations(monotonic_time);
|
| -}
|
| -
|
| -bool WebLayerImpl::hasActiveAnimation() { return layer_->HasActiveAnimation(); }
|
| -
|
| -void WebLayerImpl::transferAnimationsTo(WebLayer* other) {
|
| - DCHECK(other);
|
| - layer_->TransferAnimationsTo(static_cast<WebLayerImpl*>(other)->layer_);
|
| -}
|
| -
|
| -void WebLayerImpl::setForceRenderSurface(bool force_render_surface) {
|
| - layer_->SetForceRenderSurface(force_render_surface);
|
| -}
|
| -
|
| -void WebLayerImpl::setScrollPosition(WebKit::WebPoint position) {
|
| - layer_->SetScrollOffset(gfx::Point(position).OffsetFromOrigin());
|
| -}
|
| -
|
| -WebKit::WebPoint WebLayerImpl::scrollPosition() const {
|
| - return gfx::PointAtOffsetFromOrigin(layer_->scroll_offset());
|
| -}
|
| -
|
| -void WebLayerImpl::setMaxScrollPosition(WebSize max_scroll_position) {
|
| - layer_->SetMaxScrollOffset(max_scroll_position);
|
| -}
|
| -
|
| -WebSize WebLayerImpl::maxScrollPosition() const {
|
| - return layer_->max_scroll_offset();
|
| -}
|
| -
|
| -void WebLayerImpl::setScrollable(bool scrollable) {
|
| - layer_->SetScrollable(scrollable);
|
| -}
|
| -
|
| -bool WebLayerImpl::scrollable() const { return layer_->scrollable(); }
|
| -
|
| -void WebLayerImpl::setHaveWheelEventHandlers(bool have_wheel_event_handlers) {
|
| - layer_->SetHaveWheelEventHandlers(have_wheel_event_handlers);
|
| -}
|
| -
|
| -bool WebLayerImpl::haveWheelEventHandlers() const {
|
| - return layer_->have_wheel_event_handlers();
|
| -}
|
| -
|
| -void WebLayerImpl::setShouldScrollOnMainThread(
|
| - bool should_scroll_on_main_thread) {
|
| - layer_->SetShouldScrollOnMainThread(should_scroll_on_main_thread);
|
| -}
|
| -
|
| -bool WebLayerImpl::shouldScrollOnMainThread() const {
|
| - return layer_->should_scroll_on_main_thread();
|
| -}
|
| -
|
| -void WebLayerImpl::setNonFastScrollableRegion(const WebVector<WebRect>& rects) {
|
| - cc::Region region;
|
| - for (size_t i = 0; i < rects.size(); ++i)
|
| - region.Union(rects[i]);
|
| - layer_->SetNonFastScrollableRegion(region);
|
| -}
|
| -
|
| -WebVector<WebRect> WebLayerImpl::nonFastScrollableRegion() const {
|
| - size_t num_rects = 0;
|
| - for (cc::Region::Iterator region_rects(layer_->non_fast_scrollable_region());
|
| - region_rects.has_rect();
|
| - region_rects.next())
|
| - ++num_rects;
|
| -
|
| - WebVector<WebRect> result(num_rects);
|
| - size_t i = 0;
|
| - for (cc::Region::Iterator region_rects(layer_->non_fast_scrollable_region());
|
| - region_rects.has_rect();
|
| - region_rects.next()) {
|
| - result[i] = region_rects.rect();
|
| - ++i;
|
| - }
|
| - return result;
|
| -}
|
| -
|
| -void WebLayerImpl::setTouchEventHandlerRegion(const WebVector<WebRect>& rects) {
|
| - cc::Region region;
|
| - for (size_t i = 0; i < rects.size(); ++i)
|
| - region.Union(rects[i]);
|
| - layer_->SetTouchEventHandlerRegion(region);
|
| -}
|
| -
|
| -WebVector<WebRect> WebLayerImpl::touchEventHandlerRegion() const {
|
| - size_t num_rects = 0;
|
| - for (cc::Region::Iterator region_rects(layer_->touch_event_handler_region());
|
| - region_rects.has_rect();
|
| - region_rects.next())
|
| - ++num_rects;
|
| -
|
| - WebVector<WebRect> result(num_rects);
|
| - size_t i = 0;
|
| - for (cc::Region::Iterator region_rects(layer_->touch_event_handler_region());
|
| - region_rects.has_rect();
|
| - region_rects.next()) {
|
| - result[i] = region_rects.rect();
|
| - ++i;
|
| - }
|
| - return result;
|
| -}
|
| -
|
| -void WebLayerImpl::setIsContainerForFixedPositionLayers(bool enable) {
|
| - layer_->SetIsContainerForFixedPositionLayers(enable);
|
| -}
|
| -
|
| -bool WebLayerImpl::isContainerForFixedPositionLayers() const {
|
| - return layer_->IsContainerForFixedPositionLayers();
|
| -}
|
| -
|
| -static WebKit::WebLayerPositionConstraint ToWebLayerPositionConstraint(
|
| - const cc::LayerPositionConstraint& constraint) {
|
| - WebKit::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();
|
| - return web_constraint;
|
| -}
|
| -
|
| -static cc::LayerPositionConstraint ToLayerPositionConstraint(
|
| - const WebKit::WebLayerPositionConstraint& web_constraint) {
|
| - cc::LayerPositionConstraint constraint;
|
| - constraint.set_is_fixed_position(web_constraint.isFixedPosition);
|
| - constraint.set_is_fixed_to_right_edge(web_constraint.isFixedToRightEdge);
|
| - constraint.set_is_fixed_to_bottom_edge(web_constraint.isFixedToBottomEdge);
|
| - return constraint;
|
| -}
|
| -
|
| -void WebLayerImpl::setPositionConstraint(
|
| - const WebKit::WebLayerPositionConstraint& constraint) {
|
| - layer_->SetPositionConstraint(ToLayerPositionConstraint(constraint));
|
| -}
|
| -
|
| -WebKit::WebLayerPositionConstraint WebLayerImpl::positionConstraint() const {
|
| - return ToWebLayerPositionConstraint(layer_->position_constraint());
|
| -}
|
| -
|
| -void WebLayerImpl::setScrollClient(
|
| - WebKit::WebLayerScrollClient* scroll_client) {
|
| - layer_->set_layer_scroll_client(scroll_client);
|
| -}
|
| -
|
| -bool WebLayerImpl::isOrphan() const { return !layer_->layer_tree_host(); }
|
| -
|
| -Layer* WebLayerImpl::layer() const { return layer_.get(); }
|
| -
|
| -} // namespace WebKit
|
|
|