Revert some changes I accidentally checked in in revision 50597. This was an

experiment to see how much time was spent doing background painting. This
resulted in incorrect opacity for Pepper plugins repainting themselves.

TEST=none
BUG=none
Review URL: http://codereview.chromium.org/2830034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51420 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 1 insertions, 42 deletions

diff --git a/chrome/renderer/pepper_plugin_delegate_impl.cc b/chrome/renderer/pepper_plugin_delegate_impl.cc
index bc11d6c..40ef961 100644
--- a/chrome/renderer/pepper_plugin_delegate_impl.cc
+++ b/chrome/renderer/pepper_plugin_delegate_impl.cc
@@ -7,7 +7,6 @@
 #include "app/surface/transport_dib.h"
 #include "base/scoped_ptr.h"
 #include "webkit/glue/plugins/pepper_plugin_instance.h"
-#include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_MACOSX)
 #include "chrome/common/render_messages.h"
@@ -132,16 +131,3 @@ PepperPluginDelegateImpl::CreateImage2D(int width, int height) {
 
   return new PlatformImage2DImpl(width, height, dib);
 }
-
-bool PepperPluginDelegateImpl::OptimizedPluginPaintInRect(
-    skia::PlatformCanvas* canvas,
-    const gfx::Rect& rect) {
-  for (std::set<pepper::PluginInstance*>::iterator i = active_instances_.begin();
-       i != active_instances_.end(); ++i) {
-    if ((*i)->position().Contains(rect)) {
-      (*i)->Paint(webkit_glue::ToWebCanvas(canvas), (*i)->position(), rect);
-      return true;
-    }
-  }
-  return false;
-}
diff --git a/chrome/renderer/pepper_plugin_delegate_impl.h b/chrome/renderer/pepper_plugin_delegate_impl.h
index c7a106e..2edb4dd 100644
--- a/chrome/renderer/pepper_plugin_delegate_impl.h
+++ b/chrome/renderer/pepper_plugin_delegate_impl.h
@@ -18,14 +18,6 @@ namespace pepper {
 class PluginInstance;
 }
 
-namespace skia {
-class PlatformCanvas;
-}
-
-namespace gfx {
-class Rect;
-}
-
 class PepperPluginDelegateImpl
     : public pepper::PluginDelegate,
       public base::SupportsWeakPtr<PepperPluginDelegateImpl> {
@@ -37,9 +29,6 @@ class PepperPluginDelegateImpl
   void ViewInitiatedPaint();
   void ViewFlushedPaint();
 
-  bool OptimizedPluginPaintInRect(skia::PlatformCanvas* canvas,
-                                  const gfx::Rect& rect);
-
   // pepper::PluginDelegate implementation.
   virtual void InstanceCreated(pepper::PluginInstance* instance);
   virtual void InstanceDeleted(pepper::PluginInstance* instance);
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index d66d791..0aa716d 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -5067,11 +5067,6 @@ void RenderView::DidHandleKeyEvent() {
   edit_commands_.clear();
 }
 
-bool RenderView::OptimizedPluginPaintInRect(skia::PlatformCanvas* canvas,
-                                            const gfx::Rect& rect) {
-  return pepper_delegate_.OptimizedPluginPaintInRect(canvas, rect);
-}
-
 #if defined(OS_MACOSX)
 void RenderView::OnWasHidden() {
   RenderWidget::OnWasHidden();
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 74a111d..c52fe51 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -567,8 +567,6 @@ class RenderView : public RenderWidget,
   virtual void OnWasHidden();
   virtual void OnWasRestored(bool needs_repainting);
 #endif
-  virtual bool OptimizedPluginPaintInRect(skia::PlatformCanvas* canvas,
-                                          const gfx::Rect& rect);
 
  private:
   // For unit tests.
diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc
index 2366f78..5b5058e 100644
--- a/chrome/renderer/render_widget.cc
+++ b/chrome/renderer/render_widget.cc
@@ -386,8 +386,7 @@ void RenderWidget::PaintRect(const gfx::Rect& rect,
     canvas->drawPaint(paint);
   }
 
-  if (!OptimizedPluginPaintInRect(canvas, rect))
-    webwidget_->paint(webkit_glue::ToWebCanvas(canvas), rect);
+  webwidget_->paint(webkit_glue::ToWebCanvas(canvas), rect);
 
   PaintDebugBorder(rect, canvas);
 
@@ -934,8 +933,3 @@ void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) {
     }
   }
 }
-
-bool RenderWidget::OptimizedPluginPaintInRect(skia::PlatformCanvas* canvas,
-                                              const gfx::Rect& rect) {
-  return false;
-}
diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h
index d602fec4..eab48c0 100644
--- a/chrome/renderer/render_widget.h
+++ b/chrome/renderer/render_widget.h
@@ -216,9 +216,6 @@ class RenderWidget : public IPC::Channel::Listener,
   // just handled.
   virtual void DidHandleKeyEvent() {}
 
-  virtual bool OptimizedPluginPaintInRect(skia::PlatformCanvas* canvas,
-                                          const gfx::Rect& rect);
-
   // Routing ID that allows us to communicate to the parent browser process
   // RenderWidgetHost. When MSG_ROUTING_NONE, no messages may be sent.
   int32 routing_id_;