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

Side by Side Diff: cc/input/top_controls_manager.cc

Issue 1124843002: [Cleanup] Remove duplicated check from TopControlsManager::ScrollBy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "cc/input/top_controls_manager.h" 5 #include "cc/input/top_controls_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "cc/animation/keyframed_animation_curve.h" 10 #include "cc/animation/keyframed_animation_curve.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 } 100 }
101 101
102 gfx::Vector2dF TopControlsManager::ScrollBy( 102 gfx::Vector2dF TopControlsManager::ScrollBy(
103 const gfx::Vector2dF& pending_delta) { 103 const gfx::Vector2dF& pending_delta) {
104 if (!TopControlsHeight()) 104 if (!TopControlsHeight())
105 return pending_delta; 105 return pending_delta;
106 106
107 if (pinch_gesture_active_) 107 if (pinch_gesture_active_)
108 return pending_delta; 108 return pending_delta;
109 109
110 if (!TopControlsHeight())
111 return pending_delta;
112
113 if (permitted_state_ == SHOWN && pending_delta.y() > 0) 110 if (permitted_state_ == SHOWN && pending_delta.y() > 0)
114 return pending_delta; 111 return pending_delta;
115 else if (permitted_state_ == HIDDEN && pending_delta.y() < 0) 112 else if (permitted_state_ == HIDDEN && pending_delta.y() < 0)
116 return pending_delta; 113 return pending_delta;
117 114
118 accumulated_scroll_delta_ += pending_delta.y(); 115 accumulated_scroll_delta_ += pending_delta.y();
119 116
120 float old_offset = ContentTopOffset(); 117 float old_offset = ContentTopOffset();
121 client_->SetCurrentTopControlsShownRatio( 118 client_->SetCurrentTopControlsShownRatio(
122 (baseline_content_offset_ - accumulated_scroll_delta_) / 119 (baseline_content_offset_ - accumulated_scroll_delta_) /
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 } 234 }
238 return false; 235 return false;
239 } 236 }
240 237
241 void TopControlsManager::ResetBaseline() { 238 void TopControlsManager::ResetBaseline() {
242 accumulated_scroll_delta_ = 0.f; 239 accumulated_scroll_delta_ = 0.f;
243 baseline_content_offset_ = ContentTopOffset(); 240 baseline_content_offset_ = ContentTopOffset();
244 } 241 }
245 242
246 } // namespace cc 243 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698