Commit 154c6f63 authored by marja's avatar marja Committed by Commit bot

Script streaming: remove config.

Script streaming is now on by default since M41 (because of this config turned
it always on). Blink side ignores the config since r189473.

R=jochen@chromium.org
BUG=

Review URL: https://codereview.chromium.org/905683002

Cr-Commit-Position: refs/heads/master@{#315011}
parent 2772f497
......@@ -53,7 +53,6 @@ void ChromeBrowserFieldTrials::InstantiateDynamicTrials() {
base::FieldTrialList::FindValue("CLD1VsCLD2");
base::FieldTrialList::FindValue("MouseEventPreconnect");
base::FieldTrialList::FindValue("DisplayList2dCanvas");
base::FieldTrialList::FindValue("V8ScriptStreaming");
// Activate the autocomplete dynamic field trials.
OmniboxFieldTrial::ActivateDynamicTrials();
}
......@@ -524,12 +524,6 @@ WebPreferences RenderViewHostImpl::ComputeWebkitPrefs(const GURL& url) {
prefs.v8_cache_options = V8_CACHE_OPTIONS_DEFAULT;
}
// TODO(marja): Clean up preferences + command line flag after streaming has
// launched in stable.
prefs.v8_script_streaming_enabled = true;
prefs.v8_script_streaming_mode =
V8_SCRIPT_STREAMING_MODE_ONLY_ASYNC_AND_DEFER;
GetContentClient()->browser()->OverrideWebkitPrefs(this, url, &prefs);
return prefs;
}
......
......@@ -44,8 +44,6 @@ IPC_ENUM_TRAITS_MAX_VALUE(WindowOpenDisposition,
IPC_ENUM_TRAITS_MAX_VALUE(net::RequestPriority, net::MAXIMUM_PRIORITY)
IPC_ENUM_TRAITS_MAX_VALUE(content::V8CacheOptions,
content::V8_CACHE_OPTIONS_LAST)
IPC_ENUM_TRAITS_MAX_VALUE(content::V8ScriptStreamingMode,
content::V8_SCRIPT_STREAMING_MODE_LAST)
IPC_ENUM_TRAITS_MIN_MAX_VALUE(ui::PointerType,
ui::POINTER_TYPE_FIRST,
ui::POINTER_TYPE_LAST)
......@@ -194,8 +192,6 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop)
IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled)
IPC_STRUCT_TRAITS_MEMBER(v8_cache_options)
IPC_STRUCT_TRAITS_MEMBER(v8_script_streaming_enabled)
IPC_STRUCT_TRAITS_MEMBER(v8_script_streaming_mode)
IPC_STRUCT_TRAITS_MEMBER(slimming_paint_enabled)
IPC_STRUCT_TRAITS_MEMBER(pepper_accelerated_video_decode_enabled)
#if defined(OS_ANDROID)
......
......@@ -451,9 +451,6 @@ const char kEnableTracingOutput[] = "enable-tracing-output";
const char kEnableUserMediaScreenCapturing[] =
"enable-usermedia-screen-capturing";
// Enables streaming scripts to V8 while loading.
const char kEnableV8ScriptStreaming[] = "enable-v8-script-streaming";
// Enables the use of the @viewport CSS rule, which allows
// pages to control aspects of their own layout. This also turns on touch-screen
// pinch gestures.
......
......@@ -133,7 +133,6 @@ CONTENT_EXPORT extern const char kEnableThreadedCompositing[];
CONTENT_EXPORT extern const char kEnableTracing[];
CONTENT_EXPORT extern const char kEnableTracingOutput[];
CONTENT_EXPORT extern const char kEnableUserMediaScreenCapturing[];
extern const char kEnableV8ScriptStreaming[];
CONTENT_EXPORT extern const char kEnableViewport[];
CONTENT_EXPORT extern const char kEnableViewportMeta[];
CONTENT_EXPORT extern const char kMainFrameResizesAreOrientationChanges[];
......
......@@ -59,18 +59,6 @@ STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_RECENT_SMALL,
STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_LAST,
WebSettings::V8CacheOptionsRecentSmall);
STATIC_ASSERT_MATCHING_ENUMS(V8_SCRIPT_STREAMING_MODE_ALL,
WebSettings::V8ScriptStreamingModeAll);
STATIC_ASSERT_MATCHING_ENUMS(
V8_SCRIPT_STREAMING_MODE_ONLY_ASYNC_AND_DEFER,
WebSettings::V8ScriptStreamingModeOnlyAsyncAndDefer);
STATIC_ASSERT_MATCHING_ENUMS(
V8_SCRIPT_STREAMING_MODE_ALL_PLUS_BLOCK_PARSER_BLOCKING,
WebSettings::V8ScriptStreamingModeAllPlusBlockParsingBlocking);
STATIC_ASSERT_MATCHING_ENUMS(
V8_SCRIPT_STREAMING_MODE_LAST,
WebSettings::V8ScriptStreamingModeAllPlusBlockParsingBlocking);
STATIC_ASSERT_MATCHING_ENUMS(ui::POINTER_TYPE_NONE,
WebSettings::PointerTypeNone);
STATIC_ASSERT_MATCHING_ENUMS(ui::POINTER_TYPE_COARSE,
......@@ -191,8 +179,6 @@ WebPreferences::WebPreferences()
use_solid_color_scrollbars(false),
navigate_on_drag_drop(true),
v8_cache_options(V8_CACHE_OPTIONS_DEFAULT),
v8_script_streaming_enabled(false),
v8_script_streaming_mode(V8_SCRIPT_STREAMING_MODE_ALL),
slimming_paint_enabled(false),
cookie_enabled(true),
pepper_accelerated_video_decode_enabled(false),
......
......@@ -50,14 +50,6 @@ enum V8CacheOptions {
V8_CACHE_OPTIONS_LAST = V8_CACHE_OPTIONS_RECENT_SMALL
};
enum V8ScriptStreamingMode {
V8_SCRIPT_STREAMING_MODE_ALL,
V8_SCRIPT_STREAMING_MODE_ONLY_ASYNC_AND_DEFER,
V8_SCRIPT_STREAMING_MODE_ALL_PLUS_BLOCK_PARSER_BLOCKING,
V8_SCRIPT_STREAMING_MODE_LAST =
V8_SCRIPT_STREAMING_MODE_ALL_PLUS_BLOCK_PARSER_BLOCKING
};
// The ISO 15924 script code for undetermined script aka Common. It's the
// default used on WebKit's side to get/set a font setting when no script is
// specified.
......@@ -180,8 +172,6 @@ struct CONTENT_EXPORT WebPreferences {
bool use_solid_color_scrollbars;
bool navigate_on_drag_drop;
V8CacheOptions v8_cache_options;
bool v8_script_streaming_enabled;
V8ScriptStreamingMode v8_script_streaming_mode;
bool slimming_paint_enabled;
// This flags corresponds to a Page's Settings' setCookieEnabled state. It
......
......@@ -1065,11 +1065,6 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
settings->setV8CacheOptions(
static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options));
settings->setV8ScriptStreamingEnabled(prefs.v8_script_streaming_enabled);
settings->setV8ScriptStreamingMode(
static_cast<WebSettings::V8ScriptStreamingMode>(
prefs.v8_script_streaming_mode));
// Needs to happen before setIgnoreVIewportTagScaleLimits below.
web_view->setDefaultPageScaleLimits(
prefs.default_minimum_page_scale_factor,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment