Prepare PepperWidget and RenderWidget for WebKit threaded compositing changes.

content/renderer/render_widget.cc

 // Copyright (c) 2011 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.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 302 matching lines @@
   needs_repainting_on_restore_ = false;
 
   // Tag the next paint as a restore ack, which is picked up by
   // DoDeferredUpdate when it sends out the next PaintRect message.
   set_next_paint_is_restore_ack();
 
   // Generate a full repaint.
   if (!is_accelerated_compositing_active_) {
     didInvalidateRect(gfx::Rect(size_.width(), size_.height()));
   } else {
+#ifndef WTF_USE_THREADED_COMPOSITING
+    webwidget_->composite(false);
+#else
     scheduleComposite();
+#endif
   }
 }
 
 void RenderWidget::OnWasSwappedOut() {
   // If we have been swapped out and no one else is using this process,
   // it's safe to exit now.  If we get swapped back in, we will call
   // AddRefProcess in SetSwappedOut.
   if (is_swapped_out_)
     RenderProcess::current()->ReleaseProcess();
 }
@@ skipping 272 matching lines @@
     // running animation callbacks so that if a callback requests another
     // we'll be sure to run it at the proper time.
     MessageLoop::current()->PostDelayedTask(FROM_HERE, NewRunnableMethod(
         this, &RenderWidget::AnimationCallback), 16);
     animation_task_posted_ = true;
     animation_update_pending_ = false;
     // Explicitly pump the WebCore Timer queue to avoid starvation on OS X.
     // See crbug.com/71735.
     // TODO(jamesr) Remove this call once crbug.com/72007 is fixed.
     RenderThread::current()->GetWebKitClientImpl()->DoTimeout();
+#ifdef WEBWIDGET_HAS_ANIMATE_CHANGES
+    webwidget_->animate(0.0);
+#else
     webwidget_->animate();
+#endif
     return;
   }
   if (animation_task_posted_)
     return;
   // This code uses base::Time::Now() to calculate the floor and next fire
   // time because javascript's Date object uses base::Time::Now().  The
   // message loop uses base::TimeTicks, which on windows can have a
   // different granularity than base::Time.
   // The upshot of all this is that this function might be called before
   // base::Time::Now() has advanced past the animation_floor_time_.  To
@@ skipping 233 matching lines @@
   Send(new ViewHostMsg_DidActivateAcceleratedCompositing(
       routing_id_, is_accelerated_compositing_active_));
 
   if (active)
     using_asynchronous_swapbuffers_ = SupportsAsynchronousSwapBuffers();
   else if (using_asynchronous_swapbuffers_)
     using_asynchronous_swapbuffers_ = false;
 }
 
 void RenderWidget::scheduleComposite() {
+#if WTF_USE_THREADED_COMPOSITING
+  NOTREACHED();
+#else
   // TODO(nduca): replace with something a little less hacky.  The reason this
   // hack is still used is because the Invalidate-DoDeferredUpdate loop
   // contains a lot of host-renderer synchronization logic that is still
   // important for the accelerated compositing case. The option of simply
   // duplicating all that code is less desirable than "faking out" the
   // invalidation path using a magical damage rect.
   didInvalidateRect(WebRect(0, 0, 1, 1));
+#endif
 }
 
 void RenderWidget::scheduleAnimation() {
   if (!animation_update_pending_) {
     animation_update_pending_ = true;
     if (!animation_task_posted_) {
       animation_task_posted_ = true;
       MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
           this, &RenderWidget::AnimationCallback));
     }
@@ skipping 242 matching lines @@
   Send(new ViewHostMsg_PaintAtSize_ACK(routing_id_, tag, bounds.size()));
 }
 
 void RenderWidget::OnMsgRepaint(const gfx::Size& size_to_paint) {
   // During shutdown we can just ignore this message.
   if (!webwidget_)
     return;
 
   set_next_paint_is_repaint_ack();
   if (is_accelerated_compositing_active_) {
+#ifndef WTF_USE_THREADED_COMPOSITING
     scheduleComposite();
+#else
+#ifdef WEBWIDGET_HAS_THREADED_COMPOSITING_CHANGES
+    webwidget_->composite(false);
+#endif
+#endif
   } else {
     gfx::Rect repaint_rect(size_to_paint.width(), size_to_paint.height());
     didInvalidateRect(repaint_rect);
   }
 }
 
 void RenderWidget::OnSetTextDirection(WebTextDirection direction) {
   if (!webwidget_)
     return;
   webwidget_->setTextDirection(direction);
@@ skipping 123 matching lines @@
 
 void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) {
   for (WebPluginGeometryVector::iterator i = plugin_window_moves_.begin();
        i != plugin_window_moves_.end(); ++i) {
     if (i->window == window) {
       plugin_window_moves_.erase(i);
       break;
     }
   }
 }