third_party/WebKit/Source/platform/weborigin/KURL.cpp - Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed.

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/platform/weborigin/KURL.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)

Patch Set: Rebasing... Created 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/transforms/TransformationMatrix.h ('k') | third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/weborigin/KURL.cpp

diff --git a/third_party/WebKit/Source/platform/weborigin/KURL.cpp b/third_party/WebKit/Source/platform/weborigin/KURL.cpp

index 48edd0ef58e8855386d8a68fd54b5f9909915ab7..2f4894fdd2922083ab18b9a0667803a2e0d9a49e 100644

--- a/third_party/WebKit/Source/platform/weborigin/KURL.cpp

+++ b/third_party/WebKit/Source/platform/weborigin/KURL.cpp

@@ -256,7 +256,7 @@ KURL::KURL(const KURL& other)

m_parsed(other.m_parsed),

m_string(other.m_string) {

if (other.m_innerURL.get())

- m_innerURL = wrapUnique(new KURL(other.m_innerURL->copy()));

+ m_innerURL = WTF::wrapUnique(new KURL(other.m_innerURL->copy()));

}

KURL::~KURL() {}

@@ -267,7 +267,7 @@ KURL& KURL::operator=(const KURL& other) {

m_parsed = other.m_parsed;

m_string = other.m_string;

if (other.m_innerURL)

- m_innerURL = wrapUnique(new KURL(other.m_innerURL->copy()));

+ m_innerURL = WTF::wrapUnique(new KURL(other.m_innerURL->copy()));

else

m_innerURL.reset();

return *this;

@@ -280,7 +280,7 @@ KURL KURL::copy() const {

result.m_parsed = m_parsed;

result.m_string = m_string.isolatedCopy();

if (m_innerURL)

- result.m_innerURL = wrapUnique(new KURL(m_innerURL->copy()));

+ result.m_innerURL = WTF::wrapUnique(new KURL(m_innerURL->copy()));

return result;

}

@@ -778,7 +778,7 @@ void KURL::initInnerURL() {

return;

}

if (url::Parsed* innerParsed = m_parsed.inner_parsed())

- m_innerURL = wrapUnique(new KURL(

+ m_innerURL = WTF::wrapUnique(new KURL(

ParsedURLString,

m_string.substring(innerParsed->scheme.begin,

innerParsed->Length() - innerParsed->scheme.begin)));