Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a

mojo/services/public/cpp/view_manager/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/public/cpp/view_manager/view.h"
 
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_private.h"
 #include "mojo/services/public/cpp/view_manager/view_observer.h"
@@ skipping 293 matching lines @@
   if (!LocalReorder(relative, direction))
     return;
   if (manager_) {
     static_cast<ViewManagerClientImpl*>(manager_)->Reorder(id_,
                                                             relative->id(),
                                                             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_);
   for (View* p = child->parent(); p; p = p->parent()) {
     if (p == this)
       return true;
   }
   return false;
 }
 
 View* View::GetChildById(Id id) {
@@ skipping 113 matching lines @@
   if (IsDrawn() == value) {
     drawn_ = value;
     return;
   }
   FOR_EACH_OBSERVER(ViewObserver, observers_, OnViewDrawnChanging(this));
   drawn_ = value;
   FOR_EACH_OBSERVER(ViewObserver, observers_, OnViewDrawnChanged(this));
 }
 
 }  // namespace mojo