[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[kbr at google.com]

The following commit has been merged in the debian/experimental branch:
commit 8b7f85213f9d74a71c2dc17a1e119e36b980f883
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 16 19:26:22 2010 +0000

    2010-09-16  Kenneth Russell  <kbr at google.com>
    
            Reviewed by James Robinson.
    
            [chromium] Add WebGraphicsContext3D accessor to WebView
            https://bugs.webkit.org/show_bug.cgi?id=45913
    
            * public/WebView.h:
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::WebViewImpl):
            (WebKit::WebViewImpl::graphicsContext3D):
            * src/WebViewImpl.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67649 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 6b0607f..69ed81e 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-16  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by James Robinson.
+
+        [chromium] Add WebGraphicsContext3D accessor to WebView
+        https://bugs.webkit.org/show_bug.cgi?id=45913
+
+        * public/WebView.h:
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::WebViewImpl):
+        (WebKit::WebViewImpl::graphicsContext3D):
+        * src/WebViewImpl.h:
+
 2010-09-16  Ilya Tikhonovsky  <loislo at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebKit/chromium/public/WebView.h b/WebKit/chromium/public/WebView.h
index 16f1397..d162f26 100644
--- a/WebKit/chromium/public/WebView.h
+++ b/WebKit/chromium/public/WebView.h
@@ -45,6 +45,7 @@ class WebDragData;
 class WebFrame;
 class WebFrameClient;
 class WebGLES2Context;
+class WebGraphicsContext3D;
 class WebNode;
 class WebSettings;
 class WebString;
@@ -342,8 +343,17 @@ public:
 
     // Returns the GLES2Context associated with this WebView. One will be
     // created if it doesn't already exist.
+    // FIXME: remove this method once the compositor is fully switched
+    // over to GraphicsContext3D.
     virtual WebGLES2Context* gles2Context() = 0;
 
+    // Returns the (on-screen) WebGraphicsContext3D associated with
+    // this WebView. One will be created if it doesn't already exist.
+    // This is used to set up sharing between this context (which is
+    // that used by the compositor) and contexts for WebGL and other
+    // APIs.
+    virtual WebGraphicsContext3D* graphicsContext3D() = 0;
+
 protected:
     ~WebView() {}
 };
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index e93b897..8289805 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -277,7 +277,6 @@ WebViewImpl::WebViewImpl(WebViewClient* client, WebDevToolsAgentClient* devTools
 #if ENABLE(INPUT_SPEECH)
     , m_speechInputClient(client)
 #endif
-    , m_gles2Context(0)
     , m_deviceOrientationClientProxy(new DeviceOrientationClientProxy(client ? client->deviceOrientationClient() : 0))
 {
     // WebKit/win/WebView.cpp does the same thing, except they call the
@@ -2460,4 +2459,10 @@ WebGLES2Context* WebViewImpl::gles2Context()
     return m_gles2Context.get();
 }
 
+WebGraphicsContext3D* WebViewImpl::graphicsContext3D()
+{
+    // FIXME: implement this.
+    return 0;
+}
+
 } // namespace WebKit
diff --git a/WebKit/chromium/src/WebViewImpl.h b/WebKit/chromium/src/WebViewImpl.h
index af50505..6e02f62 100644
--- a/WebKit/chromium/src/WebViewImpl.h
+++ b/WebKit/chromium/src/WebViewImpl.h
@@ -336,10 +336,19 @@ public:
     // Onscreen contexts display to the screen associated with this view.
     // Offscreen contexts render offscreen but can share resources with the
     // onscreen context and thus can be composited.
+    // FIXME: remove this once the compositor is switched to use GraphicsContext3D.
     PassOwnPtr<WebCore::GLES2Context> getOnscreenGLES2Context();
 
     // Returns an onscreen context
+    // FIXME: remove this once the compositor is switched to use GraphicsContext3D.
     virtual WebGLES2Context* gles2Context();
+
+    // Returns the onscreen 3D context used by the compositor. This is
+    // used by the renderer's code to set up resource sharing between
+    // the compositor's context and subordinate contexts for APIs like
+    // WebGL. Returns 0 if compositing support is not compiled in.
+    virtual WebGraphicsContext3D* graphicsContext3D();
+
     virtual WebCore::SharedGraphicsContext3D* getSharedGraphicsContext3D();
 
     WebCore::PopupContainer* selectPopup() const { return m_selectPopup.get(); }

-- 
WebKit Debian packaging