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

Side by Side Diff: mandoline/tab/frame_connection.cc

Issue 1281663002: Mandoline: Allow submitting CompositorFrames directly to mojo::Views (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 5 years, 3 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/view_manager/view_tree_unittest.cc ('k') | mandoline/ui/aura/surface_binding.cc » ('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 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 "mandoline/tab/frame_connection.h" 5 #include "mandoline/tab/frame_connection.h"
6 6
7 #include "components/clipboard/public/interfaces/clipboard.mojom.h" 7 #include "components/clipboard/public/interfaces/clipboard.mojom.h"
8 #include "components/resource_provider/public/interfaces/resource_provider.mojom .h" 8 #include "components/resource_provider/public/interfaces/resource_provider.mojom .h"
9 #include "components/view_manager/public/interfaces/gpu.mojom.h" 9 #include "components/view_manager/public/interfaces/gpu.mojom.h"
10 #include "components/view_manager/public/interfaces/surfaces.mojom.h"
11 #include "components/view_manager/public/interfaces/view_tree_host.mojom.h" 10 #include "components/view_manager/public/interfaces/view_tree_host.mojom.h"
12 #include "mojo/application/public/cpp/application_connection.h" 11 #include "mojo/application/public/cpp/application_connection.h"
13 #include "mojo/application/public/cpp/application_impl.h" 12 #include "mojo/application/public/cpp/application_impl.h"
14 #include "mojo/services/network/public/interfaces/cookie_store.mojom.h" 13 #include "mojo/services/network/public/interfaces/cookie_store.mojom.h"
15 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h" 14 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
16 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h" 15 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h"
17 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h" 16 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
18 17
19 #if defined(OS_LINUX) && !defined(OS_ANDROID) 18 #if defined(OS_LINUX) && !defined(OS_ANDROID)
20 #include "components/font_service/public/interfaces/font_service.mojom.h" 19 #include "components/font_service/public/interfaces/font_service.mojom.h"
(...skipping 30 matching lines...) Expand all
51 clipboard_interfaces.push_back(mojo::Clipboard::Name_); 50 clipboard_interfaces.push_back(mojo::Clipboard::Name_);
52 filter->filter.insert("mojo:clipboard", clipboard_interfaces.Pass()); 51 filter->filter.insert("mojo:clipboard", clipboard_interfaces.Pass());
53 52
54 mojo::Array<mojo::String> tracing_interfaces; 53 mojo::Array<mojo::String> tracing_interfaces;
55 tracing_interfaces.push_back(tracing::StartupPerformanceDataCollector::Name_); 54 tracing_interfaces.push_back(tracing::StartupPerformanceDataCollector::Name_);
56 filter->filter.insert("mojo:tracing", tracing_interfaces.Pass()); 55 filter->filter.insert("mojo:tracing", tracing_interfaces.Pass());
57 56
58 mojo::Array<mojo::String> view_manager_interfaces; 57 mojo::Array<mojo::String> view_manager_interfaces;
59 view_manager_interfaces.push_back(mojo::Gpu::Name_); 58 view_manager_interfaces.push_back(mojo::Gpu::Name_);
60 view_manager_interfaces.push_back(mojo::ViewTreeHostFactory::Name_); 59 view_manager_interfaces.push_back(mojo::ViewTreeHostFactory::Name_);
61 view_manager_interfaces.push_back(mojo::Surface::Name_);
62 filter->filter.insert("mojo:view_manager", view_manager_interfaces.Pass()); 60 filter->filter.insert("mojo:view_manager", view_manager_interfaces.Pass());
63 61
64 #if defined(OS_LINUX) && !defined(OS_ANDROID) 62 #if defined(OS_LINUX) && !defined(OS_ANDROID)
65 mojo::Array<mojo::String> font_service_interfaces; 63 mojo::Array<mojo::String> font_service_interfaces;
66 font_service_interfaces.push_back(font_service::FontService::Name_); 64 font_service_interfaces.push_back(font_service::FontService::Name_);
67 filter->filter.insert("mojo:font_service", font_service_interfaces.Pass()); 65 filter->filter.insert("mojo:font_service", font_service_interfaces.Pass());
68 #endif 66 #endif
69 67
70 application_connection_ = app->ConnectToApplicationWithCapabilityFilter( 68 application_connection_ = app->ConnectToApplicationWithCapabilityFilter(
71 request.Pass(), filter.Pass()); 69 request.Pass(), filter.Pass());
72 application_connection_->ConnectToService(view_tree_client); 70 application_connection_->ConnectToService(view_tree_client);
73 application_connection_->ConnectToService(&frame_tree_client_); 71 application_connection_->ConnectToService(&frame_tree_client_);
74 frame_tree_client_.set_connection_error_handler([]() { 72 frame_tree_client_.set_connection_error_handler([]() {
75 // TODO(sky): implement this. 73 // TODO(sky): implement this.
76 NOTIMPLEMENTED(); 74 NOTIMPLEMENTED();
77 }); 75 });
78 } 76 }
79 77
80 } // namespace mandoline 78 } // namespace mandoline
OLDNEW
« no previous file with comments | « components/view_manager/view_tree_unittest.cc ('k') | mandoline/ui/aura/surface_binding.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698