Changeset 64385 in webkit

Timestamp:

Jul 30, 2010 4:34:40 PM (14 years ago)

Author:

jamesr@google.com

Message:

2010-07-30 James Robinson <​jamesr@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:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/ChromeClient.h (modified) (2 diffs)
• page/chromium/ChromeClientChromium.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-30  James Robinson  <jamesr@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@chromium.org>
 

trunk/WebCore/page/ChromeClient.h

@@ -65 +65 @@
 #endif
 
+#if USE(GLES2_RENDERING)
+    class GLES2Contxt;
+#endif
+
 #if ENABLE(NOTIFICATIONS)
     class NotificationPresenter;
@@ -220 +224 @@
 #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*) { }

trunk/WebCore/page/chromium/ChromeClientChromium.h

@@ -40 +40 @@
 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.
@@ -60 +56 @@
     // 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
 };