Title: [111524] trunk/Source/WebCore
- Revision
- 111524
- Author
- [email protected]
- Date
- 2012-03-21 04:58:01 -0700 (Wed, 21 Mar 2012)
Log Message
[Qt][WK2][Mac] MiniBrowser asserts at HashTable.h:480
https://bugs.webkit.org/show_bug.cgi?id=81113
The GLContext is created by QWindow/QSurface using
QOpenGLContext which is implemented using NSOpenGL functions
on mac. Therefore we should use QOpenGLContext as well when
querying for the current context. AGL is not supposed
to be paired with NSOpenGL.
Altering the typedef for GLContext is fine, since
the GLContext type is only used as a key in a map.
Reviewed by Kenneth Rohde Christiansen.
* platform/graphics/texmap/TextureMapperGL.cpp:
(SharedGLData):
(WebCore::TextureMapperGLData::SharedGLData::getCurrentGLContext):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (111523 => 111524)
--- trunk/Source/WebCore/ChangeLog 2012-03-21 11:43:40 UTC (rev 111523)
+++ trunk/Source/WebCore/ChangeLog 2012-03-21 11:58:01 UTC (rev 111524)
@@ -1,3 +1,22 @@
+2012-03-21 Zeno Albisser <[email protected]>
+
+ [Qt][WK2][Mac] MiniBrowser asserts at HashTable.h:480
+ https://bugs.webkit.org/show_bug.cgi?id=81113
+
+ The GLContext is created by QWindow/QSurface using
+ QOpenGLContext which is implemented using NSOpenGL functions
+ on mac. Therefore we should use QOpenGLContext as well when
+ querying for the current context. AGL is not supposed
+ to be paired with NSOpenGL.
+ Altering the typedef for GLContext is fine, since
+ the GLContext type is only used as a key in a map.
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ (SharedGLData):
+ (WebCore::TextureMapperGLData::SharedGLData::getCurrentGLContext):
+
2012-03-21 Ilya Tikhonovsky <[email protected]>
Web Inspector: HeapSnapshot: make _bfs twice as fast as the old version.
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (111523 => 111524)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2012-03-21 11:43:40 UTC (rev 111523)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2012-03-21 11:58:01 UTC (rev 111524)
@@ -32,13 +32,12 @@
#if PLATFORM(QT)
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QOpenGLContext>
#include <QPlatformPixmap>
#endif
#endif
-#if defined(TEXMAP_OPENGL_ES_2)
-#include <EGL/egl.h>
-#elif OS(WINDOWS)
+#if OS(WINDOWS)
#include <windows.h>
#elif OS(MAC_OS_X)
#include <AGL/agl.h>
@@ -72,11 +71,11 @@
struct TextureMapperGLData {
struct SharedGLData : public RefCounted<SharedGLData> {
-#if defined(TEXMAP_OPENGL_ES_2)
- typedef EGLContext GLContext;
+#if PLATFORM(QT) && (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+ typedef QOpenGLContext* GLContext;
static GLContext getCurrentGLContext()
{
- return eglGetCurrentContext();
+ return QOpenGLContext::currentContext();
}
#elif OS(WINDOWS)
typedef HGLRC GLContext;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
