OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "webkit/renderer/compositor_bindings/web_layer_impl.h" | 5 #include "webkit/renderer/compositor_bindings/web_layer_impl.h" |
6 | 6 |
7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
8 #include "cc/animation/animation.h" | 8 #include "cc/animation/animation.h" |
9 #include "cc/base/region.h" | 9 #include "cc/base/region.h" |
10 #include "cc/layers/layer.h" | 10 #include "cc/layers/layer.h" |
11 #include "cc/layers/layer_position_constraint.h" | 11 #include "cc/layers/layer_position_constraint.h" |
| 12 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositingReaso
ns.h" |
12 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" | 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" |
13 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" | 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" |
14 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerPositionCon
straint.h" | 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerPositionCon
straint.h" |
15 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" | 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" |
16 #include "third_party/skia/include/utils/SkMatrix44.h" | 17 #include "third_party/skia/include/utils/SkMatrix44.h" |
17 #include "webkit/renderer/compositor_bindings/web_animation_impl.h" | 18 #include "webkit/renderer/compositor_bindings/web_animation_impl.h" |
18 | 19 |
19 using cc::Animation; | 20 using cc::Animation; |
20 using cc::Layer; | 21 using cc::Layer; |
21 using WebKit::WebLayer; | 22 using WebKit::WebLayer; |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 | 164 |
164 void WebLayerImpl::setFilter(SkImageFilter* filter) { | 165 void WebLayerImpl::setFilter(SkImageFilter* filter) { |
165 layer_->SetFilter(skia::SharePtr(filter)); | 166 layer_->SetFilter(skia::SharePtr(filter)); |
166 } | 167 } |
167 | 168 |
168 void WebLayerImpl::setDebugName(WebKit::WebString name) { | 169 void WebLayerImpl::setDebugName(WebKit::WebString name) { |
169 layer_->SetDebugName( | 170 layer_->SetDebugName( |
170 UTF16ToASCII(base::string16(name.data(), name.length()))); | 171 UTF16ToASCII(base::string16(name.data(), name.length()))); |
171 } | 172 } |
172 | 173 |
| 174 void WebLayerImpl::setCompositingReasons( |
| 175 WebKit::WebCompositingReasons reasons) { |
| 176 layer_->SetCompositingReasons(reasons); |
| 177 } |
| 178 |
173 void WebLayerImpl::setAnimationDelegate( | 179 void WebLayerImpl::setAnimationDelegate( |
174 WebKit::WebAnimationDelegate* delegate) { | 180 WebKit::WebAnimationDelegate* delegate) { |
175 layer_->set_layer_animation_delegate(delegate); | 181 layer_->set_layer_animation_delegate(delegate); |
176 } | 182 } |
177 | 183 |
178 bool WebLayerImpl::addAnimation(WebKit::WebAnimation* animation) { | 184 bool WebLayerImpl::addAnimation(WebKit::WebAnimation* animation) { |
179 return layer_->AddAnimation( | 185 return layer_->AddAnimation( |
180 static_cast<WebAnimationImpl*>(animation)->CloneToAnimation()); | 186 static_cast<WebAnimationImpl*>(animation)->CloneToAnimation()); |
181 } | 187 } |
182 | 188 |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
342 void WebLayerImpl::setScrollClient( | 348 void WebLayerImpl::setScrollClient( |
343 WebKit::WebLayerScrollClient* scroll_client) { | 349 WebKit::WebLayerScrollClient* scroll_client) { |
344 layer_->set_layer_scroll_client(scroll_client); | 350 layer_->set_layer_scroll_client(scroll_client); |
345 } | 351 } |
346 | 352 |
347 bool WebLayerImpl::isOrphan() const { return !layer_->layer_tree_host(); } | 353 bool WebLayerImpl::isOrphan() const { return !layer_->layer_tree_host(); } |
348 | 354 |
349 Layer* WebLayerImpl::layer() const { return layer_.get(); } | 355 Layer* WebLayerImpl::layer() const { return layer_.get(); } |
350 | 356 |
351 } // namespace WebKit | 357 } // namespace WebKit |
OLD | NEW |