OLD | NEW |
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 #ifndef SKY_SHELL_UI_ENGINE_H_ | 5 #ifndef SKY_SHELL_UI_ENGINE_H_ |
6 #define SKY_SHELL_UI_ENGINE_H_ | 6 #define SKY_SHELL_UI_ENGINE_H_ |
7 | 7 |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
11 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
12 #include "mojo/public/cpp/bindings/binding.h" | 12 #include "mojo/public/cpp/bindings/binding.h" |
13 #include "mojo/public/cpp/system/core.h" | 13 #include "mojo/public/cpp/system/core.h" |
14 #include "mojo/public/interfaces/application/service_provider.mojom.h" | 14 #include "mojo/public/interfaces/application/service_provider.mojom.h" |
15 #include "mojo/services/navigation/public/interfaces/navigation.mojom.h" | 15 #include "mojo/services/navigation/public/interfaces/navigation.mojom.h" |
16 #include "skia/ext/refptr.h" | 16 #include "skia/ext/refptr.h" |
17 #include "sky/engine/public/platform/ServiceProvider.h" | 17 #include "sky/engine/public/platform/ServiceProvider.h" |
| 18 #include "sky/engine/public/sky/sky_view.h" |
18 #include "sky/engine/public/web/WebFrameClient.h" | 19 #include "sky/engine/public/web/WebFrameClient.h" |
19 #include "sky/engine/public/web/WebViewClient.h" | 20 #include "sky/engine/public/web/WebViewClient.h" |
20 #include "sky/shell/gpu_delegate.h" | 21 #include "sky/shell/gpu_delegate.h" |
21 #include "sky/shell/ui_delegate.h" | 22 #include "sky/shell/ui_delegate.h" |
22 #include "sky/shell/service_provider.h" | 23 #include "sky/shell/service_provider.h" |
23 #include "third_party/skia/include/core/SkPicture.h" | 24 #include "third_party/skia/include/core/SkPicture.h" |
24 #include "ui/gfx/geometry/size.h" | 25 #include "ui/gfx/geometry/size.h" |
25 | 26 |
26 namespace sky { | 27 namespace sky { |
27 class PlatformImpl; | 28 class PlatformImpl; |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 mojo::URLRequestPtr request) override; | 83 mojo::URLRequestPtr request) override; |
83 void DidNavigateLocally(const mojo::String& url) override; | 84 void DidNavigateLocally(const mojo::String& url) override; |
84 void RequestNavigateHistory(int32_t delta) override; | 85 void RequestNavigateHistory(int32_t delta) override; |
85 | 86 |
86 void UpdateWebViewSize(); | 87 void UpdateWebViewSize(); |
87 | 88 |
88 Config config_; | 89 Config config_; |
89 mojo::ServiceProviderPtr service_provider_; | 90 mojo::ServiceProviderPtr service_provider_; |
90 scoped_ptr<PlatformImpl> platform_impl_; | 91 scoped_ptr<PlatformImpl> platform_impl_; |
91 scoped_ptr<Animator> animator_; | 92 scoped_ptr<Animator> animator_; |
| 93 |
| 94 std::unique_ptr<blink::SkyView> sky_view_; |
92 blink::WebView* web_view_; | 95 blink::WebView* web_view_; |
| 96 |
93 float device_pixel_ratio_; | 97 float device_pixel_ratio_; |
94 gfx::Size physical_size_; | 98 gfx::Size physical_size_; |
95 mojo::Binding<ViewportObserver> viewport_observer_binding_; | 99 mojo::Binding<ViewportObserver> viewport_observer_binding_; |
96 | 100 |
97 base::WeakPtrFactory<Engine> weak_factory_; | 101 base::WeakPtrFactory<Engine> weak_factory_; |
98 | 102 |
99 DISALLOW_COPY_AND_ASSIGN(Engine); | 103 DISALLOW_COPY_AND_ASSIGN(Engine); |
100 }; | 104 }; |
101 | 105 |
102 } // namespace shell | 106 } // namespace shell |
103 } // namespace sky | 107 } // namespace sky |
104 | 108 |
105 #endif // SKY_SHELL_UI_ENGINE_H_ | 109 #endif // SKY_SHELL_UI_ENGINE_H_ |
OLD | NEW |