4 files changed, 3 insertions, 28 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 09ce2cd..681d3e9 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1557,12 +1557,6 @@ WebStorageNamespace* RenderViewImpl::createSessionStorageNamespace(
 
 WebGraphicsContext3D* RenderViewImpl::createGraphicsContext3D(
     const WebGraphicsContext3D::Attributes& attributes) {
-  return createGraphicsContext3D(attributes, true);
-}
-
-WebGraphicsContext3D* RenderViewImpl::createGraphicsContext3D(
-    const WebGraphicsContext3D::Attributes& attributes,
-    bool direct) {
   if (!webview())
     return NULL;
   // The WebGraphicsContext3DInProcessImpl code path is used for
@@ -1570,21 +1564,15 @@ WebGraphicsContext3D* RenderViewImpl::createGraphicsContext3D(
   // debugging and bringing up new ports.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessWebGL)) {
     return webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView(
-        attributes, direct);
+        attributes, true);
   } else {
-    int surface = direct ? surface_id() : 0;
-
     GURL url;
     if (webview()->mainFrame())
       url = GURL(webview()->mainFrame()->document().url());
 
-    base::WeakPtr<WebGraphicsContext3DSwapBuffersClient> swap_client;
-    if (direct)
-      swap_client = AsWeakPtr();
-
     scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context(
         new WebGraphicsContext3DCommandBufferImpl(
-            surface, url, RenderThreadImpl::current(), swap_client));
+            surface_id(), url, RenderThreadImpl::current(), AsWeakPtr()));
 
     if (!context->Initialize(attributes))
       return NULL;
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 1b89c474..de9995e 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -354,10 +354,6 @@ class RenderViewImpl : public RenderWidget,
       unsigned quota);
   virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D(
       const WebKit::WebGraphicsContext3D::Attributes& attributes);
-  // TODO(jamesr): remove this form once removed upstream.
-  virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D(
-      const WebKit::WebGraphicsContext3D::Attributes& attributes,
-      bool direct);
   virtual void didAddMessageToConsole(
       const WebKit::WebConsoleMessage& message,
       const WebKit::WebString& source_name,
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 1b4af4d..7698d6a 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -346,13 +346,8 @@ WebStorageNamespace* TestWebViewDelegate::createSessionStorageNamespace(
 
 WebGraphicsContext3D* TestWebViewDelegate::createGraphicsContext3D(
     const WebGraphicsContext3D::Attributes& attributes) {
-  return createGraphicsContext3D(attributes, true);
-}
-WebGraphicsContext3D* TestWebViewDelegate::createGraphicsContext3D(
-    const WebGraphicsContext3D::Attributes& attributes,
-    bool direct) {
   return webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView(
-      attributes, direct);
+      attributes, true);
 }
 
 void TestWebViewDelegate::didAddMessageToConsole(
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index c541b78..29af104 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -91,10 +91,6 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
       unsigned quota);
   virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D(
       const WebKit::WebGraphicsContext3D::Attributes& attributes);
-  // TODO(jamesr): remove this form after deleted upstream.
-  virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D(
-      const WebKit::WebGraphicsContext3D::Attributes& attributes,
-      bool direct);
   virtual void didAddMessageToConsole(
       const WebKit::WebConsoleMessage& message,
       const WebKit::WebString& source_name, unsigned source_line);