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

Side by Side Diff: components/mus/server_view.h

Issue 1304063014: cc: Plumbing for BeginFrameSource based on Surfaces (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More use-after-free. Attempt to fix mojo. Created 5 years, 2 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 #ifndef COMPONENTS_MUS_SERVER_VIEW_H_ 5 #ifndef COMPONENTS_MUS_SERVER_VIEW_H_
6 #define COMPONENTS_MUS_SERVER_VIEW_H_ 6 #define COMPONENTS_MUS_SERVER_VIEW_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 #if !defined(NDEBUG) 114 #if !defined(NDEBUG)
115 std::string GetDebugWindowHierarchy() const; 115 std::string GetDebugWindowHierarchy() const;
116 void BuildDebugInfo(const std::string& depth, std::string* result) const; 116 void BuildDebugInfo(const std::string& depth, std::string* result) const;
117 #endif 117 #endif
118 118
119 private: 119 private:
120 typedef std::vector<ServerView*> Views; 120 typedef std::vector<ServerView*> Views;
121 121
122 // SurfaceFactoryClient implementation. 122 // SurfaceFactoryClient implementation.
123 void ReturnResources(const cc::ReturnedResourceArray& resources) override; 123 void ReturnResources(const cc::ReturnedResourceArray& resources) override;
124 void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
124 125
125 // Implementation of removing a view. Doesn't send any notification. 126 // Implementation of removing a view. Doesn't send any notification.
126 void RemoveImpl(ServerView* view); 127 void RemoveImpl(ServerView* view);
127 128
128 ServerViewDelegate* delegate_; 129 ServerViewDelegate* delegate_;
129 const ViewId id_; 130 const ViewId id_;
130 ServerView* parent_; 131 ServerView* parent_;
131 Views children_; 132 Views children_;
132 bool visible_; 133 bool visible_;
133 gfx::Rect bounds_; 134 gfx::Rect bounds_;
(...skipping 10 matching lines...) Expand all
144 base::ObserverList<ServerViewObserver> observers_; 145 base::ObserverList<ServerViewObserver> observers_;
145 mojo::SurfaceClientPtr client_; 146 mojo::SurfaceClientPtr client_;
146 mojo::Binding<Surface> binding_; 147 mojo::Binding<Surface> binding_;
147 148
148 DISALLOW_COPY_AND_ASSIGN(ServerView); 149 DISALLOW_COPY_AND_ASSIGN(ServerView);
149 }; 150 };
150 151
151 } // namespace mus 152 } // namespace mus
152 153
153 #endif // COMPONENTS_MUS_SERVER_VIEW_H_ 154 #endif // COMPONENTS_MUS_SERVER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698