OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "cc/blink/web_layer_impl.h" | 5 #include "cc/blink/web_layer_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <utility> | 10 #include <utility> |
11 #include <vector> | 11 #include <vector> |
12 | 12 |
13 #include "base/bind.h" | 13 #include "base/bind.h" |
14 #include "base/strings/string_util.h" | 14 #include "base/strings/string_util.h" |
15 #include "base/threading/thread_checker.h" | 15 #include "base/threading/thread_checker.h" |
16 #include "base/trace_event/trace_event_impl.h" | 16 #include "base/trace_event/trace_event_impl.h" |
| 17 #include "cc/animation/element_id.h" |
17 #include "cc/base/region.h" | 18 #include "cc/base/region.h" |
18 #include "cc/base/switches.h" | 19 #include "cc/base/switches.h" |
19 #include "cc/blink/web_blend_mode.h" | 20 #include "cc/blink/web_blend_mode.h" |
20 #include "cc/layers/layer.h" | 21 #include "cc/layers/layer.h" |
21 #include "cc/layers/layer_position_constraint.h" | 22 #include "cc/layers/layer_position_constraint.h" |
22 #include "cc/trees/layer_tree_host.h" | 23 #include "cc/trees/layer_tree_host.h" |
23 #include "third_party/WebKit/public/platform/WebFloatPoint.h" | 24 #include "third_party/WebKit/public/platform/WebFloatPoint.h" |
24 #include "third_party/WebKit/public/platform/WebFloatRect.h" | 25 #include "third_party/WebKit/public/platform/WebFloatRect.h" |
25 #include "third_party/WebKit/public/platform/WebLayerPositionConstraint.h" | 26 #include "third_party/WebKit/public/platform/WebLayerPositionConstraint.h" |
26 #include "third_party/WebKit/public/platform/WebLayerScrollClient.h" | 27 #include "third_party/WebKit/public/platform/WebLayerScrollClient.h" |
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
372 } | 373 } |
373 | 374 |
374 const cc::Layer* WebLayerImpl::ccLayer() const { | 375 const cc::Layer* WebLayerImpl::ccLayer() const { |
375 return layer_.get(); | 376 return layer_.get(); |
376 } | 377 } |
377 | 378 |
378 cc::Layer* WebLayerImpl::ccLayer() { | 379 cc::Layer* WebLayerImpl::ccLayer() { |
379 return layer_.get(); | 380 return layer_.get(); |
380 } | 381 } |
381 | 382 |
382 void WebLayerImpl::setElementId(uint64_t id) { | 383 void WebLayerImpl::setElementId(const cc::ElementId& id) { |
383 layer_->SetElementId(id); | 384 layer_->SetElementId(id); |
384 } | 385 } |
385 | 386 |
386 uint64_t WebLayerImpl::elementId() const { | 387 cc::ElementId WebLayerImpl::elementId() const { |
387 return layer_->element_id(); | 388 return layer_->element_id(); |
388 } | 389 } |
389 | 390 |
390 void WebLayerImpl::setCompositorMutableProperties(uint32_t properties) { | 391 void WebLayerImpl::setCompositorMutableProperties(uint32_t properties) { |
391 layer_->SetMutableProperties(properties); | 392 layer_->SetMutableProperties(properties); |
392 } | 393 } |
393 | 394 |
394 uint32_t WebLayerImpl::compositorMutableProperties() const { | 395 uint32_t WebLayerImpl::compositorMutableProperties() const { |
395 return layer_->mutable_properties(); | 396 return layer_->mutable_properties(); |
396 } | 397 } |
(...skipping 18 matching lines...) Expand all Loading... |
415 | 416 |
416 void WebLayerImpl::SetContentsOpaqueIsFixed(bool fixed) { | 417 void WebLayerImpl::SetContentsOpaqueIsFixed(bool fixed) { |
417 contents_opaque_is_fixed_ = fixed; | 418 contents_opaque_is_fixed_ = fixed; |
418 } | 419 } |
419 | 420 |
420 void WebLayerImpl::setHasWillChangeTransformHint(bool has_will_change) { | 421 void WebLayerImpl::setHasWillChangeTransformHint(bool has_will_change) { |
421 layer_->SetHasWillChangeTransformHint(has_will_change); | 422 layer_->SetHasWillChangeTransformHint(has_will_change); |
422 } | 423 } |
423 | 424 |
424 } // namespace cc_blink | 425 } // namespace cc_blink |
OLD | NEW |