Title: [206394] branches/safari-602-branch/Source/WebCore
- Revision
- 206394
- Author
- [email protected]
- Date
- 2016-09-26 14:25:17 -0700 (Mon, 26 Sep 2016)
Log Message
Merge r206241. rdar://problem/28450514
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (206393 => 206394)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-09-26 21:25:12 UTC (rev 206393)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-09-26 21:25:17 UTC (rev 206394)
@@ -1,5 +1,9 @@
2016-09-26 Babak Shafiei <[email protected]>
+ Merge r206241. rdar://problem/28450514
+
+2016-09-26 Babak Shafiei <[email protected]>
+
Merge r206238. rdar://problem/28450514
2016-09-21 Anders Carlsson <[email protected]>
Modified: branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.cpp (206393 => 206394)
--- branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-09-26 21:25:12 UTC (rev 206393)
+++ branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-09-26 21:25:17 UTC (rev 206394)
@@ -775,7 +775,7 @@
}
if (!ScriptController::processingUserGesture()) {
- window.printErrorMessage("Must call ApplePaySession.openPaymemntSetup from a user gesture handler.");
+ window.printErrorMessage("Must call ApplePaySession.openPaymentSetup from a user gesture handler.");
ec = INVALID_ACCESS_ERR;
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes