Revert 178746

content/renderer/render_widget_fullscreen_pepper.cc

 // Copyright (c) 2012 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 "content/renderer/render_widget_fullscreen_pepper.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 121 matching lines @@
     canvas->scale(canvas_scale, canvas_scale);
 
     WebRect plugin_rect(0, 0, size_.width, size_.height);
     widget_->plugin()->Paint(canvas, plugin_rect, rect);
   }
 
   virtual void setCompositorSurfaceReady() {
   }
 
   virtual void composite(bool finish) {
+    if (!widget_->plugin())
+      return;
+
+    WebGraphicsContext3DCommandBufferImpl* context = widget_->context();
+    DCHECK(context);
+    unsigned int texture = widget_->plugin()->GetBackingTextureId();
+    context->bindTexture(GL_TEXTURE_2D, texture);
+    context->drawArrays(GL_TRIANGLES, 0, 3);
+    widget_->SwapBuffers();
   }
 
   virtual void themeChanged() {
     NOTIMPLEMENTED();
   }
 
   virtual bool handleInputEvent(const WebInputEvent& event) {
     if (!widget_->plugin())
       return false;
 
@@ skipping 351 matching lines @@
 }
 
 WebWidget* RenderWidgetFullscreenPepper::CreateWebWidget() {
   return new PepperWidget(this);
 }
 
 bool RenderWidgetFullscreenPepper::SupportsAsynchronousSwapBuffers() {
   return context_ != NULL;
 }
 
-// Fullscreen pepper widgets composite themselves into the plugin's backing
-// texture (as opposed to using the cc library to composite as normal
-// content::RenderWidgets do), so to produce a composited frame we just have to
-// draw this texture and swap.
-void RenderWidgetFullscreenPepper::Composite() {
-  if (!plugin_)
-    return;
-
-  DCHECK(context_);
-  unsigned int texture = plugin_->GetBackingTextureId();
-  context_->bindTexture(GL_TEXTURE_2D, texture);
-  context_->drawArrays(GL_TRIANGLES, 0, 3);
-  SwapBuffers();
-}
-
 void RenderWidgetFullscreenPepper::CreateContext() {
   DCHECK(!context_);
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kDisableFlashFullscreen3d))
     return;
   WebKit::WebGraphicsContext3D::Attributes attributes;
   attributes.depth = false;
   attributes.stencil = false;
   attributes.antialias = false;
   attributes.shareResources = false;
@@ skipping 139 matching lines @@
 RenderWidgetFullscreenPepper::GetParentContextForPlatformContext3D() {
   if (!context_) {
     CreateContext();
   }
   if (!context_)
     return NULL;
   return context_;
 }
 
 }  // namespace content