1 files changed, 16 insertions, 1 deletions
diff --git a/WebKit/chromium/src/WebViewImpl.h b/WebKit/chromium/src/WebViewImpl.h
index db2a1d2..312f20f 100644
--- a/WebKit/chromium/src/WebViewImpl.h
+++ b/WebKit/chromium/src/WebViewImpl.h
@@ -53,6 +53,7 @@
 namespace WebCore {
 class ChromiumDataObject;
 class Frame;
+class GLES2Context;
 class HistoryItem;
 class HitTestResult;
 class KeyboardEvent;
@@ -164,11 +165,18 @@ public:
                                      const WebString& value);
     virtual WebDevToolsAgent* devToolsAgent();
     virtual WebAccessibilityObject accessibilityObject();
+    // DEPRECATED.
     virtual void applyAutoFillSuggestions(
         const WebNode&,
         const WebVector<WebString>& names,
         const WebVector<WebString>& labels,
         int separatorIndex);
+    virtual void applyAutoFillSuggestions(
+        const WebNode&,
+        const WebVector<WebString>& names,
+        const WebVector<WebString>& labels,
+        const WebVector<int>& uniqueIDs,
+        int separatorIndex);
     // DEPRECATED: replacing with applyAutoFillSuggestions.
     virtual void applyAutocompleteSuggestions(
         const WebNode&,
@@ -183,7 +191,6 @@ public:
                                     unsigned inactiveBackgroundColor,
                                     unsigned inactiveForegroundColor);
     virtual void performCustomContextMenuAction(unsigned action);
-    virtual WebGLES2Context* gles2Context();
 
     // WebViewImpl
 
@@ -314,6 +321,14 @@ public:
     void setRootLayerNeedsDisplay();
     void setRootGraphicsLayer(WebCore::PlatformLayer*);
 #endif
+    // 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.
+    PassOwnPtr<WebCore::GLES2Context> getOnscreenGLES2Context();
+    PassOwnPtr<WebCore::GLES2Context> getOffscreenGLES2Context();
+
+    // Returns an onscreen context
+    virtual WebGLES2Context* gles2Context();
 
     WebCore::PopupContainer* selectPopup() const { return m_selectPopup.get(); }