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

Side by Side Diff: mojo/services/html_viewer/html_document.cc

Issue 795593004: Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More workarounds for MSVC Created 5 years, 11 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 "mojo/services/html_viewer/html_document.h" 5 #include "mojo/services/html_viewer/html_document.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/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop_proxy.h" 10 #include "base/message_loop/message_loop_proxy.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 HTMLDocument::~HTMLDocument() { 118 HTMLDocument::~HTMLDocument() {
119 STLDeleteElements(&ax_provider_impls_); 119 STLDeleteElements(&ax_provider_impls_);
120 120
121 if (web_view_) 121 if (web_view_)
122 web_view_->close(); 122 web_view_->close();
123 if (root_) 123 if (root_)
124 root_->RemoveObserver(this); 124 root_->RemoveObserver(this);
125 } 125 }
126 126
127 void HTMLDocument::OnEmbed( 127 void HTMLDocument::OnEmbed(
128 ViewManager* view_manager,
129 View* root, 128 View* root,
130 mojo::ServiceProviderImpl* embedee_service_provider_impl, 129 mojo::ServiceProviderImpl* embedee_service_provider_impl,
131 scoped_ptr<mojo::ServiceProvider> embedder_service_provider) { 130 scoped_ptr<mojo::ServiceProvider> embedder_service_provider) {
132 root_ = root; 131 root_ = root;
133 embedder_service_provider_ = embedder_service_provider.Pass(); 132 embedder_service_provider_ = embedder_service_provider.Pass();
134 navigator_host_.set_service_provider(embedder_service_provider_.get()); 133 navigator_host_.set_service_provider(embedder_service_provider_.get());
135 134
136 blink::WebSize root_size(root_->bounds().width, root_->bounds().height); 135 blink::WebSize root_size(root_->bounds().width, root_->bounds().height);
137 web_view_->resize(root_size); 136 web_view_->resize(root_size);
138 web_layer_tree_view_impl_->setViewportSize(root_size); 137 web_layer_tree_view_impl_->setViewportSize(root_size);
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 } 286 }
288 287
289 void HTMLDocument::OnViewInputEvent(View* view, const mojo::EventPtr& event) { 288 void HTMLDocument::OnViewInputEvent(View* view, const mojo::EventPtr& event) {
290 scoped_ptr<blink::WebInputEvent> web_event = 289 scoped_ptr<blink::WebInputEvent> web_event =
291 event.To<scoped_ptr<blink::WebInputEvent>>(); 290 event.To<scoped_ptr<blink::WebInputEvent>>();
292 if (web_event) 291 if (web_event)
293 web_view_->handleInputEvent(*web_event); 292 web_view_->handleInputEvent(*web_event);
294 } 293 }
295 294
296 } // namespace html_viewer 295 } // namespace html_viewer
OLDNEW
« no previous file with comments | « mojo/services/html_viewer/html_document.h ('k') | mojo/services/network/public/interfaces/url_loader.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698