| 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 if (!configuration_) { | 59 if (!configuration_) { |
| 60 configuration_.reset([[WKWebViewConfiguration alloc] init]); | 60 configuration_.reset([[WKWebViewConfiguration alloc] init]); |
| 61 if (is_off_the_record_) { | 61 if (is_off_the_record_) { |
| 62 [configuration_ | 62 [configuration_ |
| 63 setWebsiteDataStore:[WKWebsiteDataStore nonPersistentDataStore]]; | 63 setWebsiteDataStore:[WKWebsiteDataStore nonPersistentDataStore]]; |
| 64 } | 64 } |
| 65 // TODO(crbug.com/620878) Remove these guards after moving to iOS10 SDK. | 65 // TODO(crbug.com/620878) Remove these guards after moving to iOS10 SDK. |
| 66 #if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 | 66 #if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 |
| 67 if (base::ios::IsRunningOnIOS10OrLater()) { | 67 if (base::ios::IsRunningOnIOS10OrLater()) { |
| 68 [configuration_ setDataDetectorTypes:WKDataDetectorTypeCalendarEvent | | 68 [configuration_ setDataDetectorTypes:WKDataDetectorTypeCalendarEvent | |
| 69 WKDataDetectorTypeFlightNumber | | 69 WKDataDetectorTypeFlightNumber]; |
| 70 WKDataDetectorTypePhoneNumber]; | |
| 71 } | 70 } |
| 72 #endif | 71 #endif |
| 73 // API available on iOS 9, although doesn't appear to enable inline playback | 72 // API available on iOS 9, although doesn't appear to enable inline playback |
| 74 // Works as intended on iOS 10+ | 73 // Works as intended on iOS 10+ |
| 75 [configuration_ setAllowsInlineMediaPlayback:YES]; | 74 [configuration_ setAllowsInlineMediaPlayback:YES]; |
| 76 // setJavaScriptCanOpenWindowsAutomatically is required to support popups. | 75 // setJavaScriptCanOpenWindowsAutomatically is required to support popups. |
| 77 [[configuration_ preferences] setJavaScriptCanOpenWindowsAutomatically:YES]; | 76 [[configuration_ preferences] setJavaScriptCanOpenWindowsAutomatically:YES]; |
| 78 [[configuration_ userContentController] | 77 [[configuration_ userContentController] |
| 79 addUserScript:InternalGetEarlyPageScript()]; | 78 addUserScript:InternalGetEarlyPageScript()]; |
| 80 } | 79 } |
| (...skipping 23 matching lines...) Expand all Loading... |
| 104 configuration_.reset(); | 103 configuration_.reset(); |
| 105 router_.reset(); | 104 router_.reset(); |
| 106 // Make sure that no one retains configuration, router, processPool. | 105 // Make sure that no one retains configuration, router, processPool. |
| 107 DCHECK(!weak_configuration); | 106 DCHECK(!weak_configuration); |
| 108 DCHECK(!weak_router); | 107 DCHECK(!weak_router); |
| 109 // TODO(crbug.com/522672): Enable this DCHECK. | 108 // TODO(crbug.com/522672): Enable this DCHECK. |
| 110 // DCHECK(!weak_process_pool); | 109 // DCHECK(!weak_process_pool); |
| 111 } | 110 } |
| 112 | 111 |
| 113 } // namespace web | 112 } // namespace web |
| OLD | NEW |