Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1375)

Unified Diff: third_party/WebKit/Source/modules/payments/PaymentAppRequestConversion.cpp

Issue 2887713002: PaymentHandler: Merge PaymentAppRequest and PaymentRequestEvent. (Closed)
Patch Set: rebase Created 3 years, 7 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
Index: third_party/WebKit/Source/modules/payments/PaymentAppRequestConversion.cpp
diff --git a/third_party/WebKit/Source/modules/payments/PaymentAppRequestConversion.cpp b/third_party/WebKit/Source/modules/payments/PaymentAppRequestConversion.cpp
index 0cb7d50508f13c30184c85d05740279ba7e3b392..8acdb04da82c67e95817275af60a6ab6adb42a6e 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentAppRequestConversion.cpp
+++ b/third_party/WebKit/Source/modules/payments/PaymentAppRequestConversion.cpp
@@ -94,7 +94,9 @@ PaymentAppRequest PaymentAppRequestConversion::ToPaymentAppRequest(
ScriptState::Scope scope(script_state);
- app_request.setOrigin(web_app_request.origin);
+ app_request.setTopLevelOrigin(web_app_request.top_level_origin);
+ app_request.setPaymentRequestOrigin(web_app_request.payment_request_origin);
+ app_request.setPaymentRequestId(web_app_request.payment_request_id);
HeapVector<PaymentMethodData> method_data;
for (const auto& md : web_app_request.method_data) {
method_data.push_back(ToPaymentMethodData(script_state, md));
@@ -105,7 +107,8 @@ PaymentAppRequest PaymentAppRequestConversion::ToPaymentAppRequest(
for (const auto& modifier : web_app_request.modifiers) {
modifiers.push_back(ToPaymentDetailsModifier(script_state, modifier));
}
- app_request.setOptionId(web_app_request.option_id);
+ app_request.setModifiers(modifiers);
+ app_request.setInstrumentKey(web_app_request.instrument_key);
return app_request;
}

Powered by Google App Engine
This is Rietveld 408576698