WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
Patch
bug-67172-20110830090433.patch (text/plain), 144.59 KB, created by
Chris Marrin
on 2011-08-30 09:04:34 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Chris Marrin
Created:
2011-08-30 09:04:34 PDT
Size:
144.59 KB
patch
obsolete
>Index: Source/WebCore/ChangeLog >=================================================================== >--- Source/WebCore/ChangeLog (revision 94033) >+++ Source/WebCore/ChangeLog (working copy) >@@ -1,3 +1,179 @@ >+2011-08-29 Chris Marrin <cmarrin@apple.com> >+ >+ Rename GraphicsContext3DInternal to GraphicsContext3DPrivate and add a dummy version of this class for Mac >+ https://bugs.webkit.org/show_bug.cgi?id=67172 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * GNUmakefile.list.am: >+ * platform/graphics/GraphicsContext3D.h: >+ * platform/graphics/chromium/Extensions3DChromium.h: >+ * platform/graphics/gtk/GraphicsContext3DGtk.cpp: >+ (WebCore::GraphicsContext3D::create): >+ (WebCore::GraphicsContext3D::GraphicsContext3D): >+ (WebCore::GraphicsContext3D::~GraphicsContext3D): >+ (WebCore::GraphicsContext3D::makeContextCurrent): >+ (WebCore::GraphicsContext3D::platformGraphicsContext3D): >+ * platform/graphics/gtk/GraphicsContext3DInternal.h: Removed. >+ * platform/graphics/gtk/GraphicsContext3DPrivate.h: Copied from Source/WebCore/platform/graphics/gtk/GraphicsContext3DInternal.h. >+ * platform/graphics/mac/GraphicsContext3DMac.mm: >+ (WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate): >+ (WebCore::GraphicsContext3DPrivate::~GraphicsContext3DPrivate): >+ (WebCore::GraphicsContext3D::GraphicsContext3D): >+ * platform/graphics/qt/GraphicsContext3DQt.cpp: >+ (WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate): >+ (WebCore::GraphicsContext3DPrivate::~GraphicsContext3DPrivate): >+ (WebCore::GraphicsContext3DPrivate::getViewportGLWidget): >+ (WebCore::GraphicsContext3DPrivate::paintToTextureMapper): >+ (WebCore::GraphicsContext3DPrivate::boundingRect): >+ (WebCore::GraphicsContext3DPrivate::paint): >+ (WebCore::GraphicsContext3DPrivate::blitMultisampleFramebuffer): >+ (WebCore::GraphicsContext3DPrivate::blitMultisampleFramebufferAndRestoreContext): >+ (WebCore::GraphicsContext3D::create): >+ (WebCore::GraphicsContext3D::GraphicsContext3D): >+ (WebCore::GraphicsContext3D::~GraphicsContext3D): >+ (WebCore::GraphicsContext3D::platformGraphicsContext3D): >+ (WebCore::GraphicsContext3D::platformLayer): >+ (WebCore::GraphicsContext3D::makeContextCurrent): >+ (WebCore::GraphicsContext3D::paintRenderingResultsToCanvas): >+ (WebCore::GraphicsContext3D::reshape): >+ (WebCore::GraphicsContext3D::activeTexture): >+ (WebCore::GraphicsContext3D::attachShader): >+ (WebCore::GraphicsContext3D::getAttachedShaders): >+ (WebCore::GraphicsContext3D::bindAttribLocation): >+ (WebCore::GraphicsContext3D::bindBuffer): >+ (WebCore::GraphicsContext3D::bindFramebuffer): >+ (WebCore::GraphicsContext3D::bindRenderbuffer): >+ (WebCore::GraphicsContext3D::bindTexture): >+ (WebCore::GraphicsContext3D::blendColor): >+ (WebCore::GraphicsContext3D::blendEquation): >+ (WebCore::GraphicsContext3D::blendEquationSeparate): >+ (WebCore::GraphicsContext3D::blendFunc): >+ (WebCore::GraphicsContext3D::blendFuncSeparate): >+ (WebCore::GraphicsContext3D::bufferData): >+ (WebCore::GraphicsContext3D::bufferSubData): >+ (WebCore::GraphicsContext3D::checkFramebufferStatus): >+ (WebCore::GraphicsContext3D::clearColor): >+ (WebCore::GraphicsContext3D::clear): >+ (WebCore::GraphicsContext3D::clearDepth): >+ (WebCore::GraphicsContext3D::clearStencil): >+ (WebCore::GraphicsContext3D::colorMask): >+ (WebCore::GraphicsContext3D::compileShader): >+ (WebCore::GraphicsContext3D::copyTexImage2D): >+ (WebCore::GraphicsContext3D::copyTexSubImage2D): >+ (WebCore::GraphicsContext3D::cullFace): >+ (WebCore::GraphicsContext3D::depthFunc): >+ (WebCore::GraphicsContext3D::depthMask): >+ (WebCore::GraphicsContext3D::depthRange): >+ (WebCore::GraphicsContext3D::detachShader): >+ (WebCore::GraphicsContext3D::disable): >+ (WebCore::GraphicsContext3D::disableVertexAttribArray): >+ (WebCore::GraphicsContext3D::drawArrays): >+ (WebCore::GraphicsContext3D::drawElements): >+ (WebCore::GraphicsContext3D::enable): >+ (WebCore::GraphicsContext3D::enableVertexAttribArray): >+ (WebCore::GraphicsContext3D::finish): >+ (WebCore::GraphicsContext3D::flush): >+ (WebCore::GraphicsContext3D::framebufferRenderbuffer): >+ (WebCore::GraphicsContext3D::framebufferTexture2D): >+ (WebCore::GraphicsContext3D::frontFace): >+ (WebCore::GraphicsContext3D::generateMipmap): >+ (WebCore::GraphicsContext3D::getActiveAttrib): >+ (WebCore::GraphicsContext3D::getActiveUniform): >+ (WebCore::GraphicsContext3D::getAttribLocation): >+ (WebCore::GraphicsContext3D::getError): >+ (WebCore::GraphicsContext3D::getString): >+ (WebCore::GraphicsContext3D::hint): >+ (WebCore::GraphicsContext3D::isBuffer): >+ (WebCore::GraphicsContext3D::isEnabled): >+ (WebCore::GraphicsContext3D::isFramebuffer): >+ (WebCore::GraphicsContext3D::isProgram): >+ (WebCore::GraphicsContext3D::isRenderbuffer): >+ (WebCore::GraphicsContext3D::isShader): >+ (WebCore::GraphicsContext3D::isTexture): >+ (WebCore::GraphicsContext3D::lineWidth): >+ (WebCore::GraphicsContext3D::linkProgram): >+ (WebCore::GraphicsContext3D::pixelStorei): >+ (WebCore::GraphicsContext3D::polygonOffset): >+ (WebCore::GraphicsContext3D::readPixels): >+ (WebCore::GraphicsContext3D::releaseShaderCompiler): >+ (WebCore::GraphicsContext3D::renderbufferStorage): >+ (WebCore::GraphicsContext3D::sampleCoverage): >+ (WebCore::GraphicsContext3D::scissor): >+ (WebCore::GraphicsContext3D::shaderSource): >+ (WebCore::GraphicsContext3D::stencilFunc): >+ (WebCore::GraphicsContext3D::stencilFuncSeparate): >+ (WebCore::GraphicsContext3D::stencilMask): >+ (WebCore::GraphicsContext3D::stencilMaskSeparate): >+ (WebCore::GraphicsContext3D::stencilOp): >+ (WebCore::GraphicsContext3D::stencilOpSeparate): >+ (WebCore::GraphicsContext3D::texParameterf): >+ (WebCore::GraphicsContext3D::texParameteri): >+ (WebCore::GraphicsContext3D::uniform1f): >+ (WebCore::GraphicsContext3D::uniform1fv): >+ (WebCore::GraphicsContext3D::uniform2f): >+ (WebCore::GraphicsContext3D::uniform2fv): >+ (WebCore::GraphicsContext3D::uniform3f): >+ (WebCore::GraphicsContext3D::uniform3fv): >+ (WebCore::GraphicsContext3D::uniform4f): >+ (WebCore::GraphicsContext3D::uniform4fv): >+ (WebCore::GraphicsContext3D::uniform1i): >+ (WebCore::GraphicsContext3D::uniform1iv): >+ (WebCore::GraphicsContext3D::uniform2i): >+ (WebCore::GraphicsContext3D::uniform2iv): >+ (WebCore::GraphicsContext3D::uniform3i): >+ (WebCore::GraphicsContext3D::uniform3iv): >+ (WebCore::GraphicsContext3D::uniform4i): >+ (WebCore::GraphicsContext3D::uniform4iv): >+ (WebCore::GraphicsContext3D::uniformMatrix2fv): >+ (WebCore::GraphicsContext3D::uniformMatrix3fv): >+ (WebCore::GraphicsContext3D::uniformMatrix4fv): >+ (WebCore::GraphicsContext3D::useProgram): >+ (WebCore::GraphicsContext3D::validateProgram): >+ (WebCore::GraphicsContext3D::vertexAttrib1f): >+ (WebCore::GraphicsContext3D::vertexAttrib1fv): >+ (WebCore::GraphicsContext3D::vertexAttrib2f): >+ (WebCore::GraphicsContext3D::vertexAttrib2fv): >+ (WebCore::GraphicsContext3D::vertexAttrib3f): >+ (WebCore::GraphicsContext3D::vertexAttrib3fv): >+ (WebCore::GraphicsContext3D::vertexAttrib4f): >+ (WebCore::GraphicsContext3D::vertexAttrib4fv): >+ (WebCore::GraphicsContext3D::vertexAttribPointer): >+ (WebCore::GraphicsContext3D::viewport): >+ (WebCore::GraphicsContext3D::getBooleanv): >+ (WebCore::GraphicsContext3D::getBufferParameteriv): >+ (WebCore::GraphicsContext3D::getFloatv): >+ (WebCore::GraphicsContext3D::getFramebufferAttachmentParameteriv): >+ (WebCore::GraphicsContext3D::getIntegerv): >+ (WebCore::GraphicsContext3D::getProgramiv): >+ (WebCore::GraphicsContext3D::getProgramInfoLog): >+ (WebCore::GraphicsContext3D::getRenderbufferParameteriv): >+ (WebCore::GraphicsContext3D::getShaderiv): >+ (WebCore::GraphicsContext3D::getShaderInfoLog): >+ (WebCore::GraphicsContext3D::getShaderSource): >+ (WebCore::GraphicsContext3D::getTexParameterfv): >+ (WebCore::GraphicsContext3D::getTexParameteriv): >+ (WebCore::GraphicsContext3D::getUniformfv): >+ (WebCore::GraphicsContext3D::getUniformiv): >+ (WebCore::GraphicsContext3D::getUniformLocation): >+ (WebCore::GraphicsContext3D::getVertexAttribfv): >+ (WebCore::GraphicsContext3D::getVertexAttribiv): >+ (WebCore::GraphicsContext3D::getVertexAttribOffset): >+ (WebCore::GraphicsContext3D::texImage2D): >+ (WebCore::GraphicsContext3D::texSubImage2D): >+ (WebCore::GraphicsContext3D::createBuffer): >+ (WebCore::GraphicsContext3D::createFramebuffer): >+ (WebCore::GraphicsContext3D::createProgram): >+ (WebCore::GraphicsContext3D::createRenderbuffer): >+ (WebCore::GraphicsContext3D::createShader): >+ (WebCore::GraphicsContext3D::createTexture): >+ (WebCore::GraphicsContext3D::deleteBuffer): >+ (WebCore::GraphicsContext3D::deleteFramebuffer): >+ (WebCore::GraphicsContext3D::deleteProgram): >+ (WebCore::GraphicsContext3D::deleteRenderbuffer): >+ (WebCore::GraphicsContext3D::deleteShader): >+ (WebCore::GraphicsContext3D::deleteTexture): >+ > 2011-08-29 John Bauman <jbauman@chromium.org> > > Speed up texImage from BGRA >Index: Source/WebCore/GNUmakefile.list.am >=================================================================== >--- Source/WebCore/GNUmakefile.list.am (revision 93979) >+++ Source/WebCore/GNUmakefile.list.am (working copy) >@@ -4817,8 +4817,8 @@ webcore_sources += \ > Source/WebCore/platform/graphics/GraphicsContext3D.h \ > Source/WebCore/platform/graphics/gtk/DrawingBufferGtk.cpp \ > Source/WebCore/platform/graphics/gtk/GraphicsContext3DGtk.cpp \ >- Source/WebCore/platform/graphics/gtk/GraphicsContext3DInternal.cpp \ >- Source/WebCore/platform/graphics/gtk/GraphicsContext3DInternal.h \ >+ Source/WebCore/platform/graphics/gtk/GraphicsContext3DPrivate.cpp \ >+ Source/WebCore/platform/graphics/gtk/GraphicsContext3DPrivate.h \ > Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp \ > Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h \ > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp >Index: Source/WebCore/platform/graphics/GraphicsContext3D.h >=================================================================== >--- Source/WebCore/platform/graphics/GraphicsContext3D.h (revision 93979) >+++ Source/WebCore/platform/graphics/GraphicsContext3D.h (working copy) >@@ -108,10 +108,7 @@ struct ActiveInfo { > GC3Dint size; > }; > >-// FIXME: ideally this would be used on all platforms. >-#if PLATFORM(CHROMIUM) || PLATFORM(QT) || PLATFORM(GTK) || PLATFORM(EFL) >-class GraphicsContext3DInternal; >-#endif >+class GraphicsContext3DPrivate; > > class GraphicsContext3D : public RefCounted<GraphicsContext3D> { > public: >@@ -954,11 +951,8 @@ public: > ListHashSet<GC3Denum> m_syntheticErrors; > #endif > >- // FIXME: ideally this would be used on all platforms. >-#if PLATFORM(CHROMIUM) || PLATFORM(QT) || PLATFORM(GTK) || PLATFORM(EFL) >- friend class GraphicsContext3DInternal; >- OwnPtr<GraphicsContext3DInternal> m_internal; >-#endif >+ friend class GraphicsContext3DPrivate; >+ OwnPtr<GraphicsContext3DPrivate> m_private; > }; > > } // namespace WebCore >Index: Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h >=================================================================== >--- Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h (revision 93979) >+++ Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h (working copy) >@@ -30,7 +30,7 @@ > > namespace WebCore { > >-class GraphicsContext3DInternal; >+class GraphicsContext3DPrivate; > class ImageBuffer; > > class Extensions3DChromium : public Extensions3D { >@@ -86,11 +86,11 @@ public: > private: > // Instances of this class are strictly owned by the GraphicsContext3D implementation and do not > // need to be instantiated by any other code. >- friend class GraphicsContext3DInternal; >- explicit Extensions3DChromium(GraphicsContext3DInternal*); >+ friend class GraphicsContext3DPrivate; >+ explicit Extensions3DChromium(GraphicsContext3DPrivate*); > >- // Weak pointer back to GraphicsContext3DInternal >- GraphicsContext3DInternal* m_internal; >+ // Weak pointer back to GraphicsContext3DPrivate >+ GraphicsContext3DPrivate* m_private; > }; > > } // namespace WebCore >Index: Source/WebCore/platform/graphics/gtk/GraphicsContext3DGtk.cpp >=================================================================== >--- Source/WebCore/platform/graphics/gtk/GraphicsContext3DGtk.cpp (revision 93979) >+++ Source/WebCore/platform/graphics/gtk/GraphicsContext3DGtk.cpp (working copy) >@@ -30,7 +30,7 @@ > #if ENABLE(WEBGL) > #include <wtf/PassOwnPtr.h> > #include "Extensions3DOpenGL.h" >-#include "GraphicsContext3DInternal.h" >+#include "GraphicsContext3DPrivate.h" > #include "OpenGLShims.h" > #include "ShaderLang.h" > #include <wtf/NotFound.h> >@@ -43,12 +43,12 @@ PassRefPtr<GraphicsContext3D> GraphicsCo > if (renderStyle == RenderDirectlyToHostWindow) > return 0; > >- OwnPtr<GraphicsContext3DInternal> internal = GraphicsContext3DInternal::create(); >- if (!internal) >+ OwnPtr<GraphicsContext3DPrivate> priv = GraphicsContext3DPrivate::create(); >+ if (!priv) > return 0; > > RefPtr<GraphicsContext3D> context = adoptRef(new GraphicsContext3D(attributes, hostWindow, false)); >- context->m_internal = internal.release(); >+ context->m_private = priv.release(); > return context.release(); > } > >@@ -64,7 +64,7 @@ GraphicsContext3D::GraphicsContext3D(Gra > , m_multisampleDepthStencilBuffer(0) > , m_multisampleColorBuffer(0) > { >- GraphicsContext3DInternal::addActiveGraphicsContext(this); >+ GraphicsContext3DPrivate::addActiveGraphicsContext(this); > > validateAttributes(); > >@@ -118,8 +118,8 @@ GraphicsContext3D::GraphicsContext3D(Gra > > GraphicsContext3D::~GraphicsContext3D() > { >- GraphicsContext3DInternal::removeActiveGraphicsContext(this); >- if (!m_internal->m_context) >+ GraphicsContext3DPrivate::removeActiveGraphicsContext(this); >+ if (!m_private->m_context) > return; > > makeContextCurrent(); >@@ -138,14 +138,14 @@ GraphicsContext3D::~GraphicsContext3D() > > void GraphicsContext3D::makeContextCurrent() > { >- if (!m_internal) >+ if (!m_private) > return; >- m_internal->makeContextCurrent(); >+ m_private->makeContextCurrent(); > } > > PlatformGraphicsContext3D GraphicsContext3D::platformGraphicsContext3D() > { >- return m_internal->m_context; >+ return m_private->m_context; > } > > bool GraphicsContext3D::isGLES2Compliant() const >Index: Source/WebCore/platform/graphics/gtk/GraphicsContext3DInternal.h >=================================================================== >--- Source/WebCore/platform/graphics/gtk/GraphicsContext3DInternal.h (revision 93979) >+++ Source/WebCore/platform/graphics/gtk/GraphicsContext3DInternal.h (working copy) >@@ -1,58 +0,0 @@ >-/* >- * Copyright (C) 2011 Igalia S.L. >- * >- * This library is free software; you can redistribute it and/or >- * modify it under the terms of the GNU Lesser General Public >- * License as published by the Free Software Foundation; either >- * version 2 of the License, or (at your option) any later version. >- * >- * This library is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- * Lesser General Public License for more details. >- * >- * You should have received a copy of the GNU Lesser General Public >- * License along with this library; if not, write to the Free >- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >- * Boston, MA 02110-1301 USA >- */ >- >-#ifndef GraphicsContext3DInternal_h >-#define GraphicsContext3DInternal_h >- >-typedef struct __GLXcontextRec *GLXContext; >-typedef unsigned long GLXPbuffer; >-typedef unsigned long GLXPixmap; >-typedef unsigned char GLubyte; >-typedef unsigned long Pixmap; >- >-namespace WebCore { >- >-class GraphicsContext3D; >- >-class GraphicsContext3DInternal { >- public: >- static PassOwnPtr<GraphicsContext3DInternal> create(); >- ~GraphicsContext3DInternal(); >- void makeContextCurrent(); >- >- private: >- friend class GraphicsContext3D; >- static GraphicsContext3DInternal* createPbufferContext(); >- static GraphicsContext3DInternal* createPixmapContext(); >- GraphicsContext3DInternal(GLXContext, GLXPbuffer); >- GraphicsContext3DInternal(GLXContext, Pixmap, GLXPixmap); >- >- static void addActiveGraphicsContext(GraphicsContext3D*); >- static void removeActiveGraphicsContext(GraphicsContext3D*); >- static void cleanupActiveContextsAtExit(); >- >- GLXContext m_context; >- GLXPbuffer m_pbuffer; >- Pixmap m_pixmap; >- GLXPixmap m_glxPixmap; >-}; >- >-} >- >-#endif // GraphicsContext3DIternal_h >Index: Source/WebCore/platform/graphics/gtk/GraphicsContext3DPrivate.h >=================================================================== >--- Source/WebCore/platform/graphics/gtk/GraphicsContext3DPrivate.h (revision 93979) (from Source/WebCore/platform/graphics/gtk/GraphicsContext3DInternal.h:93979) >+++ Source/WebCore/platform/graphics/gtk/GraphicsContext3DPrivate.h (working copy) >@@ -0,0 +1,58 @@ >+/* >+ * Copyright (C) 2011 Igalia S.L. >+ * >+ * This library is free software; you can redistribute it and/or >+ * modify it under the terms of the GNU Lesser General Public >+ * License as published by the Free Software Foundation; either >+ * version 2 of the License, or (at your option) any later version. >+ * >+ * This library is distributed in the hope that it will be useful, >+ * but WITHOUT ANY WARRANTY; without even the implied warranty of >+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >+ * Lesser General Public License for more details. >+ * >+ * You should have received a copy of the GNU Lesser General Public >+ * License along with this library; if not, write to the Free >+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >+ * Boston, MA 02110-1301 USA >+ */ >+ >+#ifndef GraphicsContext3DInternal_h >+#define GraphicsContext3DInternal_h >+ >+typedef struct __GLXcontextRec *GLXContext; >+typedef unsigned long GLXPbuffer; >+typedef unsigned long GLXPixmap; >+typedef unsigned char GLubyte; >+typedef unsigned long Pixmap; >+ >+namespace WebCore { >+ >+class GraphicsContext3D; >+ >+class GraphicsContext3DInternal { >+ public: >+ static PassOwnPtr<GraphicsContext3DInternal> create(); >+ ~GraphicsContext3DInternal(); >+ void makeContextCurrent(); >+ >+ private: >+ friend class GraphicsContext3D; >+ static GraphicsContext3DInternal* createPbufferContext(); >+ static GraphicsContext3DInternal* createPixmapContext(); >+ GraphicsContext3DInternal(GLXContext, GLXPbuffer); >+ GraphicsContext3DInternal(GLXContext, Pixmap, GLXPixmap); >+ >+ static void addActiveGraphicsContext(GraphicsContext3D*); >+ static void removeActiveGraphicsContext(GraphicsContext3D*); >+ static void cleanupActiveContextsAtExit(); >+ >+ GLXContext m_context; >+ GLXPbuffer m_pbuffer; >+ Pixmap m_pixmap; >+ GLXPixmap m_glxPixmap; >+}; >+ >+} >+ >+#endif // GraphicsContext3DIternal_h >Index: Source/WebCore/platform/graphics/gtk/GraphicsContext3DPrivate.h >=================================================================== >--- Source/WebCore/platform/graphics/gtk/GraphicsContext3DPrivate.h (revision 93979) >+++ Source/WebCore/platform/graphics/gtk/GraphicsContext3DPrivate.h (working copy) >@@ -17,8 +17,8 @@ > * Boston, MA 02110-1301 USA > */ > >-#ifndef GraphicsContext3DInternal_h >-#define GraphicsContext3DInternal_h >+#ifndef GraphicsContext3DPrivate_h >+#define GraphicsContext3DPrivate_h > > typedef struct __GLXcontextRec *GLXContext; > typedef unsigned long GLXPbuffer; >@@ -30,18 +30,18 @@ namespace WebCore { > > class GraphicsContext3D; > >-class GraphicsContext3DInternal { >+class GraphicsContext3DPrivate { > public: >- static PassOwnPtr<GraphicsContext3DInternal> create(); >- ~GraphicsContext3DInternal(); >+ static PassOwnPtr<GraphicsContext3DPrivate> create(); >+ ~GraphicsContext3DPrivate(); > void makeContextCurrent(); > > private: > friend class GraphicsContext3D; >- static GraphicsContext3DInternal* createPbufferContext(); >- static GraphicsContext3DInternal* createPixmapContext(); >- GraphicsContext3DInternal(GLXContext, GLXPbuffer); >- GraphicsContext3DInternal(GLXContext, Pixmap, GLXPixmap); >+ static GraphicsContext3DPrivate* createPbufferContext(); >+ static GraphicsContext3DPrivate* createPixmapContext(); >+ GraphicsContext3DPrivate(GLXContext, GLXPbuffer); >+ GraphicsContext3DPrivate(GLXContext, Pixmap, GLXPixmap); > > static void addActiveGraphicsContext(GraphicsContext3D*); > static void removeActiveGraphicsContext(GraphicsContext3D*); >@@ -55,4 +55,4 @@ class GraphicsContext3DInternal { > > } > >-#endif // GraphicsContext3DIternal_h >+#endif // GraphicsContext3DPrivate_h >Index: Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm >=================================================================== >--- Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm (revision 93979) >+++ Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm (working copy) >@@ -53,6 +53,21 @@ > > namespace WebCore { > >+// FIXME: This class is currently empty on Mac, but will get populated as >+// the restructuring in https://bugs.webkit.org/show_bug.cgi?id=66903 is done >+class GraphicsContext3DPrivate { >+public: >+ GraphicsContext3DPrivate(GraphicsContext3D* graphicsContext3D) >+ : m_graphicsContext3D(graphicsContext3D) >+ { >+ } >+ >+ ~GraphicsContext3DPrivate() { } >+ >+private: >+ GraphicsContext3D* m_graphicsContext3D; >+}; >+ > static void setPixelFormat(Vector<CGLPixelFormatAttribute>& attribs, int colorBits, int depthBits, bool accelerated, bool supersample, bool closest) > { > attribs.clear(); >@@ -104,6 +119,7 @@ GraphicsContext3D::GraphicsContext3D(Gra > , m_multisampleFBO(0) > , m_multisampleDepthStencilBuffer(0) > , m_multisampleColorBuffer(0) >+ , m_private(adoptPtr(new GraphicsContext3DPrivate(this))) > { > UNUSED_PARAM(hostWindow); > >Index: Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp >=================================================================== >--- Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp (revision 93979) >+++ Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp (working copy) >@@ -60,7 +60,7 @@ typedef char GLchar; > #define GL_DEPTH24_STENCIL8 0x88F0 > #endif > >-class GraphicsContext3DInternal >+class GraphicsContext3DPrivate > #if USE(ACCELERATED_COMPOSITING) > #if USE(TEXTURE_MAPPER) > : public TextureMapperPlatformLayer >@@ -70,8 +70,8 @@ class GraphicsContext3DInternal > #endif > { > public: >- GraphicsContext3DInternal(GraphicsContext3D*, HostWindow*); >- ~GraphicsContext3DInternal(); >+ GraphicsContext3DPrivate(GraphicsContext3D*, HostWindow*); >+ ~GraphicsContext3DPrivate(); > > QGLWidget* getViewportGLWidget(); > #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER) >@@ -98,7 +98,7 @@ bool GraphicsContext3D::isGLES2Compliant > #endif > } > >-GraphicsContext3DInternal::GraphicsContext3DInternal(GraphicsContext3D* context, HostWindow* hostWindow) >+GraphicsContext3DPrivate::GraphicsContext3DPrivate(GraphicsContext3D* context, HostWindow* hostWindow) > : m_context(context) > , m_hostWindow(hostWindow) > , m_glWidget(0) >@@ -117,13 +117,13 @@ GraphicsContext3DInternal::GraphicsConte > m_glWidget->makeCurrent(); > } > >-GraphicsContext3DInternal::~GraphicsContext3DInternal() >+GraphicsContext3DPrivate::~GraphicsContext3DPrivate() > { > delete m_glWidget; > m_glWidget = 0; > } > >-QGLWidget* GraphicsContext3DInternal::getViewportGLWidget() >+QGLWidget* GraphicsContext3DPrivate::getViewportGLWidget() > { > QWebPageClient* webPageClient = m_hostWindow->platformPageClient(); > if (!webPageClient) >@@ -142,7 +142,7 @@ static inline quint32 swapBgrToRgb(quint > } > > #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER) >-void GraphicsContext3DInternal::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity, BitmapTexture* mask) const >+void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity, BitmapTexture* mask) const > { > blitMultisampleFramebufferAndRestoreContext(); > >@@ -197,12 +197,12 @@ void GraphicsContext3DInternal::paintToT > } > #endif // USE(ACCELERATED_COMPOSITING) > >-QRectF GraphicsContext3DInternal::boundingRect() const >+QRectF GraphicsContext3DPrivate::boundingRect() const > { > return QRectF(QPointF(0, 0), QSizeF(m_context->m_currentWidth, m_context->m_currentHeight)); > } > >-void GraphicsContext3DInternal::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) >+void GraphicsContext3DPrivate::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) > { > Q_UNUSED(widget); > >@@ -254,7 +254,7 @@ void GraphicsContext3DInternal::paint(QP > painter->drawImage(/* x */ 0, /* y */ 0, offscreenImage); > } > >-void GraphicsContext3DInternal::blitMultisampleFramebuffer() const >+void GraphicsContext3DPrivate::blitMultisampleFramebuffer() const > { > if (!m_context->m_attrs.antialias) > return; >@@ -264,7 +264,7 @@ void GraphicsContext3DInternal::blitMult > glBindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_context->m_boundFBO); > } > >-void GraphicsContext3DInternal::blitMultisampleFramebufferAndRestoreContext() const >+void GraphicsContext3DPrivate::blitMultisampleFramebufferAndRestoreContext() const > { > if (!m_context->m_attrs.antialias) > return; >@@ -287,7 +287,7 @@ PassRefPtr<GraphicsContext3D> GraphicsCo > if (renderStyle == RenderDirectlyToHostWindow) > return 0; > RefPtr<GraphicsContext3D> context = adoptRef(new GraphicsContext3D(attrs, hostWindow, false)); >- return context->m_internal ? context.release() : 0; >+ return context->m_private ? context.release() : 0; > } > > GraphicsContext3D::GraphicsContext3D(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow, bool) >@@ -306,7 +306,7 @@ GraphicsContext3D::GraphicsContext3D(Gra > , m_multisampleFBO(0) > , m_multisampleDepthStencilBuffer(0) > , m_multisampleColorBuffer(0) >- , m_internal(adoptPtr(new GraphicsContext3DInternal(this, hostWindow))) >+ , m_private(adoptPtr(new GraphicsContext3DPrivate(this, hostWindow))) > { > #if defined(QT_OPENGL_ES_2) > m_attrs.stencil = false; >@@ -314,9 +314,9 @@ GraphicsContext3D::GraphicsContext3D(Gra > validateAttributes(); > #endif > >- if (!m_internal->m_glWidget->isValid()) { >+ if (!m_private->m_glWidget->isValid()) { > LOG_ERROR("GraphicsContext3D: QGLWidget initialization failed."); >- m_internal = nullptr; >+ m_private = nullptr; > return; > } > >@@ -327,7 +327,7 @@ GraphicsContext3D::GraphicsContext3D(Gra > initialized = true; > } > if (!success) { >- m_internal = nullptr; >+ m_private = nullptr; > return; > } > >@@ -384,8 +384,8 @@ GraphicsContext3D::GraphicsContext3D(Gra > > GraphicsContext3D::~GraphicsContext3D() > { >- m_internal->m_glWidget->makeCurrent(); >- if (!m_internal->m_glWidget->isValid()) >+ m_private->m_glWidget->makeCurrent(); >+ if (!m_private->m_glWidget->isValid()) > return; > glDeleteTextures(1, &m_texture); > glDeleteFramebuffers(1, &m_fbo); >@@ -400,7 +400,7 @@ GraphicsContext3D::~GraphicsContext3D() > > PlatformGraphicsContext3D GraphicsContext3D::platformGraphicsContext3D() > { >- return m_internal->m_glWidget; >+ return m_private->m_glWidget; > } > > Platform3DObject GraphicsContext3D::platformTexture() const >@@ -411,22 +411,22 @@ Platform3DObject GraphicsContext3D::plat > #if USE(ACCELERATED_COMPOSITING) > PlatformLayer* GraphicsContext3D::platformLayer() const > { >- return m_internal.get(); >+ return m_private.get(); > } > #endif > > void GraphicsContext3D::makeContextCurrent() > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > } > > void GraphicsContext3D::paintRenderingResultsToCanvas(CanvasRenderingContext* context) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > HTMLCanvasElement* canvas = context->canvas(); > ImageBuffer* imageBuffer = canvas->buffer(); > QPainter* painter = imageBuffer->context()->platformContext(); >- m_internal->paint(painter, 0, 0); >+ m_private->paint(painter, 0, 0); > } > > #if defined(QT_OPENGL_ES_2) >@@ -439,13 +439,13 @@ PassRefPtr<ImageData> GraphicsContext3D: > > void GraphicsContext3D::reshape(int width, int height) > { >- if ((width == m_currentWidth && height == m_currentHeight) || (!m_internal)) >+ if ((width == m_currentWidth && height == m_currentHeight) || (!m_private)) > return; > > m_currentWidth = width; > m_currentHeight = height; > >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > > // Create color buffer > glBindTexture(GraphicsContext3D::TEXTURE_2D, m_texture); >@@ -502,7 +502,7 @@ IntSize GraphicsContext3D::getInternalFr > > void GraphicsContext3D::activeTexture(GC3Denum texture) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glActiveTexture(texture); > } > >@@ -510,7 +510,7 @@ void GraphicsContext3D::attachShader(Pla > { > ASSERT(program); > ASSERT(shader); >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glAttachShader(program, shader); > } > >@@ -521,111 +521,111 @@ void GraphicsContext3D::getAttachedShade > return; > } > >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glGetAttachedShaders(program, maxCount, count, shaders); > } > > void GraphicsContext3D::bindAttribLocation(Platform3DObject program, GC3Duint index, const String& name) > { > ASSERT(program); >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glBindAttribLocation(program, index, name.utf8().data()); > } > > void GraphicsContext3D::bindBuffer(GC3Denum target, Platform3DObject buffer) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glBindBuffer(target, buffer); > } > > void GraphicsContext3D::bindFramebuffer(GC3Denum target, Platform3DObject buffer) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > m_boundFBO = buffer ? buffer : m_fbo; > glBindFramebuffer(target, m_boundFBO); > } > > void GraphicsContext3D::bindRenderbuffer(GC3Denum target, Platform3DObject renderbuffer) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glBindRenderbuffer(target, renderbuffer); > } > > void GraphicsContext3D::bindTexture(GC3Denum target, Platform3DObject texture) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glBindTexture(target, texture); > } > > void GraphicsContext3D::blendColor(GC3Dclampf red, GC3Dclampf green, GC3Dclampf blue, GC3Dclampf alpha) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glBlendColor(red, green, blue, alpha); > } > > void GraphicsContext3D::blendEquation(GC3Denum mode) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glBlendEquation(mode); > } > > void GraphicsContext3D::blendEquationSeparate(GC3Denum modeRGB, GC3Denum modeAlpha) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glBlendEquationSeparate(modeRGB, modeAlpha); > } > > void GraphicsContext3D::blendFunc(GC3Denum sfactor, GC3Denum dfactor) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glBlendFunc(sfactor, dfactor); > } > > void GraphicsContext3D::blendFuncSeparate(GC3Denum srcRGB, GC3Denum dstRGB, GC3Denum srcAlpha, GC3Denum dstAlpha) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha); > } > > void GraphicsContext3D::bufferData(GC3Denum target, GC3Dsizeiptr size, GC3Denum usage) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glBufferData(target, size, /* data */ 0, usage); > } > > void GraphicsContext3D::bufferData(GC3Denum target, GC3Dsizeiptr size, const void* data, GC3Denum usage) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glBufferData(target, size, data, usage); > } > > void GraphicsContext3D::bufferSubData(GC3Denum target, GC3Dintptr offset, GC3Dsizeiptr size, const void* data) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glBufferSubData(target, offset, size, data); > } > > GC3Denum GraphicsContext3D::checkFramebufferStatus(GC3Denum target) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > return glCheckFramebufferStatus(target); > } > > void GraphicsContext3D::clearColor(GC3Dclampf r, GC3Dclampf g, GC3Dclampf b, GC3Dclampf a) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glClearColor(r, g, b, a); > } > > void GraphicsContext3D::clear(GC3Dbitfield mask) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glClear(mask); > } > > void GraphicsContext3D::clearDepth(GC3Dclampf depth) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > #if defined(QT_OPENGL_ES_2) > glClearDepthf(depth); > #else >@@ -635,56 +635,56 @@ void GraphicsContext3D::clearDepth(GC3Dc > > void GraphicsContext3D::clearStencil(GC3Dint s) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glClearStencil(s); > } > > void GraphicsContext3D::colorMask(GC3Dboolean red, GC3Dboolean green, GC3Dboolean blue, GC3Dboolean alpha) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glColorMask(red, green, blue, alpha); > } > > void GraphicsContext3D::compileShader(Platform3DObject shader) > { > ASSERT(shader); >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glCompileShader(shader); > } > > void GraphicsContext3D::copyTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Dint border) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glCopyTexImage2D(target, level, internalformat, x, y, width, height, border); > } > > void GraphicsContext3D::copyTexSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height); > } > > void GraphicsContext3D::cullFace(GC3Denum mode) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glCullFace(mode); > } > > void GraphicsContext3D::depthFunc(GC3Denum func) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glDepthFunc(func); > } > > void GraphicsContext3D::depthMask(GC3Dboolean flag) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glDepthMask(flag); > } > > void GraphicsContext3D::depthRange(GC3Dclampf zNear, GC3Dclampf zFar) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > #if defined(QT_OPENGL_ES_2) > glDepthRangef(zNear, zFar); > #else >@@ -696,79 +696,79 @@ void GraphicsContext3D::detachShader(Pla > { > ASSERT(program); > ASSERT(shader); >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glDetachShader(program, shader); > } > > void GraphicsContext3D::disable(GC3Denum cap) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glDisable(cap); > } > > void GraphicsContext3D::disableVertexAttribArray(GC3Duint index) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glDisableVertexAttribArray(index); > } > > void GraphicsContext3D::drawArrays(GC3Denum mode, GC3Dint first, GC3Dsizei count) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glDrawArrays(mode, first, count); > } > > void GraphicsContext3D::drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, GC3Dintptr offset) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glDrawElements(mode, count, type, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset))); > } > > void GraphicsContext3D::enable(GC3Denum cap) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glEnable(cap); > } > > void GraphicsContext3D::enableVertexAttribArray(GC3Duint index) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glEnableVertexAttribArray(index); > } > > void GraphicsContext3D::finish() > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glFinish(); > } > > void GraphicsContext3D::flush() > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glFlush(); > } > > void GraphicsContext3D::framebufferRenderbuffer(GC3Denum target, GC3Denum attachment, GC3Denum renderbuffertarget, Platform3DObject buffer) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glFramebufferRenderbuffer(target, attachment, renderbuffertarget, buffer); > } > > void GraphicsContext3D::framebufferTexture2D(GC3Denum target, GC3Denum attachment, GC3Denum textarget, Platform3DObject texture, GC3Dint level) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glFramebufferTexture2D(target, attachment, textarget, texture, level); > } > > void GraphicsContext3D::frontFace(GC3Denum mode) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glFrontFace(mode); > } > > void GraphicsContext3D::generateMipmap(GC3Denum target) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glGenerateMipmap(target); > } > >@@ -779,7 +779,7 @@ bool GraphicsContext3D::getActiveAttrib( > return false; > } > >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > > GLint maxLength = 0; > glGetProgramiv(program, GraphicsContext3D::ACTIVE_ATTRIBUTE_MAX_LENGTH, &maxLength); >@@ -811,7 +811,7 @@ bool GraphicsContext3D::getActiveUniform > return false; > } > >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > > GLint maxLength = 0; > glGetProgramiv(static_cast<GLuint>(program), GraphicsContext3D::ACTIVE_UNIFORM_MAX_LENGTH, &maxLength); >@@ -841,7 +841,7 @@ int GraphicsContext3D::getAttribLocation > if (!program) > return -1; > >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > return glGetAttribLocation(program, name.utf8().data()); > } > >@@ -859,19 +859,19 @@ GC3Denum GraphicsContext3D::getError() > return err; > } > >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > return glGetError(); > } > > String GraphicsContext3D::getString(GC3Denum name) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > return String((const char*) glGetString(name)); > } > > void GraphicsContext3D::hint(GC3Denum target, GC3Denum mode) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glHint(target, mode); > } > >@@ -880,13 +880,13 @@ GC3Dboolean GraphicsContext3D::isBuffer( > if (!buffer) > return GL_FALSE; > >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > return glIsBuffer(buffer); > } > > GC3Dboolean GraphicsContext3D::isEnabled(GC3Denum cap) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > return glIsEnabled(cap); > } > >@@ -895,7 +895,7 @@ GC3Dboolean GraphicsContext3D::isFramebu > if (!framebuffer) > return GL_FALSE; > >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > return glIsFramebuffer(framebuffer); > } > >@@ -904,7 +904,7 @@ GC3Dboolean GraphicsContext3D::isProgram > if (!program) > return GL_FALSE; > >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > return glIsProgram(program); > } > >@@ -913,7 +913,7 @@ GC3Dboolean GraphicsContext3D::isRenderb > if (!renderbuffer) > return GL_FALSE; > >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > return glIsRenderbuffer(renderbuffer); > } > >@@ -922,7 +922,7 @@ GC3Dboolean GraphicsContext3D::isShader( > if (!shader) > return GL_FALSE; > >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > return glIsShader(shader); > } > >@@ -931,38 +931,38 @@ GC3Dboolean GraphicsContext3D::isTexture > if (!texture) > return GL_FALSE; > >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > return glIsTexture(texture); > } > > void GraphicsContext3D::lineWidth(GC3Dfloat width) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glLineWidth(static_cast<float>(width)); > } > > void GraphicsContext3D::linkProgram(Platform3DObject program) > { > ASSERT(program); >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glLinkProgram(program); > } > > void GraphicsContext3D::pixelStorei(GC3Denum paramName, GC3Dint param) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glPixelStorei(paramName, param); > } > > void GraphicsContext3D::polygonOffset(GC3Dfloat factor, GC3Dfloat units) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glPolygonOffset(factor, units); > } > > void GraphicsContext3D::readPixels(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, void* data) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > > if (type != GraphicsContext3D::UNSIGNED_BYTE || format != GraphicsContext3D::RGBA) > return; >@@ -972,13 +972,13 @@ void GraphicsContext3D::readPixels(GC3Di > > void GraphicsContext3D::releaseShaderCompiler() > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > notImplemented(); > } > > void GraphicsContext3D::renderbufferStorage(GC3Denum target, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > #if !defined(QT_OPENGL_ES_2) > switch (internalformat) { > case DEPTH_STENCIL: >@@ -1001,13 +1001,13 @@ void GraphicsContext3D::renderbufferStor > > void GraphicsContext3D::sampleCoverage(GC3Dclampf value, GC3Dboolean invert) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glSampleCoverage(value, invert); > } > > void GraphicsContext3D::scissor(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glScissor(x, y, width, height); > } > >@@ -1015,7 +1015,7 @@ void GraphicsContext3D::shaderSource(Pla > { > ASSERT(shader); > >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > > String prefixedSource; > >@@ -1033,169 +1033,169 @@ void GraphicsContext3D::shaderSource(Pla > > void GraphicsContext3D::stencilFunc(GC3Denum func, GC3Dint ref, GC3Duint mask) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glStencilFunc(func, ref, mask); > } > > void GraphicsContext3D::stencilFuncSeparate(GC3Denum face, GC3Denum func, GC3Dint ref, GC3Duint mask) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glStencilFuncSeparate(face, func, ref, mask); > } > > void GraphicsContext3D::stencilMask(GC3Duint mask) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glStencilMask(mask); > } > > void GraphicsContext3D::stencilMaskSeparate(GC3Denum face, GC3Duint mask) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glStencilMaskSeparate(face, mask); > } > > void GraphicsContext3D::stencilOp(GC3Denum fail, GC3Denum zfail, GC3Denum zpass) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glStencilOp(fail, zfail, zpass); > } > > void GraphicsContext3D::stencilOpSeparate(GC3Denum face, GC3Denum fail, GC3Denum zfail, GC3Denum zpass) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glStencilOpSeparate(face, fail, zfail, zpass); > } > > void GraphicsContext3D::texParameterf(GC3Denum target, GC3Denum paramName, GC3Dfloat value) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glTexParameterf(target, paramName, value); > } > > void GraphicsContext3D::texParameteri(GC3Denum target, GC3Denum paramName, GC3Dint value) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glTexParameteri(target, paramName, value); > } > > void GraphicsContext3D::uniform1f(GC3Dint location, GC3Dfloat v0) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUniform1f(location, v0); > } > > void GraphicsContext3D::uniform1fv(GC3Dint location, GC3Dfloat* array, GC3Dsizei size) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUniform1fv(location, size, array); > } > > void GraphicsContext3D::uniform2f(GC3Dint location, GC3Dfloat v0, GC3Dfloat v1) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUniform2f(location, v0, v1); > } > > void GraphicsContext3D::uniform2fv(GC3Dint location, GC3Dfloat* array, GC3Dsizei size) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUniform2fv(location, size, array); > } > > void GraphicsContext3D::uniform3f(GC3Dint location, GC3Dfloat v0, GC3Dfloat v1, GC3Dfloat v2) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUniform3f(location, v0, v1, v2); > } > > void GraphicsContext3D::uniform3fv(GC3Dint location, GC3Dfloat* array, GC3Dsizei size) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUniform3fv(location, size, array); > } > > void GraphicsContext3D::uniform4f(GC3Dint location, GC3Dfloat v0, GC3Dfloat v1, GC3Dfloat v2, GC3Dfloat v3) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUniform4f(location, v0, v1, v2, v3); > } > > void GraphicsContext3D::uniform4fv(GC3Dint location, GC3Dfloat* array, GC3Dsizei size) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUniform4fv(location, size, array); > } > > void GraphicsContext3D::uniform1i(GC3Dint location, GC3Dint v0) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUniform1i(location, v0); > } > > void GraphicsContext3D::uniform1iv(GC3Dint location, GC3Dint* array, GC3Dsizei size) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUniform1iv(location, size, array); > } > > void GraphicsContext3D::uniform2i(GC3Dint location, GC3Dint v0, GC3Dint v1) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUniform2i(location, v0, v1); > } > > void GraphicsContext3D::uniform2iv(GC3Dint location, GC3Dint* array, GC3Dsizei size) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUniform2iv(location, size, array); > } > > void GraphicsContext3D::uniform3i(GC3Dint location, GC3Dint v0, GC3Dint v1, GC3Dint v2) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUniform3i(location, v0, v1, v2); > } > > void GraphicsContext3D::uniform3iv(GC3Dint location, GC3Dint* array, GC3Dsizei size) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUniform3iv(location, size, array); > } > > void GraphicsContext3D::uniform4i(GC3Dint location, GC3Dint v0, GC3Dint v1, GC3Dint v2, GC3Dint v3) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUniform4i(location, v0, v1, v2, v3); > } > > void GraphicsContext3D::uniform4iv(GC3Dint location, GC3Dint* array, GC3Dsizei size) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUniform4iv(location, size, array); > } > > void GraphicsContext3D::uniformMatrix2fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* array, GC3Dsizei size) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUniformMatrix2fv(location, size, transpose, array); > } > > void GraphicsContext3D::uniformMatrix3fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* array, GC3Dsizei size) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUniformMatrix3fv(location, size, transpose, array); > } > > void GraphicsContext3D::uniformMatrix4fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* array, GC3Dsizei size) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUniformMatrix4fv(location, size, transpose, array); > } > > void GraphicsContext3D::useProgram(Platform3DObject program) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glUseProgram(program); > } > >@@ -1203,109 +1203,109 @@ void GraphicsContext3D::validateProgram( > { > ASSERT(program); > >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glValidateProgram(program); > } > > void GraphicsContext3D::vertexAttrib1f(GC3Duint index, GC3Dfloat v0) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glVertexAttrib1f(index, v0); > } > > void GraphicsContext3D::vertexAttrib1fv(GC3Duint index, GC3Dfloat* array) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glVertexAttrib1fv(index, array); > } > > void GraphicsContext3D::vertexAttrib2f(GC3Duint index, GC3Dfloat v0, GC3Dfloat v1) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glVertexAttrib2f(index, v0, v1); > } > > void GraphicsContext3D::vertexAttrib2fv(GC3Duint index, GC3Dfloat* array) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glVertexAttrib2fv(index, array); > } > > void GraphicsContext3D::vertexAttrib3f(GC3Duint index, GC3Dfloat v0, GC3Dfloat v1, GC3Dfloat v2) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glVertexAttrib3f(index, v0, v1, v2); > } > > void GraphicsContext3D::vertexAttrib3fv(GC3Duint index, GC3Dfloat* array) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glVertexAttrib3fv(index, array); > } > > void GraphicsContext3D::vertexAttrib4f(GC3Duint index, GC3Dfloat v0, GC3Dfloat v1, GC3Dfloat v2, GC3Dfloat v3) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glVertexAttrib4f(index, v0, v1, v2, v3); > } > > void GraphicsContext3D::vertexAttrib4fv(GC3Duint index, GC3Dfloat* array) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glVertexAttrib4fv(index, array); > } > > void GraphicsContext3D::vertexAttribPointer(GC3Duint index, GC3Dint size, GC3Denum type, GC3Dboolean normalized, GC3Dsizei stride, GC3Dintptr offset) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glVertexAttribPointer(index, size, type, normalized, stride, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset))); > } > > void GraphicsContext3D::viewport(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glViewport(x, y, width, height); > } > > void GraphicsContext3D::getBooleanv(GC3Denum paramName, GC3Dboolean* value) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glGetBooleanv(paramName, value); > } > > void GraphicsContext3D::getBufferParameteriv(GC3Denum target, GC3Denum paramName, GC3Dint* value) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glGetBufferParameteriv(target, paramName, value); > } > > void GraphicsContext3D::getFloatv(GC3Denum paramName, GC3Dfloat* value) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glGetFloatv(paramName, value); > } > > void GraphicsContext3D::getFramebufferAttachmentParameteriv(GC3Denum target, GC3Denum attachment, GC3Denum paramName, GC3Dint* value) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glGetFramebufferAttachmentParameteriv(target, attachment, paramName, value); > } > > void GraphicsContext3D::getIntegerv(GC3Denum paramName, GC3Dint* value) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glGetIntegerv(paramName, value); > } > > void GraphicsContext3D::getProgramiv(Platform3DObject program, GC3Denum paramName, GC3Dint* value) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glGetProgramiv(program, paramName, value); > } > > String GraphicsContext3D::getProgramInfoLog(Platform3DObject program) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > > GLint length = 0; > glGetProgramiv(program, GraphicsContext3D::INFO_LOG_LENGTH, &length); >@@ -1326,20 +1326,20 @@ String GraphicsContext3D::getProgramInfo > > void GraphicsContext3D::getRenderbufferParameteriv(GC3Denum target, GC3Denum paramName, GC3Dint* value) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glGetRenderbufferParameteriv(target, paramName, value); > } > > void GraphicsContext3D::getShaderiv(Platform3DObject shader, GC3Denum paramName, GC3Dint* value) > { > ASSERT(shader); >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glGetShaderiv(shader, paramName, value); > } > > String GraphicsContext3D::getShaderInfoLog(Platform3DObject shader) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > > GLint length = 0; > glGetShaderiv(shader, GraphicsContext3D::INFO_LOG_LENGTH, &length); >@@ -1359,7 +1359,7 @@ String GraphicsContext3D::getShaderInfoL > > String GraphicsContext3D::getShaderSource(Platform3DObject shader) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > > GLint length = 0; > glGetShaderiv(shader, GraphicsContext3D::SHADER_SOURCE_LENGTH, &length); >@@ -1379,25 +1379,25 @@ String GraphicsContext3D::getShaderSourc > > void GraphicsContext3D::getTexParameterfv(GC3Denum target, GC3Denum paramName, GC3Dfloat* value) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glGetTexParameterfv(target, paramName, value); > } > > void GraphicsContext3D::getTexParameteriv(GC3Denum target, GC3Denum paramName, GC3Dint* value) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glGetTexParameteriv(target, paramName, value); > } > > void GraphicsContext3D::getUniformfv(Platform3DObject program, GC3Dint location, GC3Dfloat* value) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glGetUniformfv(program, location, value); > } > > void GraphicsContext3D::getUniformiv(Platform3DObject program, GC3Dint location, GC3Dint* value) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glGetUniformiv(program, location, value); > } > >@@ -1405,25 +1405,25 @@ GC3Dint GraphicsContext3D::getUniformLoc > { > ASSERT(program); > >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > return glGetUniformLocation(program, name.utf8().data()); > } > > void GraphicsContext3D::getVertexAttribfv(GC3Duint index, GC3Denum paramName, GC3Dfloat* value) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glGetVertexAttribfv(index, paramName, value); > } > > void GraphicsContext3D::getVertexAttribiv(GC3Duint index, GC3Denum paramName, GC3Dint* value) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glGetVertexAttribiv(index, paramName, value); > } > > GC3Dsizeiptr GraphicsContext3D::getVertexAttribOffset(GC3Duint index, GC3Denum paramName) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > > GLvoid* pointer = 0; > glGetVertexAttribPointerv(index, paramName, &pointer); >@@ -1432,20 +1432,20 @@ GC3Dsizeiptr GraphicsContext3D::getVerte > > bool GraphicsContext3D::texImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Denum format, GC3Denum type, const void* pixels) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); > return true; > } > > void GraphicsContext3D::texSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoff, GC3Dint yoff, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, const void* pixels) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glTexSubImage2D(target, level, xoff, yoff, width, height, format, type, pixels); > } > > Platform3DObject GraphicsContext3D::createBuffer() > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > GLuint handle = 0; > glGenBuffers(/* count */ 1, &handle); > return handle; >@@ -1453,7 +1453,7 @@ Platform3DObject GraphicsContext3D::crea > > Platform3DObject GraphicsContext3D::createFramebuffer() > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > GLuint handle = 0; > glGenFramebuffers(/* count */ 1, &handle); > return handle; >@@ -1461,13 +1461,13 @@ Platform3DObject GraphicsContext3D::crea > > Platform3DObject GraphicsContext3D::createProgram() > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > return glCreateProgram(); > } > > Platform3DObject GraphicsContext3D::createRenderbuffer() > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > GLuint handle = 0; > glGenRenderbuffers(/* count */ 1, &handle); > return handle; >@@ -1475,13 +1475,13 @@ Platform3DObject GraphicsContext3D::crea > > Platform3DObject GraphicsContext3D::createShader(GC3Denum type) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > return glCreateShader(type); > } > > Platform3DObject GraphicsContext3D::createTexture() > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > GLuint handle = 0; > glGenTextures(1, &handle); > return handle; >@@ -1489,37 +1489,37 @@ Platform3DObject GraphicsContext3D::crea > > void GraphicsContext3D::deleteBuffer(Platform3DObject buffer) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glDeleteBuffers(1, &buffer); > } > > void GraphicsContext3D::deleteFramebuffer(Platform3DObject framebuffer) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glDeleteFramebuffers(1, &framebuffer); > } > > void GraphicsContext3D::deleteProgram(Platform3DObject program) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glDeleteProgram(program); > } > > void GraphicsContext3D::deleteRenderbuffer(Platform3DObject renderbuffer) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glDeleteRenderbuffers(1, &renderbuffer); > } > > void GraphicsContext3D::deleteShader(Platform3DObject shader) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glDeleteShader(shader); > } > > void GraphicsContext3D::deleteTexture(Platform3DObject texture) > { >- m_internal->m_glWidget->makeCurrent(); >+ m_private->m_glWidget->makeCurrent(); > glDeleteTextures(1, &texture); > } > >Index: Source/WebKit/chromium/ChangeLog >=================================================================== >--- Source/WebKit/chromium/ChangeLog (revision 94033) >+++ Source/WebKit/chromium/ChangeLog (working copy) >@@ -1,3 +1,99 @@ >+2011-08-29 Chris Marrin <cmarrin@apple.com> >+ >+ Rename GraphicsContext3DInternal to GraphicsContext3DPrivate and add a dummy version of this class for Mac >+ https://bugs.webkit.org/show_bug.cgi?id=67172 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * WebKit.gyp: >+ * src/Extensions3DChromium.cpp: >+ (WebCore::Extensions3DChromium::Extensions3DChromium): >+ (WebCore::Extensions3DChromium::supports): >+ (WebCore::Extensions3DChromium::ensureEnabled): >+ (WebCore::Extensions3DChromium::isEnabled): >+ (WebCore::Extensions3DChromium::getGraphicsResetStatusARB): >+ (WebCore::Extensions3DChromium::blitFramebuffer): >+ (WebCore::Extensions3DChromium::renderbufferStorageMultisample): >+ (WebCore::Extensions3DChromium::mapBufferSubDataCHROMIUM): >+ (WebCore::Extensions3DChromium::unmapBufferSubDataCHROMIUM): >+ (WebCore::Extensions3DChromium::mapTexSubImage2DCHROMIUM): >+ (WebCore::Extensions3DChromium::unmapTexSubImage2DCHROMIUM): >+ (WebCore::Extensions3DChromium::setSwapBuffersCompleteCallbackCHROMIUM): >+ (WebCore::Extensions3DChromium::rateLimitOffscreenContextCHROMIUM): >+ (WebCore::Extensions3DChromium::paintFramebufferToCanvas): >+ * src/GraphicsContext3DChromium.cpp: >+ (WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate): >+ (WebCore::GraphicsContext3DPrivate::~GraphicsContext3DPrivate): >+ (WebCore::GraphicsContext3DPrivate::initialize): >+ (WebCore::GraphicsContext3DPrivate::extractWebGraphicsContext3D): >+ (WebCore::GraphicsContext3DPrivate::platformGraphicsContext3D): >+ (WebCore::GraphicsContext3DPrivate::platformTexture): >+ (WebCore::GraphicsContext3DPrivate::grContext): >+ (WebCore::GraphicsContext3DPrivate::prepareTexture): >+ (WebCore::GraphicsContext3DPrivate::platformLayer): >+ (WebCore::GraphicsContext3DPrivate::markContextChanged): >+ (WebCore::GraphicsContext3DPrivate::markLayerComposited): >+ (WebCore::GraphicsContext3DPrivate::layerComposited): >+ (WebCore::GraphicsContext3DPrivate::paintFramebufferToCanvas): >+ (WebCore::GraphicsContext3DPrivate::paintRenderingResultsToCanvas): >+ (WebCore::GraphicsContext3DPrivate::paintCompositedResultsToCanvas): >+ (WebCore::GraphicsContext3DPrivate::paintRenderingResultsToImageData): >+ (WebCore::GraphicsContext3DPrivate::paintsIntoCanvasBuffer): >+ (WebCore::GraphicsContext3DPrivate::reshape): >+ (WebCore::GraphicsContext3DPrivate::getInternalFramebufferSize): >+ (WebCore::GraphicsContext3DPrivate::isContextLost): >+ (WebCore::GraphicsContext3DPrivate::isGLES2Compliant): >+ (WebCore::GraphicsContext3DPrivate::bindAttribLocation): >+ (WebCore::GraphicsContext3DPrivate::bufferData): >+ (WebCore::GraphicsContext3DPrivate::bufferSubData): >+ (WebCore::GraphicsContext3DPrivate::getActiveAttrib): >+ (WebCore::GraphicsContext3DPrivate::getActiveUniform): >+ (WebCore::GraphicsContext3DPrivate::getAttribLocation): >+ (WebCore::GraphicsContext3DPrivate::getContextAttributes): >+ (WebCore::GraphicsContext3DPrivate::getProgramInfoLog): >+ (WebCore::GraphicsContext3DPrivate::getShaderInfoLog): >+ (WebCore::GraphicsContext3DPrivate::getShaderSource): >+ (WebCore::GraphicsContext3DPrivate::getString): >+ (WebCore::GraphicsContext3DPrivate::getUniformLocation): >+ (WebCore::GraphicsContext3DPrivate::shaderSource): >+ (WebCore::GraphicsContext3DPrivate::texImage2D): >+ (WebCore::GraphicsContext3DPrivate::texSubImage2D): >+ (WebCore::GraphicsContext3DPrivate::uniform1fv): >+ (WebCore::GraphicsContext3DPrivate::uniform1iv): >+ (WebCore::GraphicsContext3DPrivate::uniform2fv): >+ (WebCore::GraphicsContext3DPrivate::uniform2iv): >+ (WebCore::GraphicsContext3DPrivate::uniform3fv): >+ (WebCore::GraphicsContext3DPrivate::uniform3iv): >+ (WebCore::GraphicsContext3DPrivate::uniform4fv): >+ (WebCore::GraphicsContext3DPrivate::uniform4iv): >+ (WebCore::GraphicsContext3DPrivate::uniformMatrix2fv): >+ (WebCore::GraphicsContext3DPrivate::uniformMatrix3fv): >+ (WebCore::GraphicsContext3DPrivate::uniformMatrix4fv): >+ (WebCore::GraphicsContext3DPrivate::getExtensions): >+ (WebCore::GraphicsContext3DPrivate::isResourceSafe): >+ (WebCore::GraphicsContext3DPrivate::initializeExtensions): >+ (WebCore::GraphicsContext3DPrivate::supportsExtension): >+ (WebCore::GraphicsContext3DPrivate::ensureExtensionEnabled): >+ (WebCore::GraphicsContext3DPrivate::isExtensionEnabled): >+ (WebCore::GraphicsContext3D::~GraphicsContext3D): >+ (WebCore::GraphicsContext3D::create): >+ (WebCore::GraphicsContext3D::platformGraphicsContext3D): >+ (WebCore::GraphicsContext3D::platformTexture): >+ (WebCore::GraphicsContext3D::grContext): >+ (WebCore::GraphicsContext3D::prepareTexture): >+ (WebCore::GraphicsContext3D::getInternalFramebufferSize): >+ (WebCore::GraphicsContext3D::isResourceSafe): >+ (WebCore::GraphicsContext3D::platformLayer): >+ (WebCore::GraphicsContext3D::layerComposited): >+ (WebCore::GraphicsContext3D::paintsIntoCanvasBuffer): >+ (WebCore::GraphicsContext3DPrivate::setContextLostCallback): >+ (WebCore::GraphicsContext3D::isGLES2Compliant): >+ (WebCore::GraphicsContext3DPrivate::setSwapBuffersCompleteCallbackCHROMIUM): >+ * src/GraphicsContext3DInternal.h: Removed. >+ * src/GraphicsContext3DPrivate.h: Copied from Source/WebKit/chromium/src/GraphicsContext3DInternal.h. >+ * src/WebViewImpl.cpp: >+ (WebKit::WebViewImpl::graphicsContext3D): >+ > 2011-08-29 Greg Billock <gbillock@google.com> > > [Chromium] Add ability to do static SerializedScriptValue deserialization >Index: Source/WebKit/chromium/WebKit.gyp >=================================================================== >--- Source/WebKit/chromium/WebKit.gyp (revision 93979) >+++ Source/WebKit/chromium/WebKit.gyp (working copy) >@@ -363,7 +363,7 @@ > 'src/GeolocationClientProxy.cpp', > 'src/GeolocationClientProxy.h', > 'src/GraphicsContext3DChromium.cpp', >- 'src/GraphicsContext3DInternal.h', >+ 'src/GraphicsContext3DPrivate.h', > 'src/gtk/WebFontInfo.cpp', > 'src/gtk/WebInputEventFactory.cpp', > 'src/IDBCallbacksProxy.cpp', >Index: Source/WebKit/chromium/src/Extensions3DChromium.cpp >=================================================================== >--- Source/WebKit/chromium/src/Extensions3DChromium.cpp (revision 93979) >+++ Source/WebKit/chromium/src/Extensions3DChromium.cpp (working copy) >@@ -30,12 +30,12 @@ > #include "Extensions3DChromium.h" > > #include "GraphicsContext3D.h" >-#include "GraphicsContext3DInternal.h" >+#include "GraphicsContext3DPrivate.h" > > namespace WebCore { > >-Extensions3DChromium::Extensions3DChromium(GraphicsContext3DInternal* internal) >- : m_internal(internal) >+Extensions3DChromium::Extensions3DChromium(GraphicsContext3DPrivate* priv) >+ : m_private(priv) > { > } > >@@ -45,7 +45,7 @@ Extensions3DChromium::~Extensions3DChrom > > bool Extensions3DChromium::supports(const String& name) > { >- return m_internal->supportsExtension(name); >+ return m_private->supportsExtension(name); > } > > void Extensions3DChromium::ensureEnabled(const String& name) >@@ -53,48 +53,48 @@ void Extensions3DChromium::ensureEnabled > #ifndef NDEBUG > bool result = > #endif >- m_internal->ensureExtensionEnabled(name); >+ m_private->ensureExtensionEnabled(name); > ASSERT(result); > } > > bool Extensions3DChromium::isEnabled(const String& name) > { >- return m_internal->isExtensionEnabled(name); >+ return m_private->isExtensionEnabled(name); > } > > int Extensions3DChromium::getGraphicsResetStatusARB() > { >- return static_cast<int>(m_internal->getGraphicsResetStatusARB()); >+ return static_cast<int>(m_private->getGraphicsResetStatusARB()); > } > > void Extensions3DChromium::blitFramebuffer(long srcX0, long srcY0, long srcX1, long srcY1, long dstX0, long dstY0, long dstX1, long dstY1, unsigned long mask, unsigned long filter) > { >- m_internal->blitFramebufferCHROMIUM(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); >+ m_private->blitFramebufferCHROMIUM(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); > } > > void Extensions3DChromium::renderbufferStorageMultisample(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height) > { >- m_internal->renderbufferStorageMultisampleCHROMIUM(target, samples, internalformat, width, height); >+ m_private->renderbufferStorageMultisampleCHROMIUM(target, samples, internalformat, width, height); > } > > void* Extensions3DChromium::mapBufferSubDataCHROMIUM(unsigned target, int offset, int size, unsigned access) > { >- return m_internal->mapBufferSubDataCHROMIUM(target, offset, size, access); >+ return m_private->mapBufferSubDataCHROMIUM(target, offset, size, access); > } > > void Extensions3DChromium::unmapBufferSubDataCHROMIUM(const void* data) > { >- m_internal->unmapBufferSubDataCHROMIUM(data); >+ m_private->unmapBufferSubDataCHROMIUM(data); > } > > void* Extensions3DChromium::mapTexSubImage2DCHROMIUM(unsigned target, int level, int xoffset, int yoffset, int width, int height, unsigned format, unsigned type, unsigned access) > { >- return m_internal->mapTexSubImage2DCHROMIUM(target, level, xoffset, yoffset, width, height, format, type, access); >+ return m_private->mapTexSubImage2DCHROMIUM(target, level, xoffset, yoffset, width, height, format, type, access); > } > > void Extensions3DChromium::unmapTexSubImage2DCHROMIUM(const void* data) > { >- m_internal->unmapTexSubImage2DCHROMIUM(data); >+ m_private->unmapTexSubImage2DCHROMIUM(data); > } > > Platform3DObject Extensions3DChromium::createVertexArrayOES() >@@ -117,17 +117,17 @@ void Extensions3DChromium::bindVertexArr > > void Extensions3DChromium::setSwapBuffersCompleteCallbackCHROMIUM(PassOwnPtr<SwapBuffersCompleteCallbackCHROMIUM> callback) > { >- m_internal->setSwapBuffersCompleteCallbackCHROMIUM(callback); >+ m_private->setSwapBuffersCompleteCallbackCHROMIUM(callback); > } > > void Extensions3DChromium::rateLimitOffscreenContextCHROMIUM() > { >- m_internal->rateLimitOffscreenContextCHROMIUM(); >+ m_private->rateLimitOffscreenContextCHROMIUM(); > } > > void Extensions3DChromium::paintFramebufferToCanvas(int framebuffer, int width, int height, bool premultiplyAlpha, ImageBuffer* imageBuffer) > { >- m_internal->paintFramebufferToCanvas(framebuffer, width, height, premultiplyAlpha, imageBuffer); >+ m_private->paintFramebufferToCanvas(framebuffer, width, height, premultiplyAlpha, imageBuffer); > } > > } // namespace WebCore >Index: Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp >=================================================================== >--- Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp (revision 93979) >+++ Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp (working copy) >@@ -40,7 +40,7 @@ > #include "Chrome.h" > #include "ChromeClientImpl.h" > #include "Extensions3DChromium.h" >-#include "GraphicsContext3DInternal.h" >+#include "GraphicsContext3DPrivate.h" > #include "HTMLCanvasElement.h" > #include "HTMLImageElement.h" > #include "ImageBuffer.h" >@@ -67,23 +67,23 @@ > > // There are two levels of delegation in this file: > // >-// 1. GraphicsContext3D delegates to GraphicsContext3DInternal. This is done >+// 1. GraphicsContext3D delegates to GraphicsContext3DPrivate. This is done > // so that we have some place to store data members common among >-// implementations; GraphicsContext3D only provides us the m_internal >-// pointer. We always delegate to the GraphicsContext3DInternal. While we >+// implementations; GraphicsContext3D only provides us the m_private >+// pointer. We always delegate to the GraphicsContext3DPrivate. While we > // could sidestep it and go directly to the WebGraphicsContext3D in some > // cases, it is better for consistency to always delegate through it. > // >-// 2. GraphicsContext3DInternal delegates to an implementation of >+// 2. GraphicsContext3DPrivate delegates to an implementation of > // WebGraphicsContext3D. This is done so we have a place to inject an > // implementation which remotes the OpenGL calls across processes. > > namespace WebCore { > > //---------------------------------------------------------------------- >-// GraphicsContext3DInternal >+// GraphicsContext3DPrivate > >-GraphicsContext3DInternal::GraphicsContext3DInternal() >+GraphicsContext3DPrivate::GraphicsContext3DPrivate() > : m_webViewImpl(0) > , m_initializedAvailableExtensions(false) > , m_layerComposited(false) >@@ -98,7 +98,7 @@ GraphicsContext3DInternal::GraphicsConte > { > } > >-GraphicsContext3DInternal::~GraphicsContext3DInternal() >+GraphicsContext3DPrivate::~GraphicsContext3DPrivate() > { > #if USE(SKIA) > if (m_grContext) { >@@ -108,7 +108,7 @@ GraphicsContext3DInternal::~GraphicsCont > #endif > } > >-bool GraphicsContext3DInternal::initialize(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow, bool renderDirectlyToHostWindow) >+bool GraphicsContext3DPrivate::initialize(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow, bool renderDirectlyToHostWindow) > { > WebKit::WebGraphicsContext3D::Attributes webAttributes; > webAttributes.alpha = attrs.alpha; >@@ -136,19 +136,19 @@ bool GraphicsContext3DInternal::initiali > return true; > } > >-WebKit::WebGraphicsContext3D* GraphicsContext3DInternal::extractWebGraphicsContext3D(GraphicsContext3D* context) >+WebKit::WebGraphicsContext3D* GraphicsContext3DPrivate::extractWebGraphicsContext3D(GraphicsContext3D* context) > { > if (!context) > return 0; >- return context->m_internal->m_impl.get(); >+ return context->m_private->m_impl.get(); > } > >-PlatformGraphicsContext3D GraphicsContext3DInternal::platformGraphicsContext3D() const >+PlatformGraphicsContext3D GraphicsContext3DPrivate::platformGraphicsContext3D() const > { > return m_impl.get(); > } > >-Platform3DObject GraphicsContext3DInternal::platformTexture() const >+Platform3DObject GraphicsContext3DPrivate::platformTexture() const > { > ASSERT(m_webViewImpl); > m_impl->setParentContext(m_webViewImpl->graphicsContext3D()); >@@ -156,7 +156,7 @@ Platform3DObject GraphicsContext3DIntern > } > > #if USE(SKIA) >-GrContext* GraphicsContext3DInternal::grContext() >+GrContext* GraphicsContext3DPrivate::grContext() > { > // Limit the number of textures we hold in the bitmap->texture cache. > static const int maxTextureCacheCount = 512; >@@ -173,19 +173,19 @@ GrContext* GraphicsContext3DInternal::gr > } > #endif > >-void GraphicsContext3DInternal::prepareTexture() >+void GraphicsContext3DPrivate::prepareTexture() > { > m_impl->prepareTexture(); > } > > #if USE(ACCELERATED_COMPOSITING) >-WebGLLayerChromium* GraphicsContext3DInternal::platformLayer() const >+WebGLLayerChromium* GraphicsContext3DPrivate::platformLayer() const > { > return m_compositingLayer.get(); > } > #endif > >-void GraphicsContext3DInternal::markContextChanged() >+void GraphicsContext3DPrivate::markContextChanged() > { > #if USE(ACCELERATED_COMPOSITING) > platformLayer()->setTextureUpdated(); >@@ -193,17 +193,17 @@ void GraphicsContext3DInternal::markCont > m_layerComposited = false; > } > >-void GraphicsContext3DInternal::markLayerComposited() >+void GraphicsContext3DPrivate::markLayerComposited() > { > m_layerComposited = true; > } > >-bool GraphicsContext3DInternal::layerComposited() const >+bool GraphicsContext3DPrivate::layerComposited() const > { > return m_layerComposited; > } > >-void GraphicsContext3DInternal::paintFramebufferToCanvas(int framebuffer, int width, int height, bool premultiplyAlpha, ImageBuffer* imageBuffer) >+void GraphicsContext3DPrivate::paintFramebufferToCanvas(int framebuffer, int width, int height, bool premultiplyAlpha, ImageBuffer* imageBuffer) > { > unsigned char* pixels = 0; > size_t bufferSize = 4 * width * height; >@@ -270,13 +270,13 @@ void GraphicsContext3DInternal::paintFra > #endif > } > >-void GraphicsContext3DInternal::paintRenderingResultsToCanvas(CanvasRenderingContext* context) >+void GraphicsContext3DPrivate::paintRenderingResultsToCanvas(CanvasRenderingContext* context) > { > ImageBuffer* imageBuffer = context->canvas()->buffer(); > paintFramebufferToCanvas(0, m_impl->width(), m_impl->height(), !m_impl->getContextAttributes().premultipliedAlpha, imageBuffer); > } > >-bool GraphicsContext3DInternal::paintCompositedResultsToCanvas(CanvasRenderingContext* context) >+bool GraphicsContext3DPrivate::paintCompositedResultsToCanvas(CanvasRenderingContext* context) > { > #if USE(ACCELERATED_COMPOSITING) > if (platformLayer()) >@@ -285,7 +285,7 @@ bool GraphicsContext3DInternal::paintCom > return false; > } > >-PassRefPtr<ImageData> GraphicsContext3DInternal::paintRenderingResultsToImageData() >+PassRefPtr<ImageData> GraphicsContext3DPrivate::paintRenderingResultsToImageData() > { > if (m_impl->getContextAttributes().premultipliedAlpha) > return 0; >@@ -302,14 +302,14 @@ PassRefPtr<ImageData> GraphicsContext3DI > return imageData.release(); > } > >-bool GraphicsContext3DInternal::paintsIntoCanvasBuffer() const >+bool GraphicsContext3DPrivate::paintsIntoCanvasBuffer() const > { > // If the gpu compositor is on then skip the readback and software rendering path. > ASSERT(m_webViewImpl); > return !m_webViewImpl->isAcceleratedCompositingActive(); > } > >-void GraphicsContext3DInternal::reshape(int width, int height) >+void GraphicsContext3DPrivate::reshape(int width, int height) > { > if (width == m_impl->width() && height == m_impl->height()) > return; >@@ -317,136 +317,136 @@ void GraphicsContext3DInternal::reshape( > m_impl->reshape(width, height); > } > >-IntSize GraphicsContext3DInternal::getInternalFramebufferSize() const >+IntSize GraphicsContext3DPrivate::getInternalFramebufferSize() const > { > return IntSize(m_impl->width(), m_impl->height()); > } > >-bool GraphicsContext3DInternal::isContextLost() >+bool GraphicsContext3DPrivate::isContextLost() > { > return m_impl->isContextLost(); > } > >-// Macros to assist in delegating from GraphicsContext3DInternal to >+// Macros to assist in delegating from GraphicsContext3DPrivate to > // WebGraphicsContext3D. > > #define DELEGATE_TO_IMPL(name) \ >-void GraphicsContext3DInternal::name() \ >+void GraphicsContext3DPrivate::name() \ > { \ > m_impl->name(); \ > } > > #define DELEGATE_TO_IMPL_R(name, rt) \ >-rt GraphicsContext3DInternal::name() \ >+rt GraphicsContext3DPrivate::name() \ > { \ > return m_impl->name(); \ > } > > #define DELEGATE_TO_IMPL_1(name, t1) \ >-void GraphicsContext3DInternal::name(t1 a1) \ >+void GraphicsContext3DPrivate::name(t1 a1) \ > { \ > m_impl->name(a1); \ > } > > #define DELEGATE_TO_IMPL_1R(name, t1, rt) \ >-rt GraphicsContext3DInternal::name(t1 a1) \ >+rt GraphicsContext3DPrivate::name(t1 a1) \ > { \ > return m_impl->name(a1); \ > } > > #define DELEGATE_TO_IMPL_2(name, t1, t2) \ >-void GraphicsContext3DInternal::name(t1 a1, t2 a2) \ >+void GraphicsContext3DPrivate::name(t1 a1, t2 a2) \ > { \ > m_impl->name(a1, a2); \ > } > > #define DELEGATE_TO_IMPL_2R(name, t1, t2, rt) \ >-rt GraphicsContext3DInternal::name(t1 a1, t2 a2) \ >+rt GraphicsContext3DPrivate::name(t1 a1, t2 a2) \ > { \ > return m_impl->name(a1, a2); \ > } > > #define DELEGATE_TO_IMPL_3(name, t1, t2, t3) \ >-void GraphicsContext3DInternal::name(t1 a1, t2 a2, t3 a3) \ >+void GraphicsContext3DPrivate::name(t1 a1, t2 a2, t3 a3) \ > { \ > m_impl->name(a1, a2, a3); \ > } > > #define DELEGATE_TO_IMPL_3R(name, t1, t2, t3, rt) \ >-rt GraphicsContext3DInternal::name(t1 a1, t2 a2, t3 a3) \ >+rt GraphicsContext3DPrivate::name(t1 a1, t2 a2, t3 a3) \ > { \ > return m_impl->name(a1, a2, a3); \ > } > > #define DELEGATE_TO_IMPL_4(name, t1, t2, t3, t4) \ >-void GraphicsContext3DInternal::name(t1 a1, t2 a2, t3 a3, t4 a4) \ >+void GraphicsContext3DPrivate::name(t1 a1, t2 a2, t3 a3, t4 a4) \ > { \ > m_impl->name(a1, a2, a3, a4); \ > } > > #define DELEGATE_TO_IMPL_4R(name, t1, t2, t3, t4, rt) \ >-rt GraphicsContext3DInternal::name(t1 a1, t2 a2, t3 a3, t4 a4) \ >+rt GraphicsContext3DPrivate::name(t1 a1, t2 a2, t3 a3, t4 a4) \ > { \ > return m_impl->name(a1, a2, a3, a4); \ > } > > #define DELEGATE_TO_IMPL_5(name, t1, t2, t3, t4, t5) \ >-void GraphicsContext3DInternal::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5) \ >+void GraphicsContext3DPrivate::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5) \ > { \ > m_impl->name(a1, a2, a3, a4, a5); \ > } > > #define DELEGATE_TO_IMPL_5R(name, t1, t2, t3, t4, t5, rt) \ >-rt GraphicsContext3DInternal::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5) \ >+rt GraphicsContext3DPrivate::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5) \ > { \ > return m_impl->name(a1, a2, a3, a4, a5); \ > } > > #define DELEGATE_TO_IMPL_6(name, t1, t2, t3, t4, t5, t6) \ >-void GraphicsContext3DInternal::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6) \ >+void GraphicsContext3DPrivate::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6) \ > { \ > m_impl->name(a1, a2, a3, a4, a5, a6); \ > } > > #define DELEGATE_TO_IMPL_6R(name, t1, t2, t3, t4, t5, t6, rt) \ >-rt GraphicsContext3DInternal::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6) \ >+rt GraphicsContext3DPrivate::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6) \ > { \ > return m_impl->name(a1, a2, a3, a4, a5, a6); \ > } > > #define DELEGATE_TO_IMPL_7(name, t1, t2, t3, t4, t5, t6, t7) \ >-void GraphicsContext3DInternal::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7) \ >+void GraphicsContext3DPrivate::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7) \ > { \ > m_impl->name(a1, a2, a3, a4, a5, a6, a7); \ > } > > #define DELEGATE_TO_IMPL_7R(name, t1, t2, t3, t4, t5, t6, t7, rt) \ >-rt GraphicsContext3DInternal::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7) \ >+rt GraphicsContext3DPrivate::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7) \ > { \ > return m_impl->name(a1, a2, a3, a4, a5, a6, a7); \ > } > > #define DELEGATE_TO_IMPL_8(name, t1, t2, t3, t4, t5, t6, t7, t8) \ >-void GraphicsContext3DInternal::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7, t8 a8) \ >+void GraphicsContext3DPrivate::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7, t8 a8) \ > { \ > m_impl->name(a1, a2, a3, a4, a5, a6, a7, a8); \ > } > > #define DELEGATE_TO_IMPL_9R(name, t1, t2, t3, t4, t5, t6, t7, t8, t9, rt) \ >-rt GraphicsContext3DInternal::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7, t8 a8, t9 a9) \ >+rt GraphicsContext3DPrivate::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7, t8 a8, t9 a9) \ > { \ > return m_impl->name(a1, a2, a3, a4, a5, a6, a7, a8, a9); \ > } > > #define DELEGATE_TO_IMPL_10(name, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) \ >-void GraphicsContext3DInternal::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7, t8 a8, t9 a9, t10 a10) \ >+void GraphicsContext3DPrivate::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7, t8 a8, t9 a9, t10 a10) \ > { \ > m_impl->name(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10); \ > } > > DELEGATE_TO_IMPL_R(makeContextCurrent, bool) > >-bool GraphicsContext3DInternal::isGLES2Compliant() const >+bool GraphicsContext3DPrivate::isGLES2Compliant() const > { > return m_impl->isGLES2Compliant(); > } >@@ -454,7 +454,7 @@ bool GraphicsContext3DInternal::isGLES2C > DELEGATE_TO_IMPL_1(activeTexture, GC3Denum) > DELEGATE_TO_IMPL_2(attachShader, Platform3DObject, Platform3DObject) > >-void GraphicsContext3DInternal::bindAttribLocation(Platform3DObject program, GC3Duint index, const String& name) >+void GraphicsContext3DPrivate::bindAttribLocation(Platform3DObject program, GC3Duint index, const String& name) > { > m_impl->bindAttribLocation(program, index, name.utf8().data()); > } >@@ -469,17 +469,17 @@ DELEGATE_TO_IMPL_2(blendEquationSeparate > DELEGATE_TO_IMPL_2(blendFunc, GC3Denum, GC3Denum) > DELEGATE_TO_IMPL_4(blendFuncSeparate, GC3Denum, GC3Denum, GC3Denum, GC3Denum) > >-void GraphicsContext3DInternal::bufferData(GC3Denum target, GC3Dsizeiptr size, GC3Denum usage) >+void GraphicsContext3DPrivate::bufferData(GC3Denum target, GC3Dsizeiptr size, GC3Denum usage) > { > m_impl->bufferData(target, size, 0, usage); > } > >-void GraphicsContext3DInternal::bufferData(GC3Denum target, GC3Dsizeiptr size, const void* data, GC3Denum usage) >+void GraphicsContext3DPrivate::bufferData(GC3Denum target, GC3Dsizeiptr size, const void* data, GC3Denum usage) > { > m_impl->bufferData(target, size, data, usage); > } > >-void GraphicsContext3DInternal::bufferSubData(GC3Denum target, GC3Dintptr offset, GC3Dsizeiptr size, const void* data) >+void GraphicsContext3DPrivate::bufferSubData(GC3Denum target, GC3Dintptr offset, GC3Dsizeiptr size, const void* data) > { > m_impl->bufferSubData(target, offset, size, data); > } >@@ -513,7 +513,7 @@ DELEGATE_TO_IMPL_5(framebufferTexture2D, > DELEGATE_TO_IMPL_1(frontFace, GC3Denum) > DELEGATE_TO_IMPL_1(generateMipmap, GC3Denum) > >-bool GraphicsContext3DInternal::getActiveAttrib(Platform3DObject program, GC3Duint index, ActiveInfo& info) >+bool GraphicsContext3DPrivate::getActiveAttrib(Platform3DObject program, GC3Duint index, ActiveInfo& info) > { > WebKit::WebGraphicsContext3D::ActiveInfo webInfo; > if (!m_impl->getActiveAttrib(program, index, webInfo)) >@@ -524,7 +524,7 @@ bool GraphicsContext3DInternal::getActiv > return true; > } > >-bool GraphicsContext3DInternal::getActiveUniform(Platform3DObject program, GC3Duint index, ActiveInfo& info) >+bool GraphicsContext3DPrivate::getActiveUniform(Platform3DObject program, GC3Duint index, ActiveInfo& info) > { > WebKit::WebGraphicsContext3D::ActiveInfo webInfo; > if (!m_impl->getActiveUniform(program, index, webInfo)) >@@ -537,7 +537,7 @@ bool GraphicsContext3DInternal::getActiv > > DELEGATE_TO_IMPL_4(getAttachedShaders, Platform3DObject, GC3Dsizei, GC3Dsizei*, Platform3DObject*) > >-GC3Dint GraphicsContext3DInternal::getAttribLocation(Platform3DObject program, const String& name) >+GC3Dint GraphicsContext3DPrivate::getAttribLocation(Platform3DObject program, const String& name) > { > return m_impl->getAttribLocation(program, name.utf8().data()); > } >@@ -546,7 +546,7 @@ DELEGATE_TO_IMPL_2(getBooleanv, GC3Denum > > DELEGATE_TO_IMPL_3(getBufferParameteriv, GC3Denum, GC3Denum, GC3Dint*) > >-GraphicsContext3D::Attributes GraphicsContext3DInternal::getContextAttributes() >+GraphicsContext3D::Attributes GraphicsContext3DPrivate::getContextAttributes() > { > WebKit::WebGraphicsContext3D::Attributes webAttributes = m_impl->getContextAttributes(); > GraphicsContext3D::Attributes attributes; >@@ -568,7 +568,7 @@ DELEGATE_TO_IMPL_2(getIntegerv, GC3Denum > > DELEGATE_TO_IMPL_3(getProgramiv, Platform3DObject, GC3Denum, GC3Dint*) > >-String GraphicsContext3DInternal::getProgramInfoLog(Platform3DObject program) >+String GraphicsContext3DPrivate::getProgramInfoLog(Platform3DObject program) > { > return m_impl->getProgramInfoLog(program); > } >@@ -577,17 +577,17 @@ DELEGATE_TO_IMPL_3(getRenderbufferParame > > DELEGATE_TO_IMPL_3(getShaderiv, Platform3DObject, GC3Denum, GC3Dint*) > >-String GraphicsContext3DInternal::getShaderInfoLog(Platform3DObject shader) >+String GraphicsContext3DPrivate::getShaderInfoLog(Platform3DObject shader) > { > return m_impl->getShaderInfoLog(shader); > } > >-String GraphicsContext3DInternal::getShaderSource(Platform3DObject shader) >+String GraphicsContext3DPrivate::getShaderSource(Platform3DObject shader) > { > return m_impl->getShaderSource(shader); > } > >-String GraphicsContext3DInternal::getString(GC3Denum name) >+String GraphicsContext3DPrivate::getString(GC3Denum name) > { > return m_impl->getString(name); > } >@@ -598,7 +598,7 @@ DELEGATE_TO_IMPL_3(getTexParameteriv, GC > DELEGATE_TO_IMPL_3(getUniformfv, Platform3DObject, GC3Dint, GC3Dfloat*) > DELEGATE_TO_IMPL_3(getUniformiv, Platform3DObject, GC3Dint, GC3Dint*) > >-GC3Dint GraphicsContext3DInternal::getUniformLocation(Platform3DObject program, const String& name) >+GC3Dint GraphicsContext3DPrivate::getUniformLocation(Platform3DObject program, const String& name) > { > return m_impl->getUniformLocation(program, name.utf8().data()); > } >@@ -626,7 +626,7 @@ DELEGATE_TO_IMPL_4(renderbufferStorage, > DELEGATE_TO_IMPL_2(sampleCoverage, GC3Dclampf, GC3Dboolean) > DELEGATE_TO_IMPL_4(scissor, GC3Dint, GC3Dint, GC3Dsizei, GC3Dsizei) > >-void GraphicsContext3DInternal::shaderSource(Platform3DObject shader, const String& string) >+void GraphicsContext3DPrivate::shaderSource(Platform3DObject shader, const String& string) > { > m_impl->shaderSource(shader, string.utf8().data()); > } >@@ -638,7 +638,7 @@ DELEGATE_TO_IMPL_2(stencilMaskSeparate, > DELEGATE_TO_IMPL_3(stencilOp, GC3Denum, GC3Denum, GC3Denum) > DELEGATE_TO_IMPL_4(stencilOpSeparate, GC3Denum, GC3Denum, GC3Denum, GC3Denum) > >-bool GraphicsContext3DInternal::texImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Denum format, GC3Denum type, const void* pixels) >+bool GraphicsContext3DPrivate::texImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Denum format, GC3Denum type, const void* pixels) > { > m_impl->texImage2D(target, level, internalformat, width, height, border, format, type, pixels); > return true; >@@ -647,78 +647,78 @@ bool GraphicsContext3DInternal::texImage > DELEGATE_TO_IMPL_3(texParameterf, GC3Denum, GC3Denum, GC3Dfloat) > DELEGATE_TO_IMPL_3(texParameteri, GC3Denum, GC3Denum, GC3Dint) > >-void GraphicsContext3DInternal::texSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, const void* pixels) >+void GraphicsContext3DPrivate::texSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, const void* pixels) > { > m_impl->texSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels); > } > > DELEGATE_TO_IMPL_2(uniform1f, GC3Dint, GC3Dfloat) > >-void GraphicsContext3DInternal::uniform1fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size) >+void GraphicsContext3DPrivate::uniform1fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size) > { > m_impl->uniform1fv(location, size, v); > } > > DELEGATE_TO_IMPL_2(uniform1i, GC3Dint, GC3Dint) > >-void GraphicsContext3DInternal::uniform1iv(GC3Dint location, GC3Dint* v, GC3Dsizei size) >+void GraphicsContext3DPrivate::uniform1iv(GC3Dint location, GC3Dint* v, GC3Dsizei size) > { > m_impl->uniform1iv(location, size, v); > } > > DELEGATE_TO_IMPL_3(uniform2f, GC3Dint, GC3Dfloat, GC3Dfloat) > >-void GraphicsContext3DInternal::uniform2fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size) >+void GraphicsContext3DPrivate::uniform2fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size) > { > m_impl->uniform2fv(location, size, v); > } > > DELEGATE_TO_IMPL_3(uniform2i, GC3Dint, GC3Dint, GC3Dint) > >-void GraphicsContext3DInternal::uniform2iv(GC3Dint location, GC3Dint* v, GC3Dsizei size) >+void GraphicsContext3DPrivate::uniform2iv(GC3Dint location, GC3Dint* v, GC3Dsizei size) > { > m_impl->uniform2iv(location, size, v); > } > > DELEGATE_TO_IMPL_4(uniform3f, GC3Dint, GC3Dfloat, GC3Dfloat, GC3Dfloat) > >-void GraphicsContext3DInternal::uniform3fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size) >+void GraphicsContext3DPrivate::uniform3fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size) > { > m_impl->uniform3fv(location, size, v); > } > > DELEGATE_TO_IMPL_4(uniform3i, GC3Dint, GC3Dint, GC3Dint, GC3Dint) > >-void GraphicsContext3DInternal::uniform3iv(GC3Dint location, GC3Dint* v, GC3Dsizei size) >+void GraphicsContext3DPrivate::uniform3iv(GC3Dint location, GC3Dint* v, GC3Dsizei size) > { > m_impl->uniform3iv(location, size, v); > } > > DELEGATE_TO_IMPL_5(uniform4f, GC3Dint, GC3Dfloat, GC3Dfloat, GC3Dfloat, GC3Dfloat) > >-void GraphicsContext3DInternal::uniform4fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size) >+void GraphicsContext3DPrivate::uniform4fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size) > { > m_impl->uniform4fv(location, size, v); > } > > DELEGATE_TO_IMPL_5(uniform4i, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint) > >-void GraphicsContext3DInternal::uniform4iv(GC3Dint location, GC3Dint* v, GC3Dsizei size) >+void GraphicsContext3DPrivate::uniform4iv(GC3Dint location, GC3Dint* v, GC3Dsizei size) > { > m_impl->uniform4iv(location, size, v); > } > >-void GraphicsContext3DInternal::uniformMatrix2fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size) >+void GraphicsContext3DPrivate::uniformMatrix2fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size) > { > m_impl->uniformMatrix2fv(location, size, transpose, value); > } > >-void GraphicsContext3DInternal::uniformMatrix3fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size) >+void GraphicsContext3DPrivate::uniformMatrix3fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size) > { > m_impl->uniformMatrix3fv(location, size, transpose, value); > } > >-void GraphicsContext3DInternal::uniformMatrix4fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size) >+void GraphicsContext3DPrivate::uniformMatrix4fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size) > { > m_impl->uniformMatrix4fv(location, size, transpose, value); > } >@@ -754,14 +754,14 @@ DELEGATE_TO_IMPL_1(deleteTexture, Platfo > > DELEGATE_TO_IMPL_1(synthesizeGLError, GC3Denum) > >-Extensions3D* GraphicsContext3DInternal::getExtensions() >+Extensions3D* GraphicsContext3DPrivate::getExtensions() > { > if (!m_extensions) > m_extensions = adoptPtr(new Extensions3DChromium(this)); > return m_extensions.get(); > } > >-bool GraphicsContext3DInternal::isResourceSafe() >+bool GraphicsContext3DPrivate::isResourceSafe() > { > if (m_resourceSafety == ResourceSafetyUnknown) > m_resourceSafety = getExtensions()->isEnabled("GL_CHROMIUM_resource_safe") ? ResourceSafe : ResourceUnsafe; >@@ -788,7 +788,7 @@ String mapExtensionName(const String& na > > } // anonymous namespace > >-void GraphicsContext3DInternal::initializeExtensions() >+void GraphicsContext3DPrivate::initializeExtensions() > { > bool success = makeContextCurrent(); > ASSERT(success); >@@ -804,14 +804,14 @@ void GraphicsContext3DInternal::initiali > } > > >-bool GraphicsContext3DInternal::supportsExtension(const String& name) >+bool GraphicsContext3DPrivate::supportsExtension(const String& name) > { > initializeExtensions(); > String mappedName = mapExtensionName(name); > return m_enabledExtensions.contains(mappedName) || m_requestableExtensions.contains(mappedName); > } > >-bool GraphicsContext3DInternal::ensureExtensionEnabled(const String& name) >+bool GraphicsContext3DPrivate::ensureExtensionEnabled(const String& name) > { > initializeExtensions(); > >@@ -830,7 +830,7 @@ bool GraphicsContext3DInternal::ensureEx > return m_enabledExtensions.contains(mappedName); > } > >-bool GraphicsContext3DInternal::isExtensionEnabled(const String& name) >+bool GraphicsContext3DPrivate::isExtensionEnabled(const String& name) > { > initializeExtensions(); > String mappedName = mapExtensionName(name); >@@ -853,114 +853,114 @@ DELEGATE_TO_IMPL_R(getGraphicsResetStatu > // > > // Macros to assist in delegating from GraphicsContext3D to >-// GraphicsContext3DInternal. >+// GraphicsContext3DPrivate. > > #define DELEGATE_TO_INTERNAL(name) \ > void GraphicsContext3D::name() \ > { \ >- m_internal->name(); \ >+ m_private->name(); \ > } > > #define DELEGATE_TO_INTERNAL_R(name, rt) \ > rt GraphicsContext3D::name() \ > { \ >- return m_internal->name(); \ >+ return m_private->name(); \ > } > > #define DELEGATE_TO_INTERNAL_1(name, t1) \ > void GraphicsContext3D::name(t1 a1) \ > { \ >- m_internal->name(a1); \ >+ m_private->name(a1); \ > } > > #define DELEGATE_TO_INTERNAL_1R(name, t1, rt) \ > rt GraphicsContext3D::name(t1 a1) \ > { \ >- return m_internal->name(a1); \ >+ return m_private->name(a1); \ > } > > #define DELEGATE_TO_INTERNAL_2(name, t1, t2) \ > void GraphicsContext3D::name(t1 a1, t2 a2) \ > { \ >- m_internal->name(a1, a2); \ >+ m_private->name(a1, a2); \ > } > > #define DELEGATE_TO_INTERNAL_2R(name, t1, t2, rt) \ > rt GraphicsContext3D::name(t1 a1, t2 a2) \ > { \ >- return m_internal->name(a1, a2); \ >+ return m_private->name(a1, a2); \ > } > > #define DELEGATE_TO_INTERNAL_3(name, t1, t2, t3) \ > void GraphicsContext3D::name(t1 a1, t2 a2, t3 a3) \ > { \ >- m_internal->name(a1, a2, a3); \ >+ m_private->name(a1, a2, a3); \ > } > > #define DELEGATE_TO_INTERNAL_3R(name, t1, t2, t3, rt) \ > rt GraphicsContext3D::name(t1 a1, t2 a2, t3 a3) \ > { \ >- return m_internal->name(a1, a2, a3); \ >+ return m_private->name(a1, a2, a3); \ > } > > #define DELEGATE_TO_INTERNAL_4(name, t1, t2, t3, t4) \ > void GraphicsContext3D::name(t1 a1, t2 a2, t3 a3, t4 a4) \ > { \ >- m_internal->name(a1, a2, a3, a4); \ >+ m_private->name(a1, a2, a3, a4); \ > } > > #define DELEGATE_TO_INTERNAL_4R(name, t1, t2, t3, t4, rt) \ > rt GraphicsContext3D::name(t1 a1, t2 a2, t3 a3, t4 a4) \ > { \ >- return m_internal->name(a1, a2, a3, a4); \ >+ return m_private->name(a1, a2, a3, a4); \ > } > > #define DELEGATE_TO_INTERNAL_5(name, t1, t2, t3, t4, t5) \ > void GraphicsContext3D::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5) \ > { \ >- m_internal->name(a1, a2, a3, a4, a5); \ >+ m_private->name(a1, a2, a3, a4, a5); \ > } > > #define DELEGATE_TO_INTERNAL_6(name, t1, t2, t3, t4, t5, t6) \ > void GraphicsContext3D::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6) \ > { \ >- m_internal->name(a1, a2, a3, a4, a5, a6); \ >+ m_private->name(a1, a2, a3, a4, a5, a6); \ > } > > #define DELEGATE_TO_INTERNAL_6R(name, t1, t2, t3, t4, t5, t6, rt) \ > rt GraphicsContext3D::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6) \ > { \ >- return m_internal->name(a1, a2, a3, a4, a5, a6); \ >+ return m_private->name(a1, a2, a3, a4, a5, a6); \ > } > > #define DELEGATE_TO_INTERNAL_7(name, t1, t2, t3, t4, t5, t6, t7) \ > void GraphicsContext3D::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7) \ > { \ >- m_internal->name(a1, a2, a3, a4, a5, a6, a7); \ >+ m_private->name(a1, a2, a3, a4, a5, a6, a7); \ > } > > #define DELEGATE_TO_INTERNAL_7R(name, t1, t2, t3, t4, t5, t6, t7, rt) \ > rt GraphicsContext3D::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7) \ > { \ >- return m_internal->name(a1, a2, a3, a4, a5, a6, a7); \ >+ return m_private->name(a1, a2, a3, a4, a5, a6, a7); \ > } > > #define DELEGATE_TO_INTERNAL_8(name, t1, t2, t3, t4, t5, t6, t7, t8) \ > void GraphicsContext3D::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7, t8 a8) \ > { \ >- m_internal->name(a1, a2, a3, a4, a5, a6, a7, a8); \ >+ m_private->name(a1, a2, a3, a4, a5, a6, a7, a8); \ > } > > #define DELEGATE_TO_INTERNAL_9(name, t1, t2, t3, t4, t5, t6, t7, t8, t9) \ > void GraphicsContext3D::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7, t8 a8, t9 a9) \ > { \ >- m_internal->name(a1, a2, a3, a4, a5, a6, a7, a8, a9); \ >+ m_private->name(a1, a2, a3, a4, a5, a6, a7, a8, a9); \ > } > > #define DELEGATE_TO_INTERNAL_9R(name, t1, t2, t3, t4, t5, t6, t7, t8, t9, rt) \ > rt GraphicsContext3D::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7, t8 a8, t9 a9) \ > { \ >- return m_internal->name(a1, a2, a3, a4, a5, a6, a7, a8, a9); \ >+ return m_private->name(a1, a2, a3, a4, a5, a6, a7, a8, a9); \ > } > > GraphicsContext3D::GraphicsContext3D(GraphicsContext3D::Attributes, HostWindow*, bool) >@@ -969,60 +969,60 @@ GraphicsContext3D::GraphicsContext3D(Gra > > GraphicsContext3D::~GraphicsContext3D() > { >- WebGLLayerChromium* canvasLayer = m_internal->platformLayer(); >+ WebGLLayerChromium* canvasLayer = m_private->platformLayer(); > if (canvasLayer) > canvasLayer->setContext(0); >- m_internal->setContextLostCallback(nullptr); >- m_internal->setSwapBuffersCompleteCallbackCHROMIUM(nullptr); >+ m_private->setContextLostCallback(nullptr); >+ m_private->setSwapBuffersCompleteCallbackCHROMIUM(nullptr); > } > > PassRefPtr<GraphicsContext3D> GraphicsContext3D::create(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow, GraphicsContext3D::RenderStyle renderStyle) > { >- OwnPtr<GraphicsContext3DInternal> internal = adoptPtr(new GraphicsContext3DInternal()); >- if (!internal->initialize(attrs, hostWindow, renderStyle == RenderDirectlyToHostWindow)) { >+ OwnPtr<GraphicsContext3DPrivate> priv = adoptPtr(new GraphicsContext3DPrivate()); >+ if (!priv->initialize(attrs, hostWindow, renderStyle == RenderDirectlyToHostWindow)) > return 0; >- } >+ > RefPtr<GraphicsContext3D> result = adoptRef(new GraphicsContext3D(attrs, hostWindow, renderStyle == RenderDirectlyToHostWindow)); >- result->m_internal = internal.release(); >+ result->m_private = priv.release(); > return result.release(); > } > > PlatformGraphicsContext3D GraphicsContext3D::platformGraphicsContext3D() const > { >- return m_internal->platformGraphicsContext3D(); >+ return m_private->platformGraphicsContext3D(); > } > > Platform3DObject GraphicsContext3D::platformTexture() const > { >- return m_internal->platformTexture(); >+ return m_private->platformTexture(); > } > > #if USE(SKIA) > GrContext* GraphicsContext3D::grContext() > { >- return m_internal->grContext(); >+ return m_private->grContext(); > } > #endif > > void GraphicsContext3D::prepareTexture() > { >- return m_internal->prepareTexture(); >+ return m_private->prepareTexture(); > } > > IntSize GraphicsContext3D::getInternalFramebufferSize() const > { >- return m_internal->getInternalFramebufferSize(); >+ return m_private->getInternalFramebufferSize(); > } > > bool GraphicsContext3D::isResourceSafe() > { >- return m_internal->isResourceSafe(); >+ return m_private->isResourceSafe(); > } > > #if USE(ACCELERATED_COMPOSITING) > PlatformLayer* GraphicsContext3D::platformLayer() const > { >- WebGLLayerChromium* canvasLayer = m_internal->platformLayer(); >+ WebGLLayerChromium* canvasLayer = m_private->platformLayer(); > canvasLayer->setContext(this); > return canvasLayer; > } >@@ -1177,7 +1177,7 @@ DELEGATE_TO_INTERNAL(markContextChanged) > > bool GraphicsContext3D::layerComposited() const > { >- return m_internal->layerComposited(); >+ return m_private->layerComposited(); > } > > DELEGATE_TO_INTERNAL_1(paintRenderingResultsToCanvas, CanvasRenderingContext*) >@@ -1186,7 +1186,7 @@ DELEGATE_TO_INTERNAL_1R(paintCompositedR > > bool GraphicsContext3D::paintsIntoCanvasBuffer() const > { >- return m_internal->paintsIntoCanvasBuffer(); >+ return m_private->paintsIntoCanvasBuffer(); > } > > DELEGATE_TO_INTERNAL_R(createBuffer, Platform3DObject) >@@ -1229,7 +1229,7 @@ PassOwnPtr<GraphicsContextLostCallbackAd > return adoptPtr(cb.get() ? new GraphicsContextLostCallbackAdapter(cb) : 0); > } > >-void GraphicsContext3DInternal::setContextLostCallback(PassOwnPtr<GraphicsContext3D::ContextLostCallback> cb) >+void GraphicsContext3DPrivate::setContextLostCallback(PassOwnPtr<GraphicsContext3D::ContextLostCallback> cb) > { > m_contextLostCallbackAdapter = GraphicsContextLostCallbackAdapter::create(cb); > m_impl->setContextLostCallback(m_contextLostCallbackAdapter.get()); >@@ -1237,7 +1237,7 @@ void GraphicsContext3DInternal::setConte > > bool GraphicsContext3D::isGLES2Compliant() const > { >- return m_internal->isGLES2Compliant(); >+ return m_private->isGLES2Compliant(); > } > > class SwapBuffersCompleteCallbackAdapter : public WebKit::WebGraphicsContext3D::WebGraphicsSwapBuffersCompleteCallbackCHROMIUM { >@@ -1261,7 +1261,7 @@ PassOwnPtr<SwapBuffersCompleteCallbackAd > return adoptPtr(cb.get() ? new SwapBuffersCompleteCallbackAdapter(cb) : 0); > } > >-void GraphicsContext3DInternal::setSwapBuffersCompleteCallbackCHROMIUM(PassOwnPtr<Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM> cb) >+void GraphicsContext3DPrivate::setSwapBuffersCompleteCallbackCHROMIUM(PassOwnPtr<Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM> cb) > { > m_swapBuffersCompleteCallbackAdapter = SwapBuffersCompleteCallbackAdapter::create(cb); > m_impl->setSwapBuffersCompleteCallbackCHROMIUM(m_swapBuffersCompleteCallbackAdapter.get()); >Index: Source/WebKit/chromium/src/GraphicsContext3DInternal.h >=================================================================== >--- Source/WebKit/chromium/src/GraphicsContext3DInternal.h (revision 93979) >+++ Source/WebKit/chromium/src/GraphicsContext3DInternal.h (working copy) >@@ -1,334 +0,0 @@ >-/* >- * Copyright (C) 2010 Google Inc. All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY >- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED >- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE >- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY >- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES >- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; >- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND >- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT >- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF >- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. >- */ >- >-#ifndef GraphicsContext3DInternal_h >-#define GraphicsContext3DInternal_h >- >-#include "Extensions3DChromium.h" >-#include "GraphicsContext3D.h" >-#include <wtf/HashSet.h> >-#include <wtf/OwnArrayPtr.h> >-#include <wtf/OwnPtr.h> >-#if USE(SKIA) >-#include "SkBitmap.h" >-#endif >- >-#if USE(SKIA) >-class GrContext; >-#endif >- >-namespace WebKit { >-class WebGraphicsContext3D; >-class WebViewImpl; >-} // namespace WebKit >- >-namespace WebCore { >- >-class Extensions3DChromium; >-#if USE(ACCELERATED_COMPOSITING) >-class WebGLLayerChromium; >-#endif >-class GraphicsContextLostCallbackAdapter; >-class SwapBuffersCompleteCallbackAdapter; >- >-class GraphicsContext3DInternal { >-public: >- GraphicsContext3DInternal(); >- ~GraphicsContext3DInternal(); >- >- bool initialize(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow, bool renderDirectlyToHostWindow); >- >- // Helper function to provide access to the lower-level WebGraphicsContext3D, >- // which is needed for subordinate contexts like WebGL's to share resources >- // with the compositor's context. >- static WebKit::WebGraphicsContext3D* extractWebGraphicsContext3D(GraphicsContext3D* context); >- >- PlatformGraphicsContext3D platformGraphicsContext3D() const; >- Platform3DObject platformTexture() const; >-#if USE(SKIA) >- GrContext* grContext(); >-#endif >- >- bool makeContextCurrent(); >- >- void reshape(int width, int height); >- IntSize getInternalFramebufferSize() const; >- bool isResourceSafe(); >- >- void markContextChanged(); >- bool layerComposited() const; >- void markLayerComposited(); >- >- void paintRenderingResultsToCanvas(CanvasRenderingContext*); >- void paintFramebufferToCanvas(int framebuffer, int width, int height, bool premultiplyAlpha, ImageBuffer*); >- PassRefPtr<ImageData> paintRenderingResultsToImageData(); >- bool paintsIntoCanvasBuffer() const; >- bool paintCompositedResultsToCanvas(CanvasRenderingContext*); >- >- void prepareTexture(); >- >-#if USE(ACCELERATED_COMPOSITING) >- WebGLLayerChromium* platformLayer() const; >-#endif >- bool isGLES2Compliant() const; >- >- void releaseShaderCompiler(); >- bool isContextLost(); >- >- //---------------------------------------------------------------------- >- // Entry points for WebGL. >- // >- void activeTexture(GC3Denum texture); >- void attachShader(Platform3DObject program, Platform3DObject shader); >- void bindAttribLocation(Platform3DObject, GC3Duint index, const String& name); >- void bindBuffer(GC3Denum target, Platform3DObject); >- void bindFramebuffer(GC3Denum target, Platform3DObject); >- void bindRenderbuffer(GC3Denum target, Platform3DObject); >- void bindTexture(GC3Denum target, Platform3DObject); >- void blendColor(GC3Dclampf red, GC3Dclampf green, GC3Dclampf blue, GC3Dclampf alpha); >- void blendEquation(GC3Denum mode); >- void blendEquationSeparate(GC3Denum modeRGB, GC3Denum modeAlpha); >- void blendFunc(GC3Denum sfactor, GC3Denum dfactor); >- void blendFuncSeparate(GC3Denum srcRGB, GC3Denum dstRGB, GC3Denum srcAlpha, GC3Denum dstAlpha); >- >- void bufferData(GC3Denum target, GC3Dsizeiptr size, GC3Denum usage); >- void bufferData(GC3Denum target, GC3Dsizeiptr size, const void* data, GC3Denum usage); >- void bufferSubData(GC3Denum target, GC3Dintptr offset, GC3Dsizeiptr size, const void* data); >- >- GC3Denum checkFramebufferStatus(GC3Denum target); >- void clear(GC3Dbitfield mask); >- void clearColor(GC3Dclampf red, GC3Dclampf green, GC3Dclampf blue, GC3Dclampf alpha); >- void clearDepth(GC3Dclampf depth); >- void clearStencil(GC3Dint s); >- void colorMask(GC3Dboolean red, GC3Dboolean green, GC3Dboolean blue, GC3Dboolean alpha); >- void compileShader(Platform3DObject); >- >- void copyTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Dint border); >- void copyTexSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height); >- void cullFace(GC3Denum mode); >- void depthFunc(GC3Denum func); >- void depthMask(GC3Dboolean flag); >- void depthRange(GC3Dclampf zNear, GC3Dclampf zFar); >- void detachShader(Platform3DObject, Platform3DObject); >- void disable(GC3Denum cap); >- void disableVertexAttribArray(GC3Duint index); >- void drawArrays(GC3Denum mode, GC3Dint first, GC3Dsizei count); >- void drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, GC3Dintptr offset); >- >- void enable(GC3Denum cap); >- void enableVertexAttribArray(GC3Duint index); >- void finish(); >- void flush(); >- void framebufferRenderbuffer(GC3Denum target, GC3Denum attachment, GC3Denum renderbuffertarget, Platform3DObject); >- void framebufferTexture2D(GC3Denum target, GC3Denum attachment, GC3Denum textarget, Platform3DObject, GC3Dint level); >- void frontFace(GC3Denum mode); >- void generateMipmap(GC3Denum target); >- >- bool getActiveAttrib(Platform3DObject program, GC3Duint index, ActiveInfo&); >- bool getActiveUniform(Platform3DObject program, GC3Duint index, ActiveInfo&); >- void getAttachedShaders(Platform3DObject program, GC3Dsizei maxCount, GC3Dsizei* count, Platform3DObject* shaders); >- GC3Dint getAttribLocation(Platform3DObject, const String& name); >- void getBooleanv(GC3Denum pname, GC3Dboolean* value); >- void getBufferParameteriv(GC3Denum target, GC3Denum pname, GC3Dint* value); >- GraphicsContext3D::Attributes getContextAttributes(); >- GC3Denum getError(); >- void getFloatv(GC3Denum pname, GC3Dfloat* value); >- void getFramebufferAttachmentParameteriv(GC3Denum target, GC3Denum attachment, GC3Denum pname, GC3Dint* value); >- void getIntegerv(GC3Denum pname, GC3Dint* value); >- void getProgramiv(Platform3DObject program, GC3Denum pname, GC3Dint* value); >- String getProgramInfoLog(Platform3DObject); >- void getRenderbufferParameteriv(GC3Denum target, GC3Denum pname, GC3Dint* value); >- void getShaderiv(Platform3DObject, GC3Denum pname, GC3Dint* value); >- String getShaderInfoLog(Platform3DObject); >- >- String getShaderSource(Platform3DObject); >- String getString(GC3Denum name); >- void getTexParameterfv(GC3Denum target, GC3Denum pname, GC3Dfloat* value); >- void getTexParameteriv(GC3Denum target, GC3Denum pname, GC3Dint* value); >- void getUniformfv(Platform3DObject program, GC3Dint location, GC3Dfloat* value); >- void getUniformiv(Platform3DObject program, GC3Dint location, GC3Dint* value); >- GC3Dint getUniformLocation(Platform3DObject, const String& name); >- void getVertexAttribfv(GC3Duint index, GC3Denum pname, GC3Dfloat* value); >- void getVertexAttribiv(GC3Duint index, GC3Denum pname, GC3Dint* value); >- GC3Dsizeiptr getVertexAttribOffset(GC3Duint index, GC3Denum pname); >- >- void hint(GC3Denum target, GC3Denum mode); >- GC3Dboolean isBuffer(Platform3DObject); >- GC3Dboolean isEnabled(GC3Denum cap); >- GC3Dboolean isFramebuffer(Platform3DObject); >- GC3Dboolean isProgram(Platform3DObject); >- GC3Dboolean isRenderbuffer(Platform3DObject); >- GC3Dboolean isShader(Platform3DObject); >- GC3Dboolean isTexture(Platform3DObject); >- void lineWidth(GC3Dfloat); >- void linkProgram(Platform3DObject); >- void pixelStorei(GC3Denum pname, GC3Dint param); >- void polygonOffset(GC3Dfloat factor, GC3Dfloat units); >- >- void readPixels(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, void* data); >- >- void renderbufferStorage(GC3Denum target, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height); >- void sampleCoverage(GC3Dclampf value, GC3Dboolean invert); >- void scissor(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height); >- void shaderSource(Platform3DObject, const String& string); >- void stencilFunc(GC3Denum func, GC3Dint ref, GC3Duint mask); >- void stencilFuncSeparate(GC3Denum face, GC3Denum func, GC3Dint ref, GC3Duint mask); >- void stencilMask(GC3Duint mask); >- void stencilMaskSeparate(GC3Denum face, GC3Duint mask); >- void stencilOp(GC3Denum fail, GC3Denum zfail, GC3Denum zpass); >- void stencilOpSeparate(GC3Denum face, GC3Denum fail, GC3Denum zfail, GC3Denum zpass); >- >- // texImage2D return false on any error rather than using an ExceptionCode. >- bool texImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Denum format, GC3Denum type, const void* pixels); >- void texParameterf(GC3Denum target, GC3Denum pname, GC3Dfloat param); >- void texParameteri(GC3Denum target, GC3Denum pname, GC3Dint param); >- void texSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, const void* pixels); >- >- void uniform1f(GC3Dint location, GC3Dfloat x); >- void uniform1fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size); >- void uniform1i(GC3Dint location, GC3Dint x); >- void uniform1iv(GC3Dint location, GC3Dint* v, GC3Dsizei size); >- void uniform2f(GC3Dint location, GC3Dfloat x, float y); >- void uniform2fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size); >- void uniform2i(GC3Dint location, GC3Dint x, GC3Dint y); >- void uniform2iv(GC3Dint location, GC3Dint* v, GC3Dsizei size); >- void uniform3f(GC3Dint location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z); >- void uniform3fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size); >- void uniform3i(GC3Dint location, GC3Dint x, GC3Dint y, GC3Dint z); >- void uniform3iv(GC3Dint location, GC3Dint* v, GC3Dsizei size); >- void uniform4f(GC3Dint location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w); >- void uniform4fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size); >- void uniform4i(GC3Dint location, GC3Dint x, GC3Dint y, GC3Dint z, GC3Dint w); >- void uniform4iv(GC3Dint location, GC3Dint* v, GC3Dsizei size); >- void uniformMatrix2fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size); >- void uniformMatrix3fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size); >- void uniformMatrix4fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size); >- >- void useProgram(Platform3DObject); >- void validateProgram(Platform3DObject); >- >- void vertexAttrib1f(GC3Duint index, GC3Dfloat x); >- void vertexAttrib1fv(GC3Duint index, GC3Dfloat* values); >- void vertexAttrib2f(GC3Duint index, GC3Dfloat x, GC3Dfloat y); >- void vertexAttrib2fv(GC3Duint index, GC3Dfloat* values); >- void vertexAttrib3f(GC3Duint index, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z); >- void vertexAttrib3fv(GC3Duint index, GC3Dfloat* values); >- void vertexAttrib4f(GC3Duint index, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w); >- void vertexAttrib4fv(GC3Duint index, GC3Dfloat* values); >- void vertexAttribPointer(GC3Duint index, GC3Dint size, GC3Denum type, GC3Dboolean normalized, >- GC3Dsizei stride, GC3Dintptr offset); >- >- void viewport(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height); >- >- Platform3DObject createBuffer(); >- Platform3DObject createFramebuffer(); >- Platform3DObject createProgram(); >- Platform3DObject createRenderbuffer(); >- Platform3DObject createShader(GC3Denum); >- Platform3DObject createTexture(); >- >- void deleteBuffer(Platform3DObject); >- void deleteFramebuffer(Platform3DObject); >- void deleteProgram(Platform3DObject); >- void deleteRenderbuffer(Platform3DObject); >- void deleteShader(Platform3DObject); >- void deleteTexture(Platform3DObject); >- >- void synthesizeGLError(GC3Denum error); >- >- void setContextLostCallback(PassOwnPtr<GraphicsContext3D::ContextLostCallback>); >- >- // Extensions3D support. >- Extensions3D* getExtensions(); >- bool supportsExtension(const String& name); >- bool ensureExtensionEnabled(const String& name); >- bool isExtensionEnabled(const String& name); >- >- // EXT_texture_format_BGRA8888 >- bool supportsBGRA(); >- >- // GL_CHROMIUM_map_sub >- bool supportsMapSubCHROMIUM(); >- void* mapBufferSubDataCHROMIUM(GC3Denum target, GC3Dsizeiptr offset, GC3Dsizei size, GC3Denum access); >- void unmapBufferSubDataCHROMIUM(const void*); >- void* mapTexSubImage2DCHROMIUM(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, GC3Denum access); >- void unmapTexSubImage2DCHROMIUM(const void*); >- >- // GL_CHROMIUM_framebuffer_multisample >- void blitFramebufferCHROMIUM(GC3Dint srcX0, GC3Dint srcY0, GC3Dint srcX1, GC3Dint srcY1, GC3Dint dstX0, GC3Dint dstY0, GC3Dint dstX1, GC3Dint dstY1, GC3Dbitfield mask, GC3Denum filter); >- void renderbufferStorageMultisampleCHROMIUM(GC3Denum target, GC3Dsizei samples, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height); >- >- // GL_CHROMIUM_swapbuffers_complete_callback >- void setSwapBuffersCompleteCallbackCHROMIUM(PassOwnPtr<Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM>); >- >- // GL_CHROMIUM_rate_limit_offscreen_context >- void rateLimitOffscreenContextCHROMIUM(); >- >- // GL_ARB_robustness >- GC3Denum getGraphicsResetStatusARB(); >- >-private: >- OwnPtr<WebKit::WebGraphicsContext3D> m_impl; >- OwnPtr<Extensions3DChromium> m_extensions; >- OwnPtr<GraphicsContextLostCallbackAdapter> m_contextLostCallbackAdapter; >- OwnPtr<SwapBuffersCompleteCallbackAdapter> m_swapBuffersCompleteCallbackAdapter; >- WebKit::WebViewImpl* m_webViewImpl; >- bool m_initializedAvailableExtensions; >- HashSet<String> m_enabledExtensions; >- HashSet<String> m_requestableExtensions; >- bool m_layerComposited; >- >- enum ResourceSafety { >- ResourceSafetyUnknown, >- ResourceSafe, >- ResourceUnsafe >- }; >- ResourceSafety m_resourceSafety; >- >-#if USE(ACCELERATED_COMPOSITING) >- RefPtr<WebGLLayerChromium> m_compositingLayer; >-#endif >-#if USE(SKIA) >- // If the width and height of the Canvas's backing store don't >- // match those that we were given in the most recent call to >- // reshape(), then we need an intermediate bitmap to read back the >- // frame buffer into. This seems to happen when CSS styles are >- // used to resize the Canvas. >- SkBitmap m_resizingBitmap; >- >- GrContext* m_grContext; >-#endif >- >-#if USE(CG) >- OwnArrayPtr<unsigned char> m_renderOutput; >- size_t m_renderOutputSize; >-#endif >- >- void initializeExtensions(); >-}; >- >-} // namespace WebCore >- >-#endif // GraphicsContext3D_h >Index: Source/WebKit/chromium/src/GraphicsContext3DPrivate.h >=================================================================== >--- Source/WebKit/chromium/src/GraphicsContext3DPrivate.h (revision 93979) (from Source/WebKit/chromium/src/GraphicsContext3DInternal.h:93979) >+++ Source/WebKit/chromium/src/GraphicsContext3DPrivate.h (working copy) >@@ -0,0 +1,334 @@ >+/* >+ * Copyright (C) 2010 Google Inc. All rights reserved. >+ * >+ * Redistribution and use in source and binary forms, with or without >+ * modification, are permitted provided that the following conditions >+ * are met: >+ * >+ * 1. Redistributions of source code must retain the above copyright >+ * notice, this list of conditions and the following disclaimer. >+ * 2. Redistributions in binary form must reproduce the above copyright >+ * notice, this list of conditions and the following disclaimer in the >+ * documentation and/or other materials provided with the distribution. >+ * >+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY >+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED >+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE >+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY >+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES >+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; >+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND >+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT >+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF >+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. >+ */ >+ >+#ifndef GraphicsContext3DInternal_h >+#define GraphicsContext3DInternal_h >+ >+#include "Extensions3DChromium.h" >+#include "GraphicsContext3D.h" >+#include <wtf/HashSet.h> >+#include <wtf/OwnArrayPtr.h> >+#include <wtf/OwnPtr.h> >+#if USE(SKIA) >+#include "SkBitmap.h" >+#endif >+ >+#if USE(SKIA) >+class GrContext; >+#endif >+ >+namespace WebKit { >+class WebGraphicsContext3D; >+class WebViewImpl; >+} // namespace WebKit >+ >+namespace WebCore { >+ >+class Extensions3DChromium; >+#if USE(ACCELERATED_COMPOSITING) >+class WebGLLayerChromium; >+#endif >+class GraphicsContextLostCallbackAdapter; >+class SwapBuffersCompleteCallbackAdapter; >+ >+class GraphicsContext3DInternal { >+public: >+ GraphicsContext3DInternal(); >+ ~GraphicsContext3DInternal(); >+ >+ bool initialize(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow, bool renderDirectlyToHostWindow); >+ >+ // Helper function to provide access to the lower-level WebGraphicsContext3D, >+ // which is needed for subordinate contexts like WebGL's to share resources >+ // with the compositor's context. >+ static WebKit::WebGraphicsContext3D* extractWebGraphicsContext3D(GraphicsContext3D* context); >+ >+ PlatformGraphicsContext3D platformGraphicsContext3D() const; >+ Platform3DObject platformTexture() const; >+#if USE(SKIA) >+ GrContext* grContext(); >+#endif >+ >+ bool makeContextCurrent(); >+ >+ void reshape(int width, int height); >+ IntSize getInternalFramebufferSize() const; >+ bool isResourceSafe(); >+ >+ void markContextChanged(); >+ bool layerComposited() const; >+ void markLayerComposited(); >+ >+ void paintRenderingResultsToCanvas(CanvasRenderingContext*); >+ void paintFramebufferToCanvas(int framebuffer, int width, int height, bool premultiplyAlpha, ImageBuffer*); >+ PassRefPtr<ImageData> paintRenderingResultsToImageData(); >+ bool paintsIntoCanvasBuffer() const; >+ bool paintCompositedResultsToCanvas(CanvasRenderingContext*); >+ >+ void prepareTexture(); >+ >+#if USE(ACCELERATED_COMPOSITING) >+ WebGLLayerChromium* platformLayer() const; >+#endif >+ bool isGLES2Compliant() const; >+ >+ void releaseShaderCompiler(); >+ bool isContextLost(); >+ >+ //---------------------------------------------------------------------- >+ // Entry points for WebGL. >+ // >+ void activeTexture(GC3Denum texture); >+ void attachShader(Platform3DObject program, Platform3DObject shader); >+ void bindAttribLocation(Platform3DObject, GC3Duint index, const String& name); >+ void bindBuffer(GC3Denum target, Platform3DObject); >+ void bindFramebuffer(GC3Denum target, Platform3DObject); >+ void bindRenderbuffer(GC3Denum target, Platform3DObject); >+ void bindTexture(GC3Denum target, Platform3DObject); >+ void blendColor(GC3Dclampf red, GC3Dclampf green, GC3Dclampf blue, GC3Dclampf alpha); >+ void blendEquation(GC3Denum mode); >+ void blendEquationSeparate(GC3Denum modeRGB, GC3Denum modeAlpha); >+ void blendFunc(GC3Denum sfactor, GC3Denum dfactor); >+ void blendFuncSeparate(GC3Denum srcRGB, GC3Denum dstRGB, GC3Denum srcAlpha, GC3Denum dstAlpha); >+ >+ void bufferData(GC3Denum target, GC3Dsizeiptr size, GC3Denum usage); >+ void bufferData(GC3Denum target, GC3Dsizeiptr size, const void* data, GC3Denum usage); >+ void bufferSubData(GC3Denum target, GC3Dintptr offset, GC3Dsizeiptr size, const void* data); >+ >+ GC3Denum checkFramebufferStatus(GC3Denum target); >+ void clear(GC3Dbitfield mask); >+ void clearColor(GC3Dclampf red, GC3Dclampf green, GC3Dclampf blue, GC3Dclampf alpha); >+ void clearDepth(GC3Dclampf depth); >+ void clearStencil(GC3Dint s); >+ void colorMask(GC3Dboolean red, GC3Dboolean green, GC3Dboolean blue, GC3Dboolean alpha); >+ void compileShader(Platform3DObject); >+ >+ void copyTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Dint border); >+ void copyTexSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height); >+ void cullFace(GC3Denum mode); >+ void depthFunc(GC3Denum func); >+ void depthMask(GC3Dboolean flag); >+ void depthRange(GC3Dclampf zNear, GC3Dclampf zFar); >+ void detachShader(Platform3DObject, Platform3DObject); >+ void disable(GC3Denum cap); >+ void disableVertexAttribArray(GC3Duint index); >+ void drawArrays(GC3Denum mode, GC3Dint first, GC3Dsizei count); >+ void drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, GC3Dintptr offset); >+ >+ void enable(GC3Denum cap); >+ void enableVertexAttribArray(GC3Duint index); >+ void finish(); >+ void flush(); >+ void framebufferRenderbuffer(GC3Denum target, GC3Denum attachment, GC3Denum renderbuffertarget, Platform3DObject); >+ void framebufferTexture2D(GC3Denum target, GC3Denum attachment, GC3Denum textarget, Platform3DObject, GC3Dint level); >+ void frontFace(GC3Denum mode); >+ void generateMipmap(GC3Denum target); >+ >+ bool getActiveAttrib(Platform3DObject program, GC3Duint index, ActiveInfo&); >+ bool getActiveUniform(Platform3DObject program, GC3Duint index, ActiveInfo&); >+ void getAttachedShaders(Platform3DObject program, GC3Dsizei maxCount, GC3Dsizei* count, Platform3DObject* shaders); >+ GC3Dint getAttribLocation(Platform3DObject, const String& name); >+ void getBooleanv(GC3Denum pname, GC3Dboolean* value); >+ void getBufferParameteriv(GC3Denum target, GC3Denum pname, GC3Dint* value); >+ GraphicsContext3D::Attributes getContextAttributes(); >+ GC3Denum getError(); >+ void getFloatv(GC3Denum pname, GC3Dfloat* value); >+ void getFramebufferAttachmentParameteriv(GC3Denum target, GC3Denum attachment, GC3Denum pname, GC3Dint* value); >+ void getIntegerv(GC3Denum pname, GC3Dint* value); >+ void getProgramiv(Platform3DObject program, GC3Denum pname, GC3Dint* value); >+ String getProgramInfoLog(Platform3DObject); >+ void getRenderbufferParameteriv(GC3Denum target, GC3Denum pname, GC3Dint* value); >+ void getShaderiv(Platform3DObject, GC3Denum pname, GC3Dint* value); >+ String getShaderInfoLog(Platform3DObject); >+ >+ String getShaderSource(Platform3DObject); >+ String getString(GC3Denum name); >+ void getTexParameterfv(GC3Denum target, GC3Denum pname, GC3Dfloat* value); >+ void getTexParameteriv(GC3Denum target, GC3Denum pname, GC3Dint* value); >+ void getUniformfv(Platform3DObject program, GC3Dint location, GC3Dfloat* value); >+ void getUniformiv(Platform3DObject program, GC3Dint location, GC3Dint* value); >+ GC3Dint getUniformLocation(Platform3DObject, const String& name); >+ void getVertexAttribfv(GC3Duint index, GC3Denum pname, GC3Dfloat* value); >+ void getVertexAttribiv(GC3Duint index, GC3Denum pname, GC3Dint* value); >+ GC3Dsizeiptr getVertexAttribOffset(GC3Duint index, GC3Denum pname); >+ >+ void hint(GC3Denum target, GC3Denum mode); >+ GC3Dboolean isBuffer(Platform3DObject); >+ GC3Dboolean isEnabled(GC3Denum cap); >+ GC3Dboolean isFramebuffer(Platform3DObject); >+ GC3Dboolean isProgram(Platform3DObject); >+ GC3Dboolean isRenderbuffer(Platform3DObject); >+ GC3Dboolean isShader(Platform3DObject); >+ GC3Dboolean isTexture(Platform3DObject); >+ void lineWidth(GC3Dfloat); >+ void linkProgram(Platform3DObject); >+ void pixelStorei(GC3Denum pname, GC3Dint param); >+ void polygonOffset(GC3Dfloat factor, GC3Dfloat units); >+ >+ void readPixels(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, void* data); >+ >+ void renderbufferStorage(GC3Denum target, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height); >+ void sampleCoverage(GC3Dclampf value, GC3Dboolean invert); >+ void scissor(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height); >+ void shaderSource(Platform3DObject, const String& string); >+ void stencilFunc(GC3Denum func, GC3Dint ref, GC3Duint mask); >+ void stencilFuncSeparate(GC3Denum face, GC3Denum func, GC3Dint ref, GC3Duint mask); >+ void stencilMask(GC3Duint mask); >+ void stencilMaskSeparate(GC3Denum face, GC3Duint mask); >+ void stencilOp(GC3Denum fail, GC3Denum zfail, GC3Denum zpass); >+ void stencilOpSeparate(GC3Denum face, GC3Denum fail, GC3Denum zfail, GC3Denum zpass); >+ >+ // texImage2D return false on any error rather than using an ExceptionCode. >+ bool texImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Denum format, GC3Denum type, const void* pixels); >+ void texParameterf(GC3Denum target, GC3Denum pname, GC3Dfloat param); >+ void texParameteri(GC3Denum target, GC3Denum pname, GC3Dint param); >+ void texSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, const void* pixels); >+ >+ void uniform1f(GC3Dint location, GC3Dfloat x); >+ void uniform1fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size); >+ void uniform1i(GC3Dint location, GC3Dint x); >+ void uniform1iv(GC3Dint location, GC3Dint* v, GC3Dsizei size); >+ void uniform2f(GC3Dint location, GC3Dfloat x, float y); >+ void uniform2fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size); >+ void uniform2i(GC3Dint location, GC3Dint x, GC3Dint y); >+ void uniform2iv(GC3Dint location, GC3Dint* v, GC3Dsizei size); >+ void uniform3f(GC3Dint location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z); >+ void uniform3fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size); >+ void uniform3i(GC3Dint location, GC3Dint x, GC3Dint y, GC3Dint z); >+ void uniform3iv(GC3Dint location, GC3Dint* v, GC3Dsizei size); >+ void uniform4f(GC3Dint location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w); >+ void uniform4fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size); >+ void uniform4i(GC3Dint location, GC3Dint x, GC3Dint y, GC3Dint z, GC3Dint w); >+ void uniform4iv(GC3Dint location, GC3Dint* v, GC3Dsizei size); >+ void uniformMatrix2fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size); >+ void uniformMatrix3fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size); >+ void uniformMatrix4fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size); >+ >+ void useProgram(Platform3DObject); >+ void validateProgram(Platform3DObject); >+ >+ void vertexAttrib1f(GC3Duint index, GC3Dfloat x); >+ void vertexAttrib1fv(GC3Duint index, GC3Dfloat* values); >+ void vertexAttrib2f(GC3Duint index, GC3Dfloat x, GC3Dfloat y); >+ void vertexAttrib2fv(GC3Duint index, GC3Dfloat* values); >+ void vertexAttrib3f(GC3Duint index, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z); >+ void vertexAttrib3fv(GC3Duint index, GC3Dfloat* values); >+ void vertexAttrib4f(GC3Duint index, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w); >+ void vertexAttrib4fv(GC3Duint index, GC3Dfloat* values); >+ void vertexAttribPointer(GC3Duint index, GC3Dint size, GC3Denum type, GC3Dboolean normalized, >+ GC3Dsizei stride, GC3Dintptr offset); >+ >+ void viewport(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height); >+ >+ Platform3DObject createBuffer(); >+ Platform3DObject createFramebuffer(); >+ Platform3DObject createProgram(); >+ Platform3DObject createRenderbuffer(); >+ Platform3DObject createShader(GC3Denum); >+ Platform3DObject createTexture(); >+ >+ void deleteBuffer(Platform3DObject); >+ void deleteFramebuffer(Platform3DObject); >+ void deleteProgram(Platform3DObject); >+ void deleteRenderbuffer(Platform3DObject); >+ void deleteShader(Platform3DObject); >+ void deleteTexture(Platform3DObject); >+ >+ void synthesizeGLError(GC3Denum error); >+ >+ void setContextLostCallback(PassOwnPtr<GraphicsContext3D::ContextLostCallback>); >+ >+ // Extensions3D support. >+ Extensions3D* getExtensions(); >+ bool supportsExtension(const String& name); >+ bool ensureExtensionEnabled(const String& name); >+ bool isExtensionEnabled(const String& name); >+ >+ // EXT_texture_format_BGRA8888 >+ bool supportsBGRA(); >+ >+ // GL_CHROMIUM_map_sub >+ bool supportsMapSubCHROMIUM(); >+ void* mapBufferSubDataCHROMIUM(GC3Denum target, GC3Dsizeiptr offset, GC3Dsizei size, GC3Denum access); >+ void unmapBufferSubDataCHROMIUM(const void*); >+ void* mapTexSubImage2DCHROMIUM(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, GC3Denum access); >+ void unmapTexSubImage2DCHROMIUM(const void*); >+ >+ // GL_CHROMIUM_framebuffer_multisample >+ void blitFramebufferCHROMIUM(GC3Dint srcX0, GC3Dint srcY0, GC3Dint srcX1, GC3Dint srcY1, GC3Dint dstX0, GC3Dint dstY0, GC3Dint dstX1, GC3Dint dstY1, GC3Dbitfield mask, GC3Denum filter); >+ void renderbufferStorageMultisampleCHROMIUM(GC3Denum target, GC3Dsizei samples, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height); >+ >+ // GL_CHROMIUM_swapbuffers_complete_callback >+ void setSwapBuffersCompleteCallbackCHROMIUM(PassOwnPtr<Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM>); >+ >+ // GL_CHROMIUM_rate_limit_offscreen_context >+ void rateLimitOffscreenContextCHROMIUM(); >+ >+ // GL_ARB_robustness >+ GC3Denum getGraphicsResetStatusARB(); >+ >+private: >+ OwnPtr<WebKit::WebGraphicsContext3D> m_impl; >+ OwnPtr<Extensions3DChromium> m_extensions; >+ OwnPtr<GraphicsContextLostCallbackAdapter> m_contextLostCallbackAdapter; >+ OwnPtr<SwapBuffersCompleteCallbackAdapter> m_swapBuffersCompleteCallbackAdapter; >+ WebKit::WebViewImpl* m_webViewImpl; >+ bool m_initializedAvailableExtensions; >+ HashSet<String> m_enabledExtensions; >+ HashSet<String> m_requestableExtensions; >+ bool m_layerComposited; >+ >+ enum ResourceSafety { >+ ResourceSafetyUnknown, >+ ResourceSafe, >+ ResourceUnsafe >+ }; >+ ResourceSafety m_resourceSafety; >+ >+#if USE(ACCELERATED_COMPOSITING) >+ RefPtr<WebGLLayerChromium> m_compositingLayer; >+#endif >+#if USE(SKIA) >+ // If the width and height of the Canvas's backing store don't >+ // match those that we were given in the most recent call to >+ // reshape(), then we need an intermediate bitmap to read back the >+ // frame buffer into. This seems to happen when CSS styles are >+ // used to resize the Canvas. >+ SkBitmap m_resizingBitmap; >+ >+ GrContext* m_grContext; >+#endif >+ >+#if USE(CG) >+ OwnArrayPtr<unsigned char> m_renderOutput; >+ size_t m_renderOutputSize; >+#endif >+ >+ void initializeExtensions(); >+}; >+ >+} // namespace WebCore >+ >+#endif // GraphicsContext3D_h >Index: Source/WebKit/chromium/src/GraphicsContext3DPrivate.h >=================================================================== >--- Source/WebKit/chromium/src/GraphicsContext3DPrivate.h (revision 93979) >+++ Source/WebKit/chromium/src/GraphicsContext3DPrivate.h (working copy) >@@ -23,8 +23,8 @@ > * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ > >-#ifndef GraphicsContext3DInternal_h >-#define GraphicsContext3DInternal_h >+#ifndef GraphicsContext3DPrivate_h >+#define GraphicsContext3DPrivate_h > > #include "Extensions3DChromium.h" > #include "GraphicsContext3D.h" >@@ -53,17 +53,17 @@ class WebGLLayerChromium; > class GraphicsContextLostCallbackAdapter; > class SwapBuffersCompleteCallbackAdapter; > >-class GraphicsContext3DInternal { >+class GraphicsContext3DPrivate { > public: >- GraphicsContext3DInternal(); >- ~GraphicsContext3DInternal(); >+ GraphicsContext3DPrivate(); >+ ~GraphicsContext3DPrivate(); > >- bool initialize(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow, bool renderDirectlyToHostWindow); >+ bool initialize(GraphicsContext3D::Attributes, HostWindow*, bool renderDirectlyToHostWindow); > > // Helper function to provide access to the lower-level WebGraphicsContext3D, > // which is needed for subordinate contexts like WebGL's to share resources > // with the compositor's context. >- static WebKit::WebGraphicsContext3D* extractWebGraphicsContext3D(GraphicsContext3D* context); >+ static WebKit::WebGraphicsContext3D* extractWebGraphicsContext3D(GraphicsContext3D*); > > PlatformGraphicsContext3D platformGraphicsContext3D() const; > Platform3DObject platformTexture() const; >@@ -113,9 +113,9 @@ public: > void blendFunc(GC3Denum sfactor, GC3Denum dfactor); > void blendFuncSeparate(GC3Denum srcRGB, GC3Denum dstRGB, GC3Denum srcAlpha, GC3Denum dstAlpha); > >- void bufferData(GC3Denum target, GC3Dsizeiptr size, GC3Denum usage); >- void bufferData(GC3Denum target, GC3Dsizeiptr size, const void* data, GC3Denum usage); >- void bufferSubData(GC3Denum target, GC3Dintptr offset, GC3Dsizeiptr size, const void* data); >+ void bufferData(GC3Denum target, GC3Dsizeiptr, GC3Denum usage); >+ void bufferData(GC3Denum target, GC3Dsizeiptr, const void* data, GC3Denum usage); >+ void bufferSubData(GC3Denum target, GC3Dintptr offset, GC3Dsizeiptr, const void* data); > > GC3Denum checkFramebufferStatus(GC3Denum target); > void clear(GC3Dbitfield mask); >@@ -192,7 +192,7 @@ public: > void renderbufferStorage(GC3Denum target, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height); > void sampleCoverage(GC3Dclampf value, GC3Dboolean invert); > void scissor(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height); >- void shaderSource(Platform3DObject, const String& string); >+ void shaderSource(Platform3DObject, const String&); > void stencilFunc(GC3Denum func, GC3Dint ref, GC3Duint mask); > void stencilFuncSeparate(GC3Denum face, GC3Denum func, GC3Dint ref, GC3Duint mask); > void stencilMask(GC3Duint mask); >@@ -207,24 +207,24 @@ public: > void texSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, const void* pixels); > > void uniform1f(GC3Dint location, GC3Dfloat x); >- void uniform1fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size); >+ void uniform1fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei); > void uniform1i(GC3Dint location, GC3Dint x); >- void uniform1iv(GC3Dint location, GC3Dint* v, GC3Dsizei size); >+ void uniform1iv(GC3Dint location, GC3Dint* v, GC3Dsizei); > void uniform2f(GC3Dint location, GC3Dfloat x, float y); >- void uniform2fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size); >+ void uniform2fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei); > void uniform2i(GC3Dint location, GC3Dint x, GC3Dint y); >- void uniform2iv(GC3Dint location, GC3Dint* v, GC3Dsizei size); >+ void uniform2iv(GC3Dint location, GC3Dint* v, GC3Dsizei); > void uniform3f(GC3Dint location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z); >- void uniform3fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size); >+ void uniform3fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei); > void uniform3i(GC3Dint location, GC3Dint x, GC3Dint y, GC3Dint z); >- void uniform3iv(GC3Dint location, GC3Dint* v, GC3Dsizei size); >+ void uniform3iv(GC3Dint location, GC3Dint* v, GC3Dsizei); > void uniform4f(GC3Dint location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w); >- void uniform4fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei size); >+ void uniform4fv(GC3Dint location, GC3Dfloat* v, GC3Dsizei); > void uniform4i(GC3Dint location, GC3Dint x, GC3Dint y, GC3Dint z, GC3Dint w); >- void uniform4iv(GC3Dint location, GC3Dint* v, GC3Dsizei size); >- void uniformMatrix2fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size); >- void uniformMatrix3fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size); >- void uniformMatrix4fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei size); >+ void uniform4iv(GC3Dint location, GC3Dint* v, GC3Dsizei); >+ void uniformMatrix2fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei); >+ void uniformMatrix3fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei); >+ void uniformMatrix4fv(GC3Dint location, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei); > > void useProgram(Platform3DObject); > void validateProgram(Platform3DObject); >@@ -271,7 +271,7 @@ public: > > // GL_CHROMIUM_map_sub > bool supportsMapSubCHROMIUM(); >- void* mapBufferSubDataCHROMIUM(GC3Denum target, GC3Dsizeiptr offset, GC3Dsizei size, GC3Denum access); >+ void* mapBufferSubDataCHROMIUM(GC3Denum target, GC3Dsizeiptr offset, GC3Dsizei, GC3Denum access); > void unmapBufferSubDataCHROMIUM(const void*); > void* mapTexSubImage2DCHROMIUM(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, GC3Denum access); > void unmapTexSubImage2DCHROMIUM(const void*); >@@ -331,4 +331,4 @@ private: > > } // namespace WebCore > >-#endif // GraphicsContext3D_h >+#endif // GraphicsContext3DPrivate_h >Index: Source/WebKit/chromium/src/WebViewImpl.cpp >=================================================================== >--- Source/WebKit/chromium/src/WebViewImpl.cpp (revision 93979) >+++ Source/WebKit/chromium/src/WebViewImpl.cpp (working copy) >@@ -63,7 +63,7 @@ > #include "GeolocationClientProxy.h" > #include "GraphicsContext.h" > #include "GraphicsContext3D.h" >-#include "GraphicsContext3DInternal.h" >+#include "GraphicsContext3DPrivate.h" > #include "HTMLInputElement.h" > #include "HTMLMediaElement.h" > #include "HTMLNames.h" >@@ -2691,17 +2691,17 @@ WebGraphicsContext3D* WebViewImpl::graph > #if USE(ACCELERATED_COMPOSITING) > if (m_page->settings()->acceleratedCompositingEnabled() && allowsAcceleratedCompositing()) { > if (m_layerTreeHost) { >- WebGraphicsContext3D* webContext = GraphicsContext3DInternal::extractWebGraphicsContext3D(m_layerTreeHost->context()); >+ WebGraphicsContext3D* webContext = GraphicsContext3DPrivate::extractWebGraphicsContext3D(m_layerTreeHost->context()); > if (webContext && !webContext->isContextLost()) > return webContext; > } > if (m_temporaryOnscreenGraphicsContext3D) { >- WebGraphicsContext3D* webContext = GraphicsContext3DInternal::extractWebGraphicsContext3D(m_temporaryOnscreenGraphicsContext3D.get()); >+ WebGraphicsContext3D* webContext = GraphicsContext3DPrivate::extractWebGraphicsContext3D(m_temporaryOnscreenGraphicsContext3D.get()); > if (webContext && !webContext->isContextLost()) > return webContext; > } > m_temporaryOnscreenGraphicsContext3D = GraphicsContext3D::create(getCompositorContextAttributes(), m_page->chrome(), GraphicsContext3D::RenderDirectlyToHostWindow); >- return GraphicsContext3DInternal::extractWebGraphicsContext3D(m_temporaryOnscreenGraphicsContext3D.get()); >+ return GraphicsContext3DPrivate::extractWebGraphicsContext3D(m_temporaryOnscreenGraphicsContext3D.get()); > } > #endif > return 0;
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=105638">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
kbr
:
review+
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 67172
:
105563
| 105638 |
105768
|
105773