From b0e06f041cb8b1f21a98c2547b9811d2aa04e538 Mon Sep 17 00:00:00 2001 From: Matthew Benedict Date: Sun, 9 Apr 2023 07:04:58 -0500 Subject: [PATCH] Revert bypasses (alpha 2) --- .../platform/graphics/cocoa/GraphicsContextGLCocoa.mm | 5 ----- Tools/MobileMiniBrowser/MobileMiniBrowser/main.m | 2 +- .../MobileMiniBrowserFramework/WebViewController.m | 6 ++---- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Source/CyberCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm b/Source/CyberCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm index 41a2564ec0929..518459715d603 100644 --- a/Source/CyberCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm +++ b/Source/CyberCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm @@ -672,10 +672,6 @@ static bool needsEAGLOnMac() #if !PLATFORM(IOS_FAMILY_SIMULATOR) GraphicsContextGLCocoa::IOSurfaceTextureAttachment GraphicsContextGLCocoa::attachIOSurfaceToSharedTexture(GCGLenum target, IOSurface* surface) { -#if 1 - NSLog(@"%u %p", target, surface); - return std::nullopt; -#else constexpr EGLint emptyAttributes[] = { EGL_NONE }; // Create a MTLTexture out of the IOSurface. @@ -715,7 +711,6 @@ static bool needsEAGLOnMac() GL_EGLImageTargetTexture2DOES(target, eglImage); return std::make_tuple(eglImage, textureWidth, textureHeight); -#endif } void GraphicsContextGLCocoa::detachIOSurfaceFromSharedTexture(void* handle) diff --git a/Tools/MobileMiniBrowser/MobileMiniBrowser/main.m b/Tools/MobileMiniBrowser/MobileMiniBrowser/main.m index 553754b2b59de..8987ca3389a04 100644 --- a/Tools/MobileMiniBrowser/MobileMiniBrowser/main.m +++ b/Tools/MobileMiniBrowser/MobileMiniBrowser/main.m @@ -28,7 +28,7 @@ int main(int argc, char * argv[]) { - //[WKProcessPool _setLinkedOnOrAfterEverythingForTesting]; + [WKProcessPool _setLinkedOnOrAfterEverythingForTesting]; @autoreleasepool { return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); diff --git a/Tools/MobileMiniBrowser/MobileMiniBrowserFramework/WebViewController.m b/Tools/MobileMiniBrowser/MobileMiniBrowserFramework/WebViewController.m index e66772b7a9d4f..6bae13d1515b2 100644 --- a/Tools/MobileMiniBrowser/MobileMiniBrowserFramework/WebViewController.m +++ b/Tools/MobileMiniBrowser/MobileMiniBrowserFramework/WebViewController.m @@ -197,12 +197,10 @@ - (WKWebView *)createWebView WKWebViewConfiguration *configuration = [[WKWebViewConfiguration alloc] init]; configuration.preferences._mockCaptureDevicesEnabled = YES; - if (@available(iOS 15.4, *)) { - configuration.preferences.elementFullscreenEnabled = YES; - } + configuration.preferences.elementFullscreenEnabled = YES; WKWebView *webView = [[WKWebView alloc] initWithFrame:self.webViewContainer.bounds configuration:configuration]; - //webView.inspectable = YES; + webView.inspectable = YES; webView.navigationDelegate = self; webView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; [webView addObserver:self forKeyPath:@"title" options:NSKeyValueObservingOptionNew context:TitleContext];