| OLD | NEW |
| 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 "mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h" | 5 #include "mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "mojo/public/cpp/shell/connect.h" | 9 #include "mojo/public/cpp/shell/connect.h" |
| 10 #include "mojo/public/interfaces/shell/shell.mojom.h" | 10 #include "mojo/public/interfaces/shell/shell.mojom.h" |
| (...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 509 const SkBitmap& contents) { | 509 const SkBitmap& contents) { |
| 510 DCHECK(connected_); | 510 DCHECK(connected_); |
| 511 pending_transactions_.push_back( | 511 pending_transactions_.push_back( |
| 512 new SetViewContentsTransaction(view_id, contents, this)); | 512 new SetViewContentsTransaction(view_id, contents, this)); |
| 513 Sync(); | 513 Sync(); |
| 514 } | 514 } |
| 515 | 515 |
| 516 //////////////////////////////////////////////////////////////////////////////// | 516 //////////////////////////////////////////////////////////////////////////////// |
| 517 // ViewManagerSynchronizer, IViewManagerClient implementation: | 517 // ViewManagerSynchronizer, IViewManagerClient implementation: |
| 518 | 518 |
| 519 void ViewManagerSynchronizer::OnConnectionEstablished( | 519 void ViewManagerSynchronizer::OnViewManagerConnectionEstablished( |
| 520 TransportConnectionId connection_id, | 520 TransportConnectionId connection_id, |
| 521 TransportChangeId next_server_change_id, | 521 TransportChangeId next_server_change_id, |
| 522 const Array<INode>& nodes) { | 522 const Array<INode>& nodes) { |
| 523 connected_ = true; | 523 connected_ = true; |
| 524 connection_id_ = connection_id; | 524 connection_id_ = connection_id; |
| 525 next_server_change_id_ = next_server_change_id; | 525 next_server_change_id_ = next_server_change_id; |
| 526 | 526 |
| 527 ViewManagerPrivate(view_manager_).set_root( | 527 ViewManagerPrivate(view_manager_).set_root( |
| 528 BuildNodeTree(view_manager_, nodes)); | 528 BuildNodeTree(view_manager_, nodes)); |
| 529 if (init_loop_) | 529 if (init_loop_) |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 617 void ViewManagerSynchronizer::RemoveFromPendingQueue( | 617 void ViewManagerSynchronizer::RemoveFromPendingQueue( |
| 618 ViewManagerTransaction* transaction) { | 618 ViewManagerTransaction* transaction) { |
| 619 DCHECK_EQ(transaction, pending_transactions_.front()); | 619 DCHECK_EQ(transaction, pending_transactions_.front()); |
| 620 pending_transactions_.erase(pending_transactions_.begin()); | 620 pending_transactions_.erase(pending_transactions_.begin()); |
| 621 if (pending_transactions_.empty() && !changes_acked_callback_.is_null()) | 621 if (pending_transactions_.empty() && !changes_acked_callback_.is_null()) |
| 622 changes_acked_callback_.Run(); | 622 changes_acked_callback_.Run(); |
| 623 } | 623 } |
| 624 | 624 |
| 625 } // namespace view_manager | 625 } // namespace view_manager |
| 626 } // namespace mojo | 626 } // namespace mojo |
| OLD | NEW |