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 <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 2119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2130 // (SnowLeopard, which has Aqua scrollbars which need synchronous updates). | 2130 // (SnowLeopard, which has Aqua scrollbars which need synchronous updates). |
2131 use_threaded_event_handling = compositor_deps_->IsElasticOverscrollEnabled(); | 2131 use_threaded_event_handling = compositor_deps_->IsElasticOverscrollEnabled(); |
2132 #endif | 2132 #endif |
2133 if (use_threaded_event_handling) { | 2133 if (use_threaded_event_handling) { |
2134 RenderThreadImpl* render_thread = RenderThreadImpl::current(); | 2134 RenderThreadImpl* render_thread = RenderThreadImpl::current(); |
2135 // render_thread may be NULL in tests. | 2135 // render_thread may be NULL in tests. |
2136 InputHandlerManager* input_handler_manager = | 2136 InputHandlerManager* input_handler_manager = |
2137 render_thread ? render_thread->input_handler_manager() : NULL; | 2137 render_thread ? render_thread->input_handler_manager() : NULL; |
2138 if (input_handler_manager) { | 2138 if (input_handler_manager) { |
2139 input_handler_manager->AddInputHandler( | 2139 input_handler_manager->AddInputHandler( |
2140 routing_id_, rwc->GetInputHandler(), AsWeakPtr()); | 2140 routing_id_, rwc->GetInputHandler(), AsWeakPtr(), |
| 2141 !webkit_preferences_.enable_scroll_animator); |
2141 } | 2142 } |
2142 } | 2143 } |
2143 } | 2144 } |
2144 | 2145 |
2145 // blink::WebFrameClient ----------------------------------------------------- | 2146 // blink::WebFrameClient ----------------------------------------------------- |
2146 | 2147 |
2147 void RenderViewImpl::Repaint(const gfx::Size& size) { | 2148 void RenderViewImpl::Repaint(const gfx::Size& size) { |
2148 OnRepaint(size); | 2149 OnRepaint(size); |
2149 } | 2150 } |
2150 | 2151 |
(...skipping 1573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3724 if (IsUseZoomForDSFEnabled()) { | 3725 if (IsUseZoomForDSFEnabled()) { |
3725 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); | 3726 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); |
3726 } else { | 3727 } else { |
3727 webview()->setDeviceScaleFactor(device_scale_factor_); | 3728 webview()->setDeviceScaleFactor(device_scale_factor_); |
3728 } | 3729 } |
3729 webview()->settings()->setPreferCompositingToLCDTextEnabled( | 3730 webview()->settings()->setPreferCompositingToLCDTextEnabled( |
3730 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); | 3731 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); |
3731 } | 3732 } |
3732 | 3733 |
3733 } // namespace content | 3734 } // namespace content |
OLD | NEW |