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

Side by Side Diff: sky/viewer/document_view.cc

Issue 1118843003: Remove some InterfacePtr<> methods which directly deal with message pipe handles. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 7 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 "sky/viewer/document_view.h" 5 #include "sky/viewer/document_view.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/message_loop/message_loop_proxy.h" 9 #include "base/message_loop/message_loop_proxy.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 191
192 TestHarnessPtr DocumentView::TakeTestHarness() { 192 TestHarnessPtr DocumentView::TakeTestHarness() {
193 return test_harness_.Pass(); 193 return test_harness_.Pass();
194 } 194 }
195 195
196 mojo::ScopedMessagePipeHandle DocumentView::TakeServicesProvidedToEmbedder() { 196 mojo::ScopedMessagePipeHandle DocumentView::TakeServicesProvidedToEmbedder() {
197 return services_provided_to_embedder_.PassMessagePipe(); 197 return services_provided_to_embedder_.PassMessagePipe();
198 } 198 }
199 199
200 mojo::ScopedMessagePipeHandle DocumentView::TakeServicesProvidedByEmbedder() { 200 mojo::ScopedMessagePipeHandle DocumentView::TakeServicesProvidedByEmbedder() {
201 return services_provided_by_embedder_.PassMessagePipe(); 201 return services_provided_by_embedder_.PassInterface().PassHandle();
202 } 202 }
203 203
204 mojo::ScopedMessagePipeHandle DocumentView::TakeServiceRegistry() { 204 mojo::ScopedMessagePipeHandle DocumentView::TakeServiceRegistry() {
205 return service_registry_.PassMessagePipe(); 205 return service_registry_.PassInterface().PassHandle();
206 } 206 }
207 207
208 mojo::Shell* DocumentView::GetShell() { 208 mojo::Shell* DocumentView::GetShell() {
209 return shell_; 209 return shell_;
210 } 210 }
211 211
212 void DocumentView::BeginFrame(base::TimeTicks frame_time) { 212 void DocumentView::BeginFrame(base::TimeTicks frame_time) {
213 double frame_time_sec = (frame_time - base::TimeTicks()).InSecondsF(); 213 double frame_time_sec = (frame_time - base::TimeTicks()).InSecondsF();
214 double deadline_sec = frame_time_sec; 214 double deadline_sec = frame_time_sec;
215 double interval_sec = 1.0/60; 215 double interval_sec = 1.0/60;
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 interface_names[0] = mojo::ViewManagerClient::Name_; 379 interface_names[0] = mojo::ViewManagerClient::Name_;
380 mojo::ServiceProviderImpl* sp_impl(new mojo::ServiceProviderImpl()); 380 mojo::ServiceProviderImpl* sp_impl(new mojo::ServiceProviderImpl());
381 sp_impl->AddService(&view_manager_client_factory_); 381 sp_impl->AddService(&view_manager_client_factory_);
382 mojo::ServiceProviderPtr sp; 382 mojo::ServiceProviderPtr sp;
383 service_registry_service_provider_binding_.reset( 383 service_registry_service_provider_binding_.reset(
384 new mojo::StrongBinding<mojo::ServiceProvider>(sp_impl, &sp)); 384 new mojo::StrongBinding<mojo::ServiceProvider>(sp_impl, &sp));
385 service_registry_->AddServices(interface_names.Pass(), sp.Pass()); 385 service_registry_->AddServices(interface_names.Pass(), sp.Pass());
386 } 386 }
387 387
388 } // namespace sky 388 } // namespace sky
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698