Enable WebGL's ASTC extension all the time
https://bugs.webkit.org/show_bug.cgi?id=202836
<rdar://problem/57627592>
Patch by Kenneth Russell <kbr@chromium.org> on 2019-12-04
Reviewed by Dean Jackson.
Remove the run-time flag - no longer necessary.
Source/WebCore:
* html/canvas/WebGLCompressedTextureASTC.cpp:
(WebCore::WebGLCompressedTextureASTC::supported):
* html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::extensionIsEnabled):
* page/RuntimeEnabledFeatures.h:
(WebCore::RuntimeEnabledFeatures::setWebGLCompressedTextureASTCSupportEnabled): Deleted.
(WebCore::RuntimeEnabledFeatures::webGLCompressedTextureASTCSupportEnabled const): Deleted.
Source/WebKit:
* Shared/WebPreferences.yaml:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@253108 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f791f8b..43f84cd 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2019-12-04 Kenneth Russell <kbr@chromium.org>
+
+ Enable WebGL's ASTC extension all the time
+ https://bugs.webkit.org/show_bug.cgi?id=202836
+ <rdar://problem/57627592>
+
+ Reviewed by Dean Jackson.
+
+ Remove the run-time flag - no longer necessary.
+
+ * html/canvas/WebGLCompressedTextureASTC.cpp:
+ (WebCore::WebGLCompressedTextureASTC::supported):
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::extensionIsEnabled):
+ * page/RuntimeEnabledFeatures.h:
+ (WebCore::RuntimeEnabledFeatures::setWebGLCompressedTextureASTCSupportEnabled): Deleted.
+ (WebCore::RuntimeEnabledFeatures::webGLCompressedTextureASTCSupportEnabled const): Deleted.
+
2019-12-04 Antti Koivisto <antti@apple.com>
[LFC][Integration] Paint with TextPainter
diff --git a/Source/WebCore/html/canvas/WebGLCompressedTextureASTC.cpp b/Source/WebCore/html/canvas/WebGLCompressedTextureASTC.cpp
index 30dc449..132f3e6 100644
--- a/Source/WebCore/html/canvas/WebGLCompressedTextureASTC.cpp
+++ b/Source/WebCore/html/canvas/WebGLCompressedTextureASTC.cpp
@@ -94,9 +94,8 @@
bool WebGLCompressedTextureASTC::supported(const WebGLRenderingContextBase& context)
{
- return RuntimeEnabledFeatures::sharedFeatures().webGLCompressedTextureASTCSupportEnabled()
- && (context.graphicsContext3D()->getExtensions().supports("GL_KHR_texture_compression_astc_hdr"_s)
- || context.graphicsContext3D()->getExtensions().supports("GL_KHR_texture_compression_astc_ldr"_s));
+ return context.graphicsContext3D()->getExtensions().supports("GL_KHR_texture_compression_astc_hdr"_s)
+ || context.graphicsContext3D()->getExtensions().supports("GL_KHR_texture_compression_astc_ldr"_s);
}
} // namespace WebCore
diff --git a/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp b/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp
index 53a1f2029..939abb8 100644
--- a/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp
+++ b/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp
@@ -3088,10 +3088,10 @@
CHECK_EXTENSION(m_webglLoseContext, "WEBGL_lose_context");
CHECK_EXTENSION(m_webglDebugRendererInfo, "WEBGL_debug_renderer_info");
CHECK_EXTENSION(m_webglDebugShaders, "WEBGL_debug_shaders");
- CHECK_EXTENSION(m_webglCompressedTextureASTC, "WEBKIT_WEBGL_compressed_texture_astc");
+ CHECK_EXTENSION(m_webglCompressedTextureASTC, "WEBGL_compressed_texture_astc");
CHECK_EXTENSION(m_webglCompressedTextureATC, "WEBKIT_WEBGL_compressed_texture_atc");
- CHECK_EXTENSION(m_webglCompressedTextureETC, "WEBKIT_WEBGL_compressed_texture_etc");
- CHECK_EXTENSION(m_webglCompressedTextureETC1, "WEBKIT_WEBGL_compressed_texture_etc1");
+ CHECK_EXTENSION(m_webglCompressedTextureETC, "WEBGL_compressed_texture_etc");
+ CHECK_EXTENSION(m_webglCompressedTextureETC1, "WEBGL_compressed_texture_etc1");
CHECK_EXTENSION(m_webglCompressedTexturePVRTC, "WEBKIT_WEBGL_compressed_texture_pvrtc");
CHECK_EXTENSION(m_webglCompressedTextureS3TC, "WEBGL_compressed_texture_s3tc");
CHECK_EXTENSION(m_webglDepthTexture, "WEBGL_depth_texture");
diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.h b/Source/WebCore/page/RuntimeEnabledFeatures.h
index 25f6e363..49091ba 100644
--- a/Source/WebCore/page/RuntimeEnabledFeatures.h
+++ b/Source/WebCore/page/RuntimeEnabledFeatures.h
@@ -161,9 +161,6 @@
void setCrossOriginResourcePolicyEnabled(bool isEnabled) { m_crossOriginResourcePolicyEnabled = isEnabled; }
bool crossOriginResourcePolicyEnabled() const { return m_crossOriginResourcePolicyEnabled; }
- void setWebGLCompressedTextureASTCSupportEnabled(bool isEnabled) { m_isWebGLCompressedTextureASTCSupportEnabled = isEnabled; }
- bool webGLCompressedTextureASTCSupportEnabled() const { return m_isWebGLCompressedTextureASTCSupportEnabled; }
-
void setServerTimingEnabled(bool isEnabled) { m_isServerTimingEnabled = isEnabled; }
bool serverTimingEnabled() const { return m_isServerTimingEnabled; }
@@ -437,7 +434,6 @@
bool m_itpDebugMode { false };
bool m_isRestrictedHTTPResponseAccess { true };
bool m_crossOriginResourcePolicyEnabled { true };
- bool m_isWebGLCompressedTextureASTCSupportEnabled { false };
bool m_isServerTimingEnabled { false };
bool m_experimentalPlugInSandboxProfilesEnabled { false };
bool m_disabledAdaptationsMetaTagEnabled { false };
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 39d69e4..17f4f51 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2019-12-04 Kenneth Russell <kbr@chromium.org>
+
+ Enable WebGL's ASTC extension all the time
+ https://bugs.webkit.org/show_bug.cgi?id=202836
+ <rdar://problem/57627592>
+
+ Reviewed by Dean Jackson.
+
+ Remove the run-time flag - no longer necessary.
+
+ * Shared/WebPreferences.yaml:
+
2019-12-04 youenn fablet <youenn@apple.com>
WebProcessPool::terminateServiceWorkerProcess should be renamed terminateServiceWorkers
diff --git a/Source/WebKit/Shared/WebPreferences.yaml b/Source/WebKit/Shared/WebPreferences.yaml
index c6ef83e..c53d664 100644
--- a/Source/WebKit/Shared/WebPreferences.yaml
+++ b/Source/WebKit/Shared/WebPreferences.yaml
@@ -1552,14 +1552,6 @@
condition: ENABLE(OVERFLOW_SCROLLING_TOUCH)
category: internal
-WebGLCompressedTextureASTCSupportEnabled:
- type: bool
- defaultValue: false
- humanReadableName: "ASTC Texture Support"
- humanReadableDescription: "Support for ASTC compressed texture formats in WebGL"
- category: internal
- webcoreBinding: RuntimeEnabledFeatures
-
FullScreenEnabled:
type: bool
defaultValue: false
