projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
cc
/
trees
/
layer_tree_host.h
diff --git
a/src/cc/trees/layer_tree_host.h
b/src/cc/trees/layer_tree_host.h
index
867bb19
..
1a2a65b
100644
(file)
--- a/
src/cc/trees/layer_tree_host.h
+++ b/
src/cc/trees/layer_tree_host.h
@@
-195,13
+195,19
@@
class CC_EXPORT LayerTreeHost {
scoped_refptr<Layer> page_scale_layer,
scoped_refptr<Layer> inner_viewport_scroll_layer,
scoped_refptr<Layer> outer_viewport_scroll_layer);
scoped_refptr<Layer> page_scale_layer,
scoped_refptr<Layer> inner_viewport_scroll_layer,
scoped_refptr<Layer> outer_viewport_scroll_layer);
+ Layer* inner_viewport_scroll_layer() const {
+ return inner_viewport_scroll_layer_.get();
+ }
+ Layer* outer_viewport_scroll_layer() const {
+ return outer_viewport_scroll_layer_.get();
+ }
const LayerTreeSettings& settings() const { return settings_; }
void SetDebugState(const LayerTreeDebugState& debug_state);
const LayerTreeDebugState& debug_state() const { return debug_state_; }
const LayerTreeSettings& settings() const { return settings_; }
void SetDebugState(const LayerTreeDebugState& debug_state);
const LayerTreeDebugState& debug_state() const { return debug_state_; }
- void SetViewportSize(
gfx::Size
device_viewport_size);
+ void SetViewportSize(
const gfx::Size&
device_viewport_size);
void SetOverdrawBottomHeight(float overdraw_bottom_height);
gfx::Size device_viewport_size() const { return device_viewport_size_; }
void SetOverdrawBottomHeight(float overdraw_bottom_height);
gfx::Size device_viewport_size() const { return device_viewport_size_; }
@@
-229,12
+235,14
@@
class CC_EXPORT LayerTreeHost {
void SetVisible(bool visible);
bool visible() const { return visible_; }
void SetVisible(bool visible);
bool visible() const { return visible_; }
- void StartPageScaleAnimation(
gfx::Vector2d
target_offset,
+ void StartPageScaleAnimation(
const gfx::Vector2d&
target_offset,
bool use_anchor,
float scale,
base::TimeDelta duration);
void ApplyScrollAndScale(const ScrollAndScaleSet& info);
bool use_anchor,
float scale,
base::TimeDelta duration);
void ApplyScrollAndScale(const ScrollAndScaleSet& info);
+ gfx::Vector2d DistributeScrollOffsetToViewports(const gfx::Vector2d offset,
+ Layer* layer);
void SetImplTransform(const gfx::Transform& transform);
void SetImplTransform(const gfx::Transform& transform);