Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / mojo / services / public / cpp / view_manager / view.h

diff --git a/src/mojo/services/public/cpp/view_manager/view.h b/src/mojo/services/public/cpp/view_manager/view.h
index 0366842..72f044c 100644 (file)
--- a/src/mojo/services/public/cpp/view_manager/view.h
+++ b/src/mojo/services/public/cpp/view_manager/view.h
@@ -12,16 +12,12 @@
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/services/public/cpp/view_manager/types.h"
+#include "mojo/services/public/interfaces/geometry/geometry.mojom.h"
 #include "mojo/services/public/interfaces/surfaces/surface_id.mojom.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager_constants.mojom.h"
-#include "third_party/skia/include/core/SkColor.h"
-#include "ui/gfx/geometry/rect.h"
-
-class SkBitmap;
 
 namespace mojo {
 
-class BitmapUploader;
 class ServiceProviderImpl;
 class View;
 class ViewManager;
@@ -46,12 +42,22 @@ class View {
   Id id() const { return id_; }
 
   // Geometric disposition.
-  const gfx::Rect& bounds() { return bounds_; }
-  void SetBounds(const gfx::Rect& bounds);
+  const Rect& bounds() const { return bounds_; }
+  void SetBounds(const Rect& bounds);
 
-  // Visibility.
+  // Visibility (also see IsDrawn()).
+  bool visible() const { return visible_; }
   void SetVisible(bool value);
-  // TODO(sky): add accessor.
+
+  const std::map<std::string, std::vector<uint8_t>>& properties() const {
+    return properties_;
+  }
+  // Sets a property. If |data| is null, this property is deleted.
+  void SetProperty(const std::string& name, const std::vector<uint8_t>* data);
+
+  // A View is drawn if the View and all its ancestors are visible and the
+  // View is attached to the root.
+  bool IsDrawn() const;
 
   // Observation.
   void AddObserver(ViewObserver* observer);
@@ -75,10 +81,6 @@ class View {
 
   void SetSurfaceId(SurfaceIdPtr id);
 
-  // TODO(beng): temporary only.
-  void SetContents(const SkBitmap& contents);
-  void SetColor(SkColor color);
-
   // Focus.
   void SetFocus();
 
@@ -104,8 +106,8 @@ class View {
   void LocalRemoveChild(View* child);
   // Returns true if the order actually changed.
   bool LocalReorder(View* relative, OrderDirection direction);
-  void LocalSetBounds(const gfx::Rect& old_bounds, const gfx::Rect& new_bounds);
-  void CreateBitmapUploader();
+  void LocalSetBounds(const Rect& old_bounds, const Rect& new_bounds);
+  void LocalSetDrawn(bool drawn);
 
   ViewManager* manager_;
   Id id_;
@@ -114,10 +116,15 @@ class View {
 
   ObserverList<ViewObserver> observers_;
 
-  gfx::Rect bounds_;
-  // TODO(jamesr): Temporary, remove when all clients are using surfaces
-  // directly.
-  scoped_ptr<BitmapUploader> bitmap_uploader_;
+  Rect bounds_;
+
+  bool visible_;
+
+  std::map<std::string, std::vector<uint8_t>> properties_;
+
+  // Drawn state is derived from the visible state and the parent's visible
+  // state. This field is only used if the view has no parent (eg it's a root).
+  bool drawn_;
 
   DISALLOW_COPY_AND_ASSIGN(View);
 };