[Payments] Implement payment instrument icons

third_party/WebKit/Source/modules/payments/PaymentInstruments.cpp

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/payments/PaymentInstruments.h"
 
 #include <utility>
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromise.h"
@@ skipping 23 matching lines @@
                                             "There is no stored instrument"));
       return true;
     case payments::mojom::blink::PaymentHandlerStatus::NO_ACTIVE_WORKER:
       resolver->Reject(
           DOMException::Create(kInvalidStateError, "No active service worker"));
       return true;
     case payments::mojom::blink::PaymentHandlerStatus::STORAGE_OPERATION_FAILED:
       resolver->Reject(DOMException::Create(kInvalidStateError,
                                             "Storage operation is failed"));
       return true;
+    case payments::mojom::blink::PaymentHandlerStatus::
+        FETCH_INSTRUMENT_ICON_FAILED:
+      resolver->Reject(DOMException::Create(
+          kNotFoundError, "Fetch or decode instrument icon failed"));
+      return true;
   }
   NOTREACHED();
   return false;
 }
 
 }  // namespace
 
 PaymentInstruments::PaymentInstruments(
     const payments::mojom::blink::PaymentManagerPtr& manager)
     : manager_(manager) {}
@@ skipping 78 matching lines @@
         script_state,
         DOMException::Create(kInvalidStateError, kPaymentManagerUnavailable));
   }
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state);
   ScriptPromise promise = resolver->Promise();
 
   payments::mojom::blink::PaymentInstrumentPtr instrument =
       payments::mojom::blink::PaymentInstrument::New();
   instrument->name = details.hasName() ? details.name() : WTF::g_empty_string;
+  if (details.hasIcons()) {
+    for (const ImageObject image_object : details.icons()) {
+      instrument->icons.push_back(payments::mojom::blink::ImageObject::New());
+      if (image_object.hasSrc())

[zino, 2017/06/09 20:29:48]

Do we need this check?
Because it is a required field, I thought that the check is unnecessary. (but
I'm not sure)

[zino, 2017/06/09 20:29:48]

The url can be relative, so, we should parse the url as follows:

ExecutionContext* context = ExecutionContext::From(script_state);
KURL parsed_url = KURL(ToWorkerGlobalScope(context)->location()->Url(),
image_object.src());
  if (!parsed_url.IsValid() || !parsed_url.ProtocolIsInHTTPFamily()) {
    resolver->Reject(V8ThrowException::CreateTypeError(
        script_state->GetIsolate(), "'" + image_object.src() + "' is not a valid
URL."));
    return promise;
  }

[gogerald1, 2017/06/09 22:25:03]

Done.

[gogerald1, 2017/06/09 22:25:03]

Done.

+        instrument->icons.back()->src = image_object.src();
+    }
+  }
+
   if (details.hasEnabledMethods()) {
     instrument->enabled_methods = details.enabledMethods();
   }
 
   if (details.hasCapabilities()) {
     v8::Local<v8::String> value;
     if (!v8::JSON::Stringify(script_state->GetContext(),
                              details.capabilities().V8Value().As<v8::Object>())
              .ToLocal(&value)) {
       exception_state.ThrowTypeError(
@@ skipping 41 matching lines @@
 
 void PaymentInstruments::onGetPaymentInstrument(
     ScriptPromiseResolver* resolver,
     payments::mojom::blink::PaymentInstrumentPtr stored_instrument,
     payments::mojom::blink::PaymentHandlerStatus status) {
   DCHECK(resolver);
   if (rejectError(resolver, status))
     return;
   PaymentInstrument instrument;
   instrument.setName(stored_instrument->name);
+
+  HeapVector<ImageObject> icons;
+  for (const auto& icon : stored_instrument->icons) {
+    ImageObject image_object;
+    image_object.setSrc(icon->src);
+    icons.emplace_back(image_object);
+  }
+  instrument.setIcons(icons);
+
   Vector<String> enabled_methods;
   for (const auto& method : stored_instrument->enabled_methods) {
     enabled_methods.push_back(method);
   }
 
   instrument.setEnabledMethods(enabled_methods);
   if (!stored_instrument->stringified_capabilities.IsEmpty()) {
     ScriptState::Scope scope(resolver->GetScriptState());
     ExceptionState exception_state(resolver->GetScriptState()->GetIsolate(),
                                    ExceptionState::kGetterContext,
@@ skipping 41 matching lines @@
 void PaymentInstruments::onClearPaymentInstruments(
     ScriptPromiseResolver* resolver,
     payments::mojom::blink::PaymentHandlerStatus status) {
   DCHECK(resolver);
   if (rejectError(resolver, status))
     return;
   resolver->Resolve();
 }
 
 }  // namespace blink