third_party/WebKit/Source/modules/websockets/InspectorWebSocketEvents.cpp - Issue 2080623002: Revert "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/modules/websockets/InspectorWebSocketEvents.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/modules/websockets/InspectorWebSocketEvents.h ('k') | third_party/WebKit/Source/modules/websockets/WebSocketChannel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/websockets/InspectorWebSocketEvents.cpp

diff --git a/third_party/WebKit/Source/modules/websockets/InspectorWebSocketEvents.cpp b/third_party/WebKit/Source/modules/websockets/InspectorWebSocketEvents.cpp

index c48f7c56b60967680a46a7373b186da25c2bea81..e95695f171af3abff23a589571745124f8fa59e0 100644

--- a/third_party/WebKit/Source/modules/websockets/InspectorWebSocketEvents.cpp

+++ b/third_party/WebKit/Source/modules/websockets/InspectorWebSocketEvents.cpp

@@ -6,13 +6,12 @@

#include "core/dom/Document.h"

#include "platform/weborigin/KURL.h"

-#include <memory>

namespace blink {

-std::unique_ptr<TracedValue> InspectorWebSocketCreateEvent::data(Document* document, unsigned long identifier, const KURL& url, const String& protocol)

+PassOwnPtr<TracedValue> InspectorWebSocketCreateEvent::data(Document* document, unsigned long identifier, const KURL& url, const String& protocol)

{

- std::unique_ptr<TracedValue> value = TracedValue::create();

+ OwnPtr<TracedValue> value = TracedValue::create();

value->setInteger("identifier", identifier);

value->setString("url", url.getString());

value->setString("frame", toHexString(document->frame()));

@@ -22,9 +21,9 @@ std::unique_ptr<TracedValue> InspectorWebSocketCreateEvent::data(Document* docum

return value;

}

-std::unique_ptr<TracedValue> InspectorWebSocketEvent::data(Document* document, unsigned long identifier)

+PassOwnPtr<TracedValue> InspectorWebSocketEvent::data(Document* document, unsigned long identifier)

{

- std::unique_ptr<TracedValue> value = TracedValue::create();

+ OwnPtr<TracedValue> value = TracedValue::create();

value->setInteger("identifier", identifier);

value->setString("frame", toHexString(document->frame()));

setCallStack(value.get());