6 files changed, 1 insertions, 71 deletions
diff --git a/content/renderer/gpu/command_buffer_proxy.cc b/content/renderer/gpu/command_buffer_proxy.cc
index caa1de5..1caeb5a 100644
--- a/content/renderer/gpu/command_buffer_proxy.cc
+++ b/content/renderer/gpu/command_buffer_proxy.cc
@@ -380,13 +380,6 @@ void CommandBufferProxy::SetSwapBuffersCallback(Callback0::Type* callback) {
   swap_buffers_callback_.reset(callback);
 }
 
-void CommandBufferProxy::ResizeOffscreenFrameBuffer(const gfx::Size& size) {
-  if (last_state_.error != gpu::error::kNoError)
-    return;
-
-  Send(new GpuCommandBufferMsg_ResizeOffscreenFrameBuffer(route_id_, size));
-}
-
 void CommandBufferProxy::SetNotifyRepaintTask(Task* task) {
   notify_repaint_task_.reset(task);
 }
@@ -413,15 +406,6 @@ CommandBufferProxy::CreateVideoDecoder(
   return decoder_host;
 }
 
-#if defined(OS_MACOSX)
-void CommandBufferProxy::SetWindowSize(const gfx::Size& size) {
-  if (last_state_.error != gpu::error::kNoError)
-    return;
-
-  Send(new GpuCommandBufferMsg_SetWindowSize(route_id_, size));
-}
-#endif
-
 bool CommandBufferProxy::Send(IPC::Message* msg) {
   // Caller should not intentionally send a message if the context is lost.
   DCHECK(last_state_.error == gpu::error::kNoError);
diff --git a/content/renderer/gpu/command_buffer_proxy.h b/content/renderer/gpu/command_buffer_proxy.h
index 2a2e25b..8c62508 100644
--- a/content/renderer/gpu/command_buffer_proxy.h
+++ b/content/renderer/gpu/command_buffer_proxy.h
@@ -77,9 +77,6 @@ class CommandBufferProxy : public gpu::CommandBuffer,
   void SetSwapBuffersCallback(Callback0::Type* callback);
   void SetChannelErrorCallback(Callback0::Type* callback);
 
-  // Asynchronously resizes an offscreen frame buffer.
-  void ResizeOffscreenFrameBuffer(const gfx::Size& size);
-
   // Set a task that will be invoked the next time the window becomes invalid
   // and needs to be repainted. Takes ownership of task.
   void SetNotifyRepaintTask(Task* task);
@@ -94,10 +91,6 @@ class CommandBufferProxy : public gpu::CommandBuffer,
       const std::vector<int32>& configs,
       media::VideoDecodeAccelerator::Client* client);
 
-#if defined(OS_MACOSX)
-  virtual void SetWindowSize(const gfx::Size& size);
-#endif
-
  private:
 
   // Send an IPC message over the GPU channel. This is private to fully
diff --git a/content/renderer/gpu/renderer_gl_context.cc b/content/renderer/gpu/renderer_gl_context.cc
index 426386e..53baa9b 100644
--- a/content/renderer/gpu/renderer_gl_context.cc
+++ b/content/renderer/gpu/renderer_gl_context.cc
@@ -107,14 +107,6 @@ RendererGLContext* RendererGLContext::CreateViewContext(
 #endif
 }
 
-#if defined(OS_MACOSX)
-void RendererGLContext::ResizeOnscreen(const gfx::Size& size) {
-  DCHECK(size.width() > 0 && size.height() > 0);
-  size_ = size;
-  command_buffer_->SetWindowSize(size);
-}
-#endif
-
 RendererGLContext* RendererGLContext::CreateOffscreenContext(
     GpuChannelHost* channel,
     const gfx::Size& size,
@@ -191,14 +183,6 @@ bool RendererGLContext::SetParent(RendererGLContext* new_parent) {
   return true;
 }
 
-void RendererGLContext::ResizeOffscreen(const gfx::Size& size) {
-  DCHECK(size.width() > 0 && size.height() > 0);
-  if (size_ != size) {
-    command_buffer_->ResizeOffscreenFrameBuffer(size);
-    size_ = size;
-  }
-}
-
 uint32 RendererGLContext::GetParentTextureId() {
   return parent_texture_id_;
 }
@@ -426,8 +410,6 @@ bool RendererGLContext::Initialize(bool onscreen,
       share_resources,
       bind_generates_resource);
 
-  size_ = size;
-
   return true;
 }
 
diff --git a/content/renderer/gpu/renderer_gl_context.h b/content/renderer/gpu/renderer_gl_context.h
index a9f9580..5013dc9 100644
--- a/content/renderer/gpu/renderer_gl_context.h
+++ b/content/renderer/gpu/renderer_gl_context.h
@@ -106,13 +106,6 @@ class RendererGLContext : public base::SupportsWeakPtr<RendererGLContext> {
       const int32* attrib_list,
       const GURL& active_arl);
 
-#if defined(OS_MACOSX)
-  // On Mac OS X only, view RendererGLContexts actually behave like offscreen
-  // RendererGLContexts, and require an explicit resize operation which is
-  // slightly different from that of offscreen RendererGLContexts.
-  void ResizeOnscreen(const gfx::Size& size);
-#endif
-
   // Create a RendererGLContext that renders to an offscreen frame buffer. If
   // parent is not NULL, that RendererGLContext can access a copy of the created
   // RendererGLContext's frame buffer that is updated every time SwapBuffers is
@@ -134,13 +127,6 @@ class RendererGLContext : public base::SupportsWeakPtr<RendererGLContext> {
   // another parent, it is important to delete them before changing the parent.
   bool SetParent(RendererGLContext* parent);
 
-  // Resize an offscreen frame buffer. The resize occurs on the next call to
-  // SwapBuffers. This is to avoid waiting until all pending GL calls have been
-  // executed by the GPU process. Everything rendered up to the call to
-  // SwapBuffers will be lost. A lost RendererGLContext will be reported if the
-  // resize fails.
-  void ResizeOffscreen(const gfx::Size& size);
-
   // For an offscreen frame buffer RendererGLContext, return the texture ID with
   // respect to the parent RendererGLContext. Returns zero if RendererGLContext
   // does not have a parent.
@@ -213,7 +199,6 @@ class RendererGLContext : public base::SupportsWeakPtr<RendererGLContext> {
   gpu::gles2::GLES2CmdHelper* gles2_helper_;
   int32 transfer_buffer_id_;
   gpu::gles2::GLES2Implementation* gles2_implementation_;
-  gfx::Size size_;
   Error last_error_;
   int frame_number_;
 
diff --git a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc
index 7c721df..0366725 100644
--- a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc
+++ b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc
@@ -241,17 +241,7 @@ void WebGraphicsContext3DCommandBufferImpl::reshape(int width, int height) {
   cached_width_ = width;
   cached_height_ = height;
 
-  if (render_directly_to_web_view_) {
-#if defined(OS_MACOSX)
-    context_->ResizeOnscreen(gfx::Size(width, height));
-#else
-    gl_->ResizeCHROMIUM(width, height);
-#endif
-  } else {
-    context_->ResizeOffscreen(gfx::Size(width, height));
-    // Force a SwapBuffers to get the framebuffer to resize.
-    context_->SwapBuffers();
-  }
+  gl_->ResizeCHROMIUM(width, height);
 
 #ifdef FLIP_FRAMEBUFFER_VERTICALLY
   scanline_.reset(new uint8[width * 4]);
diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc
index 1ccd917..0d5480b 100644
--- a/content/renderer/render_widget_fullscreen_pepper.cc
+++ b/content/renderer/render_widget_fullscreen_pepper.cc
@@ -316,11 +316,7 @@ void RenderWidgetFullscreenPepper::OnResize(const gfx::Size& size,
                                             const gfx::Rect& resizer_rect) {
   if (context_) {
     gpu::gles2::GLES2Implementation* gl = context_->GetImplementation();
-#if defined(OS_MACOSX)
-    context_->ResizeOnscreen(size);
-#else
     gl->ResizeCHROMIUM(size.width(), size.height());
-#endif
     gl->Viewport(0, 0, size.width(), size.height());
   }
   RenderWidget::OnResize(size, resizer_rect);