Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(512)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 785723002: Add new extension APIs related to animation policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unnecessary code Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
1061 1061
1062 settings->setSelectionIncludesAltImageText(true); 1062 settings->setSelectionIncludesAltImageText(true);
1063 1063
1064 settings->setV8CacheOptions( 1064 settings->setV8CacheOptions(
1065 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options)); 1065 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options));
1066 1066
1067 settings->setV8ScriptStreamingEnabled(prefs.v8_script_streaming_enabled); 1067 settings->setV8ScriptStreamingEnabled(prefs.v8_script_streaming_enabled);
1068 settings->setV8ScriptStreamingMode( 1068 settings->setV8ScriptStreamingMode(
1069 static_cast<WebSettings::V8ScriptStreamingMode>( 1069 static_cast<WebSettings::V8ScriptStreamingMode>(
1070 prefs.v8_script_streaming_mode)); 1070 prefs.v8_script_streaming_mode));
1071 settings->setImageAnimationPolicy(
1072 static_cast<WebSettings::ImageAnimationPolicy>(prefs.animation_policy));
1071 1073
1072 #if defined(OS_ANDROID) 1074 #if defined(OS_ANDROID)
1073 settings->setAllowCustomScrollbarInMainFrame(false); 1075 settings->setAllowCustomScrollbarInMainFrame(false);
1074 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); 1076 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled);
1075 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); 1077 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor);
1076 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); 1078 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment);
1077 settings->setFullscreenSupported(prefs.fullscreen_supported); 1079 settings->setFullscreenSupported(prefs.fullscreen_supported);
1078 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); 1080 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom);
1079 settings->setAutoZoomFocusedNodeToLegibleScale(true); 1081 settings->setAutoZoomFocusedNodeToLegibleScale(true);
1080 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); 1082 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled);
(...skipping 3026 matching lines...) Expand 10 before | Expand all | Expand 10 after
4107 std::vector<gfx::Size> sizes; 4109 std::vector<gfx::Size> sizes;
4108 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4110 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4109 if (!url.isEmpty()) 4111 if (!url.isEmpty())
4110 urls.push_back( 4112 urls.push_back(
4111 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4113 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4112 } 4114 }
4113 SendUpdateFaviconURL(urls); 4115 SendUpdateFaviconURL(urls);
4114 } 4116 }
4115 4117
4116 } // namespace content 4118 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698