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

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

Issue 905683002: Script streaming: remove config. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months 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
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1047 matching lines...) Expand 10 before | Expand all | Expand 10 after
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->setV8ScriptStreamingEnabled(prefs.v8_script_streaming_enabled);
1069 settings->setV8ScriptStreamingMode(
1070 static_cast<WebSettings::V8ScriptStreamingMode>(
1071 prefs.v8_script_streaming_mode));
1072
1073 // Needs to happen before setIgnoreVIewportTagScaleLimits below. 1068 // Needs to happen before setIgnoreVIewportTagScaleLimits below.
1074 web_view->setDefaultPageScaleLimits( 1069 web_view->setDefaultPageScaleLimits(
1075 prefs.default_minimum_page_scale_factor, 1070 prefs.default_minimum_page_scale_factor,
1076 prefs.default_maximum_page_scale_factor); 1071 prefs.default_maximum_page_scale_factor);
1077 1072
1078 #if defined(OS_ANDROID) 1073 #if defined(OS_ANDROID)
1079 settings->setAllowCustomScrollbarInMainFrame(false); 1074 settings->setAllowCustomScrollbarInMainFrame(false);
1080 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); 1075 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled);
1081 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); 1076 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor);
1082 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); 1077 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment);
(...skipping 2976 matching lines...) Expand 10 before | Expand all | Expand 10 after
4059 std::vector<gfx::Size> sizes; 4054 std::vector<gfx::Size> sizes;
4060 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4055 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4061 if (!url.isEmpty()) 4056 if (!url.isEmpty())
4062 urls.push_back( 4057 urls.push_back(
4063 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4058 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4064 } 4059 }
4065 SendUpdateFaviconURL(urls); 4060 SendUpdateFaviconURL(urls);
4066 } 4061 }
4067 4062
4068 } // namespace content 4063 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698