summaryrefslogtreecommitdiffstats
path: root/cc/trees/layer_tree_host.h
diff options
context:
space:
mode:
authoraelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-09 04:58:40 +0000
committeraelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-09 04:58:40 +0000
commit18ce5970341cca6e54068f93e2a9a5868ac87e4f (patch)
tree9b8deca3d7607adb48077b45e062b5c3ca70390d /cc/trees/layer_tree_host.h
parent71c34d4002250050679e0bfc85fa428de3df7851 (diff)
downloadchromium_src-18ce5970341cca6e54068f93e2a9a5868ac87e4f.zip
chromium_src-18ce5970341cca6e54068f93e2a9a5868ac87e4f.tar.gz
chromium_src-18ce5970341cca6e54068f93e2a9a5868ac87e4f.tar.bz2
Delete layout_viewport_size.
This value is redundant. We can use the root cliprect size or the device_viewport_size divided by device_scale_factor instead. This value was only used by PinchZoomScrollbars, I replaced it with one that should be equivalent. NOTRY=true BUG=229098 Review URL: https://chromiumcodereview.appspot.com/13637017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/trees/layer_tree_host.h')
-rw-r--r--cc/trees/layer_tree_host.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
index 270e8eb..bd2298c 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_;