| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "cc/trees/layer_tree_host.h" | 9 #include "cc/trees/layer_tree_host.h" |
| 10 #include "content/renderer/gpu/render_widget_compositor.h" | 10 #include "content/renderer/gpu/render_widget_compositor.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 TopControlsState current, | 44 TopControlsState current, |
| 45 bool animate) { | 45 bool animate) { |
| 46 cc::TopControlsState constraints_cc = | 46 cc::TopControlsState constraints_cc = |
| 47 ContentToCcTopControlsState(constraints); | 47 ContentToCcTopControlsState(constraints); |
| 48 cc::TopControlsState current_cc = ContentToCcTopControlsState(current); | 48 cc::TopControlsState current_cc = ContentToCcTopControlsState(current); |
| 49 if (compositor_) | 49 if (compositor_) |
| 50 compositor_->UpdateTopControlsState(constraints_cc, current_cc, animate); | 50 compositor_->UpdateTopControlsState(constraints_cc, current_cc, animate); |
| 51 top_controls_constraints_ = constraints_cc; | 51 top_controls_constraints_ = constraints_cc; |
| 52 } | 52 } |
| 53 | 53 |
| 54 void RenderViewImpl::didScrollWithKeyboard(const WebKit::WebSize& delta) { | 54 void RenderViewImpl::didScrollWithKeyboard(const blink::WebSize& delta) { |
| 55 if (delta.height == 0) | 55 if (delta.height == 0) |
| 56 return; | 56 return; |
| 57 if (compositor_) { | 57 if (compositor_) { |
| 58 cc::TopControlsState current = delta.height < 0 ? cc::SHOWN : cc::HIDDEN; | 58 cc::TopControlsState current = delta.height < 0 ? cc::SHOWN : cc::HIDDEN; |
| 59 compositor_->UpdateTopControlsState(top_controls_constraints_, | 59 compositor_->UpdateTopControlsState(top_controls_constraints_, |
| 60 current, | 60 current, |
| 61 true); | 61 true); |
| 62 } | 62 } |
| 63 } | 63 } |
| 64 | 64 |
| 65 } // namespace content | 65 } // namespace content |
| OLD | NEW |