Add BeginFrameObserverProxy

ui/compositor/compositor.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 "ui/compositor/compositor.h"
 
 #include <algorithm>
 #include <deque>
 
 #include "base/bind.h"
@@ skipping 138 matching lines @@
 
 Compositor::~Compositor() {
   TRACE_EVENT0("shutdown", "Compositor::destructor");
 
   CancelCompositorLock();
   DCHECK(!compositor_lock_);
 
   FOR_EACH_OBSERVER(CompositorObserver, observer_list_,
                     OnCompositingShuttingDown(this));
 
+  DCHECK(begin_frame_observer_list_.empty());
+
   if (root_layer_)
     root_layer_->SetCompositor(NULL);
 
   // Stop all outstanding draws before telling the ContextFactory to tear
   // down any contexts that the |host_| may rely upon.
   host_.reset();
 
   context_factory_->RemoveCompositor(this);
 }
 
@@ skipping 107 matching lines @@
 void Compositor::RemoveAnimationObserver(
     CompositorAnimationObserver* observer) {
   animation_observer_list_.RemoveObserver(observer);
 }
 
 bool Compositor::HasAnimationObserver(
     const CompositorAnimationObserver* observer) const {
   return animation_observer_list_.HasObserver(observer);
 }
 
+void Compositor::AddBeginFrameObserver(
+    CompositorBeginFrameObserver* observer,
+    const cc::BeginFrameArgs& last_begin_frame_args_sent_to_observer) {
+  // If |last_begin_frame_args_| is still effective, send it to the new

[danakj, 2015/03/19 22:36:41]

what does "still effective" mean? You're checking that it's new here? This
doesn't clarify for me why Compositor is doing this check instead of the
observer..

[simonhong, 2015/03/20 16:07:36]

Ah... I got your meaning now.
You mean that making Compositor just OnSendBeginFrame(missed_begin_frame_) to
newly added
observer and let observer verify about it whether or not to send to child
scheduler.

+  // |observer| immediately.
+  if (last_begin_frame_args_sent_to_observer.frame_time !=

[brianderson, 2015/03/19 22:48:59]

Now that there's a shared CompositorBeginFrameObserverImpl we can use, should
the BeginFrame de-dupe logic and test move there?

[simonhong, 2015/03/20 16:07:36]

Yep, moved to there.

+      missed_begin_frame_args_.frame_time) {
+    observer->OnSendBeginFrame(missed_begin_frame_args_);

[brianderson, 2015/03/19 22:48:59]

Then the call to OnSendBeginFrame can move to below.

[simonhong, 2015/03/20 16:07:36]

Done.

+  }
+
+  if (begin_frame_observer_list_.empty())
+    host_->SetChildrenNeedBeginFrames(true);

[brianderson, 2015/03/19 22:48:59]

else if (missed_begin_frame_args_.IsValid())
  observer->OnSendBeginFrame(missed_begin_frame_args_);

We should also make missed_begin_frame_args_ invalid after calling
SetChildrenNeedBeginFrames(false) to avoid sending a reallly old missed begin
frame from a previous active period.

Can you add a test case for that? I think this patch will fail that test.

[simonhong, 2015/03/20 16:07:36]

Done.

+
+  std::list<CompositorBeginFrameObserver*>::iterator it =

[danakj, 2015/03/19 22:36:41]

do all of this inside the DCHECK please, temp vars are good but keep DCHECK-only
code in DCHECKs

[brianderson, 2015/03/19 22:48:59]

auto? Here and elsewhere.

[simonhong, 2015/03/20 16:07:36]

Done.

+      std::find(begin_frame_observer_list_.begin(),
+                begin_frame_observer_list_.end(), observer);
+  DCHECK(begin_frame_observer_list_.end() == it);

[danakj, 2015/03/19 22:36:41]

DCHECK(it != end)

Like we do foo != 5 not 5 != foo. end is the "fixed" thing here.

[simonhong, 2015/03/20 16:07:36]

Done.

+
+  begin_frame_observer_list_.push_back(observer);
+}
+
+void Compositor::RemoveBeginFrameObserver(
+    CompositorBeginFrameObserver* observer) {
+  std::list<CompositorBeginFrameObserver*>::iterator it =
+      std::find(begin_frame_observer_list_.begin(),
+                begin_frame_observer_list_.end(), observer);
+  DCHECK(begin_frame_observer_list_.end() != it);

[danakj, 2015/03/19 22:36:40]

DCHECK(it != end)

[simonhong, 2015/03/20 16:07:36]

Done.

+  begin_frame_observer_list_.erase(it);
+
+  if (begin_frame_observer_list_.empty())
+    host_->SetChildrenNeedBeginFrames(false);

[brianderson, 2015/03/19 22:48:59]

To make missed_begin_frame_args_ invalid:
missed_begin_frame_args_ = BeginFrameArgs();

[simonhong, 2015/03/20 16:07:36]

Done.

+}
+
 void Compositor::BeginMainFrame(const cc::BeginFrameArgs& args) {
   FOR_EACH_OBSERVER(CompositorAnimationObserver,
                     animation_observer_list_,
                     OnAnimationStep(args.frame_time));
   if (animation_observer_list_.might_have_observers())
     host_->SetNeedsAnimate();
 }
 
 void Compositor::BeginMainFrameNotExpectedSoon() {
 }
@@ skipping 42 matching lines @@
   FOR_EACH_OBSERVER(CompositorObserver, observer_list_,
                     OnCompositingStarted(this, start_time));
 }
 
 void Compositor::DidAbortSwapBuffers() {
   FOR_EACH_OBSERVER(CompositorObserver,
                     observer_list_,
                     OnCompositingAborted(this));
 }
 
+void Compositor::SendBeginFramesToChildren(const cc::BeginFrameArgs& args) {
+  std::list<CompositorBeginFrameObserver*>::iterator it =
+      begin_frame_observer_list_.begin();
+  while(it != begin_frame_observer_list_.end()) {

[danakj, 2015/03/19 22:36:41]

for (auto* observer : begin_..._list_)

[simonhong, 2015/03/20 16:07:36]

Done.

+    (*it)->OnSendBeginFrame(args);
+    it++;
+  }
+  missed_begin_frame_args_ = args;
+  missed_begin_frame_args_.type = cc::BeginFrameArgs::MISSED;
+}
+
 const cc::LayerTreeDebugState& Compositor::GetLayerTreeDebugState() const {
   return host_->debug_state();
 }
 
 void Compositor::SetLayerTreeDebugState(
     const cc::LayerTreeDebugState& debug_state) {
   host_->SetDebugState(debug_state);
 }
 
 const cc::RendererSettings& Compositor::GetRendererSettings() const {
@@ skipping 19 matching lines @@
                     observer_list_,
                     OnCompositingLockStateChanged(this));
 }
 
 void Compositor::CancelCompositorLock() {
   if (compositor_lock_)
     compositor_lock_->CancelLock();
 }
 
 }  // namespace ui