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

Side by Side Diff: sky/shell/ui/engine.cc

Issue 974483004: Stocks app shouldn't show black when resuming from recents list (Closed) Base URL: git@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/shell/ui/engine.h ('k') | sky/shell/ui_delegate.h » ('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 "sky/shell/ui/engine.h" 5 #include "sky/shell/ui/engine.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "mojo/public/cpp/application/connect.h" 8 #include "mojo/public/cpp/application/connect.h"
9 #include "sky/engine/public/platform/WebInputEvent.h" 9 #include "sky/engine/public/platform/WebInputEvent.h"
10 #include "sky/engine/public/web/Sky.h" 10 #include "sky/engine/public/web/Sky.h"
(...skipping 15 matching lines...) Expand all
26 26
27 void ConfigureSettings(blink::WebSettings* settings) { 27 void ConfigureSettings(blink::WebSettings* settings) {
28 settings->setDefaultFixedFontSize(13); 28 settings->setDefaultFixedFontSize(13);
29 settings->setDefaultFontSize(16); 29 settings->setDefaultFontSize(16);
30 settings->setLoadsImagesAutomatically(true); 30 settings->setLoadsImagesAutomatically(true);
31 } 31 }
32 32
33 } 33 }
34 34
35 Engine::Engine(const Config& config) 35 Engine::Engine(const Config& config)
36 : java_task_runner_(config.java_task_runner), 36 : config_(config),
37 animator_(new Animator(config, this)), 37 animator_(new Animator(config, this)),
38 web_view_(nullptr), 38 web_view_(nullptr),
39 device_pixel_ratio_(1.0f), 39 device_pixel_ratio_(1.0f),
40 viewport_observer_binding_(this), 40 viewport_observer_binding_(this),
41 weak_factory_(this) { 41 weak_factory_(this) {
42 } 42 }
43 43
44 Engine::~Engine() { 44 Engine::~Engine() {
45 if (web_view_) 45 if (web_view_)
46 web_view_->close(); 46 web_view_->close();
47 } 47 }
48 48
49 base::WeakPtr<Engine> Engine::GetWeakPtr() { 49 base::WeakPtr<Engine> Engine::GetWeakPtr() {
50 return weak_factory_.GetWeakPtr(); 50 return weak_factory_.GetWeakPtr();
51 } 51 }
52 52
53 mojo::ServiceProviderPtr Engine::CreateServiceProvider() { 53 mojo::ServiceProviderPtr Engine::CreateServiceProvider() {
54 mojo::MessagePipe pipe; 54 mojo::MessagePipe pipe;
55 java_task_runner_->PostTask(FROM_HERE, base::Bind( 55 config_.java_task_runner->PostTask(
56 CreateJavaServiceProvider, 56 FROM_HERE,
57 base::Passed(mojo::MakeRequest<mojo::ServiceProvider>( 57 base::Bind(CreateJavaServiceProvider,
58 pipe.handle1.Pass())))); 58 base::Passed(mojo::MakeRequest<mojo::ServiceProvider>(
59 pipe.handle1.Pass()))));
59 return mojo::MakeProxy<mojo::ServiceProvider>(pipe.handle0.Pass()); 60 return mojo::MakeProxy<mojo::ServiceProvider>(pipe.handle0.Pass());
60 } 61 }
61 62
62 void Engine::Init() { 63 void Engine::Init() {
63 service_provider_ = CreateServiceProvider(); 64 service_provider_ = CreateServiceProvider();
64 mojo::NetworkServicePtr network_service; 65 mojo::NetworkServicePtr network_service;
65 mojo::ConnectToService(service_provider_.get(), &network_service); 66 mojo::ConnectToService(service_provider_.get(), &network_service);
66 platform_impl_.reset(new PlatformImpl(network_service.Pass())); 67 platform_impl_.reset(new PlatformImpl(network_service.Pass()));
67 68
68 blink::initialize(platform_impl_.get()); 69 blink::initialize(platform_impl_.get());
(...skipping 18 matching lines...) Expand all
87 88
88 web_view_->paint(canvas.get(), blink::WebRect(gfx::Rect(physical_size_))); 89 web_view_->paint(canvas.get(), blink::WebRect(gfx::Rect(physical_size_)));
89 return skia::AdoptRef(recorder.endRecordingAsPicture()); 90 return skia::AdoptRef(recorder.endRecordingAsPicture());
90 } 91 }
91 92
92 void Engine::ConnectToViewportObserver( 93 void Engine::ConnectToViewportObserver(
93 mojo::InterfaceRequest<ViewportObserver> request) { 94 mojo::InterfaceRequest<ViewportObserver> request) {
94 viewport_observer_binding_.Bind(request.Pass()); 95 viewport_observer_binding_.Bind(request.Pass());
95 } 96 }
96 97
98 void Engine::OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget) {
99 config_.gpu_task_runner->PostTask(
100 FROM_HERE, base::Bind(&GPUDelegate::OnAcceleratedWidgetAvailable,
101 config_.gpu_delegate, widget));
102 if (web_view_)
103 scheduleVisualUpdate();
104 }
105
106 void Engine::OnOutputSurfaceDestroyed() {
107 config_.gpu_task_runner->PostTask(
108 FROM_HERE,
109 base::Bind(&GPUDelegate::OnOutputSurfaceDestroyed, config_.gpu_delegate));
110 }
111
97 void Engine::OnViewportMetricsChanged(int width, int height, 112 void Engine::OnViewportMetricsChanged(int width, int height,
98 float device_pixel_ratio) { 113 float device_pixel_ratio) {
99 physical_size_.SetSize(width, height); 114 physical_size_.SetSize(width, height);
100 device_pixel_ratio_ = device_pixel_ratio; 115 device_pixel_ratio_ = device_pixel_ratio;
101 if (web_view_) 116 if (web_view_)
102 UpdateWebViewSize(); 117 UpdateWebViewSize();
103 } 118 }
104 119
105 void Engine::UpdateWebViewSize() 120 void Engine::UpdateWebViewSize()
106 { 121 {
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 189
175 void Engine::DidNavigateLocally(const mojo::String& url) { 190 void Engine::DidNavigateLocally(const mojo::String& url) {
176 } 191 }
177 192
178 void Engine::RequestNavigateHistory(int32_t delta) { 193 void Engine::RequestNavigateHistory(int32_t delta) {
179 NOTIMPLEMENTED(); 194 NOTIMPLEMENTED();
180 } 195 }
181 196
182 } // namespace shell 197 } // namespace shell
183 } // namespace sky 198 } // namespace sky
OLDNEW
« no previous file with comments | « sky/shell/ui/engine.h ('k') | sky/shell/ui_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698