Factor common code into native_viewport_controller.cc

mojo/services/native_viewport/native_viewport_x11.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/services/native_viewport/native_viewport.h"
 
 #include <X11/Xlib.h>
 
-#include "base/bind.h"
-#include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_pump_x11.h"
-#include "gpu/command_buffer/client/gl_in_process_context.h"
-#include "gpu/command_buffer/client/gles2_implementation.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/x/x11_types.h"
 
 namespace mojo {
 namespace services {
 
 class NativeViewportX11 : public NativeViewport,
                           public base::MessagePumpDispatcher {
  public:
   NativeViewportX11(NativeViewportDelegate* delegate)
@@ skipping 12 matching lines @@
         InputOutput,
         CopyFromParent,  // visual
         CWBackPixmap | CWOverrideRedirect, &swa);
 
     base::MessagePumpX11::Current()->AddDispatcherForWindow(this, window_);
     base::MessagePumpX11::Current()->AddDispatcherForRootWindow(this);
 
     XMapWindow(display, window_);
     XFlush(display);
 
-    gpu::GLInProcessContextAttribs attribs;
-    gl_context_.reset(gpu::GLInProcessContext::CreateContext(
-        false, window_, bounds_.size(), false,
-        attribs, gfx::PreferDiscreteGpu));
-    gl_context_->SetContextLostCallback(base::Bind(
-        &NativeViewportX11::OnGLContextLost, base::Unretained(this)));
-
-    delegate_->OnGLContextAvailable(gl_context_->GetImplementation());
+    delegate_->OnAcceleratedWidgetAvailable(window_);
   }
 
   virtual ~NativeViewportX11() {
     base::MessagePumpX11::Current()->RemoveDispatcherForRootWindow(this);
     base::MessagePumpX11::Current()->RemoveDispatcherForWindow(window_);
 
     XDestroyWindow(gfx::GetXDisplay(), window_);
   }
 
  private:
   // Overridden from NativeViewport:
+  virtual gfx::Size GetSize() OVERRIDE {
+    return bounds_.size();
+  }
   virtual void Close() OVERRIDE {
     // TODO(beng): perform this in response to XWindow destruction.
     delegate_->OnDestroyed();
   }
 
   // Overridden from base::MessagePumpDispatcher:
   virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE {
     return true;
   }
 
-  void OnGLContextLost() {
-    gl_context_.reset();
-    delegate_->OnGLContextLost();
-  }
-
   NativeViewportDelegate* delegate_;
   gfx::Rect bounds_;
   XID window_;
-  scoped_ptr<gpu::GLInProcessContext> gl_context_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeViewportX11);
 };
 
 // static
 scoped_ptr<NativeViewport> NativeViewport::Create(
     shell::Context* context,
     NativeViewportDelegate* delegate) {
   return scoped_ptr<NativeViewport>(new NativeViewportX11(delegate)).Pass();
 }
 
 }  // namespace services
 }  // namespace mojo