Change exo::SurfaceFactoryOwner to exo::ExoCompositorFrameSink

components/exo/exo_compositor_frame_sink.h

+// Copyright 2016 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.
+
+#ifndef COMPONENTS_EXO_EXO_COMPOSITOR_FRAME_SINK_H_
+#define COMPONENTS_EXO_EXO_COMPOSITOR_FRAME_SINK_H_
+
+#include <list>
+#include <memory>
+#include <set>
+#include <utility>
+
+#include "base/callback.h"
+#include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
+#include "base/observer_list.h"
+#include "cc/ipc/compositor_frame.mojom.h"
+#include "cc/ipc/mojo_compositor_frame_sink.mojom.h"
+#include "cc/resources/transferable_resource.h"
+#include "cc/scheduler/begin_frame_source.h"
+#include "cc/surfaces/surface_factory.h"
+#include "cc/surfaces/surface_factory_client.h"
+#include "cc/surfaces/surface_id_allocator.h"
+#include "mojo/public/cpp/bindings/binding.h"
+#include "third_party/skia/include/core/SkRegion.h"
+#include "third_party/skia/include/core/SkXfermode.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_observer.h"
+#include "ui/gfx/geometry/rect.h"
+
+namespace cc {
+class SurfaceFactory;
+}
+
+namespace exo {
+class CompositorFrameSinkHolder;
+
+// This class owns the SurfaceFactory and keeps track of references to the
+// contents of Buffers. It's keeped alive by references from
+// release_callbacks_. It's destroyed when its owning Surface is destroyed and
+// the last outstanding release callback is called.
+class ExoCompositorFrameSink : public base::RefCounted<ExoCompositorFrameSink>,

[Fady Samuel, 2016/11/17 21:42:54]

Does this need to be refcounted?

[Alex Z., 2016/12/07 21:13:43]

Done.

+                               public cc::SurfaceFactoryClient,
+                               public cc::BeginFrameObserver {
+ public:
+  ExoCompositorFrameSink(const cc::FrameSinkId& frame_sink_id,
+                         cc::SurfaceManager* surface_manager,
+                         CompositorFrameSinkHolder* client);
+
+  // To be cc::mojom::MojoCompositorFrameSink:
+  void SubmitCompositorFrame(const cc::LocalFrameId& local_frame_id,
+                             cc::CompositorFrame frame);
+
+ private:
+  friend class base::RefCounted<ExoCompositorFrameSink>;
+
+  ~ExoCompositorFrameSink() override;
+  void UpdateNeedsBeginFrameInternal();
+  void DidRecieveCompositorFrameAck();
+
+  // cc::SurfaceFactoryClient:
+  void ReturnResources(const cc::ReturnedResourceArray& resources) override;
+  void WillDrawSurface(const cc::LocalFrameId& id,
+                       const gfx::Rect& damage_rect) override;
+  void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
+
+  // cc::BeginFrameObserver:
+  void OnBeginFrame(const cc::BeginFrameArgs& args) override;
+  const cc::BeginFrameArgs& LastUsedBeginFrameArgs() const override;
+  void OnBeginFrameSourcePausedChanged(bool paused) override;
+
+  const cc::FrameSinkId frame_sink_id_;
+  cc::LocalFrameId last_local_frame_id_;
+
+  cc::SurfaceManager* surface_manager_;
+  cc::SurfaceFactory surface_factory_;
+
+  // TODO(staraz): This should be cc::mojom::MojoCompositorFrameSinkClientPtr
+  scoped_refptr<CompositorFrameSinkHolder> client_;

[jbauman, 2016/11/17 22:47:37]

This is backwards. The CompositorFrameSinkHolder needs to hold on to the
ExoCompositorFrameSink so that the SurfaceFactory isn't destroyed until the
release callbacks have run.

[Alex Z., 2016/11/23 14:25:04]

Done.

+
+  int ack_pending_count_ = 0;
+  cc::ReturnedResourceArray surface_returned_resources_;
+
+  cc::BeginFrameSource* begin_frame_source_ = nullptr;
+
+  gfx::Size last_submitted_frame_size_;
+
+  cc::BeginFrameArgs last_begin_frame_args_;
+
+  bool needs_begin_frame_ = false;
+  bool added_frame_observer_ = false;
+
+  DISALLOW_COPY_AND_ASSIGN(ExoCompositorFrameSink);
+};
+
+}  // namespace exo
+
+#endif  // COMPONENTS_EXO_EXO_COMPOSITOR_FRAME_SINK_H_