Title: [234030] branches/safari-606-branch/Source
- Revision
- 234030
- Author
- [email protected]
- Date
- 2018-07-20 01:05:38 -0700 (Fri, 20 Jul 2018)
Log Message
Cherry-pick r233992. rdar://problem/42417109
Update iOS fullscreen alert text again
https://bugs.webkit.org/show_bug.cgi?id=187797
rdar://problem/42373783
Reviewed by Jer Noble.
Source/WebCore:
* English.lproj/Localizable.strings:
Source/WebKit:
* UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
(-[WKFullScreenViewController _showPhishingAlert]):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@233992 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-606-branch/Source/WebCore/ChangeLog (234029 => 234030)
--- branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-20 08:05:34 UTC (rev 234029)
+++ branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-20 08:05:38 UTC (rev 234030)
@@ -1,5 +1,37 @@
2018-07-20 Babak Shafiei <[email protected]>
+ Cherry-pick r233992. rdar://problem/42417109
+
+ Update iOS fullscreen alert text again
+ https://bugs.webkit.org/show_bug.cgi?id=187797
+ rdar://problem/42373783
+
+ Reviewed by Jer Noble.
+
+ Source/WebCore:
+
+ * English.lproj/Localizable.strings:
+
+ Source/WebKit:
+
+ * UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
+ (-[WKFullScreenViewController _showPhishingAlert]):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@233992 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-19 Jon Lee <[email protected]>
+
+ Update iOS fullscreen alert text again
+ https://bugs.webkit.org/show_bug.cgi?id=187797
+ rdar://problem/42373783
+
+ Reviewed by Jer Noble.
+
+ * English.lproj/Localizable.strings:
+
+2018-07-20 Babak Shafiei <[email protected]>
+
Cherry-pick r233982. rdar://problem/42389208
Hitting RELEASE_ASSERT(!m_activeDOMObjectAdditionForbidden) under HTMLMediaElement::resume()
Modified: branches/safari-606-branch/Source/WebCore/English.lproj/Localizable.strings (234029 => 234030)
--- branches/safari-606-branch/Source/WebCore/English.lproj/Localizable.strings 2018-07-20 08:05:34 UTC (rev 234029)
+++ branches/safari-606-branch/Source/WebCore/English.lproj/Localizable.strings 2018-07-20 08:05:38 UTC (rev 234030)
@@ -338,7 +338,7 @@
"Invalid value" = "Invalid value";
/* Fullscreen Deceptive Website Warning Sheet Title */
-"It looks like you are typing on “%@”" = "It looks like you are typing on “%@”";
+"It looks like you are typing while in full screen" = "It looks like you are typing while in full screen";
/* Italic context menu item */
"Italic" = "Italic";
@@ -764,7 +764,7 @@
"Typing (Undo action name)" = "Typing";
/* Fullscreen Deceptive Website Warning Sheet Content Text */
-"Typing is not allowed in full screen. This website may be showing a fake keyboard to trick you into disclosing personal or financial information." = "Typing is not allowed in full screen. This website may be showing a fake keyboard to trick you into disclosing personal or financial information.";
+"Typing is not allowed in full screen websites. “%@” may be showing a fake keyboard to trick you into disclosing personal or financial information." = "Typing is not allowed in full screen websites. “%@” may be showing a fake keyboard to trick you into disclosing personal or financial information.";
/* accessibility role description for a URL field. */
"URL field" = "URL field";
Modified: branches/safari-606-branch/Source/WebKit/ChangeLog (234029 => 234030)
--- branches/safari-606-branch/Source/WebKit/ChangeLog 2018-07-20 08:05:34 UTC (rev 234029)
+++ branches/safari-606-branch/Source/WebKit/ChangeLog 2018-07-20 08:05:38 UTC (rev 234030)
@@ -1,3 +1,36 @@
+2018-07-20 Babak Shafiei <[email protected]>
+
+ Cherry-pick r233992. rdar://problem/42417109
+
+ Update iOS fullscreen alert text again
+ https://bugs.webkit.org/show_bug.cgi?id=187797
+ rdar://problem/42373783
+
+ Reviewed by Jer Noble.
+
+ Source/WebCore:
+
+ * English.lproj/Localizable.strings:
+
+ Source/WebKit:
+
+ * UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
+ (-[WKFullScreenViewController _showPhishingAlert]):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@233992 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-19 Jon Lee <[email protected]>
+
+ Update iOS fullscreen alert text again
+ https://bugs.webkit.org/show_bug.cgi?id=187797
+ rdar://problem/42373783
+
+ Reviewed by Jer Noble.
+
+ * UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
+ (-[WKFullScreenViewController _showPhishingAlert]):
+
2018-07-19 Babak Shafiei <[email protected]>
Revert r233925. rdar://problem/42354959
Modified: branches/safari-606-branch/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm (234029 => 234030)
--- branches/safari-606-branch/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm 2018-07-20 08:05:34 UTC (rev 234029)
+++ branches/safari-606-branch/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm 2018-07-20 08:05:38 UTC (rev 234030)
@@ -542,8 +542,8 @@
- (void)_showPhishingAlert
{
- NSString *alertTitle = [NSString stringWithFormat:WEB_UI_STRING("It looks like you are typing on “%@”", "Fullscreen Deceptive Website Warning Sheet Title"), (NSString *)self.location];
- NSString *alertMessage = WEB_UI_STRING("Typing is not allowed in full screen. This website may be showing a fake keyboard to trick you into disclosing personal or financial information.", "Fullscreen Deceptive Website Warning Sheet Content Text");
+ NSString *alertTitle = WEB_UI_STRING("It looks like you are typing while in full screen", "Fullscreen Deceptive Website Warning Sheet Title");
+ NSString *alertMessage = [NSString stringWithFormat:WEB_UI_STRING("Typing is not allowed in full screen websites. “%@” may be showing a fake keyboard to trick you into disclosing personal or financial information.", "Fullscreen Deceptive Website Warning Sheet Content Text"), (NSString *)self.location];
UIAlertController* alert = [UIAlertController alertControllerWithTitle:alertTitle message:alertMessage preferredStyle:UIAlertControllerStyleAlert];
if (auto* page = [self._webView _page])
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
