third_party/WebKit/Source/modules/nfc/NFC.cpp - Issue 2218533002: Backporting JSONValues from protocol::Values

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/nfc/NFC.cpp

Issue 2218533002: Backporting JSONValues from protocol::Values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Clone LoggingCanvas log Created 4 years, 4 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:

Index: third_party/WebKit/Source/modules/nfc/NFC.cpp

diff --git a/third_party/WebKit/Source/modules/nfc/NFC.cpp b/third_party/WebKit/Source/modules/nfc/NFC.cpp

index 5ddc7ec50e0a55f5d0ca3b800fa872b62857dbcf..67715cfd0f8f082ae2fc28264224d06b7523d6b9 100644

--- a/third_party/WebKit/Source/modules/nfc/NFC.cpp

+++ b/third_party/WebKit/Source/modules/nfc/NFC.cpp

@@ -178,8 +178,8 @@ struct TypeConverter<mojo::WTFArray<uint8_t>, blink::ScriptValue> {

}

if (value->IsObject() && !value->IsArrayBuffer()) {

- RefPtr<blink::JSONValue> jsonResult = blink::toJSONValue(scriptValue.context(), value);

- if (jsonResult && (jsonResult->getType() == blink::JSONValue::TypeObject))

+ std::unique_ptr<blink::JSONValue> jsonResult = blink::toJSONValue(scriptValue.context(), value);

+ if (jsonResult && (jsonResult->type() == blink::JSONValue::TypeObject))

return mojo::WTFArray<uint8_t>::From(jsonResult->toJSONString());

}