Mandoline: Merge Surfaces and Views apps

components/view_manager/surfaces/surfaces_impl.h

Index: components/view_manager/surfaces/surfaces_impl.h
diff --git a/components/view_manager/surfaces/surfaces_impl.h b/components/view_manager/surfaces/surfaces_impl.h
index f167f380736f5af74b1861f02dc13788b2c6189f..68fdf22a89d1083913daea1a7f467ea11f558981 100644
--- a/components/view_manager/surfaces/surfaces_impl.h
+++ b/components/view_manager/surfaces/surfaces_impl.h
@@ -10,7 +10,7 @@
 #include "cc/surfaces/surface_factory_client.h"
 #include "components/view_manager/public/interfaces/command_buffer.mojom.h"
 #include "components/view_manager/public/interfaces/surfaces.mojom.h"
-#include "components/view_manager/public/interfaces/viewport_parameter_listener.mojom.h"
+#include "components/view_manager/surfaces/surfaces_state.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/common/weak_binding_set.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
@@ -25,14 +25,10 @@ class ApplicationManager;
 
 namespace surfaces {
 class SurfacesScheduler;
-class SurfacesServiceApplication;
 
 class SurfacesImpl : public mojo::Surface, public cc::SurfaceFactoryClient {

[rjkroege, 2015/08/06 00:16:22]

This has a confusing name. Is it the SurfaceImplementation?

[Fady Samuel, 2015/08/06 16:48:23]

Very confusing name. I agree. Again I don't want to rename it here because it'll
confuse other changes I think.

[rjkroege, 2015/08/06 22:09:02]

but we will clean it up in future iterations over the code?

  public:
-  SurfacesImpl(SurfacesServiceApplication* application,
-               cc::SurfaceManager* manager,
-               uint32_t id_namespace,
-               SurfacesScheduler* scheduler,
+  SurfacesImpl(const scoped_refptr<SurfacesState>& state,
                mojo::InterfaceRequest<mojo::Surface> request);
 
   ~SurfacesImpl() override;
@@ -54,11 +50,9 @@ class SurfacesImpl : public mojo::Surface, public cc::SurfaceFactoryClient {
  private:
   cc::SurfaceId QualifyIdentifier(uint32_t local_id);
 
-  SurfacesServiceApplication* application_;
-  cc::SurfaceManager* manager_;
-  cc::SurfaceFactory factory_;
+  scoped_refptr<SurfacesState> state_;
   const uint32_t id_namespace_;

[rjkroege, 2015/08/06 00:16:22]

what is this? needs a comment

[Fady Samuel, 2015/08/06 16:48:23]

Done.

-  SurfacesScheduler* scheduler_;
+  cc::SurfaceFactory factory_;

[rjkroege, 2015/08/06 00:16:21]

Why inline and not a pointer? Is this class the Surface itself or the factory?
If a SurfaceImpl, the factory should be shared?

[Fady Samuel, 2015/08/06 16:48:23]

The problem is this abstraction is bad. SurfacesImpl is not a single Surface. It
is an entire namespace of Surfaces that can be generated by the process that
requested the service. This is a bad abstraction and I want to get rid of
it....in a separate CL :P

[rjkroege, 2015/08/06 22:09:02]

ok

   mojo::ScopedMessagePipeHandle command_buffer_handle_;
   mojo::ResourceReturnerPtr returner_;
   mojo::StrongBinding<Surface> binding_;