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 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1030 settings->setPasswordEchoEnabled(prefs.password_echo_enabled); | 1030 settings->setPasswordEchoEnabled(prefs.password_echo_enabled); |
1031 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds); | 1031 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds); |
1032 settings->setShouldClearDocumentBackground( | 1032 settings->setShouldClearDocumentBackground( |
1033 prefs.should_clear_document_background); | 1033 prefs.should_clear_document_background); |
1034 settings->setEnableScrollAnimator(prefs.enable_scroll_animator); | 1034 settings->setEnableScrollAnimator(prefs.enable_scroll_animator); |
1035 | 1035 |
1036 settings->setRegionBasedColumnsEnabled(prefs.region_based_columns_enabled); | 1036 settings->setRegionBasedColumnsEnabled(prefs.region_based_columns_enabled); |
1037 | 1037 |
1038 WebRuntimeFeatures::enableTouch(prefs.touch_enabled); | 1038 WebRuntimeFeatures::enableTouch(prefs.touch_enabled); |
1039 settings->setMaxTouchPoints(prefs.pointer_events_max_touch_points); | 1039 settings->setMaxTouchPoints(prefs.pointer_events_max_touch_points); |
| 1040 settings->setAvailablePointerTypes(prefs.available_pointer_types); |
| 1041 settings->setPrimaryPointerType( |
| 1042 static_cast<WebSettings::PointerType>(prefs.primary_pointer_type)); |
| 1043 settings->setAvailableHoverTypes(prefs.available_hover_types); |
| 1044 settings->setPrimaryHoverType( |
| 1045 static_cast<WebSettings::HoverType>(prefs.primary_hover_type)); |
1040 settings->setDeviceSupportsTouch(prefs.device_supports_touch); | 1046 settings->setDeviceSupportsTouch(prefs.device_supports_touch); |
1041 settings->setDeviceSupportsMouse(prefs.device_supports_mouse); | 1047 settings->setDeviceSupportsMouse(prefs.device_supports_mouse); |
1042 settings->setEnableTouchAdjustment(prefs.touch_adjustment_enabled); | 1048 settings->setEnableTouchAdjustment(prefs.touch_adjustment_enabled); |
1043 | 1049 |
1044 settings->setDeferredImageDecodingEnabled( | 1050 settings->setDeferredImageDecodingEnabled( |
1045 prefs.deferred_image_decoding_enabled); | 1051 prefs.deferred_image_decoding_enabled); |
1046 WebRuntimeFeatures::enableImageColorProfiles( | 1052 WebRuntimeFeatures::enableImageColorProfiles( |
1047 prefs.image_color_profiles_enabled); | 1053 prefs.image_color_profiles_enabled); |
1048 settings->setShouldRespectImageOrientation( | 1054 settings->setShouldRespectImageOrientation( |
1049 prefs.should_respect_image_orientation); | 1055 prefs.should_respect_image_orientation); |
(...skipping 3170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4220 std::vector<gfx::Size> sizes; | 4226 std::vector<gfx::Size> sizes; |
4221 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4227 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4222 if (!url.isEmpty()) | 4228 if (!url.isEmpty()) |
4223 urls.push_back( | 4229 urls.push_back( |
4224 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4230 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4225 } | 4231 } |
4226 SendUpdateFaviconURL(urls); | 4232 SendUpdateFaviconURL(urls); |
4227 } | 4233 } |
4228 | 4234 |
4229 } // namespace content | 4235 } // namespace content |
OLD | NEW |