OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/exo/surface.h" | 5 #include "components/exo/surface.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "base/memory/ptr_util.h" | 12 #include "base/memory/ptr_util.h" |
13 #include "base/trace_event/trace_event.h" | 13 #include "base/trace_event/trace_event.h" |
14 #include "base/trace_event/trace_event_argument.h" | 14 #include "base/trace_event/trace_event_argument.h" |
15 #include "cc/quads/render_pass.h" | 15 #include "cc/quads/render_pass.h" |
16 #include "cc/quads/shared_quad_state.h" | 16 #include "cc/quads/shared_quad_state.h" |
17 #include "cc/quads/solid_color_draw_quad.h" | 17 #include "cc/quads/solid_color_draw_quad.h" |
18 #include "cc/quads/texture_draw_quad.h" | 18 #include "cc/quads/texture_draw_quad.h" |
19 #include "cc/resources/single_release_callback.h" | 19 #include "cc/resources/single_release_callback.h" |
20 #include "cc/surfaces/surface.h" | 20 #include "cc/surfaces/surface.h" |
21 #include "cc/surfaces/surface_factory.h" | 21 #include "cc/surfaces/surface_factory.h" |
22 #include "cc/surfaces/surface_id_allocator.h" | 22 #include "cc/surfaces/surface_id_allocator.h" |
23 #include "cc/surfaces/surface_manager.h" | 23 #include "cc/surfaces/surface_manager.h" |
24 #include "components/exo/buffer.h" | 24 #include "components/exo/buffer.h" |
25 #include "components/exo/surface_delegate.h" | 25 #include "components/exo/surface_delegate.h" |
26 #include "components/exo/surface_observer.h" | 26 #include "components/exo/surface_observer.h" |
27 #include "mojo/public/cpp/bindings/strong_binding.h" | |
27 #include "third_party/khronos/GLES2/gl2.h" | 28 #include "third_party/khronos/GLES2/gl2.h" |
28 #include "ui/aura/env.h" | 29 #include "ui/aura/env.h" |
29 #include "ui/aura/window_delegate.h" | 30 #include "ui/aura/window_delegate.h" |
30 #include "ui/aura/window_property.h" | 31 #include "ui/aura/window_property.h" |
31 #include "ui/aura/window_targeter.h" | 32 #include "ui/aura/window_targeter.h" |
32 #include "ui/base/cursor/cursor.h" | 33 #include "ui/base/cursor/cursor.h" |
33 #include "ui/base/hit_test.h" | 34 #include "ui/base/hit_test.h" |
34 #include "ui/compositor/layer.h" | 35 #include "ui/compositor/layer.h" |
35 #include "ui/events/event.h" | 36 #include "ui/events/event.h" |
36 #include "ui/gfx/buffer_format_util.h" | 37 #include "ui/gfx/buffer_format_util.h" |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
155 if (!surface) { | 156 if (!surface) { |
156 LOG(ERROR) << "Attempting to require callback on nonexistent surface"; | 157 LOG(ERROR) << "Attempting to require callback on nonexistent surface"; |
157 return; | 158 return; |
158 } | 159 } |
159 surface->AddDestructionDependency(sequence); | 160 surface->AddDestructionDependency(sequence); |
160 } | 161 } |
161 | 162 |
162 } // namespace | 163 } // namespace |
163 | 164 |
164 //////////////////////////////////////////////////////////////////////////////// | 165 //////////////////////////////////////////////////////////////////////////////// |
165 // SurfaceFactoryOwner, public: | |
166 | |
167 SurfaceFactoryOwner::SurfaceFactoryOwner() {} | |
168 | |
169 //////////////////////////////////////////////////////////////////////////////// | |
170 // cc::SurfaceFactoryClient overrides: | |
171 | |
172 void SurfaceFactoryOwner::ReturnResources( | |
173 const cc::ReturnedResourceArray& resources) { | |
174 scoped_refptr<SurfaceFactoryOwner> holder(this); | |
175 for (auto& resource : resources) { | |
176 auto it = release_callbacks_.find(resource.id); | |
177 DCHECK(it != release_callbacks_.end()); | |
178 it->second.second->Run(resource.sync_token, resource.lost); | |
179 release_callbacks_.erase(it); | |
180 } | |
181 } | |
182 | |
183 void SurfaceFactoryOwner::WillDrawSurface(const cc::LocalFrameId& id, | |
184 const gfx::Rect& damage_rect) { | |
185 if (surface_) | |
186 surface_->WillDraw(); | |
187 } | |
188 | |
189 void SurfaceFactoryOwner::SetBeginFrameSource( | |
190 cc::BeginFrameSource* begin_frame_source) { | |
191 if (surface_) | |
192 surface_->SetBeginFrameSource(begin_frame_source); | |
193 } | |
194 | |
195 //////////////////////////////////////////////////////////////////////////////// | |
196 // SurfaceFactoryOwner, private: | |
197 | |
198 SurfaceFactoryOwner::~SurfaceFactoryOwner() { | |
199 if (surface_factory_->manager()) | |
200 surface_factory_->manager()->InvalidateFrameSinkId(frame_sink_id_); | |
201 } | |
202 | |
203 //////////////////////////////////////////////////////////////////////////////// | |
204 // Surface, public: | 166 // Surface, public: |
205 | 167 |
206 Surface::Surface() | 168 Surface::Surface() |
207 : window_(new aura::Window(new CustomWindowDelegate(this))), | 169 : window_(new aura::Window(new CustomWindowDelegate(this))), |
170 frame_sink_id_( | |
171 aura::Env::GetInstance()->context_factory()->AllocateFrameSinkId()), | |
208 surface_manager_( | 172 surface_manager_( |
209 aura::Env::GetInstance()->context_factory()->GetSurfaceManager()), | 173 aura::Env::GetInstance()->context_factory()->GetSurfaceManager()), |
210 factory_owner_(new SurfaceFactoryOwner) { | 174 compositor_frame_sink_holder_(new CompositorFrameSinkHolder()), |
Fady Samuel
2016/11/17 21:42:54
Make this implement MojoCompositorFrameSinkClient.
Alex Z.
2016/11/23 14:25:04
Done.
| |
175 compositor_frame_sink_( | |
176 new ExoCompositorFrameSink(frame_sink_id_, | |
177 surface_manager_, | |
178 compositor_frame_sink_holder_.get())) { | |
Fady Samuel
2016/11/17 21:42:54
Take in a MojoCompostiorFrameSinkClientPtr here.
Alex Z.
2016/11/23 14:25:04
Done.
| |
211 window_->SetType(ui::wm::WINDOW_TYPE_CONTROL); | 179 window_->SetType(ui::wm::WINDOW_TYPE_CONTROL); |
212 window_->SetName("ExoSurface"); | 180 window_->SetName("ExoSurface"); |
213 window_->SetProperty(kSurfaceKey, this); | 181 window_->SetProperty(kSurfaceKey, this); |
214 window_->Init(ui::LAYER_SOLID_COLOR); | 182 window_->Init(ui::LAYER_SOLID_COLOR); |
215 window_->SetEventTargeter(base::WrapUnique(new CustomWindowTargeter)); | 183 window_->SetEventTargeter(base::WrapUnique(new CustomWindowTargeter)); |
216 window_->set_owned_by_parent(false); | 184 window_->set_owned_by_parent(false); |
217 window_->AddObserver(this); | 185 window_->AddObserver(this); |
218 factory_owner_->surface_ = this; | |
219 factory_owner_->frame_sink_id_ = | |
220 aura::Env::GetInstance()->context_factory()->AllocateFrameSinkId(); | |
221 factory_owner_->id_allocator_.reset(new cc::SurfaceIdAllocator()); | |
222 surface_manager_->RegisterFrameSinkId(factory_owner_->frame_sink_id_); | |
223 surface_manager_->RegisterSurfaceFactoryClient(factory_owner_->frame_sink_id_, | |
224 factory_owner_.get()); | |
225 factory_owner_->surface_factory_.reset(new cc::SurfaceFactory( | |
226 factory_owner_->frame_sink_id_, surface_manager_, factory_owner_.get())); | |
227 aura::Env::GetInstance()->context_factory()->AddObserver(this); | 186 aura::Env::GetInstance()->context_factory()->AddObserver(this); |
228 } | 187 } |
229 | 188 |
230 Surface::~Surface() { | 189 Surface::~Surface() { |
231 aura::Env::GetInstance()->context_factory()->RemoveObserver(this); | 190 aura::Env::GetInstance()->context_factory()->RemoveObserver(this); |
232 for (SurfaceObserver& observer : observers_) | 191 for (SurfaceObserver& observer : observers_) |
233 observer.OnSurfaceDestroying(this); | 192 observer.OnSurfaceDestroying(this); |
234 | 193 |
235 window_->RemoveObserver(this); | 194 window_->RemoveObserver(this); |
236 window_->layer()->SetShowSolidColorContent(); | 195 window_->layer()->SetShowSolidColorContent(); |
237 | 196 |
238 factory_owner_->surface_ = nullptr; | |
239 | |
240 // Call pending frame callbacks with a null frame time to indicate that they | 197 // Call pending frame callbacks with a null frame time to indicate that they |
241 // have been cancelled. | 198 // have been cancelled. |
242 frame_callbacks_.splice(frame_callbacks_.end(), pending_frame_callbacks_); | 199 frame_callbacks_.splice(frame_callbacks_.end(), pending_frame_callbacks_); |
243 active_frame_callbacks_.splice(active_frame_callbacks_.end(), | 200 active_frame_callbacks_.splice(active_frame_callbacks_.end(), |
244 frame_callbacks_); | 201 frame_callbacks_); |
245 for (const auto& frame_callback : active_frame_callbacks_) | 202 for (const auto& frame_callback : active_frame_callbacks_) |
246 frame_callback.Run(base::TimeTicks()); | 203 frame_callback.Run(base::TimeTicks()); |
247 | 204 |
248 if (begin_frame_source_ && needs_begin_frame_) | 205 if (begin_frame_source_ && needs_begin_frame_) |
249 begin_frame_source_->RemoveObserver(this); | 206 begin_frame_source_->RemoveObserver(this); |
250 | |
251 if (local_frame_id_.is_valid()) | |
252 factory_owner_->surface_factory_->Destroy(local_frame_id_); | |
253 | |
254 surface_manager_->UnregisterSurfaceFactoryClient( | |
255 factory_owner_->frame_sink_id_); | |
256 } | 207 } |
257 | 208 |
258 // static | 209 // static |
259 Surface* Surface::AsSurface(const aura::Window* window) { | 210 Surface* Surface::AsSurface(const aura::Window* window) { |
260 return window->GetProperty(kSurfaceKey); | 211 return window->GetProperty(kSurfaceKey); |
261 } | 212 } |
262 | 213 |
263 cc::SurfaceId Surface::GetSurfaceId() const { | 214 cc::SurfaceId Surface::GetSurfaceId() const { |
264 return cc::SurfaceId(factory_owner_->frame_sink_id_, local_frame_id_); | 215 return cc::SurfaceId(frame_sink_id_, local_frame_id_); |
265 } | 216 } |
266 | 217 |
267 void Surface::Attach(Buffer* buffer) { | 218 void Surface::Attach(Buffer* buffer) { |
268 TRACE_EVENT1("exo", "Surface::Attach", "buffer", | 219 TRACE_EVENT1("exo", "Surface::Attach", "buffer", |
269 buffer ? buffer->GetSize().ToString() : "null"); | 220 buffer ? buffer->GetSize().ToString() : "null"); |
270 | 221 |
271 has_pending_contents_ = true; | 222 has_pending_contents_ = true; |
272 pending_buffer_.Reset(buffer ? buffer->AsWeakPtr() : base::WeakPtr<Buffer>()); | 223 pending_buffer_.Reset(buffer ? buffer->AsWeakPtr() : base::WeakPtr<Buffer>()); |
273 } | 224 } |
274 | 225 |
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
470 has_pending_contents_ = false; | 421 has_pending_contents_ = false; |
471 | 422 |
472 current_buffer_ = std::move(pending_buffer_); | 423 current_buffer_ = std::move(pending_buffer_); |
473 | 424 |
474 UpdateResource(true); | 425 UpdateResource(true); |
475 } | 426 } |
476 | 427 |
477 cc::LocalFrameId old_local_frame_id = local_frame_id_; | 428 cc::LocalFrameId old_local_frame_id = local_frame_id_; |
478 if (needs_commit_to_new_surface_ || !local_frame_id_.is_valid()) { | 429 if (needs_commit_to_new_surface_ || !local_frame_id_.is_valid()) { |
479 needs_commit_to_new_surface_ = false; | 430 needs_commit_to_new_surface_ = false; |
480 local_frame_id_ = factory_owner_->id_allocator_->GenerateId(); | 431 local_frame_id_ = id_allocator_.GenerateId(); |
481 factory_owner_->surface_factory_->Create(local_frame_id_); | |
482 } | 432 } |
483 | 433 |
484 UpdateSurface(true); | 434 UpdateSurface(true); |
485 | 435 |
486 if (old_local_frame_id.is_valid() && old_local_frame_id != local_frame_id_) { | |
487 factory_owner_->surface_factory_->SetPreviousFrameSurface( | |
488 local_frame_id_, old_local_frame_id); | |
489 factory_owner_->surface_factory_->Destroy(old_local_frame_id); | |
490 } | |
491 | |
492 if (old_local_frame_id != local_frame_id_) { | 436 if (old_local_frame_id != local_frame_id_) { |
493 float contents_surface_to_layer_scale = 1.0; | 437 float contents_surface_to_layer_scale = 1.0; |
494 // The bounds must be updated before switching to the new surface, because | 438 // The bounds must be updated before switching to the new surface, because |
495 // the layer may be mirrored, in which case a surface change causes the | 439 // the layer may be mirrored, in which case a surface change causes the |
496 // mirror layer to update its surface using the latest bounds. | 440 // mirror layer to update its surface using the latest bounds. |
497 window_->layer()->SetBounds( | 441 window_->layer()->SetBounds( |
498 gfx::Rect(window_->layer()->bounds().origin(), content_size_)); | 442 gfx::Rect(window_->layer()->bounds().origin(), content_size_)); |
499 window_->layer()->SetShowSurface( | 443 window_->layer()->SetShowSurface( |
500 cc::SurfaceId(factory_owner_->frame_sink_id_, local_frame_id_), | 444 cc::SurfaceId(frame_sink_id_, local_frame_id_), |
501 base::Bind(&SatisfyCallback, base::Unretained(surface_manager_)), | 445 base::Bind(&SatisfyCallback, base::Unretained(surface_manager_)), |
502 base::Bind(&RequireCallback, base::Unretained(surface_manager_)), | 446 base::Bind(&RequireCallback, base::Unretained(surface_manager_)), |
503 content_size_, contents_surface_to_layer_scale, content_size_); | 447 content_size_, contents_surface_to_layer_scale, content_size_); |
504 window_->layer()->SetFillsBoundsOpaquely( | 448 window_->layer()->SetFillsBoundsOpaquely( |
505 state_.blend_mode == SkXfermode::kSrc_Mode || | 449 state_.blend_mode == SkXfermode::kSrc_Mode || |
506 state_.opaque_region.contains( | 450 state_.opaque_region.contains( |
507 gfx::RectToSkIRect(gfx::Rect(content_size_)))); | 451 gfx::RectToSkIRect(gfx::Rect(content_size_)))); |
508 } | 452 } |
509 | 453 |
510 // Reset damage. | 454 // Reset damage. |
511 pending_damage_.setEmpty(); | 455 pending_damage_.setEmpty(); |
512 | 456 |
513 DCHECK(!current_resource_.id || | 457 DCHECK(!current_resource_.id || |
514 factory_owner_->release_callbacks_.count(current_resource_.id)); | 458 compositor_frame_sink_holder_->release_callbacks_.count( |
Fady Samuel
2016/11/17 21:42:54
CompositorFrameSinkHolder::HasReleaseCallbacks()?
Alex Z.
2016/11/23 14:25:04
Done.
| |
459 current_resource_.id)); | |
515 | 460 |
516 // Move pending frame callbacks to the end of frame_callbacks_. | 461 // Move pending frame callbacks to the end of frame_callbacks_. |
517 frame_callbacks_.splice(frame_callbacks_.end(), pending_frame_callbacks_); | 462 frame_callbacks_.splice(frame_callbacks_.end(), pending_frame_callbacks_); |
518 | 463 |
519 // Synchronize window hierarchy. This will position and update the stacking | 464 // Synchronize window hierarchy. This will position and update the stacking |
520 // order of all sub-surfaces after committing all pending state of sub-surface | 465 // order of all sub-surfaces after committing all pending state of sub-surface |
521 // descendants. | 466 // descendants. |
522 aura::Window* stacking_target = nullptr; | 467 aura::Window* stacking_target = nullptr; |
523 for (auto& sub_surface_entry : pending_sub_surfaces_) { | 468 for (auto& sub_surface_entry : pending_sub_surfaces_) { |
524 Surface* sub_surface = sub_surface_entry.first; | 469 Surface* sub_surface = sub_surface_entry.first; |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
637 | 582 |
638 void Surface::OnLostResources() { | 583 void Surface::OnLostResources() { |
639 if (!local_frame_id_.is_valid()) | 584 if (!local_frame_id_.is_valid()) |
640 return; | 585 return; |
641 | 586 |
642 UpdateResource(false); | 587 UpdateResource(false); |
643 UpdateSurface(false); | 588 UpdateSurface(false); |
644 } | 589 } |
645 | 590 |
646 void Surface::OnWindowAddedToRootWindow(aura::Window* window) { | 591 void Surface::OnWindowAddedToRootWindow(aura::Window* window) { |
647 window->layer()->GetCompositor()->AddFrameSink( | 592 window->layer()->GetCompositor()->AddFrameSink(frame_sink_id_); |
648 factory_owner_->frame_sink_id_); | |
649 } | 593 } |
650 | 594 |
651 void Surface::OnWindowRemovingFromRootWindow(aura::Window* window, | 595 void Surface::OnWindowRemovingFromRootWindow(aura::Window* window, |
652 aura::Window* new_root) { | 596 aura::Window* new_root) { |
653 window->layer()->GetCompositor()->RemoveFrameSink( | 597 window->layer()->GetCompositor()->RemoveFrameSink(frame_sink_id_); |
654 factory_owner_->frame_sink_id_); | |
655 } | 598 } |
656 | 599 |
657 void Surface::OnBeginFrame(const cc::BeginFrameArgs& args) { | 600 void Surface::OnBeginFrame(const cc::BeginFrameArgs& args) { |
658 while (!active_frame_callbacks_.empty()) { | 601 while (!active_frame_callbacks_.empty()) { |
659 active_frame_callbacks_.front().Run(args.frame_time); | 602 active_frame_callbacks_.front().Run(args.frame_time); |
660 active_frame_callbacks_.pop_front(); | 603 active_frame_callbacks_.pop_front(); |
661 } | 604 } |
662 last_begin_frame_args_ = args; | 605 last_begin_frame_args_ = args; |
663 } | 606 } |
664 | 607 |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
744 resource.id = next_resource_id_++; | 687 resource.id = next_resource_id_++; |
745 resource.format = cc::RGBA_8888; | 688 resource.format = cc::RGBA_8888; |
746 resource.filter = | 689 resource.filter = |
747 texture_mailbox.nearest_neighbor() ? GL_NEAREST : GL_LINEAR; | 690 texture_mailbox.nearest_neighbor() ? GL_NEAREST : GL_LINEAR; |
748 resource.size = texture_mailbox.size_in_pixels(); | 691 resource.size = texture_mailbox.size_in_pixels(); |
749 resource.mailbox_holder = gpu::MailboxHolder(texture_mailbox.mailbox(), | 692 resource.mailbox_holder = gpu::MailboxHolder(texture_mailbox.mailbox(), |
750 texture_mailbox.sync_token(), | 693 texture_mailbox.sync_token(), |
751 texture_mailbox.target()); | 694 texture_mailbox.target()); |
752 resource.is_overlay_candidate = texture_mailbox.is_overlay_candidate(); | 695 resource.is_overlay_candidate = texture_mailbox.is_overlay_candidate(); |
753 | 696 |
754 factory_owner_->release_callbacks_[resource.id] = std::make_pair( | 697 compositor_frame_sink_holder_->release_callbacks_[resource.id] = |
Fady Samuel
2016/11/17 21:42:54
This is really icky. How about CompositorFrameSink
| |
755 factory_owner_, std::move(texture_mailbox_release_callback)); | 698 std::make_pair(compositor_frame_sink_holder_, |
699 std::move(texture_mailbox_release_callback)); | |
756 current_resource_ = resource; | 700 current_resource_ = resource; |
757 } else { | 701 } else { |
758 current_resource_.id = 0; | 702 current_resource_.id = 0; |
759 current_resource_.size = gfx::Size(); | 703 current_resource_.size = gfx::Size(); |
760 } | 704 } |
761 } | 705 } |
762 | 706 |
763 void Surface::UpdateSurface(bool full_damage) { | 707 void Surface::UpdateSurface(bool full_damage) { |
764 gfx::Size buffer_size = current_resource_.size; | 708 gfx::Size buffer_size = current_resource_.size; |
765 gfx::SizeF scaled_buffer_size( | 709 gfx::SizeF scaled_buffer_size( |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
838 } else { | 782 } else { |
839 cc::SolidColorDrawQuad* solid_quad = | 783 cc::SolidColorDrawQuad* solid_quad = |
840 render_pass->CreateAndAppendDrawQuad<cc::SolidColorDrawQuad>(); | 784 render_pass->CreateAndAppendDrawQuad<cc::SolidColorDrawQuad>(); |
841 solid_quad->SetNew(quad_state, quad_rect, quad_rect, SK_ColorBLACK, false); | 785 solid_quad->SetNew(quad_state, quad_rect, quad_rect, SK_ColorBLACK, false); |
842 } | 786 } |
843 | 787 |
844 delegated_frame->render_pass_list.push_back(std::move(render_pass)); | 788 delegated_frame->render_pass_list.push_back(std::move(render_pass)); |
845 cc::CompositorFrame frame; | 789 cc::CompositorFrame frame; |
846 frame.delegated_frame_data = std::move(delegated_frame); | 790 frame.delegated_frame_data = std::move(delegated_frame); |
847 | 791 |
848 factory_owner_->surface_factory_->SubmitCompositorFrame( | 792 compositor_frame_sink_->SubmitCompositorFrame(local_frame_id_, |
849 local_frame_id_, std::move(frame), cc::SurfaceFactory::DrawCallback()); | 793 std::move(frame)); |
850 } | 794 } |
851 | 795 |
852 void Surface::UpdateNeedsBeginFrame() { | 796 void Surface::UpdateNeedsBeginFrame() { |
853 if (!begin_frame_source_) | 797 if (!begin_frame_source_) |
854 return; | 798 return; |
855 | 799 |
856 bool needs_begin_frame = !active_frame_callbacks_.empty(); | 800 bool needs_begin_frame = !active_frame_callbacks_.empty(); |
857 if (needs_begin_frame == needs_begin_frame_) | 801 if (needs_begin_frame == needs_begin_frame_) |
858 return; | 802 return; |
859 | 803 |
(...skipping 24 matching lines...) Expand all Loading... | |
884 | 828 |
885 int64_t Surface::GetPropertyInternal(const void* key, | 829 int64_t Surface::GetPropertyInternal(const void* key, |
886 int64_t default_value) const { | 830 int64_t default_value) const { |
887 std::map<const void*, Value>::const_iterator iter = prop_map_.find(key); | 831 std::map<const void*, Value>::const_iterator iter = prop_map_.find(key); |
888 if (iter == prop_map_.end()) | 832 if (iter == prop_map_.end()) |
889 return default_value; | 833 return default_value; |
890 return iter->second.value; | 834 return iter->second.value; |
891 } | 835 } |
892 | 836 |
893 } // namespace exo | 837 } // namespace exo |
OLD | NEW |