third_party/WebKit/Source/platform/exported/WebContentSettingCallbacks.cpp - Issue 1916703002: Prepare for move-only PassOwnPtr in the remaining directories.

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/exported/WebContentSettingCallbacks.cpp

Issue 1916703002: Prepare for move-only PassOwnPtr in the remaining directories. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@core1

Patch Set: Merge with trunk. Created 4 years, 8 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/audio/AudioBus.cpp ('k') | third_party/WebKit/Source/platform/exported/WebFileSystemCallbacks.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/exported/WebContentSettingCallbacks.cpp

diff --git a/third_party/WebKit/Source/platform/exported/WebContentSettingCallbacks.cpp b/third_party/WebKit/Source/platform/exported/WebContentSettingCallbacks.cpp

index 88319d38c866ff6415756a56d59d96e58b01524c..de907f6e6b835592696b6e22a7c76aa8c9c7a30d 100644

--- a/third_party/WebKit/Source/platform/exported/WebContentSettingCallbacks.cpp

+++ b/third_party/WebKit/Source/platform/exported/WebContentSettingCallbacks.cpp

@@ -11,21 +11,21 @@ namespace blink {

class WebContentSettingCallbacksPrivate : public RefCounted<WebContentSettingCallbacksPrivate> {

public:

- static PassRefPtr<WebContentSettingCallbacksPrivate> create(const PassOwnPtr<ContentSettingCallbacks>& callbacks)

+ static PassRefPtr<WebContentSettingCallbacksPrivate> create(PassOwnPtr<ContentSettingCallbacks> callbacks)

{

- return adoptRef(new WebContentSettingCallbacksPrivate(callbacks));

+ return adoptRef(new WebContentSettingCallbacksPrivate(std::move(callbacks)));

}

ContentSettingCallbacks* callbacks() { return m_callbacks.get(); }

private:

- WebContentSettingCallbacksPrivate(const PassOwnPtr<ContentSettingCallbacks>& callbacks) : m_callbacks(callbacks) { }

+ WebContentSettingCallbacksPrivate(PassOwnPtr<ContentSettingCallbacks> callbacks) : m_callbacks(std::move(callbacks)) { }

OwnPtr<ContentSettingCallbacks> m_callbacks;

};

-WebContentSettingCallbacks::WebContentSettingCallbacks(const PassOwnPtr<ContentSettingCallbacks>& callbacks)

+WebContentSettingCallbacks::WebContentSettingCallbacks(PassOwnPtr<ContentSettingCallbacks>&& callbacks)

{

- m_private = WebContentSettingCallbacksPrivate::create(callbacks);

+ m_private = WebContentSettingCallbacksPrivate::create(std::move(callbacks));

}

void WebContentSettingCallbacks::reset()