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

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

Issue 2467913002: Touch event flag should control only DOM event firing. (Closed)
Patch Set: Deprecate the histogram. Created 4 years 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 #include <memory> 9 #include <memory>
10 10
(...skipping 906 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 settings->setStrictPowerfulFeatureRestrictions( 917 settings->setStrictPowerfulFeatureRestrictions(
918 prefs.strict_powerful_feature_restrictions); 918 prefs.strict_powerful_feature_restrictions);
919 settings->setAllowGeolocationOnInsecureOrigins( 919 settings->setAllowGeolocationOnInsecureOrigins(
920 prefs.allow_geolocation_on_insecure_origins); 920 prefs.allow_geolocation_on_insecure_origins);
921 settings->setPasswordEchoEnabled(prefs.password_echo_enabled); 921 settings->setPasswordEchoEnabled(prefs.password_echo_enabled);
922 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds); 922 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds);
923 settings->setShouldClearDocumentBackground( 923 settings->setShouldClearDocumentBackground(
924 prefs.should_clear_document_background); 924 prefs.should_clear_document_background);
925 settings->setEnableScrollAnimator(prefs.enable_scroll_animator); 925 settings->setEnableScrollAnimator(prefs.enable_scroll_animator);
926 926
927 WebRuntimeFeatures::enableTouch(prefs.touch_enabled); 927 WebRuntimeFeatures::enableTouchEventAPI(prefs.touch_event_api_enabled);
928 settings->setMaxTouchPoints(prefs.pointer_events_max_touch_points); 928 settings->setMaxTouchPoints(prefs.pointer_events_max_touch_points);
929 settings->setAvailablePointerTypes(prefs.available_pointer_types); 929 settings->setAvailablePointerTypes(prefs.available_pointer_types);
930 settings->setPrimaryPointerType( 930 settings->setPrimaryPointerType(
931 static_cast<blink::PointerType>(prefs.primary_pointer_type)); 931 static_cast<blink::PointerType>(prefs.primary_pointer_type));
932 settings->setAvailableHoverTypes(prefs.available_hover_types); 932 settings->setAvailableHoverTypes(prefs.available_hover_types);
933 settings->setPrimaryHoverType( 933 settings->setPrimaryHoverType(
934 static_cast<blink::HoverType>(prefs.primary_hover_type)); 934 static_cast<blink::HoverType>(prefs.primary_hover_type));
935 settings->setDeviceSupportsTouch(prefs.device_supports_touch); 935 settings->setDeviceSupportsTouch(prefs.device_supports_touch);
936 settings->setDeviceSupportsMouse(prefs.device_supports_mouse); 936 settings->setDeviceSupportsMouse(prefs.device_supports_mouse);
937 settings->setEnableTouchAdjustment(prefs.touch_adjustment_enabled); 937 settings->setEnableTouchAdjustment(prefs.touch_adjustment_enabled);
(...skipping 1869 matching lines...) Expand 10 before | Expand all | Expand 10 after
2807 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); 2807 INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
2808 } 2808 }
2809 2809
2810 std::unique_ptr<InputEventAck> ack( 2810 std::unique_ptr<InputEventAck> ack(
2811 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type, 2811 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type,
2812 INPUT_EVENT_ACK_STATE_NOT_CONSUMED)); 2812 INPUT_EVENT_ACK_STATE_NOT_CONSUMED));
2813 OnInputEventAck(std::move(ack)); 2813 OnInputEventAck(std::move(ack));
2814 } 2814 }
2815 2815
2816 } // namespace content 2816 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698