Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8

mojo/services/view_manager/public/cpp/lib/view.cc

 // Copyright 2014 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 "mojo/services/view_manager/public/cpp/view.h"
 
 #include <set>
 
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.h"
@@ skipping 163 matching lines @@
 bool OwnsView(ViewManager* manager, View* view) {
   return !manager ||
       static_cast<ViewManagerClientImpl*>(manager)->OwnsView(view->id());
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // View, public:
 
-// static
-View* View::Create(ViewManager* view_manager) {
-  View* view = new View(view_manager);
-  static_cast<ViewManagerClientImpl*>(view_manager)->AddView(view);
-  return view;
-}
-
 void View::Destroy() {
   if (!OwnsView(manager_, this))
     return;
 
   if (manager_)
     static_cast<ViewManagerClientImpl*>(manager_)->DestroyView(id_);
   while (!children_.empty()) {
     View* child = children_.front();
     if (!OwnsView(manager_, child)) {
       ViewPrivate(child).ClearParent();
@@ skipping 76 matching lines @@
   const View* root = this;
   for (const View* parent = this; parent; parent = parent->parent())
     root = parent;
   return root;
 }
 
 void View::AddChild(View* child) {
   // TODO(beng): not necessarily valid to all connections, but possibly to the
   //             embeddee in an embedder-embeddee relationship.
   if (manager_)
-    CHECK_EQ(ViewPrivate(child).view_manager(), manager_);
+    CHECK_EQ(child->view_manager(), manager_);
   LocalAddChild(child);
   if (manager_)
     static_cast<ViewManagerClientImpl*>(manager_)->AddChild(child->id(), id_);
 }
 
 void View::RemoveChild(View* child) {
   // TODO(beng): not necessarily valid to all connections, but possibly to the
   //             embeddee in an embedder-embeddee relationship.
   if (manager_)
-    CHECK_EQ(ViewPrivate(child).view_manager(), manager_);
+    CHECK_EQ(child->view_manager(), manager_);
   LocalRemoveChild(child);
   if (manager_) {
     static_cast<ViewManagerClientImpl*>(manager_)->RemoveChild(child->id(),
                                                                id_);
   }
 }
 
 void View::MoveToFront() {
   if (!parent_ || parent_->children_.back() == this)
     return;
@@ skipping 15 matching lines @@
                                                             direction);
   }
 }
 
 bool View::Contains(View* child) const {
   if (!child)
     return false;
   if (child == this)
     return true;
   if (manager_)
-    CHECK_EQ(ViewPrivate(child).view_manager(), manager_);
+    CHECK_EQ(child->view_manager(), manager_);
   for (View* p = child->parent(); p; p = p->parent()) {
     if (p == this)
       return true;
   }
   return false;
 }
 
 View* View::GetChildById(Id id) {
   if (id == id_)
     return this;
@@ skipping 72 matching lines @@
       (*pair.second.deallocator)(pair.second.value);
   }
   prop_map_.clear();
 
   FOR_EACH_OBSERVER(ViewObserver, observers_, OnViewDestroyed(this));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // View, private:
 
-View::View(ViewManager* manager)
+View::View(ViewManager* manager, Id id)
     : manager_(manager),
-      id_(static_cast<ViewManagerClientImpl*>(manager_)->CreateView()),
-      parent_(NULL),
+      id_(id),
+      parent_(nullptr),
       visible_(false),
       drawn_(false) {
 }
 
 int64 View::SetLocalPropertyInternal(const void* key,
                                      const char* name,
                                      PropertyDeallocator deallocator,
                                      int64 value,
                                      int64 default_value) {
   int64 old = GetLocalPropertyInternal(key, default_value);
@@ skipping 108 matching lines @@
 void View::NotifyViewVisibilityChangedUp(View* target) {
   // Start with the parent as we already notified |this|
   // in NotifyViewVisibilityChangedDown.
   for (View* view = parent(); view; view = view->parent()) {
     bool ret = view->NotifyViewVisibilityChangedAtReceiver(target);
     DCHECK(ret);
   }
 }
 
 }  // namespace mojo