third_party/WebKit/Source/modules/payments/PaymentAppRequestConversion.cpp - Issue 2887713002: PaymentHandler: Merge PaymentAppRequest and PaymentRequestEvent.

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/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

« no previous file with comments | « third_party/WebKit/Source/modules/payments/PaymentAppRequest.idl ('k') | third_party/WebKit/Source/modules/payments/PaymentAppRequestConversionTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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;

}