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 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1116 prefs.use_expanded_heuristics_for_gpu_rasterization); | 1116 prefs.use_expanded_heuristics_for_gpu_rasterization); |
1117 settings->setMainFrameResizesAreOrientationChanges( | 1117 settings->setMainFrameResizesAreOrientationChanges( |
1118 prefs.main_frame_resizes_are_orientation_changes); | 1118 prefs.main_frame_resizes_are_orientation_changes); |
1119 | 1119 |
1120 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); | 1120 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); |
1121 | 1121 |
1122 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled); | 1122 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled); |
1123 | 1123 |
1124 settings->setSelectionIncludesAltImageText(true); | 1124 settings->setSelectionIncludesAltImageText(true); |
1125 | 1125 |
| 1126 settings->setV8CacheOptions( |
| 1127 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options)); |
| 1128 |
1126 #if defined(OS_ANDROID) | 1129 #if defined(OS_ANDROID) |
1127 settings->setAllowCustomScrollbarInMainFrame(false); | 1130 settings->setAllowCustomScrollbarInMainFrame(false); |
1128 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); | 1131 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); |
1129 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); | 1132 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); |
1130 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); | 1133 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); |
1131 settings->setDisallowFullscreenForNonMediaElements( | 1134 settings->setDisallowFullscreenForNonMediaElements( |
1132 prefs.disallow_fullscreen_for_non_media_elements); | 1135 prefs.disallow_fullscreen_for_non_media_elements); |
1133 settings->setFullscreenSupported(prefs.fullscreen_supported); | 1136 settings->setFullscreenSupported(prefs.fullscreen_supported); |
1134 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); | 1137 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); |
1135 settings->setAutoZoomFocusedNodeToLegibleScale(true); | 1138 settings->setAutoZoomFocusedNodeToLegibleScale(true); |
(...skipping 3177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4313 std::vector<gfx::Size> sizes; | 4316 std::vector<gfx::Size> sizes; |
4314 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4317 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4315 if (!url.isEmpty()) | 4318 if (!url.isEmpty()) |
4316 urls.push_back( | 4319 urls.push_back( |
4317 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4320 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4318 } | 4321 } |
4319 SendUpdateFaviconURL(urls); | 4322 SendUpdateFaviconURL(urls); |
4320 } | 4323 } |
4321 | 4324 |
4322 } // namespace content | 4325 } // namespace content |
OLD | NEW |