[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
mrobinson at webkit.org
mrobinson at webkit.org
Fri Jan 21 15:05:28 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 1d0017da38352d1e848a8307bcbbee59cb3892fd
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 7 00:24:05 2011 +0000
2011-01-06 Martin Robinson <mrobinson at igalia.com>
Reviewed by Eric Seidel.
[GTK] Initial build support for WebGL
https://bugs.webkit.org/show_bug.cgi?id=51716
* configure.ac: Add a configure option for WebGL.
2011-01-06 Martin Robinson <mrobinson at igalia.com>
Reviewed by Eric Seidel.
[GTK] Initial build support for WebGL
https://bugs.webkit.org/show_bug.cgi?id=51716
Add initial build support for WebGL and insert bits of implementation
necessary for clean compilation into GraphicsContext3D.
No new tests. This is just a build change.
* GNUmakefile.am: Add missing files to the source lists.
* platform/graphics/GraphicsContext3D.h: Include IntSize.h as it's used below.
Include typedefs necessary for WebGL on GTK+ and consolidate typdefs which are the
same across different platforms. X11 headers define the VERSION symbol, so it's
necessary to undefine it, since it's used as an enum value.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75209 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index ac03531..0032216 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-06 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Eric Seidel.
+
+ [GTK] Initial build support for WebGL
+ https://bugs.webkit.org/show_bug.cgi?id=51716
+
+ * configure.ac: Add a configure option for WebGL.
+
2011-01-06 Michael Saboff <msaboff at apple.com>
Reviewed by Gavin Barraclough.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 337fb9e..6d81d20 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2011-01-06 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Eric Seidel.
+
+ [GTK] Initial build support for WebGL
+ https://bugs.webkit.org/show_bug.cgi?id=51716
+
+ Add initial build support for WebGL and insert bits of implementation
+ necessary for clean compilation into GraphicsContext3D.
+
+ No new tests. This is just a build change.
+
+ * GNUmakefile.am: Add missing files to the source lists.
+ * platform/graphics/GraphicsContext3D.h: Include IntSize.h as it's used below.
+ Include typedefs necessary for WebGL on GTK+ and consolidate typdefs which are the
+ same across different platforms. X11 headers define the VERSION symbol, so it's
+ necessary to undefine it, since it's used as an enum value.
+
2011-01-06 Helder Correia <helder at sencha.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 8b80c1c..de06560 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -568,6 +568,8 @@ webcore_built_sources += \
DerivedSources/WebCore/JSWebGLBuffer.h \
DerivedSources/WebCore/JSWebGLContextAttributes.cpp \
DerivedSources/WebCore/JSWebGLContextAttributes.h \
+ DerivedSources/WebCore/JSWebGLContextEvent.cpp \
+ DerivedSources/WebCore/JSWebGLContextEvent.h \
DerivedSources/WebCore/JSWebGLFramebuffer.cpp \
DerivedSources/WebCore/JSWebGLFramebuffer.h \
DerivedSources/WebCore/JSWebGLProgram.cpp \
@@ -696,6 +698,7 @@ webcore_sources += \
WebCore/bindings/js/GCController.h \
WebCore/bindings/js/IDBBindingUtilities.h \
WebCore/bindings/js/JSArrayBufferCustom.cpp \
+ WebCore/bindings/js/JSArrayBufferViewHelper.h \
WebCore/bindings/js/JSAttrCustom.cpp \
WebCore/bindings/js/JSAudioConstructor.cpp \
WebCore/bindings/js/JSAudioConstructor.h \
@@ -845,11 +848,12 @@ webcore_sources += \
WebCore/bindings/js/JSTouchCustom.cpp \
WebCore/bindings/js/JSTouchListCustom.cpp \
WebCore/bindings/js/JSTreeWalkerCustom.cpp \
- WebCore/bindings/js/JSWebKitCSSKeyframeRuleCustom.cpp \
- WebCore/bindings/js/JSWebKitCSSKeyframesRuleCustom.cpp \
WebCore/bindings/js/JSUint16ArrayCustom.cpp \
WebCore/bindings/js/JSUint32ArrayCustom.cpp \
WebCore/bindings/js/JSUint8ArrayCustom.cpp \
+ WebCore/bindings/js/JSWebKitCSSKeyframeRuleCustom.cpp \
+ WebCore/bindings/js/JSWebKitCSSKeyframesRuleCustom.cpp \
+ WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp \
WebCore/bindings/js/JSWebKitCSSMatrixCustom.cpp \
WebCore/bindings/js/JSWebKitPointCustom.cpp \
WebCore/bindings/js/JSWebSocketCustom.cpp \
@@ -1541,6 +1545,7 @@ webcore_sources += \
WebCore/html/canvas/ArrayBuffer.h \
WebCore/html/canvas/ArrayBufferView.cpp \
WebCore/html/canvas/ArrayBufferView.h \
+ WebCore/html/canvas/CanvasContextAttributes.cpp \
WebCore/html/canvas/CanvasContextAttributes.h \
WebCore/html/canvas/CanvasGradient.cpp \
WebCore/html/canvas/CanvasGradient.h \
@@ -4642,6 +4647,40 @@ FEATURE_DEFINES += ENABLE_BLOB=1
webcore_cppflags += -DENABLE_BLOB=1
endif # END ENABLE_BLOB
+# ---
+# 3D canvas (WebGL) support
+# ---
+if ENABLE_3D_CANVAS
+FEATURE_DEFINES += ENABLE_3D_CANVAS=1
+webcore_cppflags += -DENABLE_3D_CANVAS=1
+webcore_sources += \
+ WebCore/html/canvas/WebGLActiveInfo.h \
+ WebCore/html/canvas/WebGLBuffer.cpp \
+ WebCore/html/canvas/WebGLBuffer.h \
+ WebCore/html/canvas/WebGLContextAttributes.cpp \
+ WebCore/html/canvas/WebGLContextAttributes.h \
+ WebCore/html/canvas/WebGLContextEvent.cpp \
+ WebCore/html/canvas/WebGLContextEvent.h \
+ WebCore/html/canvas/WebGLFramebuffer.cpp \
+ WebCore/html/canvas/WebGLFramebuffer.h \
+ WebCore/html/canvas/WebGLGetInfo.cpp \
+ WebCore/html/canvas/WebGLGetInfo.h \
+ WebCore/html/canvas/WebGLObject.cpp \
+ WebCore/html/canvas/WebGLObject.h \
+ WebCore/html/canvas/WebGLProgram.cpp \
+ WebCore/html/canvas/WebGLProgram.h \
+ WebCore/html/canvas/WebGLRenderbuffer.cpp \
+ WebCore/html/canvas/WebGLRenderbuffer.h \
+ WebCore/html/canvas/WebGLRenderingContext.cpp \
+ WebCore/html/canvas/WebGLRenderingContext.h \
+ WebCore/html/canvas/WebGLShader.cpp \
+ WebCore/html/canvas/WebGLShader.h \
+ WebCore/html/canvas/WebGLTexture.cpp \
+ WebCore/html/canvas/WebGLTexture.h \
+ WebCore/html/canvas/WebGLUniformLocation.cpp \
+ WebCore/html/canvas/WebGLUniformLocation.h
+endif # END ENABLE_3D_CANVAS
+
DerivedSources/WebCore/CSSPropertyNames.cpp: DerivedSources/WebCore/CSSPropertyNames.h
DerivedSources/WebCore/CSSPropertyNames.h: $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/makeprop.pl
if sort $(WEBCORE_CSS_PROPERTY_NAMES) | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
diff --git a/WebCore/platform/graphics/GraphicsContext3D.h b/WebCore/platform/graphics/GraphicsContext3D.h
index 8720fdb..5e7eb5a 100644
--- a/WebCore/platform/graphics/GraphicsContext3D.h
+++ b/WebCore/platform/graphics/GraphicsContext3D.h
@@ -26,6 +26,7 @@
#ifndef GraphicsContext3D_h
#define GraphicsContext3D_h
+#include "IntSize.h"
#include "GraphicsLayer.h"
#include "PlatformString.h"
@@ -36,18 +37,15 @@
// FIXME: Find a better way to avoid the name confliction for NO_ERROR.
#if ((PLATFORM(CHROMIUM) && OS(WINDOWS)) || PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)))
#undef NO_ERROR
+#elif PLATFORM(GTK)
+// This define is from the X11 headers, but it's used below, so we must undefine it.
+#undef VERSION
#endif
#if PLATFORM(MAC)
#include "ANGLEWebKitBridge.h"
#include <OpenGL/OpenGL.h>
#include <wtf/RetainPtr.h>
-
-typedef CGLContextObj PlatformGraphicsContext3D;
-const PlatformGraphicsContext3D NullPlatformGraphicsContext3D = 0;
-typedef GLuint Platform3DObject;
-const Platform3DObject NullPlatform3DObject = 0;
-
#ifdef __OBJC__
@class CALayer;
@class WebGLLayer;
@@ -60,17 +58,26 @@ QT_BEGIN_NAMESPACE
class QPainter;
class QRect;
QT_END_NAMESPACE
-typedef void* PlatformGraphicsContext3D;
-const PlatformGraphicsContext3D NullPlatformGraphicsContext3D = 0;
-typedef int Platform3DObject;
-const Platform3DObject NullPlatform3DObject = 0;
+#elif PLATFORM(GTK)
+typedef unsigned int GLuint;
+#endif
+
+#if PLATFORM(MAC)
+typedef CGLContextObj PlatformGraphicsContext3D;
#else
typedef void* PlatformGraphicsContext3D;
-const PlatformGraphicsContext3D NullPlatformGraphicsContext3D = 0;
+#endif
+
+#if PLATFORM(MAC) || PLATFORM(GTK)
+typedef GLuint Platform3DObject;
+#else
typedef int Platform3DObject;
-const Platform3DObject NullPlatform3DObject = 0;
#endif
+// These are currently the same among all implementations.
+const PlatformGraphicsContext3D NullPlatformGraphicsContext3D = 0;
+const Platform3DObject NullPlatform3DObject = 0;
+
#if PLATFORM(CG)
#include <CoreGraphics/CGContext.h>
#endif
diff --git a/configure.ac b/configure.ac
index 2b4472e..5d7c043 100644
--- a/configure.ac
+++ b/configure.ac
@@ -365,6 +365,14 @@ AC_ARG_ENABLE(3D_transforms,
[],[enable_3D_transforms="no"])
AC_MSG_RESULT([$enable_3D_transforms])
+# check whether to enable 3D canvas (WebGL) support
+AC_MSG_CHECKING([whether to enable 3D canvas (WebGL) support])
+AC_ARG_ENABLE(3D_canvas,
+ AC_HELP_STRING([--enable-3D-canvas],
+ [enable support for 3D canvas (WebGL) [default=yes]]),
+ [], [enable_3D_canvas="no"])
+AC_MSG_RESULT([$enable_3D_canvas])
+
# check whether to enable channel messaging support
AC_MSG_CHECKING([whether to enable HTML5 Channel Messaging support])
AC_ARG_ENABLE(channel_messaging,
@@ -955,6 +963,7 @@ AM_CONDITIONAL([USE_GSTREAMER], [test "$have_gstreamer" = "yes"])
# WebKit feature conditionals
AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"])
AM_CONDITIONAL([ENABLE_3D_TRANSFORMS],[test "$enable_3D_transforms" = "yes"])
+AM_CONDITIONAL([ENABLE_3D_CANVAS],[test "$enable_3D_canvas" = "yes"])
AM_CONDITIONAL([ENABLE_BLOB],[test "$enable_blob" = "yes"])
AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"])
AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"])
@@ -1043,6 +1052,7 @@ Build configuration:
Optimized memory allocator : $enable_fast_malloc
Features:
3D Transforms : $enable_3D_transforms
+ 3D Canvas (WebGL) : $enable_3D_canvas
Blob support : $enable_blob
Directory upload : $enable_directory_upload
Fast Mobile Scrolling : $enable_fast_mobile_scrolling
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list