| 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 1050 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1061 | 1061 |
| 1062 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); | 1062 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); |
| 1063 | 1063 |
| 1064 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled); | 1064 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled); |
| 1065 | 1065 |
| 1066 settings->setSelectionIncludesAltImageText(true); | 1066 settings->setSelectionIncludesAltImageText(true); |
| 1067 | 1067 |
| 1068 settings->setV8CacheOptions( | 1068 settings->setV8CacheOptions( |
| 1069 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options)); | 1069 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options)); |
| 1070 | 1070 |
| 1071 settings->setV8ScriptStreamingEnabled(prefs.v8_script_streaming_enabled); |
| 1072 |
| 1071 #if defined(OS_ANDROID) | 1073 #if defined(OS_ANDROID) |
| 1072 settings->setAllowCustomScrollbarInMainFrame(false); | 1074 settings->setAllowCustomScrollbarInMainFrame(false); |
| 1073 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); | 1075 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); |
| 1074 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); | 1076 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); |
| 1075 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); | 1077 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); |
| 1076 settings->setDisallowFullscreenForNonMediaElements( | 1078 settings->setDisallowFullscreenForNonMediaElements( |
| 1077 prefs.disallow_fullscreen_for_non_media_elements); | 1079 prefs.disallow_fullscreen_for_non_media_elements); |
| 1078 settings->setFullscreenSupported(prefs.fullscreen_supported); | 1080 settings->setFullscreenSupported(prefs.fullscreen_supported); |
| 1079 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); | 1081 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); |
| 1080 settings->setAutoZoomFocusedNodeToLegibleScale(true); | 1082 settings->setAutoZoomFocusedNodeToLegibleScale(true); |
| (...skipping 3119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4200 std::vector<gfx::Size> sizes; | 4202 std::vector<gfx::Size> sizes; |
| 4201 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4203 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4202 if (!url.isEmpty()) | 4204 if (!url.isEmpty()) |
| 4203 urls.push_back( | 4205 urls.push_back( |
| 4204 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4206 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4205 } | 4207 } |
| 4206 SendUpdateFaviconURL(urls); | 4208 SendUpdateFaviconURL(urls); |
| 4207 } | 4209 } |
| 4208 | 4210 |
| 4209 } // namespace content | 4211 } // namespace content |
| OLD | NEW |