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

Unified Diff: cc/trees/layer_tree_host.h

Issue 13637017: Delete layout_viewport_size. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Android Created 7 years, 8 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/test/layer_tree_test.cc ('k') | cc/trees/layer_tree_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host.h
diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
index 270e8eb92287f605b377542127f660f1deec037a..bd2298cc0a2c1328b26b447b0af2fb374256755e 100644
--- a/cc/trees/layer_tree_host.h
+++ b/cc/trees/layer_tree_host.h
@@ -27,6 +27,7 @@
#include "cc/trees/occlusion_tracker.h"
#include "cc/trees/proxy.h"
#include "skia/ext/refptr.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbar.h"
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkPicture.h"
#include "ui/gfx/rect.h"
@@ -104,6 +105,8 @@ class CC_EXPORT LayerTreeHost : NON_EXPORTED_BASE(public RateLimiterClient) {
void Layout();
void BeginCommitOnImplThread(LayerTreeHostImpl* host_impl);
void FinishCommitOnImplThread(LayerTreeHostImpl* host_impl);
+ gfx::Size PinchZoomScrollbarSize(
+ WebKit::WebScrollbar::Orientation orientation) const;
void SetPinchZoomScrollbarsBoundsAndPosition();
void CreateAndAddPinchZoomScrollbars();
void WillCommit();
@@ -176,11 +179,9 @@ class CC_EXPORT LayerTreeHost : NON_EXPORTED_BASE(public RateLimiterClient) {
void SetDebugState(const LayerTreeDebugState& debug_state);
const LayerTreeDebugState& debug_state() const { return debug_state_; }
- void SetViewportSize(gfx::Size layout_viewport_size,
- gfx::Size device_viewport_size);
+ void SetViewportSize(gfx::Size device_viewport_size);
void SetOverdrawBottomHeight(float overdraw_bottom_height);
- gfx::Size layout_viewport_size() const { return layout_viewport_size_; }
gfx::Size device_viewport_size() const { return device_viewport_size_; }
float overdraw_bottom_height() const { return overdraw_bottom_height_; }
@@ -301,7 +302,6 @@ class CC_EXPORT LayerTreeHost : NON_EXPORTED_BASE(public RateLimiterClient) {
LayerTreeSettings settings_;
LayerTreeDebugState debug_state_;
- gfx::Size layout_viewport_size_;
gfx::Size device_viewport_size_;
float overdraw_bottom_height_;
float device_scale_factor_;
« no previous file with comments | « cc/test/layer_tree_test.cc ('k') | cc/trees/layer_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698