Title: [96003] releases/WebKitGTK/webkit-1.6/Source/WebCore
- Revision
- 96003
- Author
- [email protected]
- Date
- 2011-09-26 15:16:39 -0700 (Mon, 26 Sep 2011)
Log Message
Merging http://trac.webkit.org/changeset/95651
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.6/Source/WebCore/ChangeLog (96002 => 96003)
--- releases/WebKitGTK/webkit-1.6/Source/WebCore/ChangeLog 2011-09-26 22:12:55 UTC (rev 96002)
+++ releases/WebKitGTK/webkit-1.6/Source/WebCore/ChangeLog 2011-09-26 22:16:39 UTC (rev 96003)
@@ -1,3 +1,18 @@
+2011-09-26 ChangSeok Oh <[email protected]>
+
+ [GTK] Fix build break when enabling webgl on r95593
+ https://bugs.webkit.org/show_bug.cgi?id=68502
+
+ Reviewed by Martin Robinson.
+
+ Add PassOwnPtr.h to GC3DPrivate.h and remove useless one from GC3DGtk.cpp & GC3DPrivate.cpp
+
+ No tests required.
+
+ * platform/graphics/gtk/GraphicsContext3DGtk.cpp:
+ * platform/graphics/gtk/GraphicsContext3DPrivate.cpp:
+ * platform/graphics/gtk/GraphicsContext3DPrivate.h:
+
2011-09-19 Mark Rowe <[email protected]>
Attempt to fix the Leopard build.
Modified: releases/WebKitGTK/webkit-1.6/Source/WebCore/platform/graphics/gtk/GraphicsContext3DGtk.cpp (96002 => 96003)
--- releases/WebKitGTK/webkit-1.6/Source/WebCore/platform/graphics/gtk/GraphicsContext3DGtk.cpp 2011-09-26 22:12:55 UTC (rev 96002)
+++ releases/WebKitGTK/webkit-1.6/Source/WebCore/platform/graphics/gtk/GraphicsContext3DGtk.cpp 2011-09-26 22:16:39 UTC (rev 96003)
@@ -28,7 +28,6 @@
#include "GraphicsContext3D.h"
#if ENABLE(WEBGL)
-#include <wtf/PassOwnPtr.h>
#include "Extensions3DOpenGL.h"
#include "GraphicsContext3DPrivate.h"
#include "OpenGLShims.h"
Modified: releases/WebKitGTK/webkit-1.6/Source/WebCore/platform/graphics/gtk/GraphicsContext3DPrivate.cpp (96002 => 96003)
--- releases/WebKitGTK/webkit-1.6/Source/WebCore/platform/graphics/gtk/GraphicsContext3DPrivate.cpp 2011-09-26 22:12:55 UTC (rev 96002)
+++ releases/WebKitGTK/webkit-1.6/Source/WebCore/platform/graphics/gtk/GraphicsContext3DPrivate.cpp 2011-09-26 22:16:39 UTC (rev 96003)
@@ -26,7 +26,6 @@
#include "OpenGLShims.h"
#include <GL/glx.h>
#include <dlfcn.h>
-#include <wtf/PassOwnPtr.h>
// We do not want to call glXMakeContextCurrent using different Display pointers,
// because it might lead to crashes in some drivers (fglrx). We use a shared display
Modified: releases/WebKitGTK/webkit-1.6/Source/WebCore/platform/graphics/gtk/GraphicsContext3DPrivate.h (96002 => 96003)
--- releases/WebKitGTK/webkit-1.6/Source/WebCore/platform/graphics/gtk/GraphicsContext3DPrivate.h 2011-09-26 22:12:55 UTC (rev 96002)
+++ releases/WebKitGTK/webkit-1.6/Source/WebCore/platform/graphics/gtk/GraphicsContext3DPrivate.h 2011-09-26 22:16:39 UTC (rev 96003)
@@ -20,6 +20,8 @@
#ifndef GraphicsContext3DPrivate_h
#define GraphicsContext3DPrivate_h
+#include <wtf/PassOwnPtr.h>
+
typedef struct __GLXcontextRec *GLXContext;
typedef unsigned long GLXPbuffer;
typedef unsigned long GLXPixmap;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
