Title: [177595] trunk/Source/WebKit/win
- Revision
- 177595
- Author
- [email protected]
- Date
- 2014-12-19 14:06:14 -0800 (Fri, 19 Dec 2014)
Log Message
[WinCairo] Crash after failing to create GL context in accelerated compositing mode.
https://bugs.webkit.org/show_bug.cgi?id=139830
Patch by [email protected] <[email protected]> on 2014-12-19
Reviewed by Alex Christensen.
There is missing a null pointer check.
* WebCoreSupport/AcceleratedCompositingContext.cpp:
(AcceleratedCompositingContext::initialize):
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (177594 => 177595)
--- trunk/Source/WebKit/win/ChangeLog 2014-12-19 21:51:39 UTC (rev 177594)
+++ trunk/Source/WebKit/win/ChangeLog 2014-12-19 22:06:14 UTC (rev 177595)
@@ -1,3 +1,15 @@
+2014-12-19 [email protected] <[email protected]>
+
+ [WinCairo] Crash after failing to create GL context in accelerated compositing mode.
+ https://bugs.webkit.org/show_bug.cgi?id=139830
+
+ Reviewed by Alex Christensen.
+
+ There is missing a null pointer check.
+
+ * WebCoreSupport/AcceleratedCompositingContext.cpp:
+ (AcceleratedCompositingContext::initialize):
+
2014-12-19 Brent Fulgham <[email protected]>
[Win] Add accessor for serializing HTTP loads.
Modified: trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp (177594 => 177595)
--- trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp 2014-12-19 21:51:39 UTC (rev 177594)
+++ trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp 2014-12-19 22:06:14 UTC (rev 177595)
@@ -99,6 +99,9 @@
if (!m_context)
m_context = GLContext::createContextForWindow(m_window, GLContext::sharingContext());
+ if (!m_context)
+ return;
+
m_context->makeContextCurrent();
m_textureMapper = TextureMapperGL::create(TextureMapper::OpenGLMode);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
