Convert to new WebWidgetClient interface for compositor activation and deactivation

I'll remove the old interface and callers from WebWidgetClient / WebViewImpl a few days after this lands, just in case we need to roll something back.

BUG=none
TEST=compiles


Review URL: http://codereview.chromium.org/8114026

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

2 files changed, 19 insertions, 8 deletions

diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index b57c11c..5d7cf89 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -922,17 +922,27 @@ void RenderWidget::didScrollRect(int dx, int dy, const WebRect& clip_rect) {
       this, &RenderWidget::InvalidationCallback));
 }
 
-void RenderWidget::didActivateAcceleratedCompositing(bool active) {
-  TRACE_EVENT1("gpu", "RenderWidget::didActivateAcceleratedCompositing",
-               "active", active);
-  is_accelerated_compositing_active_ = active;
+void RenderWidget::didActivateCompositor(int compositorIdentifier) {
+  TRACE_EVENT0("gpu", "RenderWidget::didActivateCompositor");
+
+  is_accelerated_compositing_active_ = true;
+  Send(new ViewHostMsg_DidActivateAcceleratedCompositing(
+      routing_id_, is_accelerated_compositing_active_));
+
+#ifndef WTF_USE_THREADED_COMPOSITING
+  using_asynchronous_swapbuffers_ = SupportsAsynchronousSwapBuffers();
+#endif
+}
+
+void RenderWidget::didDeactivateCompositor() {
+  TRACE_EVENT0("gpu", "RenderWidget::didDeactivateCompositor");
+
+  is_accelerated_compositing_active_ = false;
   Send(new ViewHostMsg_DidActivateAcceleratedCompositing(
       routing_id_, is_accelerated_compositing_active_));
 
 #ifndef WTF_USE_THREADED_COMPOSITING
-  if (active)
-    using_asynchronous_swapbuffers_ = SupportsAsynchronousSwapBuffers();
-  else if (using_asynchronous_swapbuffers_)
+  if (using_asynchronous_swapbuffers_)
     using_asynchronous_swapbuffers_ = false;
 #endif
 }
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index 624888b..17db0c2 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -104,7 +104,8 @@ class CONTENT_EXPORT RenderWidget
   // WebKit::WebWidgetClient
   virtual void didInvalidateRect(const WebKit::WebRect&);
   virtual void didScrollRect(int dx, int dy, const WebKit::WebRect& clipRect);
-  virtual void didActivateAcceleratedCompositing(bool active);
+  virtual void didActivateCompositor(int compositorIdentifier);
+  virtual void didDeactivateCompositor();
   virtual void scheduleComposite();
   virtual void scheduleAnimation();
   virtual void didFocus();