Changeset 288505 in webkit

Timestamp:

Jan 24, 2022, 5:55:17 PM (5 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r288034. rdar://problem/86341944

REGRESSION: ARKit example loads a page full of random symbols instead of a 3D model
​https://bugs.webkit.org/show_bug.cgi?id=235254

Reviewed by Tim Horton.

When we enabled the ModelDocument support, we disabled the ContentProvider path.
This was a mistake - it has to be a runtime check.

• UIProcess/API/Cocoa/WKPreferences.mm: Expose the ModelDocumentEnabled WebPreference so that it can be read from a WKWebViewConfiguration. (-[WKPreferences _setModelDocumentEnabled:]): (-[WKPreferences _modelDocumentEnabled]):
• UIProcess/API/Cocoa/WKPreferencesPrivate.h:
• UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm: Rather than the compile-time test, check the WebPreferences to see if ModelDocument is disabled. (-[WKWebViewContentProviderRegistry initWithConfiguration:]):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@288034 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-613-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKPreferences.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKPreferencesPrivate.h (modified) (1 diff)
• UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm (modified) (2 diffs)

branches/safari-613-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2022-01-24  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r288034. rdar://problem/86341944
+
+    REGRESSION:  ARKit example loads a page full of random symbols instead of a 3D model
+    https://bugs.webkit.org/show_bug.cgi?id=235254
+    
+    Reviewed by Tim Horton.
+    
+    When we enabled the ModelDocument support, we disabled the ContentProvider path.
+    This was a mistake - it has to be a runtime check.
+    
+    * UIProcess/API/Cocoa/WKPreferences.mm: Expose the ModelDocumentEnabled WebPreference so that
+    it can be read from a WKWebViewConfiguration.
+    (-[WKPreferences _setModelDocumentEnabled:]):
+    (-[WKPreferences _modelDocumentEnabled]):
+    * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+    * UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm: Rather than the compile-time test, check the
+    WebPreferences to see if ModelDocument is disabled.
+    (-[WKWebViewContentProviderRegistry initWithConfiguration:]):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288034 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-01-14  Dean Jackson  <dino@apple.com>
+
+            REGRESSION:  ARKit example loads a page full of random symbols instead of a 3D model
+            https://bugs.webkit.org/show_bug.cgi?id=235254
+
+            Reviewed by Tim Horton.
+
+            When we enabled the ModelDocument support, we disabled the ContentProvider path.
+            This was a mistake - it has to be a runtime check.
+
+            * UIProcess/API/Cocoa/WKPreferences.mm: Expose the ModelDocumentEnabled WebPreference so that
+            it can be read from a WKWebViewConfiguration.
+            (-[WKPreferences _setModelDocumentEnabled:]):
+            (-[WKPreferences _modelDocumentEnabled]):
+            * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+            * UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm: Rather than the compile-time test, check the
+            WebPreferences to see if ModelDocument is disabled.
+            (-[WKWebViewContentProviderRegistry initWithConfiguration:]):
+
 2022-01-24  Alan Coon  <alancoon@apple.com>
 

branches/safari-613-branch/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm

@@ -1561 +1561 @@
 }
 
+- (void)_setModelDocumentEnabled:(BOOL)enabled
+{
+    _preferences->setModelDocumentEnabled(enabled);
+}
+
+- (BOOL)_modelDocumentEnabled
+{
+    return _preferences->modelDocumentEnabled();
+}
+
 @end
-
 
 @implementation WKPreferences (WKDeprecated)

branches/safari-613-branch/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h

@@ -178 +178 @@
 @property (nonatomic, setter=_setAccessHandleEnabled:) BOOL _accessHandleEnabled WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
 @property (nonatomic, setter=_setNotificationsEnabled:) BOOL _notificationsEnabled WK_API_AVAILABLE(macos(10.13.4), ios(WK_IOS_TBA));
+@property (nonatomic, setter=_setModelDocumentEnabled:) BOOL _modelDocumentEnabled WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
 
 #if !TARGET_OS_IPHONE

branches/safari-613-branch/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm

@@ -31 +31 @@
 #import "WKPDFView.h"
 #import "WKUSDPreviewView.h"
-#import <WebKit/WKWebViewConfigurationPrivate.h>
 #import "WKWebViewInternal.h"
 #import "WebPageProxy.h"
 #import <WebCore/MIMETypeRegistry.h>
+#import <WebKit/WKPreferencesPrivate.h>
+#import <WebKit/WKWebViewConfigurationPrivate.h>
 #import <wtf/FixedVector.h>
 #import <wtf/HashCountedSet.h>
@@ -55 +56 @@
 #endif
 
-#if USE(SYSTEM_PREVIEW) && !HAVE(UIKIT_WEBKIT_INTERNALS) && !ENABLE(MODEL_ELEMENT)
-    if (configuration._systemPreviewEnabled) {
+#if USE(SYSTEM_PREVIEW) && !HAVE(UIKIT_WEBKIT_INTERNALS)
+    if (configuration._systemPreviewEnabled && !configuration.preferences._modelDocumentEnabled) {
         for (auto& type : WebCore::MIMETypeRegistry::usdMIMETypes())
             [self registerProvider:[WKUSDPreviewView class] forMIMEType:@(type)];