| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "ios/web/web_state/ui/wk_web_view_configuration_provider.h" | 5 #import "ios/web/web_state/ui/wk_web_view_configuration_provider.h" |
| 6 | 6 |
| 7 #import <Foundation/Foundation.h> | 7 #import <Foundation/Foundation.h> |
| 8 #import <WebKit/WebKit.h> | 8 #import <WebKit/WebKit.h> |
| 9 | 9 |
| 10 #include "base/ios/ios_util.h" | 10 #include "base/ios/ios_util.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 configuration_.reset([[WKWebViewConfiguration alloc] init]); | 60 configuration_.reset([[WKWebViewConfiguration alloc] init]); |
| 61 if (is_off_the_record_ && base::ios::IsRunningOnIOS9OrLater()) { | 61 if (is_off_the_record_ && base::ios::IsRunningOnIOS9OrLater()) { |
| 62 // WKWebsiteDataStore is iOS9 only. | 62 // WKWebsiteDataStore is iOS9 only. |
| 63 [configuration_ | 63 [configuration_ |
| 64 setWebsiteDataStore:[WKWebsiteDataStore nonPersistentDataStore]]; | 64 setWebsiteDataStore:[WKWebsiteDataStore nonPersistentDataStore]]; |
| 65 } | 65 } |
| 66 // TODO(crbug.com/620878) Remove these guards after moving to iOS10 SDK. | 66 // TODO(crbug.com/620878) Remove these guards after moving to iOS10 SDK. |
| 67 #if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 | 67 #if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 |
| 68 if (base::ios::IsRunningOnIOS10OrLater()) { | 68 if (base::ios::IsRunningOnIOS10OrLater()) { |
| 69 [configuration_ setDataDetectorTypes:WKDataDetectorTypeCalendarEvent | | 69 [configuration_ setDataDetectorTypes:WKDataDetectorTypeCalendarEvent | |
| 70 WKDataDetectorTypeFlightNumber | | 70 WKDataDetectorTypeFlightNumber]; |
| 71 WKDataDetectorTypePhoneNumber]; | |
| 72 } | 71 } |
| 73 #endif | 72 #endif |
| 74 // API available on iOS 9, although doesn't appear to enable inline playback | 73 // API available on iOS 9, although doesn't appear to enable inline playback |
| 75 // Works as intended on iOS 10+ | 74 // Works as intended on iOS 10+ |
| 76 [configuration_ setAllowsInlineMediaPlayback:YES]; | 75 [configuration_ setAllowsInlineMediaPlayback:YES]; |
| 77 // setJavaScriptCanOpenWindowsAutomatically is required to support popups. | 76 // setJavaScriptCanOpenWindowsAutomatically is required to support popups. |
| 78 [[configuration_ preferences] setJavaScriptCanOpenWindowsAutomatically:YES]; | 77 [[configuration_ preferences] setJavaScriptCanOpenWindowsAutomatically:YES]; |
| 79 [[configuration_ userContentController] | 78 [[configuration_ userContentController] |
| 80 addUserScript:InternalGetEarlyPageScript()]; | 79 addUserScript:InternalGetEarlyPageScript()]; |
| 81 } | 80 } |
| (...skipping 23 matching lines...) Expand all Loading... |
| 105 configuration_.reset(); | 104 configuration_.reset(); |
| 106 router_.reset(); | 105 router_.reset(); |
| 107 // Make sure that no one retains configuration, router, processPool. | 106 // Make sure that no one retains configuration, router, processPool. |
| 108 DCHECK(!weak_configuration); | 107 DCHECK(!weak_configuration); |
| 109 DCHECK(!weak_router); | 108 DCHECK(!weak_router); |
| 110 // TODO(crbug.com/522672): Enable this DCHECK. | 109 // TODO(crbug.com/522672): Enable this DCHECK. |
| 111 // DCHECK(!weak_process_pool); | 110 // DCHECK(!weak_process_pool); |
| 112 } | 111 } |
| 113 | 112 |
| 114 } // namespace web | 113 } // namespace web |
| OLD | NEW |