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 1049 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1060 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); | 1060 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); |
1061 | 1061 |
1062 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled); | 1062 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled); |
1063 | 1063 |
1064 settings->setSelectionIncludesAltImageText(true); | 1064 settings->setSelectionIncludesAltImageText(true); |
1065 | 1065 |
1066 settings->setV8CacheOptions( | 1066 settings->setV8CacheOptions( |
1067 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options)); | 1067 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options)); |
1068 | 1068 |
1069 settings->setV8ScriptStreamingEnabled(prefs.v8_script_streaming_enabled); | 1069 settings->setV8ScriptStreamingEnabled(prefs.v8_script_streaming_enabled); |
| 1070 settings->setV8ScriptStreamingMode( |
| 1071 static_cast<WebSettings::V8ScriptStreamingMode>( |
| 1072 prefs.v8_script_streaming_mode)); |
1070 | 1073 |
1071 #if defined(OS_ANDROID) | 1074 #if defined(OS_ANDROID) |
1072 settings->setAllowCustomScrollbarInMainFrame(false); | 1075 settings->setAllowCustomScrollbarInMainFrame(false); |
1073 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); | 1076 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); |
1074 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); | 1077 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); |
1075 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); | 1078 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); |
1076 settings->setFullscreenSupported(prefs.fullscreen_supported); | 1079 settings->setFullscreenSupported(prefs.fullscreen_supported); |
1077 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); | 1080 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); |
1078 settings->setAutoZoomFocusedNodeToLegibleScale(true); | 1081 settings->setAutoZoomFocusedNodeToLegibleScale(true); |
1079 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); | 1082 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); |
(...skipping 3134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4214 std::vector<gfx::Size> sizes; | 4217 std::vector<gfx::Size> sizes; |
4215 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4218 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4216 if (!url.isEmpty()) | 4219 if (!url.isEmpty()) |
4217 urls.push_back( | 4220 urls.push_back( |
4218 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4221 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4219 } | 4222 } |
4220 SendUpdateFaviconURL(urls); | 4223 SendUpdateFaviconURL(urls); |
4221 } | 4224 } |
4222 | 4225 |
4223 } // namespace content | 4226 } // namespace content |
OLD | NEW |