third_party/WebKit/Source/platform/weborigin/KURL.cpp - Issue 2050123002: Remove OwnPtr from Blink.

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 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: First attempt to land. Created 4 years, 6 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/platform/weborigin/KURL.h ('k') | third_party/WebKit/Source/platform/weborigin/SecurityOrigin.h » ('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 d8b32348d5118f0a884357d8f441ec55a1abf7c6..b191958f75a3b25752a9ab0039d5bcb84832cfe9 100644

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

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

@@ -29,6 +29,7 @@

#include "platform/weborigin/KnownPorts.h"

#include "url/url_util.h"

+#include "wtf/PtrUtil.h"

#include "wtf/StdLibExtras.h"

#include "wtf/text/CString.h"

#include "wtf/text/StringHash.h"

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

, m_string(other.m_string)

{

if (other.m_innerURL.get())

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

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

}

KURL::~KURL()

@@ -288,7 +289,7 @@ KURL& KURL::operator=(const KURL& other)

m_parsed = other.m_parsed;

m_string = other.m_string;

if (other.m_innerURL)

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

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

else

m_innerURL.reset();

return *this;

@@ -302,7 +303,7 @@ KURL KURL::copy() const

result.m_parsed = m_parsed;

result.m_string = m_string.isolatedCopy();

if (m_innerURL)

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

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

return result;

}

@@ -818,7 +819,7 @@ void KURL::initInnerURL()

return;

}

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

- m_innerURL = adoptPtr(new KURL(ParsedURLString, m_string.substring(innerParsed->scheme.begin, innerParsed->Length() - innerParsed->scheme.begin)));

+ m_innerURL = wrapUnique(new KURL(ParsedURLString, m_string.substring(innerParsed->scheme.begin, innerParsed->Length() - innerParsed->scheme.begin)));

else

m_innerURL.reset();

}