Title: [259915] trunk/Source/WebCore
- Revision
- 259915
- Author
- ryanhad...@apple.com
- Date
- 2020-04-10 17:41:36 -0700 (Fri, 10 Apr 2020)
Log Message
Unreviewed, reverting r259764.
Causes layout test crashes under GuardMalloc
Reverted changeset:
"Release WebGLLayer earlier in ~GraphicsContextGLOpenGL"
https://bugs.webkit.org/show_bug.cgi?id=210213
https://trac.webkit.org/changeset/259764
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (259914 => 259915)
--- trunk/Source/WebCore/ChangeLog 2020-04-11 00:09:19 UTC (rev 259914)
+++ trunk/Source/WebCore/ChangeLog 2020-04-11 00:41:36 UTC (rev 259915)
@@ -1,3 +1,15 @@
+2020-04-10 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, reverting r259764.
+
+ Causes layout test crashes under GuardMalloc
+
+ Reverted changeset:
+
+ "Release WebGLLayer earlier in ~GraphicsContextGLOpenGL"
+ https://bugs.webkit.org/show_bug.cgi?id=210213
+ https://trac.webkit.org/changeset/259764
+
2020-04-10 Peng Liu <peng.l...@apple.com>
REGRESSION: (r259850)[ Mac wk1 Debug ] media/track/track-user-stylesheet.html is flaky failing.
Modified: trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm (259914 => 259915)
--- trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm 2020-04-11 00:09:19 UTC (rev 259914)
+++ trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm 2020-04-11 00:41:36 UTC (rev 259915)
@@ -582,10 +582,6 @@
gl::DeleteFramebuffers(1, &m_fbo);
#endif
- // Release the WebGLLayer before destroying the underlying
- // context to enable it to do any necessary cleanups.
- m_webGLLayer = nullptr;
-
#if USE(OPENGL_ES)
[EAGLContext setCurrentContext:0];
[static_cast<EAGLContext *>(m_contextObj) release];
@@ -596,6 +592,7 @@
EGL_MakeCurrent(m_displayObj, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
EGL_DestroyContext(m_displayObj, m_contextObj);
#endif
+ [m_webGLLayer setContext:nullptr];
}
LOG(WebGL, "Destroyed a GraphicsContextGLOpenGL (%p).", this);
Modified: trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.h (259914 => 259915)
--- trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.h 2020-04-11 00:09:19 UTC (rev 259914)
+++ trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.h 2020-04-11 00:41:36 UTC (rev 259915)
@@ -66,6 +66,8 @@
#endif
}
+@property (nonatomic) NakedPtr<WebCore::GraphicsContextGLOpenGL> context;
+
- (id)initWithGraphicsContextGL:(NakedPtr<WebCore::GraphicsContextGLOpenGL>)context;
- (CGImageRef)copyImageSnapshotWithColorSpace:(CGColorSpaceRef)colorSpace;
Modified: trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm (259914 => 259915)
--- trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm 2020-04-11 00:09:19 UTC (rev 259914)
+++ trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm 2020-04-11 00:41:36 UTC (rev 259915)
@@ -59,6 +59,8 @@
@implementation WebGLLayer
+@synthesize context=_context;
+
-(id)initWithGraphicsContextGL:(NakedPtr<WebCore::GraphicsContextGLOpenGL>)context
{
_context = context;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
