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

Side by Side Diff: components/mus/vm/connection_manager.cc

Issue 1377493002: mus: move View Manager to components/mus/vm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased 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
« no previous file with comments | « components/mus/vm/connection_manager.h ('k') | components/mus/vm/connection_manager_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/mus/connection_manager.h" 5 #include "components/mus/vm/connection_manager.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "cc/output/compositor_frame.h" 9 #include "cc/output/compositor_frame.h"
10 #include "cc/quads/shared_quad_state.h" 10 #include "cc/quads/shared_quad_state.h"
11 #include "cc/quads/surface_draw_quad.h" 11 #include "cc/quads/surface_draw_quad.h"
12 #include "components/mus/client_connection.h" 12 #include "components/mus/vm/client_connection.h"
13 #include "components/mus/connection_manager_delegate.h" 13 #include "components/mus/vm/connection_manager_delegate.h"
14 #include "components/mus/server_view.h" 14 #include "components/mus/vm/server_view.h"
15 #include "components/mus/view_coordinate_conversions.h" 15 #include "components/mus/vm/view_coordinate_conversions.h"
16 #include "components/mus/view_tree_host_connection.h" 16 #include "components/mus/vm/view_tree_host_connection.h"
17 #include "components/mus/view_tree_impl.h" 17 #include "components/mus/vm/view_tree_impl.h"
18 #include "mojo/application/public/cpp/application_connection.h" 18 #include "mojo/application/public/cpp/application_connection.h"
19 #include "mojo/converters/geometry/geometry_type_converters.h" 19 #include "mojo/converters/geometry/geometry_type_converters.h"
20 #include "mojo/converters/input_events/input_events_type_converters.h" 20 #include "mojo/converters/input_events/input_events_type_converters.h"
21 #include "mojo/converters/surfaces/surfaces_type_converters.h" 21 #include "mojo/converters/surfaces/surfaces_type_converters.h"
22 #include "ui/gfx/geometry/size_conversions.h" 22 #include "ui/gfx/geometry/size_conversions.h"
23 23
24 namespace mus { 24 namespace mus {
25 25
26 ConnectionManager::ScopedChange::ScopedChange( 26 ConnectionManager::ScopedChange::ScopedChange(
27 ViewTreeImpl* connection, 27 ViewTreeImpl* connection,
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 ServerView* view = GetView(ViewIdFromTransportId(id)); 447 ServerView* view = GetView(ViewIdFromTransportId(id));
448 // If a CompositorFrame message arrives late, say during a navigation, then 448 // If a CompositorFrame message arrives late, say during a navigation, then
449 // it may contain view IDs that no longer exist. 449 // it may contain view IDs that no longer exist.
450 if (!view || view->surface_id().is_null()) 450 if (!view || view->surface_id().is_null())
451 return false; 451 return false;
452 452
453 // TODO(fsamuel): This shouldn't be in the ConnectionManager. Let's find a 453 // TODO(fsamuel): This shouldn't be in the ConnectionManager. Let's find a
454 // better home for it. http://crbug.com/533029. 454 // better home for it. http://crbug.com/533029.
455 cc::SurfaceDrawQuad* surface_quad = 455 cc::SurfaceDrawQuad* surface_quad =
456 render_pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>(); 456 render_pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
457 surface_quad->SetAll( 457 surface_quad->SetAll(sqs, input->rect.To<gfx::Rect>(),
458 sqs, 458 input->opaque_rect.To<gfx::Rect>(),
459 input->rect.To<gfx::Rect>(), 459 input->visible_rect.To<gfx::Rect>(),
460 input->opaque_rect.To<gfx::Rect>(), 460 input->needs_blending, view->surface_id());
461 input->visible_rect.To<gfx::Rect>(),
462 input->needs_blending,
463 view->surface_id());
464 return true; 461 return true;
465 } 462 }
466 463
467 } // namespace mus 464 } // namespace mus
OLDNEW
« no previous file with comments | « components/mus/vm/connection_manager.h ('k') | components/mus/vm/connection_manager_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698