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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2150973002: Remove threading primitives from ParseHTMLOnMainThread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785
Patch Set: Created 4 years, 5 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 | « no previous file | third_party/WebKit/Source/core/frame/Settings.in » ('j') | 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 "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1367 matching lines...) Expand 10 before | Expand all | Expand 10 after
1378 // backgroundHtmlParserPendingTokenLimit 1378 // backgroundHtmlParserPendingTokenLimit
1379 "BackgroundHtmlParserTokenLimits", 1379 "BackgroundHtmlParserTokenLimits",
1380 1380
1381 // Keys: doHtmlPreloadScanning 1381 // Keys: doHtmlPreloadScanning
1382 "HtmlPreloadScanning", 1382 "HtmlPreloadScanning",
1383 1383
1384 // Keys: lowPriorityIframes 1384 // Keys: lowPriorityIframes
1385 "LowPriorityIFrames", 1385 "LowPriorityIFrames",
1386 1386
1387 // Keys: disallowFetchForDocWrittenScriptsInMainFrame 1387 // Keys: disallowFetchForDocWrittenScriptsInMainFrame
1388 "DisallowFetchForDocWrittenScriptsInMainFrame" 1388 "DisallowFetchForDocWrittenScriptsInMainFrame",
1389
1390 // Keys: parseHTMLOnMainThreadSyncTokenize
1391 "ParseHTMLOnMainThread",
1389 }; 1392 };
1390 1393
1391 std::vector<std::string> blink_settings; 1394 std::vector<std::string> blink_settings;
1392 for (const char* field_trial_name : kBlinkSettingsFieldTrials) { 1395 for (const char* field_trial_name : kBlinkSettingsFieldTrials) {
1393 // Each blink-settings field trial should include a forcing_flag group, 1396 // Each blink-settings field trial should include a forcing_flag group,
1394 // to make sure that clients that specify the blink-settings flag on the 1397 // to make sure that clients that specify the blink-settings flag on the
1395 // command line are excluded from the experiment groups. To make 1398 // command line are excluded from the experiment groups. To make
1396 // sure we assign clients that specify this flag to the forcing_flag 1399 // sure we assign clients that specify this flag to the forcing_flag
1397 // group, we must call GetVariationParams for each field trial first 1400 // group, we must call GetVariationParams for each field trial first
1398 // (for example, before checking HasSwitch() and returning), since 1401 // (for example, before checking HasSwitch() and returning), since
(...skipping 1644 matching lines...) Expand 10 before | Expand all | Expand 10 after
3043 if (channel <= kMaxDisableEncryptionChannel) { 3046 if (channel <= kMaxDisableEncryptionChannel) {
3044 static const char* const kWebRtcDevSwitchNames[] = { 3047 static const char* const kWebRtcDevSwitchNames[] = {
3045 switches::kDisableWebRtcEncryption, 3048 switches::kDisableWebRtcEncryption,
3046 }; 3049 };
3047 to_command_line->CopySwitchesFrom(from_command_line, 3050 to_command_line->CopySwitchesFrom(from_command_line,
3048 kWebRtcDevSwitchNames, 3051 kWebRtcDevSwitchNames,
3049 arraysize(kWebRtcDevSwitchNames)); 3052 arraysize(kWebRtcDevSwitchNames));
3050 } 3053 }
3051 } 3054 }
3052 #endif // defined(ENABLE_WEBRTC) 3055 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/Settings.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698