Title: [290944] branches/safari-613-branch/Source/WebCore
- Revision
- 290944
- Author
- [email protected]
- Date
- 2022-03-07 14:10:46 -0800 (Mon, 07 Mar 2022)
Log Message
Cherry-pick r290562. rdar://problem/88767033
Loading a USDZ url as the main resource renders as garbage
https://bugs.webkit.org/show_bug.cgi?id=237240
rdar://88767033
Reviewed by Antoine Quint.
We can't render a USD document if the ModelDocument feature is not enabled.
* platform/MIMETypeRegistry.cpp:
(WebCore::MIMETypeRegistry::canShowMIMEType):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@290562 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613-branch/Source/WebCore/ChangeLog (290943 => 290944)
--- branches/safari-613-branch/Source/WebCore/ChangeLog 2022-03-07 22:10:43 UTC (rev 290943)
+++ branches/safari-613-branch/Source/WebCore/ChangeLog 2022-03-07 22:10:46 UTC (rev 290944)
@@ -1,5 +1,36 @@
2022-03-07 Russell Epstein <[email protected]>
+ Cherry-pick r290562. rdar://problem/88767033
+
+ Loading a USDZ url as the main resource renders as garbage
+ https://bugs.webkit.org/show_bug.cgi?id=237240
+ rdar://88767033
+
+ Reviewed by Antoine Quint.
+
+ We can't render a USD document if the ModelDocument feature is not enabled.
+
+ * platform/MIMETypeRegistry.cpp:
+ (WebCore::MIMETypeRegistry::canShowMIMEType):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@290562 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-02-27 Dean Jackson <[email protected]>
+
+ Loading a USDZ url as the main resource renders as garbage
+ https://bugs.webkit.org/show_bug.cgi?id=237240
+ rdar://88767033
+
+ Reviewed by Antoine Quint.
+
+ We can't render a USD document if the ModelDocument feature is not enabled.
+
+ * platform/MIMETypeRegistry.cpp:
+ (WebCore::MIMETypeRegistry::canShowMIMEType):
+
+2022-03-07 Russell Epstein <[email protected]>
+
Cherry-pick r290560. rdar://problem/89526227
Use hasAttributeWithoutSynchronisation for checking inert attribute in Adjuster::adjust
Modified: branches/safari-613-branch/Source/WebCore/platform/MIMETypeRegistry.cpp (290943 => 290944)
--- branches/safari-613-branch/Source/WebCore/platform/MIMETypeRegistry.cpp 2022-03-07 22:10:43 UTC (rev 290943)
+++ branches/safari-613-branch/Source/WebCore/platform/MIMETypeRegistry.cpp 2022-03-07 22:10:46 UTC (rev 290944)
@@ -28,6 +28,7 @@
#include "MIMETypeRegistry.h"
#include "MediaPlayer.h"
+#include "RuntimeEnabledFeatures.h"
#include "ThreadGlobalData.h"
#include <wtf/FixedVector.h>
#include <wtf/HashMap.h>
@@ -662,7 +663,7 @@
#endif
#if ENABLE(MODEL_ELEMENT)
- if (isSupportedModelMIMEType(mimeType))
+ if (isSupportedModelMIMEType(mimeType) && RuntimeEnabledFeatures::sharedFeatures().modelDocumentEnabled())
return true;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
