Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Side by Side Diff: components/view_manager/server_view.cc

Issue 1317713006: Changes around how embed roots are set (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge to trunk Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/view_manager/server_view.h" 5 #include "components/view_manager/server_view.h"
6 6
7 #include <inttypes.h> 7 #include <inttypes.h>
8 8
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "components/view_manager/server_view_delegate.h" 10 #include "components/view_manager/server_view_delegate.h"
11 #include "components/view_manager/server_view_observer.h" 11 #include "components/view_manager/server_view_observer.h"
12 #include "components/view_manager/surfaces/surfaces_state.h" 12 #include "components/view_manager/surfaces/surfaces_state.h"
13 #include "mojo/converters/geometry/geometry_type_converters.h" 13 #include "mojo/converters/geometry/geometry_type_converters.h"
14 #include "mojo/converters/surfaces/surfaces_type_converters.h" 14 #include "mojo/converters/surfaces/surfaces_type_converters.h"
15 15
16 namespace view_manager { 16 namespace view_manager {
17 17
18 namespace { 18 namespace {
19 19
20 void CallCallback(const mojo::Closure& callback, cc::SurfaceDrawStatus status) { 20 void CallCallback(const mojo::Closure& callback, cc::SurfaceDrawStatus status) {
21 callback.Run(); 21 callback.Run();
22 } 22 }
23 23
24 } // namespace 24 } // namespace
25 25
26 ServerView::ServerView(ServerViewDelegate* delegate, 26 ServerView::ServerView(ServerViewDelegate* delegate, const ViewId& id)
27 const ViewId& id)
28 : delegate_(delegate), 27 : delegate_(delegate),
29 id_(id), 28 id_(id),
30 parent_(nullptr), 29 parent_(nullptr),
31 visible_(false), 30 visible_(false),
32 opacity_(1), 31 opacity_(1),
33 allows_reembed_(false), 32 pending_access_policy_(mojo::ViewTree::ACCESS_POLICY_DEFAULT),
34 // Don't notify newly added observers during notification. This causes 33 // Don't notify newly added observers during notification. This causes
35 // problems for code that adds an observer as part of an observer 34 // problems for code that adds an observer as part of an observer
36 // notification (such as ServerViewDrawTracker). 35 // notification (such as ServerViewDrawTracker).
37 observers_(base::ObserverList<ServerViewObserver>::NOTIFY_EXISTING_ONLY), 36 observers_(base::ObserverList<ServerViewObserver>::NOTIFY_EXISTING_ONLY),
38 binding_(this) { 37 binding_(this) {
39 DCHECK(delegate); // Must provide a delegate. 38 DCHECK(delegate); // Must provide a delegate.
40 } 39 }
41 40
42 ServerView::~ServerView() { 41 ServerView::~ServerView() {
43 FOR_EACH_OBSERVER(ServerViewObserver, observers_, OnWillDestroyView(this)); 42 FOR_EACH_OBSERVER(ServerViewObserver, observers_, OnWillDestroyView(this));
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 client_->ReturnResources( 309 client_->ReturnResources(
311 mojo::Array<mojo::ReturnedResourcePtr>::From(resources)); 310 mojo::Array<mojo::ReturnedResourcePtr>::From(resources));
312 } 311 }
313 312
314 void ServerView::RemoveImpl(ServerView* view) { 313 void ServerView::RemoveImpl(ServerView* view) {
315 view->parent_ = NULL; 314 view->parent_ = NULL;
316 children_.erase(std::find(children_.begin(), children_.end(), view)); 315 children_.erase(std::find(children_.begin(), children_.end(), view));
317 } 316 }
318 317
319 } // namespace view_manager 318 } // namespace view_manager
OLDNEW
« no previous file with comments | « components/view_manager/server_view.h ('k') | components/view_manager/view_manager_client_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698