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 1047 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1058 | 1058 |
1059 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); | 1059 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); |
1060 | 1060 |
1061 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled); | 1061 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled); |
1062 | 1062 |
1063 settings->setSelectionIncludesAltImageText(true); | 1063 settings->setSelectionIncludesAltImageText(true); |
1064 | 1064 |
1065 settings->setV8CacheOptions( | 1065 settings->setV8CacheOptions( |
1066 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options)); | 1066 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options)); |
1067 | 1067 |
| 1068 settings->setImageAnimationPolicy( |
| 1069 static_cast<WebSettings::ImageAnimationPolicy>(prefs.animation_policy)); |
| 1070 |
1068 // Needs to happen before setIgnoreVIewportTagScaleLimits below. | 1071 // Needs to happen before setIgnoreVIewportTagScaleLimits below. |
1069 web_view->setDefaultPageScaleLimits( | 1072 web_view->setDefaultPageScaleLimits( |
1070 prefs.default_minimum_page_scale_factor, | 1073 prefs.default_minimum_page_scale_factor, |
1071 prefs.default_maximum_page_scale_factor); | 1074 prefs.default_maximum_page_scale_factor); |
1072 | 1075 |
1073 #if defined(OS_ANDROID) | 1076 #if defined(OS_ANDROID) |
1074 settings->setAllowCustomScrollbarInMainFrame(false); | 1077 settings->setAllowCustomScrollbarInMainFrame(false); |
1075 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); | 1078 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); |
1076 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); | 1079 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); |
1077 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); | 1080 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); |
(...skipping 2980 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4058 std::vector<gfx::Size> sizes; | 4061 std::vector<gfx::Size> sizes; |
4059 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4062 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4060 if (!url.isEmpty()) | 4063 if (!url.isEmpty()) |
4061 urls.push_back( | 4064 urls.push_back( |
4062 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4065 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4063 } | 4066 } |
4064 SendUpdateFaviconURL(urls); | 4067 SendUpdateFaviconURL(urls); |
4065 } | 4068 } |
4066 | 4069 |
4067 } // namespace content | 4070 } // namespace content |
OLD | NEW |