Changeset 77900 in webkit

Timestamp:

Feb 7, 2011 10:25:20 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-02-07 Alexey Marinichev <​amarinichev@chromium.org>

Reviewed by Kenneth Russell.

Hook up WebGraphicsContext3D::setContextLostCallback.
​https://bugs.webkit.org/show_bug.cgi?id=53722

Test: fast/canvas/webgl/context-lost.html, comment out the line with
extension.loseContext() and kill the GPU process "Lose context"
message shows up.

• html/canvas/WebGLRenderingContext.cpp: (WebCore::WebGLRenderingContextLostCallback::WebGLRenderingContextLostCallback): (WebCore::WebGLRenderingContextLostCallback::onContextLost): (WebCore::WebGLRenderingContextLostCallback::~WebGLRenderingContextLostCallback): (WebCore::WebGLRenderingContext::initializeNewContext): (WebCore::WebGLRenderingContext::~WebGLRenderingContext):
• platform/graphics/GraphicsContext3D.h: (WebCore::GraphicsContext3D::ContextLostCallback::~ContextLostCallback):
• platform/graphics/mac/GraphicsContext3DMac.mm: (WebCore::GraphicsContext3D::setContextLostCallback): stub
• platform/graphics/qt/GraphicsContext3DQt.cpp: (WebCore::GraphicsContext3D::setContextLostCallback): stub

2011-02-07 Alexey Marinichev <​amarinichev@chromium.org>

Reviewed by Kenneth Russell.

Hook up WebGraphicsContext3D::setContextLostCallback.
​https://bugs.webkit.org/show_bug.cgi?id=53722

Test: fast/canvas/webgl/context-lost.html, comment out the line with
extension.loseContext() and kill the GPU process "Lose context"
message shows up.

• public/WebGraphicsContext3D.h: (WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback::~WebGraphicsContextLostCallback):
• src/GraphicsContext3DChromium.cpp: (WebCore::GraphicsContextLostCallbackAdapter::~GraphicsContextLostCallbackAdapter): (WebCore::GraphicsContextLostCallbackAdapter::GraphicsContextLostCallbackAdapter): (WebCore::GraphicsContextLostCallbackAdapter::onContextLost): (WebCore::GraphicsContextLostCallbackAdapter::create): (WebCore::GraphicsContext3DInternal::setContextLostCallback):
• src/GraphicsContext3DInternal.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/canvas/WebGLRenderingContext.cpp (modified) (3 diffs)
• WebCore/platform/graphics/GraphicsContext3D.h (modified) (1 diff)
• WebCore/platform/graphics/mac/GraphicsContext3DMac.mm (modified) (1 diff)
• WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebGraphicsContext3D.h (modified) (1 diff)
• WebKit/chromium/src/GraphicsContext3DChromium.cpp (modified) (1 diff)
• WebKit/chromium/src/GraphicsContext3DInternal.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-07  Alexey Marinichev  <amarinichev@chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        Hook up WebGraphicsContext3D::setContextLostCallback.
+        https://bugs.webkit.org/show_bug.cgi?id=53722
+
+        Test: fast/canvas/webgl/context-lost.html, comment out the line with
+        extension.loseContext() and kill the GPU process "Lose context"
+        message shows up.
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContextLostCallback::WebGLRenderingContextLostCallback):
+        (WebCore::WebGLRenderingContextLostCallback::onContextLost):
+        (WebCore::WebGLRenderingContextLostCallback::~WebGLRenderingContextLostCallback):
+        (WebCore::WebGLRenderingContext::initializeNewContext):
+        (WebCore::WebGLRenderingContext::~WebGLRenderingContext):
+        * platform/graphics/GraphicsContext3D.h:
+        (WebCore::GraphicsContext3D::ContextLostCallback::~ContextLostCallback):
+        * platform/graphics/mac/GraphicsContext3DMac.mm:
+        (WebCore::GraphicsContext3D::setContextLostCallback): stub
+        * platform/graphics/qt/GraphicsContext3DQt.cpp:
+        (WebCore::GraphicsContext3D::setContextLostCallback): stub
+
 2011-02-07  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -342 +342 @@
 }
 
+class WebGLRenderingContextLostCallback : public GraphicsContext3D::ContextLostCallback {
+public:
+    WebGLRenderingContextLostCallback(WebGLRenderingContext* cb) : m_contextLostCallback(cb) {}
+    virtual void onContextLost() { m_contextLostCallback->forceLostContext(); }
+    virtual ~WebGLRenderingContextLostCallback() {}
+private:
+    WebGLRenderingContext* m_contextLostCallback;
+};
+
 PassOwnPtr<WebGLRenderingContext> WebGLRenderingContext::create(HTMLCanvasElement* canvas, WebGLContextAttributes* attrs)
 {
@@ -417 +426 @@
     m_context->reshape(canvas()->width(), canvas()->height());
     m_context->viewport(0, 0, canvas()->width(), canvas()->height());
+
+    m_context->setContextLostCallback(adoptPtr(new WebGLRenderingContextLostCallback(this)));
 }
 
@@ -438 +449 @@
 {
     detachAndRemoveAllObjects();
+    m_context->setContextLostCallback(0);
 }
 

trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h

@@ -455 +455 @@
     };
 
+    class ContextLostCallback {
+    public:
+        virtual void onContextLost() = 0;
+        virtual ~ContextLostCallback() {}
+    };
+
+    void setContextLostCallback(PassOwnPtr<ContextLostCallback>);
+
     static PassRefPtr<GraphicsContext3D> create(Attributes, HostWindow*, RenderStyle = RenderOffscreen);
     ~GraphicsContext3D();

trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm

@@ -246 +246 @@
 }
 
+void GraphicsContext3D::setContextLostCallback(PassOwnPtr<ContextLostCallback>)
+{
+}
+
 }
 

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

@@ -1648 +1648 @@
 }
 
+void GraphicsContext3D::setContextLostCallback(PassOwnPtr<ContextLostCallback>)
+{
+}
+
 }
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-02-07  Alexey Marinichev  <amarinichev@chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        Hook up WebGraphicsContext3D::setContextLostCallback.
+        https://bugs.webkit.org/show_bug.cgi?id=53722
+
+        Test: fast/canvas/webgl/context-lost.html, comment out the line with
+        extension.loseContext() and kill the GPU process "Lose context"
+        message shows up.
+
+        * public/WebGraphicsContext3D.h:
+        (WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback::~WebGraphicsContextLostCallback):
+        * src/GraphicsContext3DChromium.cpp:
+        (WebCore::GraphicsContextLostCallbackAdapter::~GraphicsContextLostCallbackAdapter):
+        (WebCore::GraphicsContextLostCallbackAdapter::GraphicsContextLostCallbackAdapter):
+        (WebCore::GraphicsContextLostCallbackAdapter::onContextLost):
+        (WebCore::GraphicsContextLostCallbackAdapter::create):
+        (WebCore::GraphicsContext3DInternal::setContextLostCallback):
+        * src/GraphicsContext3DInternal.h:
+
 2011-02-07  Adam Klein  <adamk@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebGraphicsContext3D.h

@@ -100 +100 @@
     public:
         virtual void onContextLost() = 0;
+        virtual ~WebGraphicsContextLostCallback() {}
     };
 

trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp

@@ -1083 +1083 @@
 DELEGATE_TO_INTERNAL_R(getExtensions, Extensions3D*)
 
+DELEGATE_TO_INTERNAL_1(setContextLostCallback, PassOwnPtr<GraphicsContext3D::ContextLostCallback>)
+
+class GraphicsContextLostCallbackAdapter : public WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback {
+public:
+    virtual void onContextLost();
+    static PassOwnPtr<GraphicsContextLostCallbackAdapter> create(PassOwnPtr<GraphicsContext3D::ContextLostCallback>);
+    virtual ~GraphicsContextLostCallbackAdapter() {}
+private:
+    GraphicsContextLostCallbackAdapter(PassOwnPtr<GraphicsContext3D::ContextLostCallback> cb) : m_contextLostCallback(cb) {}
+    OwnPtr<GraphicsContext3D::ContextLostCallback> m_contextLostCallback;
+};
+
+void GraphicsContextLostCallbackAdapter::onContextLost()
+{
+    if (m_contextLostCallback)
+        m_contextLostCallback->onContextLost();
+}
+
+PassOwnPtr<GraphicsContextLostCallbackAdapter> GraphicsContextLostCallbackAdapter::create(PassOwnPtr<GraphicsContext3D::ContextLostCallback> cb)
+{
+    return adoptPtr(new GraphicsContextLostCallbackAdapter(cb));
+}
+
+void GraphicsContext3DInternal::setContextLostCallback(PassOwnPtr<GraphicsContext3D::ContextLostCallback> cb)
+{
+    m_contextLostCallbackAdapter = GraphicsContextLostCallbackAdapter::create(cb);
+    m_impl->setContextLostCallback(m_contextLostCallbackAdapter.get());
+}
+
 bool GraphicsContext3D::isGLES2Compliant() const
 {

trunk/Source/WebKit/chromium/src/GraphicsContext3DInternal.h

@@ -45 +45 @@
 class WebGLLayerChromium;
 #endif
+class GraphicsContextLostCallbackAdapter;
 
 class GraphicsContext3DInternal {
@@ -240 +241 @@
     void synthesizeGLError(GC3Denum error);
 
+    void setContextLostCallback(PassOwnPtr<GraphicsContext3D::ContextLostCallback>);
+
     // Extensions3D support.
     Extensions3D* getExtensions();
@@ -266 +269 @@
     OwnPtr<WebKit::WebGraphicsContext3D> m_impl;
     OwnPtr<Extensions3DChromium> m_extensions;
+    OwnPtr<GraphicsContextLostCallbackAdapter> m_contextLostCallbackAdapter;
     WebKit::WebViewImpl* m_webViewImpl;
     bool m_initializedAvailableExtensions;