Commit 3bd6f398 authored by Justin Cohen's avatar Justin Cohen Committed by Commit Bot

[ios] Remove content filter blocking workaround on iOS13.

Bug: 954332
Change-Id: Ia8a590b912962b343e9fceb577875ef03f51a9b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1760267
Auto-Submit: Justin Cohen <justincohen@chromium.org>
Reviewed-by: default avatarAli Juma <ajuma@chromium.org>
Reviewed-by: default avatarEugene But <eugenebut@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#688103}
parent 7a52673d
...@@ -13,7 +13,7 @@ namespace web { ...@@ -13,7 +13,7 @@ namespace web {
bool IsSafeBrowsingWarningDisplayedInWebView(WKWebView* web_view); bool IsSafeBrowsingWarningDisplayedInWebView(WKWebView* web_view);
// Returns true if workaround for loading restricted URLs should be applied. // Returns true if workaround for loading restricted URLs should be applied.
// TODO(crbug.com/954332): Remove this workaround when // TODO(crbug.com/954332): Remove this workaround when iOS 12 is dropped.
// https://bugs.webkit.org/show_bug.cgi?id=196930 is fixed. // https://bugs.webkit.org/show_bug.cgi?id=196930 is fixed.
bool RequiresContentFilterBlockingWorkaround(); bool RequiresContentFilterBlockingWorkaround();
......
...@@ -37,6 +37,10 @@ bool RequiresContentFilterBlockingWorkaround() { ...@@ -37,6 +37,10 @@ bool RequiresContentFilterBlockingWorkaround() {
if (!GetWebClient()->IsSlimNavigationManagerEnabled()) if (!GetWebClient()->IsSlimNavigationManagerEnabled())
return false; return false;
// This is fixed in iOS13 beta 7.
if (@available(iOS 13, *))
return false;
if (@available(iOS 12.2, *)) if (@available(iOS 12.2, *))
return true; return true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment