2011-02-14 Andrew Wason <rectalogic@rectalogic.com>
Reviewed by Kenneth Russell.
[Qt] WebKit fails to compile for Qt when WebGL enabled
https://bugs.webkit.org/show_bug.cgi?id=53431
No new tests.
* WebCore.pro:
Add source and header files and include directory to Qt project.
* html/canvas/WebGLRenderingContext.cpp:
File uses 'emit' which is a Qt keyword - #undef emit.
* platform/graphics/gpu/qt: Added.
* platform/graphics/gpu/qt/DrawingBufferQt.cpp: Added.
Partial implementation of DrawingBuffer for Qt.
(WebCore::DrawingBuffer::DrawingBuffer):
(WebCore::DrawingBuffer::~DrawingBuffer):
(WebCore::DrawingBuffer::didReset):
(WebCore::DrawingBuffer::platformLayer):
(WebCore::DrawingBuffer::platformColorBuffer):
* platform/graphics/qt/Extensions3DQt.cpp:
Noop implementation for pure virtual methods added to Extensions3D.h
(WebCore::Extensions3DQt::blitFramebuffer):
(WebCore::Extensions3DQt::renderbufferStorageMultisample):
* platform/graphics/qt/Extensions3DQt.h:
Declare new methods added to Extensions3D.h
* platform/graphics/qt/GraphicsContext3DQt.cpp:
Remove method implementations no longer in GraphicsContext3D.h.
Change m_syntheticErrors to use unsigned int to match new
GC3Denum type.
(WebCore::GraphicsContext3D::create):
Change return type to match GraphicsContext3D.h
(WebCore::GraphicsContext3D::lineWidth):
Change argument type to GC3Dfloat to match GraphicsContext3D.h
(WebCore::GraphicsContext3D::getUniformLocation):
Change return type to GC3Dfloat to match GraphicsContext3D.h
(WebCore::GraphicsContext3D::getExtensions):
Need to call get() on OwnPtr.
(WebCore::GraphicsContext3D::getImageData):
Rename enum values to match declarations in GraphicsContext3D.h
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@78495 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/WebCore.pro b/Source/WebCore/WebCore.pro
index 748c032..bbb9e84 100644
--- a/Source/WebCore/WebCore.pro
+++ b/Source/WebCore/WebCore.pro
@@ -3810,6 +3810,7 @@
html/canvas/WebGLActiveInfo.h \
html/canvas/WebGLBuffer.h \
html/canvas/WebGLContextAttributes.h \
+ html/canvas/WebGLContextEvent.h \
html/canvas/WebGLExtension.h \
html/canvas/WebGLFramebuffer.h \
html/canvas/WebGLGetInfo.h \
@@ -3824,6 +3825,7 @@
html/canvas/WebKitLoseContext.h \
platform/graphics/Extensions3D.h \
platform/graphics/GraphicsContext3D.h \
+ platform/graphics/gpu/DrawingBuffer.h \
platform/graphics/qt/Extensions3DQt.h
!v8 {
@@ -3835,6 +3837,7 @@
html/canvas/WebGLObject.cpp \
html/canvas/WebGLBuffer.cpp \
html/canvas/WebGLContextAttributes.cpp \
+ html/canvas/WebGLContextEvent.cpp \
html/canvas/WebGLExtension.cpp \
html/canvas/WebGLFramebuffer.cpp \
html/canvas/WebGLGetInfo.cpp \
@@ -3848,8 +3851,12 @@
html/canvas/WebGLUniformLocation.cpp \
html/canvas/WebKitLoseContext.cpp \
platform/graphics/GraphicsContext3D.cpp \
+ platform/graphics/gpu/DrawingBuffer.cpp \
+ platform/graphics/gpu/qt/DrawingBufferQt.cpp \
platform/graphics/qt/Extensions3DQt.cpp \
platform/graphics/qt/GraphicsContext3DQt.cpp
+
+ INCLUDEPATH += $$PWD/platform/graphics/gpu
}
contains(DEFINES, ENABLE_SYMBIAN_DIALOG_PROVIDERS) {
