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