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

[jamesr at google.com]

The following commit has been merged in the debian/experimental branch:
commit 7b907a8ff6bad33fcde9d7bbc1378fdecadd9ed6
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 30 23:34:40 2010 +0000

    2010-07-30  James Robinson  <jamesr at chromium.org>
    
            Reviewed by Darin Fisher.
    
            Move GLES2 context manipulation to ChromeClient.h and put it behind the right #if guard
            https://bugs.webkit.org/show_bug.cgi?id=43281
    
            These calls were initially put in ChromeClientChromium, but they aren't chromium specific.
            In theory any port that could create the proper OpenGL ES 2 contexts could implement
            these functions.  Also moves the calls to be behind the correct #if guard.
    
            * page/ChromeClient.h:
            * page/chromium/ChromeClientChromium.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64385 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 61706e6..4ccf9f2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-30  James Robinson  <jamesr at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Move GLES2 context manipulation to ChromeClient.h and put it behind the right #if guard
+        https://bugs.webkit.org/show_bug.cgi?id=43281
+
+        These calls were initially put in ChromeClientChromium, but they aren't chromium specific.
+        In theory any port that could create the proper OpenGL ES 2 contexts could implement
+        these functions.  Also moves the calls to be behind the correct #if guard.
+
+        * page/ChromeClient.h:
+        * page/chromium/ChromeClientChromium.h:
+
 2010-07-30  Dumitru Daniliuc  <dumi at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebCore/page/ChromeClient.h b/WebCore/page/ChromeClient.h
index 795b25c..eac5eb3 100644
--- a/WebCore/page/ChromeClient.h
+++ b/WebCore/page/ChromeClient.h
@@ -64,6 +64,10 @@ namespace WebCore {
     class GraphicsLayer;
 #endif
 
+#if USE(GLES2_RENDERING)
+    class GLES2Contxt;
+#endif
+
 #if ENABLE(NOTIFICATIONS)
     class NotificationPresenter;
 #endif
@@ -219,6 +223,12 @@ namespace WebCore {
         virtual bool allowsAcceleratedCompositing() const { return true; }
 #endif
 
+#if USE(GLES2_RENDERING)
+        // Request a GL ES 2 context to use for compositing this page's content.
+        virtual PassOwnPtr<GLES2Context> getOnscreenGLES2Context() = 0;
+        virtual PassOwnPtr<GLES2Context> getOffscreenGLES2Context() = 0;
+#endif
+
         virtual bool supportsFullscreenForNode(const Node*) { return false; }
         virtual void enterFullscreenForNode(Node*) { }
         virtual void exitFullscreenForNode(Node*) { }
diff --git a/WebCore/page/chromium/ChromeClientChromium.h b/WebCore/page/chromium/ChromeClientChromium.h
index 46985b1..e897c15 100644
--- a/WebCore/page/chromium/ChromeClientChromium.h
+++ b/WebCore/page/chromium/ChromeClientChromium.h
@@ -39,10 +39,6 @@ class AccessibilityObject;
 class IntRect;
 class PopupContainer;
 
-#if USE(ACCELERATED_COMPOSITING)
-class GLES2Context;
-#endif
-
 // Contains Chromium-specific extensions to the ChromeClient.  Only put
 // things here that don't make sense for other ports.
 class ChromeClientChromium : public ChromeClient {
@@ -59,12 +55,6 @@ public:
 
     // Notifies embedder that the state of an accessibility object has changed.
     virtual void didChangeAccessibilityObjectState(AccessibilityObject*) = 0;
-
-#if USE(ACCELERATED_COMPOSITING)
-    // Request a GL ES 2 context to use for compositing this page's content.
-    virtual PassOwnPtr<GLES2Context> getOnscreenGLES2Context() = 0;
-    virtual PassOwnPtr<GLES2Context> getOffscreenGLES2Context() = 0;
-#endif
 };
 
 } // namespace WebCore

-- 
WebKit Debian packaging