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

Side by Side Diff: third_party/WebKit/Source/core/frame/BrowserControls.cpp

Issue 2716153003: Removed FrameHost::chromeClient() (Closed)
Patch Set: Rebase Created 3 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/frame/BrowserControls.h" 5 #include "core/frame/BrowserControls.h"
6 6
7 #include <algorithm> // for std::min and std::max
7 #include "core/frame/FrameHost.h" 8 #include "core/frame/FrameHost.h"
slangley 2017/02/27 08:32:35 should be a vertical space between system & user h
8 #include "core/frame/VisualViewport.h" 9 #include "core/frame/VisualViewport.h"
9 #include "core/page/ChromeClient.h" 10 #include "core/page/ChromeClient.h"
11 #include "core/page/Page.h"
10 #include "platform/geometry/FloatSize.h" 12 #include "platform/geometry/FloatSize.h"
11 #include <algorithm> // for std::min and std::max
12 13
13 namespace blink { 14 namespace blink {
14 15
15 BrowserControls::BrowserControls(const FrameHost& frameHost) 16 BrowserControls::BrowserControls(const FrameHost& frameHost)
16 : m_frameHost(&frameHost), 17 : m_frameHost(&frameHost),
17 m_height(0), 18 m_height(0),
18 m_shownRatio(0), 19 m_shownRatio(0),
19 m_baselineContentOffset(0), 20 m_baselineContentOffset(0),
20 m_accumulatedScrollDelta(0), 21 m_accumulatedScrollDelta(0),
21 m_shrinkViewport(false), 22 m_shrinkViewport(false),
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 } 80 }
80 81
81 void BrowserControls::setShownRatio(float shownRatio) { 82 void BrowserControls::setShownRatio(float shownRatio) {
82 shownRatio = std::min(shownRatio, 1.f); 83 shownRatio = std::min(shownRatio, 1.f);
83 shownRatio = std::max(shownRatio, 0.f); 84 shownRatio = std::max(shownRatio, 0.f);
84 85
85 if (m_shownRatio == shownRatio) 86 if (m_shownRatio == shownRatio)
86 return; 87 return;
87 88
88 m_shownRatio = shownRatio; 89 m_shownRatio = shownRatio;
89 m_frameHost->chromeClient().didUpdateBrowserControls(); 90 m_frameHost->page().chromeClient().didUpdateBrowserControls();
90 } 91 }
91 92
92 void BrowserControls::updateConstraintsAndState( 93 void BrowserControls::updateConstraintsAndState(
93 WebBrowserControlsState constraints, 94 WebBrowserControlsState constraints,
94 WebBrowserControlsState current, 95 WebBrowserControlsState current,
95 bool animate) { 96 bool animate) {
96 m_permittedState = constraints; 97 m_permittedState = constraints;
97 98
98 DCHECK(!(constraints == WebBrowserControlsShown && 99 DCHECK(!(constraints == WebBrowserControlsShown &&
99 current == WebBrowserControlsHidden)); 100 current == WebBrowserControlsHidden));
(...skipping 16 matching lines...) Expand all
116 else 117 else
117 setShownRatio(1.f); 118 setShownRatio(1.f);
118 } 119 }
119 120
120 void BrowserControls::setHeight(float height, bool shrinkViewport) { 121 void BrowserControls::setHeight(float height, bool shrinkViewport) {
121 if (m_height == height && m_shrinkViewport == shrinkViewport) 122 if (m_height == height && m_shrinkViewport == shrinkViewport)
122 return; 123 return;
123 124
124 m_height = height; 125 m_height = height;
125 m_shrinkViewport = shrinkViewport; 126 m_shrinkViewport = shrinkViewport;
126 m_frameHost->chromeClient().didUpdateBrowserControls(); 127 m_frameHost->page().chromeClient().didUpdateBrowserControls();
127 } 128 }
128 129
129 } // namespace blink 130 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698