third_party/WebKit/Source/core/html/parser/HTMLResourcePreloader.cpp - Issue 1835773002: Rename AtomicString::string() to AtomicString::getString().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/html/parser/HTMLResourcePreloader.cpp

Issue 1835773002: Rename AtomicString::string() to AtomicString::getString(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix Windows Created 4 years, 9 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/html/parser/HTMLParserIdioms.cpp ('k') | third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/parser/HTMLResourcePreloader.cpp

diff --git a/third_party/WebKit/Source/core/html/parser/HTMLResourcePreloader.cpp b/third_party/WebKit/Source/core/html/parser/HTMLResourcePreloader.cpp

index c6f6fc547a01c8f9b2bd12d87542d3a775a22daa..4812561fa37231a4f6b588e6dbd16ce2045de007 100644

--- a/third_party/WebKit/Source/core/html/parser/HTMLResourcePreloader.cpp

+++ b/third_party/WebKit/Source/core/html/parser/HTMLResourcePreloader.cpp

@@ -74,7 +74,7 @@ void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload, const Ne

if (request.url().protocolIsData())

return;

if (preload->resourceType() == Resource::Script || preload->resourceType() == Resource::CSSStyleSheet || preload->resourceType() == Resource::ImportResource)

- request.setCharset(preload->charset().isEmpty() ? m_document->characterSet().string() : preload->charset());

+ request.setCharset(preload->charset().isEmpty() ? m_document->characterSet().getString() : preload->charset());

request.setForPreload(true);

int duration = static_cast<int>(1000 * (monotonicallyIncreasingTime() - preload->discoveryTime()));

DEFINE_STATIC_LOCAL(CustomCountHistogram, preloadDelayHistogram, ("WebCore.PreloadDelayMs", 0, 2000, 20));