summaryrefslogtreecommitdiffstats
path: root/content/renderer/render_widget.cc
diff options
context:
space:
mode:
authoraelias <aelias@chromium.org>2015-02-07 13:43:01 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-07 21:43:29 +0000
commit6004fe0188ac900b02b843a9bff3ad8e569d616a (patch)
treea9b4d1eafd984be567b19f03c95801b3b719aaf3 /content/renderer/render_widget.cc
parentaafbad78096f681d9677df4134e333dc3e11a90e (diff)
downloadchromium_src-6004fe0188ac900b02b843a9bff3ad8e569d616a.zip
chromium_src-6004fe0188ac900b02b843a9bff3ad8e569d616a.tar.gz
chromium_src-6004fe0188ac900b02b843a9bff3ad8e569d616a.tar.bz2
Normalize top controls offset to (0, 1), Chromium-side.
Since top controls height can now be changed, storing top controls offset as an absolute value causes problems. Normalizing its format to (0, 1) means we we don't need to adjust it when the height changes. It also improves readability and means TopControlsManager will compute correctly even when the height is currently 0. This patch also switches top controls to use SyncedProperty. See also Blink-side patch: https://codereview.chromium.org/882683003 BUG=430635 Review URL: https://codereview.chromium.org/901813002 Cr-Commit-Position: refs/heads/master@{#315216}
Diffstat (limited to 'content/renderer/render_widget.cc')
-rw-r--r--content/renderer/render_widget.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 9cc9899..1b29380 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -808,8 +808,8 @@ void RenderWidget::Resize(const gfx::Size& new_size,
WillToggleFullscreen();
is_fullscreen_ = is_fullscreen;
- webwidget_->setTopControlsLayoutHeight(top_controls_shrink_blink_size_
- ? top_controls_height : 0.f);
+ webwidget_->setTopControlsHeight(top_controls_height,
+ top_controls_shrink_blink_size_);
if (size_ != new_size) {
size_ = new_size;