| 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 2114 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2125   // (SnowLeopard, which has Aqua scrollbars which need synchronous updates). | 2125   // (SnowLeopard, which has Aqua scrollbars which need synchronous updates). | 
| 2126   use_threaded_event_handling = compositor_deps_->IsElasticOverscrollEnabled(); | 2126   use_threaded_event_handling = compositor_deps_->IsElasticOverscrollEnabled(); | 
| 2127 #endif | 2127 #endif | 
| 2128   if (use_threaded_event_handling) { | 2128   if (use_threaded_event_handling) { | 
| 2129     RenderThreadImpl* render_thread = RenderThreadImpl::current(); | 2129     RenderThreadImpl* render_thread = RenderThreadImpl::current(); | 
| 2130     // render_thread may be NULL in tests. | 2130     // render_thread may be NULL in tests. | 
| 2131     InputHandlerManager* input_handler_manager = | 2131     InputHandlerManager* input_handler_manager = | 
| 2132         render_thread ? render_thread->input_handler_manager() : NULL; | 2132         render_thread ? render_thread->input_handler_manager() : NULL; | 
| 2133     if (input_handler_manager) { | 2133     if (input_handler_manager) { | 
| 2134       input_handler_manager->AddInputHandler( | 2134       input_handler_manager->AddInputHandler( | 
| 2135           routing_id(), rwc->GetInputHandler(), AsWeakPtr()); | 2135           routing_id(), rwc->GetInputHandler(), AsWeakPtr(), | 
|  | 2136           webkit_preferences_.enable_scroll_animator); | 
| 2136     } | 2137     } | 
| 2137   } | 2138   } | 
| 2138 } | 2139 } | 
| 2139 | 2140 | 
| 2140 // blink::WebFrameClient ----------------------------------------------------- | 2141 // blink::WebFrameClient ----------------------------------------------------- | 
| 2141 | 2142 | 
| 2142 void RenderViewImpl::Repaint(const gfx::Size& size) { | 2143 void RenderViewImpl::Repaint(const gfx::Size& size) { | 
| 2143   OnRepaint(size); | 2144   OnRepaint(size); | 
| 2144 } | 2145 } | 
| 2145 | 2146 | 
| (...skipping 1567 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3713   if (IsUseZoomForDSFEnabled()) { | 3714   if (IsUseZoomForDSFEnabled()) { | 
| 3714     webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); | 3715     webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); | 
| 3715   } else { | 3716   } else { | 
| 3716     webview()->setDeviceScaleFactor(device_scale_factor_); | 3717     webview()->setDeviceScaleFactor(device_scale_factor_); | 
| 3717   } | 3718   } | 
| 3718   webview()->settings()->setPreferCompositingToLCDTextEnabled( | 3719   webview()->settings()->setPreferCompositingToLCDTextEnabled( | 
| 3719       PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); | 3720       PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); | 
| 3720 } | 3721 } | 
| 3721 | 3722 | 
| 3722 }  // namespace content | 3723 }  // namespace content | 
| OLD | NEW | 
|---|