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

Unified Diff: cc/layer_tree_impl.h

Issue 12093015: Move page scale ownership to LayerTreeImpl. (Closed) Base URL: http://git.chromium.org/chromium/src.git@coordchange3
Patch Set: Rebase to 179503 Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layer_tree_host_unittest.cc ('k') | cc/layer_tree_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_tree_impl.h
diff --git a/cc/layer_tree_impl.h b/cc/layer_tree_impl.h
index b2abec870498dcf4a822100f4d9c877e92221066..139b5f98c898d3b6fedf72c513cdf2c4a9b7a7a1 100644
--- a/cc/layer_tree_impl.h
+++ b/cc/layer_tree_impl.h
@@ -30,7 +30,6 @@ class LayerTreeImpl;
class LayerTreeSettings;
class OutputSurface;
class PaintTimeCounter;
-class PinchZoomViewport;
class Proxy;
class ResourceProvider;
class TileManager;
@@ -74,7 +73,6 @@ class CC_EXPORT LayerTreeImpl {
const gfx::Size& layout_viewport_size() const;
std::string layer_tree_as_text() const;
DebugRectHistory* debug_rect_history() const;
- const PinchZoomViewport& pinch_zoom_viewport() const;
// Other public methods
// ---------------------------------------------------------------------------
@@ -82,6 +80,8 @@ class CC_EXPORT LayerTreeImpl {
void SetRootLayer(scoped_ptr<LayerImpl>);
scoped_ptr<LayerImpl> DetachLayerTree();
+ void pushPropertiesTo(LayerTreeImpl*);
+
int source_frame_number() const { return source_frame_number_; }
void set_source_frame_number(int frame_number) {
source_frame_number_ = frame_number;
@@ -119,6 +119,23 @@ class CC_EXPORT LayerTreeImpl {
UPDATE_ACTIVE_TREE_FOR_DRAW
};
+ gfx::Transform ImplTransform() const;
+
+ void SetPageScaleFactorAndLimits(float page_scale_factor,
+ float min_page_scale_factor, float max_page_scale_factor);
+ void SetPageScaleDelta(float delta);
+ float total_page_scale_factor() const {
+ return page_scale_factor_ * page_scale_delta_;
+ }
+ float page_scale_factor() const { return page_scale_factor_; }
+ float min_page_scale_factor() const { return min_page_scale_factor_; }
+ float max_page_scale_factor() const { return max_page_scale_factor_; }
+ float page_scale_delta() const { return page_scale_delta_; }
+ void set_sent_page_scale_delta(float delta) {
+ sent_page_scale_delta_ = delta;
+ }
+ float sent_page_scale_delta() const { return sent_page_scale_delta_; }
+
// Updates draw properties and render surface layer list
void UpdateDrawProperties(UpdateDrawPropertiesReason reason);
void set_needs_update_draw_properties() {
@@ -170,6 +187,12 @@ protected:
SkColor background_color_;
bool has_transparent_background_;
+ float page_scale_factor_;
+ float page_scale_delta_;
+ float sent_page_scale_delta_;
+ float min_page_scale_factor_;
+ float max_page_scale_factor_;
+
typedef base::hash_map<int, LayerImpl*> LayerIdMap;
LayerIdMap layer_id_map_;
« no previous file with comments | « cc/layer_tree_host_unittest.cc ('k') | cc/layer_tree_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698