| 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 1071 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1082 | 1082 |
| 1083 settings->setSelectionIncludesAltImageText(true); | 1083 settings->setSelectionIncludesAltImageText(true); |
| 1084 | 1084 |
| 1085 settings->setV8CacheOptions( | 1085 settings->setV8CacheOptions( |
| 1086 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options)); | 1086 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options)); |
| 1087 | 1087 |
| 1088 settings->setV8ScriptStreamingEnabled(prefs.v8_script_streaming_enabled); | 1088 settings->setV8ScriptStreamingEnabled(prefs.v8_script_streaming_enabled); |
| 1089 settings->setV8ScriptStreamingMode( | 1089 settings->setV8ScriptStreamingMode( |
| 1090 static_cast<WebSettings::V8ScriptStreamingMode>( | 1090 static_cast<WebSettings::V8ScriptStreamingMode>( |
| 1091 prefs.v8_script_streaming_mode)); | 1091 prefs.v8_script_streaming_mode)); |
| 1092 settings->setImageAnimationPolicy( |
| 1093 static_cast<WebSettings::ImageAnimationPolicy>(prefs.animation_policy)); |
| 1092 | 1094 |
| 1093 #if defined(OS_ANDROID) | 1095 #if defined(OS_ANDROID) |
| 1094 settings->setAllowCustomScrollbarInMainFrame(false); | 1096 settings->setAllowCustomScrollbarInMainFrame(false); |
| 1095 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); | 1097 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); |
| 1096 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); | 1098 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); |
| 1097 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); | 1099 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); |
| 1098 settings->setFullscreenSupported(prefs.fullscreen_supported); | 1100 settings->setFullscreenSupported(prefs.fullscreen_supported); |
| 1099 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); | 1101 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); |
| 1100 settings->setAutoZoomFocusedNodeToLegibleScale(true); | 1102 settings->setAutoZoomFocusedNodeToLegibleScale(true); |
| 1101 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); | 1103 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); |
| (...skipping 3108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4210 std::vector<gfx::Size> sizes; | 4212 std::vector<gfx::Size> sizes; |
| 4211 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4213 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4212 if (!url.isEmpty()) | 4214 if (!url.isEmpty()) |
| 4213 urls.push_back( | 4215 urls.push_back( |
| 4214 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4216 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4215 } | 4217 } |
| 4216 SendUpdateFaviconURL(urls); | 4218 SendUpdateFaviconURL(urls); |
| 4217 } | 4219 } |
| 4218 | 4220 |
| 4219 } // namespace content | 4221 } // namespace content |
| OLD | NEW |