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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 1631963002: Plumb firing passive event listeners. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master_wheel_passive_listeners_2a
Patch Set: Add integration test Created 4 years, 10 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 (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 2121 matching lines...) Expand 10 before | Expand all | Expand 10 after
2132 routing_id(), text_input_type != blink::WebTextInputTypeNone)); 2132 routing_id(), text_input_type != blink::WebTextInputTypeNone));
2133 #endif 2133 #endif
2134 } 2134 }
2135 2135
2136 void RenderViewImpl::initializeLayerTreeView() { 2136 void RenderViewImpl::initializeLayerTreeView() {
2137 RenderWidget::initializeLayerTreeView(); 2137 RenderWidget::initializeLayerTreeView();
2138 RenderWidgetCompositor* rwc = compositor(); 2138 RenderWidgetCompositor* rwc = compositor();
2139 if (!rwc) 2139 if (!rwc)
2140 return; 2140 return;
2141 2141
2142 bool enable_wheel_gestures =
2143 base::CommandLine::ForCurrentProcess()->HasSwitch(
2144 switches::kEnableWheelGestures);
2145
2142 bool use_threaded_event_handling = true; 2146 bool use_threaded_event_handling = true;
2143 #if defined(OS_MACOSX) && !defined(OS_IOS) 2147 #if defined(OS_MACOSX) && !defined(OS_IOS)
2144 // Disable threaded event handling if content is not handling the elastic 2148 // Disable threaded event handling if content is not handling the elastic
2145 // overscroll effect. This includes the cases where the elastic overscroll 2149 // overscroll effect. This includes the cases where the elastic overscroll
2146 // effect is being handled by Blink (because of command line flags) and older 2150 // effect is being handled by Blink (because of command line flags) and older
2147 // operating system versions which do not have an elastic overscroll effect 2151 // operating system versions which do not have an elastic overscroll effect
2148 // (SnowLeopard, which has Aqua scrollbars which need synchronous updates). 2152 // (SnowLeopard, which has Aqua scrollbars which need synchronous updates).
2149 use_threaded_event_handling = compositor_deps_->IsElasticOverscrollEnabled(); 2153 use_threaded_event_handling = compositor_deps_->IsElasticOverscrollEnabled();
2150 #endif 2154 #endif
2151 if (use_threaded_event_handling) { 2155 if (use_threaded_event_handling) {
2152 RenderThreadImpl* render_thread = RenderThreadImpl::current(); 2156 RenderThreadImpl* render_thread = RenderThreadImpl::current();
2153 // render_thread may be NULL in tests. 2157 // render_thread may be NULL in tests.
2154 InputHandlerManager* input_handler_manager = 2158 InputHandlerManager* input_handler_manager =
2155 render_thread ? render_thread->input_handler_manager() : NULL; 2159 render_thread ? render_thread->input_handler_manager() : NULL;
2156 if (input_handler_manager) { 2160 if (input_handler_manager) {
2157 input_handler_manager->AddInputHandler( 2161 input_handler_manager->AddInputHandler(
2158 routing_id(), rwc->GetInputHandler(), AsWeakPtr(), 2162 routing_id(), rwc->GetInputHandler(), AsWeakPtr(),
2159 webkit_preferences_.enable_scroll_animator); 2163 webkit_preferences_.enable_scroll_animator, enable_wheel_gestures);
2160 } 2164 }
2161 } 2165 }
2162 } 2166 }
2163 2167
2164 // blink::WebFrameClient ----------------------------------------------------- 2168 // blink::WebFrameClient -----------------------------------------------------
2165 2169
2166 void RenderViewImpl::Repaint(const gfx::Size& size) { 2170 void RenderViewImpl::Repaint(const gfx::Size& size) {
2167 OnRepaint(size); 2171 OnRepaint(size);
2168 } 2172 }
2169 2173
(...skipping 1362 matching lines...) Expand 10 before | Expand all | Expand 10 after
3532 if (IsUseZoomForDSFEnabled()) { 3536 if (IsUseZoomForDSFEnabled()) {
3533 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); 3537 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_);
3534 } else { 3538 } else {
3535 webview()->setDeviceScaleFactor(device_scale_factor_); 3539 webview()->setDeviceScaleFactor(device_scale_factor_);
3536 } 3540 }
3537 webview()->settings()->setPreferCompositingToLCDTextEnabled( 3541 webview()->settings()->setPreferCompositingToLCDTextEnabled(
3538 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); 3542 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
3539 } 3543 }
3540 3544
3541 } // namespace content 3545 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698