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 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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); | 1071 settings->setV8ScriptStreamingEnabled(prefs.v8_script_streaming_enabled); |
1072 settings->setV8ScriptStreamingMode( | 1072 settings->setV8ScriptStreamingMode( |
1073 static_cast<WebSettings::V8ScriptStreamingMode>( | 1073 static_cast<WebSettings::V8ScriptStreamingMode>( |
1074 prefs.v8_script_streaming_mode)); | 1074 prefs.v8_script_streaming_mode)); |
| 1075 settings->setImageAnimationPolicy( |
| 1076 static_cast<WebSettings::ImageAnimationPolicy>(prefs.animation_policy)); |
1075 | 1077 |
1076 #if defined(OS_ANDROID) | 1078 #if defined(OS_ANDROID) |
1077 settings->setAllowCustomScrollbarInMainFrame(false); | 1079 settings->setAllowCustomScrollbarInMainFrame(false); |
1078 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); | 1080 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); |
1079 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); | 1081 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); |
1080 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); | 1082 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); |
1081 settings->setFullscreenSupported(prefs.fullscreen_supported); | 1083 settings->setFullscreenSupported(prefs.fullscreen_supported); |
1082 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); | 1084 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); |
1083 settings->setAutoZoomFocusedNodeToLegibleScale(true); | 1085 settings->setAutoZoomFocusedNodeToLegibleScale(true); |
1084 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); | 1086 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); |
(...skipping 3019 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4104 std::vector<gfx::Size> sizes; | 4106 std::vector<gfx::Size> sizes; |
4105 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4107 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4106 if (!url.isEmpty()) | 4108 if (!url.isEmpty()) |
4107 urls.push_back( | 4109 urls.push_back( |
4108 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4110 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4109 } | 4111 } |
4110 SendUpdateFaviconURL(urls); | 4112 SendUpdateFaviconURL(urls); |
4111 } | 4113 } |
4112 | 4114 |
4113 } // namespace content | 4115 } // namespace content |
OLD | NEW |