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 1112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1123 settings->setViewportMetaEnabled(prefs.viewport_meta_enabled); | 1123 settings->setViewportMetaEnabled(prefs.viewport_meta_enabled); |
1124 settings->setMainFrameResizesAreOrientationChanges( | 1124 settings->setMainFrameResizesAreOrientationChanges( |
1125 prefs.main_frame_resizes_are_orientation_changes); | 1125 prefs.main_frame_resizes_are_orientation_changes); |
1126 | 1126 |
1127 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); | 1127 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); |
1128 | 1128 |
1129 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled); | 1129 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled); |
1130 | 1130 |
1131 settings->setSelectionIncludesAltImageText(true); | 1131 settings->setSelectionIncludesAltImageText(true); |
1132 | 1132 |
| 1133 settings->setV8CacheOptions( |
| 1134 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options)); |
| 1135 |
1133 #if defined(OS_ANDROID) | 1136 #if defined(OS_ANDROID) |
1134 settings->setAllowCustomScrollbarInMainFrame(false); | 1137 settings->setAllowCustomScrollbarInMainFrame(false); |
1135 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); | 1138 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); |
1136 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); | 1139 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); |
1137 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); | 1140 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); |
1138 settings->setDisallowFullscreenForNonMediaElements( | 1141 settings->setDisallowFullscreenForNonMediaElements( |
1139 prefs.disallow_fullscreen_for_non_media_elements); | 1142 prefs.disallow_fullscreen_for_non_media_elements); |
1140 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); | 1143 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); |
1141 settings->setAutoZoomFocusedNodeToLegibleScale(true); | 1144 settings->setAutoZoomFocusedNodeToLegibleScale(true); |
1142 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); | 1145 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); |
(...skipping 3152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4295 std::vector<gfx::Size> sizes; | 4298 std::vector<gfx::Size> sizes; |
4296 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4299 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4297 if (!url.isEmpty()) | 4300 if (!url.isEmpty()) |
4298 urls.push_back( | 4301 urls.push_back( |
4299 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4302 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4300 } | 4303 } |
4301 SendUpdateFaviconURL(urls); | 4304 SendUpdateFaviconURL(urls); |
4302 } | 4305 } |
4303 | 4306 |
4304 } // namespace content | 4307 } // namespace content |
OLD | NEW |