Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(972)

Side by Side Diff: webkit/compositor_bindings/web_layer_impl.cc

Issue 15051011: Add CompositingReasons to compositor layer types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/compositor_bindings/web_layer_impl.h" 5 #include "webkit/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/compositor_bindings/web_animation_impl.h" 18 #include "webkit/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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 void WebLayerImpl::setFilter(SkImageFilter* filter) { 165 void WebLayerImpl::setFilter(SkImageFilter* filter) {
165 SkSafeRef(filter); // Claim a reference for the compositor. 166 SkSafeRef(filter); // Claim a reference for the compositor.
166 layer_->SetFilter(skia::AdoptRef(filter)); 167 layer_->SetFilter(skia::AdoptRef(filter));
167 } 168 }
168 169
169 void WebLayerImpl::setDebugName(WebKit::WebString name) { 170 void WebLayerImpl::setDebugName(WebKit::WebString name) {
170 layer_->SetDebugName( 171 layer_->SetDebugName(
171 UTF16ToASCII(base::string16(name.data(), name.length()))); 172 UTF16ToASCII(base::string16(name.data(), name.length())));
172 } 173 }
173 174
175 void WebLayerImpl::setCompositingReasons(
176 WebKit::WebCompositingReasons reasons) {
177 layer_->SetCompositingReasons(reasons);
178 }
179
174 void WebLayerImpl::setAnimationDelegate( 180 void WebLayerImpl::setAnimationDelegate(
175 WebKit::WebAnimationDelegate* delegate) { 181 WebKit::WebAnimationDelegate* delegate) {
176 layer_->set_layer_animation_delegate(delegate); 182 layer_->set_layer_animation_delegate(delegate);
177 } 183 }
178 184
179 bool WebLayerImpl::addAnimation(WebKit::WebAnimation* animation) { 185 bool WebLayerImpl::addAnimation(WebKit::WebAnimation* animation) {
180 return layer_->AddAnimation( 186 return layer_->AddAnimation(
181 static_cast<WebAnimationImpl*>(animation)->CloneToAnimation()); 187 static_cast<WebAnimationImpl*>(animation)->CloneToAnimation());
182 } 188 }
183 189
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 void WebLayerImpl::setScrollClient( 349 void WebLayerImpl::setScrollClient(
344 WebKit::WebLayerScrollClient* scroll_client) { 350 WebKit::WebLayerScrollClient* scroll_client) {
345 layer_->set_layer_scroll_client(scroll_client); 351 layer_->set_layer_scroll_client(scroll_client);
346 } 352 }
347 353
348 bool WebLayerImpl::isOrphan() const { return !layer_->layer_tree_host(); } 354 bool WebLayerImpl::isOrphan() const { return !layer_->layer_tree_host(); }
349 355
350 Layer* WebLayerImpl::layer() const { return layer_.get(); } 356 Layer* WebLayerImpl::layer() const { return layer_.get(); }
351 357
352 } // namespace WebKit 358 } // namespace WebKit
OLDNEW
« cc/layers/layer.cc ('K') | « webkit/compositor_bindings/web_layer_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698