Title: [153492] trunk/Source/WebCore
- Revision
- 153492
- Author
- achristen...@apple.com
- Date
- 2013-07-30 14:19:23 -0700 (Tue, 30 Jul 2013)
Log Message
Compile fix for WebGL on 32-bit Windows.
https://bugs.webkit.org/show_bug.cgi?id=119235
Reviewed by Darin Adler.
* platform/graphics/GLContext.cpp:
Created GLNativeWindowType typedef.
(WebCore::GLContext::createContextForWindow):
* platform/graphics/GLContext.h:
Replaced uint64_t with GLNativeWindowType.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (153491 => 153492)
--- trunk/Source/WebCore/ChangeLog 2013-07-30 21:06:44 UTC (rev 153491)
+++ trunk/Source/WebCore/ChangeLog 2013-07-30 21:19:23 UTC (rev 153492)
@@ -1,3 +1,16 @@
+2013-07-30 Alex Christensen <achristen...@apple.com>
+
+ Compile fix for WebGL on 32-bit Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=119235
+
+ Reviewed by Darin Adler.
+
+ * platform/graphics/GLContext.cpp:
+ Created GLNativeWindowType typedef.
+ (WebCore::GLContext::createContextForWindow):
+ * platform/graphics/GLContext.h:
+ Replaced uint64_t with GLNativeWindowType.
+
2013-07-30 Patrick Gansterer <par...@webkit.org>
[WIN] Remove dependency on CoreFoundation from DownloadBundle
Modified: trunk/Source/WebCore/platform/graphics/GLContext.cpp (153491 => 153492)
--- trunk/Source/WebCore/platform/graphics/GLContext.cpp 2013-07-30 21:06:44 UTC (rev 153491)
+++ trunk/Source/WebCore/platform/graphics/GLContext.cpp 2013-07-30 21:19:23 UTC (rev 153492)
@@ -147,7 +147,7 @@
-PassOwnPtr<GLContext> GLContext::createContextForWindow(uint64_t windowHandle, GLContext* sharingContext)
+PassOwnPtr<GLContext> GLContext::createContextForWindow(GLNativeWindowType windowHandle, GLContext* sharingContext)
{
#if PLATFORM(GTK) && defined(GDK_WINDOWING_WAYLAND) && USE(EGL)
GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get());
Modified: trunk/Source/WebCore/platform/graphics/GLContext.h (153491 => 153492)
--- trunk/Source/WebCore/platform/graphics/GLContext.h 2013-07-30 21:06:44 UTC (rev 153491)
+++ trunk/Source/WebCore/platform/graphics/GLContext.h 2013-07-30 21:19:23 UTC (rev 153492)
@@ -25,6 +25,13 @@
#include <wtf/Noncopyable.h>
#include <wtf/PassOwnPtr.h>
+#if USE(EGL) && !PLATFORM(GTK)
+#include "eglplatform.h"
+typedef EGLNativeWindowType GLNativeWindowType;
+#else
+typedef uint64_t GLNativeWindowType;
+#endif
+
#if USE(CAIRO)
typedef struct _cairo_device cairo_device_t;
#endif
@@ -38,7 +45,7 @@
class GLContext {
WTF_MAKE_NONCOPYABLE(GLContext);
public:
- static PassOwnPtr<GLContext> createContextForWindow(uint64_t windowHandle, GLContext* sharingContext);
+ static PassOwnPtr<GLContext> createContextForWindow(GLNativeWindowType windowHandle, GLContext* sharingContext);
static PassOwnPtr<GLContext> createOffscreenContext(GLContext* sharing = 0);
static GLContext* getCurrent();
static GLContext* sharingContext();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
