Commit 8adf605a authored by Leon Han's avatar Leon Han Committed by Commit Bot

[webnfc] A follow-up clean up

BUG=520391

Change-Id: I5b9a807081657f2d211575a282ae7fa7f45c71ef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1791927
Auto-Submit: Leon Han <leon.han@intel.com>
Commit-Queue: Reilly Grant <reillyg@chromium.org>
Reviewed-by: default avatarReilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#694843}
parent 7cf56aa7
...@@ -29,14 +29,14 @@ size_t GetNDEFMessageSize(const device::mojom::blink::NDEFMessage& message) { ...@@ -29,14 +29,14 @@ size_t GetNDEFMessageSize(const device::mojom::blink::NDEFMessage& message) {
} }
bool SetNDEFMessageURL(const String& origin, bool SetNDEFMessageURL(const String& origin,
device::mojom::blink::NDEFMessage& message) { device::mojom::blink::NDEFMessage* message) {
KURL origin_url(origin); KURL origin_url(origin);
if (!message.url.IsEmpty() && origin_url.CanSetPathname()) { if (!message->url.IsEmpty() && origin_url.CanSetPathname()) {
origin_url.SetPath(message.url); origin_url.SetPath(message->url);
} }
message.url = origin_url; message->url = origin_url;
return origin_url.IsValid(); return origin_url.IsValid();
} }
......
...@@ -19,7 +19,7 @@ class DOMException; ...@@ -19,7 +19,7 @@ class DOMException;
size_t GetNDEFMessageSize(const device::mojom::blink::NDEFMessage& message); size_t GetNDEFMessageSize(const device::mojom::blink::NDEFMessage& message);
bool SetNDEFMessageURL(const String& origin, bool SetNDEFMessageURL(const String& origin,
device::mojom::blink::NDEFMessage& message); device::mojom::blink::NDEFMessage* message);
device::mojom::blink::NDEFCompatibility StringToNDEFCompatibility( device::mojom::blink::NDEFCompatibility StringToNDEFCompatibility(
const WTF::String& compatibility); const WTF::String& compatibility);
......
...@@ -84,7 +84,7 @@ ScriptPromise NFCWriter::push(ScriptState* script_state, ...@@ -84,7 +84,7 @@ ScriptPromise NFCWriter::push(ScriptState* script_state,
DCHECK(message); DCHECK(message);
if (!SetNDEFMessageURL(execution_context->GetSecurityOrigin()->ToString(), if (!SetNDEFMessageURL(execution_context->GetSecurityOrigin()->ToString(),
*message)) { message.get())) {
return ScriptPromise::RejectWithDOMException( return ScriptPromise::RejectWithDOMException(
script_state, MakeGarbageCollected<DOMException>( script_state, MakeGarbageCollected<DOMException>(
DOMExceptionCode::kSyntaxError, kNfcSetIdError)); DOMExceptionCode::kSyntaxError, kNfcSetIdError));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment