Changeset 57747 in webkit

Timestamp:

Apr 16, 2010 2:39:36 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-16 Jarkko Sakkinen <​jarkko.j.sakkinen@gmail.com>

Reviewed by Simon Hausmann.

[Qt] WebGL is not visible when QGLWidget viewport is used
​https://bugs.webkit.org/show_bug.cgi?id=37070

Added HostWindow parameter to the constructor of GraphicsContext3D.
Shared OpenGL context is initialized with parent QGLWidget.

• html/canvas/WebGLRenderingContext.cpp: (WebCore::WebGLRenderingContext::create):
• platform/graphics/GraphicsContext3D.h:
• platform/graphics/mac/GraphicsContext3DMac.cpp: (WebCore::GraphicsContext3D::create): (WebCore::GraphicsContext3D::GraphicsContext3D):
• platform/graphics/qt/GraphicsContext3DQt.cpp: (WebCore::GraphicsContext3DInternal::GraphicsContext3DInternal): (WebCore::GraphicsContext3DInternal::~GraphicsContext3DInternal): (WebCore::GraphicsContext3DInternal::getOwnerGLWidget): (WebCore::GraphicsContext3D::create): (WebCore::GraphicsContext3D::GraphicsContext3D):

2010-04-16 Jarkko Sakkinen <​jarkko.j.sakkinen@gmail.com>

Reviewed by Simon Hausmann.

[Qt] WebGL is not visible when QGLWidget viewport is used
​https://bugs.webkit.org/show_bug.cgi?id=37070

Added HostWindow parameter to the constructor of GraphicsContext3D.
Shared OpenGL context is initialized with parent QGLWidget.

• src/GraphicsContext3D.cpp: (WebCore::GraphicsContext3D::GraphicsContext3D):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/canvas/WebGLRenderingContext.cpp (modified) (2 diffs)
• WebCore/platform/graphics/GraphicsContext3D.h (modified) (3 diffs)
• WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp (modified) (2 diffs)
• WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp (modified) (9 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/GraphicsContext3D.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-16  Jarkko Sakkinen  <jarkko.j.sakkinen@gmail.com>
+ 
+        Reviewed by Simon Hausmann.
+ 
+        [Qt] WebGL is not visible when QGLWidget viewport is used
+        https://bugs.webkit.org/show_bug.cgi?id=37070
+ 
+        Added HostWindow parameter to the constructor of GraphicsContext3D.
+        Shared OpenGL context is initialized with parent QGLWidget.
+ 
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::create):
+        * platform/graphics/GraphicsContext3D.h:
+        * platform/graphics/mac/GraphicsContext3DMac.cpp:
+        (WebCore::GraphicsContext3D::create):
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+        * platform/graphics/qt/GraphicsContext3DQt.cpp:
+        (WebCore::GraphicsContext3DInternal::GraphicsContext3DInternal):
+        (WebCore::GraphicsContext3DInternal::~GraphicsContext3DInternal):
+        (WebCore::GraphicsContext3DInternal::getOwnerGLWidget):
+        (WebCore::GraphicsContext3D::create):
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+
 2010-04-16  Jarkko Sakkinen  <jarkko.j.sakkinen@gmail.com>
 

trunk/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -31 +31 @@
 
 #include "CanvasPixelArray.h"
+#include "FrameView.h"
 #include "HTMLCanvasElement.h"
 #include "HTMLImageElement.h"
@@ -74 +75 @@
 PassOwnPtr<WebGLRenderingContext> WebGLRenderingContext::create(HTMLCanvasElement* canvas, WebGLContextAttributes* attrs)
 {
-    OwnPtr<GraphicsContext3D> context(GraphicsContext3D::create(attrs->attributes()));
+    HostWindow* hostWindow = canvas->document()->view()->root()->hostWindow();
+    OwnPtr<GraphicsContext3D> context(GraphicsContext3D::create(attrs->attributes(), hostWindow));
+
     if (!context)
         return 0;

trunk/WebCore/platform/graphics/GraphicsContext3D.h

@@ -74 +74 @@
     class Image;
     class ImageData;
+    class HostWindow;
 
     struct ActiveInfo {
@@ -411 +412 @@
         };
 
-        static PassOwnPtr<GraphicsContext3D> create(Attributes attrs);
+        static PassOwnPtr<GraphicsContext3D> create(Attributes attrs, HostWindow* hostWindow);
         virtual ~GraphicsContext3D();
 
@@ -686 +687 @@
 
     private:        
-        GraphicsContext3D(Attributes attrs);
+        GraphicsContext3D(Attributes attrs, HostWindow* hostWindow);
 
         // Helpers for texture uploading.

trunk/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp

@@ -76 +76 @@
 }
 
-PassOwnPtr<GraphicsContext3D> GraphicsContext3D::create(GraphicsContext3D::Attributes attrs)
-{
-    OwnPtr<GraphicsContext3D> context(new GraphicsContext3D(attrs));
+PassOwnPtr<GraphicsContext3D> GraphicsContext3D::create(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow)
+{
+    OwnPtr<GraphicsContext3D> context(new GraphicsContext3D(attrs, hostWindow));
     return context->m_contextObj ? context.release() : 0;
 }
 
-GraphicsContext3D::GraphicsContext3D(GraphicsContext3D::Attributes attrs)
+GraphicsContext3D::GraphicsContext3D(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow)
     : m_currentWidth(0)
     , m_currentHeight(0)
@@ -95 +95 @@
     , m_multisampleColorBuffer(0)
 {
+    UNUSED_PARAM(hostWindow);
+
     Vector<CGLPixelFormatAttribute> attribs;
     CGLPixelFormatObj pixelFormatObj = 0;

trunk/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp

@@ -24 +24 @@
 #include "GraphicsContext.h"
 #include "HTMLCanvasElement.h"
+#include "HostWindow.h"
 #include "ImageBuffer.h"
 #include "NotImplemented.h"
+#include "QWebPageClient.h"
 #include "WebGLActiveInfo.h"
 #include "WebGLArray.h"
@@ -38 +40 @@
 #include "WebGLTexture.h"
 #include "WebGLUnsignedByteArray.h"
+#include <QAbstractScrollArea>
 #include <wtf/UnusedParam.h>
 #include <wtf/text/CString.h>
@@ -148 +151 @@
 class GraphicsContext3DInternal {
 public:
-    GraphicsContext3DInternal(GraphicsContext3D::Attributes attrs);
+    GraphicsContext3DInternal(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow);
     ~GraphicsContext3DInternal();
 
@@ -256 +259 @@
 private:
 
+    QGLWidget* getOwnerGLWidget(QWebPageClient* webPageClient);
     void* getProcAddress(const String& proc);
     bool m_contextValid;
@@ -266 +270 @@
 #endif
  
-GraphicsContext3DInternal::GraphicsContext3DInternal(GraphicsContext3D::Attributes attrs)
+GraphicsContext3DInternal::GraphicsContext3DInternal(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow)
     : m_attrs(attrs)
     , m_glWidget(0)
@@ -275 +279 @@
     , m_contextValid(true)
 {
-    m_attrs.alpha = true;
-    m_attrs.depth = true;
-    m_attrs.stencil = false;
-    m_attrs.antialias = false;
-    m_attrs.premultipliedAlpha = true;
-
-    QGLFormat format;
-
-    format.setDepth(true);
-    format.setSampleBuffers(true);
-    format.setStencil(false);
-
-    m_glWidget = new QGLWidget(format);
+    QWebPageClient* webPageClient = hostWindow->platformPageClient();
+    QGLWidget* ownerGLWidget  = getOwnerGLWidget(webPageClient);
+
+    if (ownerGLWidget) 
+        m_glWidget = new QGLWidget(0, ownerGLWidget);
+    else {
+        QGLFormat format;
+        format.setDepth(true);
+        format.setSampleBuffers(true);
+        format.setStencil(false);
+
+        m_glWidget = new QGLWidget(format);
+    }
+
     if (!m_glWidget->isValid()) {
         LOG_ERROR("GraphicsContext3D: QGLWidget does not have a valid context");
@@ -293 +298 @@
         return;
     }
+ 
+    QGLFormat format = m_glWidget->format();
+
+    m_attrs.alpha = format.alpha();
+    m_attrs.depth = format.depth();
+    m_attrs.stencil = format.stencil();
+    m_attrs.antialias = false;
+    m_attrs.premultipliedAlpha = true;
 
     m_glWidget->makeCurrent();
@@ -432 +445 @@
 }
 
+QGLWidget* GraphicsContext3DInternal::getOwnerGLWidget(QWebPageClient* webPageClient)
+{
+    QAbstractScrollArea* scrollArea = qobject_cast<QAbstractScrollArea*>(webPageClient->ownerWidget());
+
+    if (scrollArea) 
+        return qobject_cast<QGLWidget*>(scrollArea->viewport());
+
+    return 0;
+}
+
 void* GraphicsContext3DInternal::getProcAddress(const String& proc)
 {
@@ -449 +472 @@
 }
 
-PassOwnPtr<GraphicsContext3D> GraphicsContext3D::create(GraphicsContext3D::Attributes attrs)
-{
-    OwnPtr<GraphicsContext3D> context(new GraphicsContext3D(attrs));
+PassOwnPtr<GraphicsContext3D> GraphicsContext3D::create(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow)
+{
+    OwnPtr<GraphicsContext3D> context(new GraphicsContext3D(attrs, hostWindow));
     return context->m_internal ? context.release() : 0;
 }
 
-GraphicsContext3D::GraphicsContext3D(GraphicsContext3D::Attributes attrs)
-    : m_internal(new GraphicsContext3DInternal(attrs))
+GraphicsContext3D::GraphicsContext3D(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow)
+    : m_internal(new GraphicsContext3DInternal(attrs, hostWindow))
 {
     if (!m_internal->isContextValid()) 

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-04-16  Jarkko Sakkinen  <jarkko.j.sakkinen@gmail.com>
+ 
+        Reviewed by Simon Hausmann.
+ 
+        [Qt] WebGL is not visible when QGLWidget viewport is used
+        https://bugs.webkit.org/show_bug.cgi?id=37070
+ 
+        Added HostWindow parameter to the constructor of GraphicsContext3D.
+        Shared OpenGL context is initialized with parent QGLWidget.
+ 
+        * src/GraphicsContext3D.cpp:
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+
 2010-04-16  Fumitoshi Ukai  <ukai@chromium.org>
 

trunk/WebKit/chromium/src/GraphicsContext3D.cpp

@@ -1049 +1049 @@
 }
 
-GraphicsContext3D::GraphicsContext3D(GraphicsContext3D::Attributes attrs)
-{
+GraphicsContext3D::GraphicsContext3D(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow)
+{
+    UNUSED_PARAM(hostWindow);
 }
 
@@ -1057 +1058 @@
 }
 
-PassOwnPtr<GraphicsContext3D> GraphicsContext3D::create(GraphicsContext3D::Attributes attrs)
+PassOwnPtr<GraphicsContext3D> GraphicsContext3D::create(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow)
 {
     GraphicsContext3DInternal* internal = new GraphicsContext3DInternal();
@@ -1064 +1065 @@
         return 0;
     }
-    PassOwnPtr<GraphicsContext3D> result = new GraphicsContext3D(attrs);
+    PassOwnPtr<GraphicsContext3D> result = new GraphicsContext3D(attrs, hostWindow);
     result->m_internal.set(internal);
     return result;