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

Unified Diff: cc/trees/layer_tree_host_common.h

Issue 786123002: Update from https://crrev.com/307330 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/layer_tree_host.cc ('k') | cc/trees/layer_tree_host_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_common.h
diff --git a/cc/trees/layer_tree_host_common.h b/cc/trees/layer_tree_host_common.h
index 349b341f6ba9783da9465a26f1af8f70c8af4fb4..81aca55c03b075b41a0ebed6719596986e5883a4 100644
--- a/cc/trees/layer_tree_host_common.h
+++ b/cc/trees/layer_tree_host_common.h
@@ -38,6 +38,8 @@ class CC_EXPORT LayerTreeHostCommon {
float device_scale_factor,
float page_scale_factor,
const LayerType* page_scale_application_layer,
+ const gfx::Vector2dF& elastic_overscroll,
+ const LayerType* elastic_overscroll_application_layer,
int max_texture_size,
bool can_use_lcd_text,
bool layers_always_allowed_lcd_text,
@@ -51,6 +53,9 @@ class CC_EXPORT LayerTreeHostCommon {
device_scale_factor(device_scale_factor),
page_scale_factor(page_scale_factor),
page_scale_application_layer(page_scale_application_layer),
+ elastic_overscroll(elastic_overscroll),
+ elastic_overscroll_application_layer(
+ elastic_overscroll_application_layer),
max_texture_size(max_texture_size),
can_use_lcd_text(can_use_lcd_text),
layers_always_allowed_lcd_text(layers_always_allowed_lcd_text),
@@ -66,6 +71,8 @@ class CC_EXPORT LayerTreeHostCommon {
float device_scale_factor;
float page_scale_factor;
const LayerType* page_scale_application_layer;
+ gfx::Vector2dF elastic_overscroll;
+ const LayerType* elastic_overscroll_application_layer;
int max_texture_size;
bool can_use_lcd_text;
bool layers_always_allowed_lcd_text;
@@ -145,6 +152,7 @@ struct CC_EXPORT ScrollAndScaleSet {
std::vector<LayerTreeHostCommon::ScrollUpdateInfo> scrolls;
float page_scale_delta;
+ gfx::Vector2dF elastic_overscroll_delta;
float top_controls_delta;
ScopedPtrVector<SwapPromise> swap_promises;
};
@@ -223,6 +231,8 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType,
1.f,
1.f,
NULL,
+ gfx::Vector2dF(),
+ NULL,
std::numeric_limits<int>::max() / 2,
false,
false,
@@ -248,6 +258,8 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType,
1.f,
1.f,
NULL,
+ gfx::Vector2dF(),
+ NULL,
std::numeric_limits<int>::max() / 2,
false,
false,
« no previous file with comments | « cc/trees/layer_tree_host.cc ('k') | cc/trees/layer_tree_host_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698