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

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

Issue 958673002: Added ServiceRegistry interface (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 9 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 | « sky/viewer/BUILD.gn ('k') | sky/viewer/document_view.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 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 #ifndef SKY_VIEWER_DOCUMENT_VIEW_H_ 5 #ifndef SKY_VIEWER_DOCUMENT_VIEW_H_
6 #define SKY_VIEWER_DOCUMENT_VIEW_H_ 6 #define SKY_VIEWER_DOCUMENT_VIEW_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "mojo/public/cpp/application/lazy_interface_ptr.h" 10 #include "mojo/public/cpp/application/lazy_interface_ptr.h"
11 #include "mojo/public/cpp/application/service_provider_impl.h" 11 #include "mojo/public/cpp/application/service_provider_impl.h"
12 #include "mojo/public/cpp/bindings/interface_impl.h" 12 #include "mojo/public/cpp/bindings/interface_impl.h"
13 #include "mojo/public/cpp/bindings/strong_binding.h"
13 #include "mojo/public/interfaces/application/application.mojom.h" 14 #include "mojo/public/interfaces/application/application.mojom.h"
14 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom. h" 15 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom. h"
15 #include "mojo/services/navigation/public/interfaces/navigation.mojom.h" 16 #include "mojo/services/navigation/public/interfaces/navigation.mojom.h"
16 #include "mojo/services/network/public/interfaces/url_loader.mojom.h" 17 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
17 #include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h" 18 #include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
18 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h" 19 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
19 #include "mojo/services/view_manager/public/cpp/view_observer.h" 20 #include "mojo/services/view_manager/public/cpp/view_observer.h"
21 #include "services/service_registry/service_registry.mojom.h"
20 #include "sky/compositor/layer_client.h" 22 #include "sky/compositor/layer_client.h"
21 #include "sky/compositor/layer_host_client.h" 23 #include "sky/compositor/layer_host_client.h"
22 #include "sky/engine/public/platform/ServiceProvider.h" 24 #include "sky/engine/public/platform/ServiceProvider.h"
23 #include "sky/engine/public/web/WebFrameClient.h" 25 #include "sky/engine/public/web/WebFrameClient.h"
24 #include "sky/engine/public/web/WebViewClient.h" 26 #include "sky/engine/public/web/WebViewClient.h"
25 #include "sky/services/testing/test_harness.mojom.h" 27 #include "sky/services/testing/test_harness.mojom.h"
26 #include "ui/events/gestures/gesture_types.h" 28 #include "ui/events/gestures/gesture_types.h"
27 29
28 namespace mojo { 30 namespace mojo {
29 class ViewManager; 31 class ViewManager;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 // sky::LayerClient 66 // sky::LayerClient
65 void PaintContents(SkCanvas* canvas, const gfx::Rect& clip) override; 67 void PaintContents(SkCanvas* canvas, const gfx::Rect& clip) override;
66 68
67 void StartDebuggerInspectorBackend(); 69 void StartDebuggerInspectorBackend();
68 70
69 void GetPixelsForTesting(std::vector<unsigned char>* pixels); 71 void GetPixelsForTesting(std::vector<unsigned char>* pixels);
70 72
71 TestHarnessPtr TakeTestHarness(); 73 TestHarnessPtr TakeTestHarness();
72 mojo::ScopedMessagePipeHandle TakeServicesProvidedToEmbedder(); 74 mojo::ScopedMessagePipeHandle TakeServicesProvidedToEmbedder();
73 mojo::ScopedMessagePipeHandle TakeServicesProvidedByEmbedder(); 75 mojo::ScopedMessagePipeHandle TakeServicesProvidedByEmbedder();
76 mojo::ScopedMessagePipeHandle TakeServiceRegistry();
74 77
75 private: 78 private:
76 // WebViewClient methods: 79 // WebViewClient methods:
77 void initializeLayerTreeView() override; 80 void initializeLayerTreeView() override;
78 void scheduleVisualUpdate() override; 81 void scheduleVisualUpdate() override;
79 blink::WebScreenInfo screenInfo() override; 82 blink::WebScreenInfo screenInfo() override;
80 83
81 // WebFrameClient methods: 84 // WebFrameClient methods:
82 mojo::View* createChildFrame() override; 85 mojo::View* createChildFrame() override;
83 void frameDetached(blink::WebFrame*) override; 86 void frameDetached(blink::WebFrame*) override;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 mojo::View* lost_focus) override; 118 mojo::View* lost_focus) override;
116 void OnViewDestroyed(mojo::View* view) override; 119 void OnViewDestroyed(mojo::View* view) override;
117 void OnViewInputEvent(mojo::View* view, const mojo::EventPtr& event) override; 120 void OnViewInputEvent(mojo::View* view, const mojo::EventPtr& event) override;
118 121
119 void Load(mojo::URLResponsePtr response); 122 void Load(mojo::URLResponsePtr response);
120 float GetDevicePixelRatio() const; 123 float GetDevicePixelRatio() const;
121 scoped_ptr<Rasterizer> CreateRasterizer(); 124 scoped_ptr<Rasterizer> CreateRasterizer();
122 125
123 void UpdateRootSizeAndViewportMetrics(const mojo::Rect& new_bounds); 126 void UpdateRootSizeAndViewportMetrics(const mojo::Rect& new_bounds);
124 127
128 void InitServiceRegistry();
129
125 mojo::URLResponsePtr response_; 130 mojo::URLResponsePtr response_;
126 mojo::ServiceProviderImpl exported_services_; 131 mojo::ServiceProviderImpl exported_services_;
132 mojo::ServiceProviderPtr imported_services_;
127 mojo::InterfaceRequest<mojo::ServiceProvider> services_provided_to_embedder_; 133 mojo::InterfaceRequest<mojo::ServiceProvider> services_provided_to_embedder_;
128 mojo::ServiceProviderPtr services_provided_by_embedder_; 134 mojo::ServiceProviderPtr services_provided_by_embedder_;
129 mojo::Shell* shell_; 135 mojo::Shell* shell_;
130 TestHarnessPtr test_harness_; 136 TestHarnessPtr test_harness_;
131 mojo::NavigatorHostPtr navigator_host_; 137 mojo::NavigatorHostPtr navigator_host_;
132 blink::WebView* web_view_; 138 blink::WebView* web_view_;
133 mojo::View* root_; 139 mojo::View* root_;
134 mojo::ViewManagerClientFactory view_manager_client_factory_; 140 mojo::ViewManagerClientFactory view_manager_client_factory_;
135 scoped_ptr<LayerHost> layer_host_; 141 scoped_ptr<LayerHost> layer_host_;
136 scoped_refptr<Layer> root_layer_; 142 scoped_refptr<Layer> root_layer_;
137 RasterizerBitmap* bitmap_rasterizer_; // Used for pixel tests. 143 RasterizerBitmap* bitmap_rasterizer_; // Used for pixel tests.
138 144 service_registry::ServiceRegistryPtr service_registry_;
145 scoped_ptr<mojo::StrongBinding<mojo::ServiceProvider>>
146 service_registry_service_provider_binding_;
139 base::WeakPtrFactory<DocumentView> weak_factory_; 147 base::WeakPtrFactory<DocumentView> weak_factory_;
140 148
141 DISALLOW_COPY_AND_ASSIGN(DocumentView); 149 DISALLOW_COPY_AND_ASSIGN(DocumentView);
142 }; 150 };
143 151
144 } // namespace sky 152 } // namespace sky
145 153
146 #endif // SKY_VIEWER_DOCUMENT_VIEW_H_ 154 #endif // SKY_VIEWER_DOCUMENT_VIEW_H_
OLDNEW
« no previous file with comments | « sky/viewer/BUILD.gn ('k') | sky/viewer/document_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698