mojo/services/html_viewer/html_document.cc - Issue 904103003: Update mojo sdk to rev 8d45c89c30b230843c5bd6dd0693a555750946c0

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

Issue 904103003: Update mojo sdk to rev 8d45c89c30b230843c5bd6dd0693a555750946c0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: surfaces_service.mojom.h -> surfaces.mojom.h Created 5 years, 10 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 | « mojo/cc/output_surface_mojo.cc ('k') | mojo/services/html_viewer/weblayertreeview_impl.h » ('j') | no next file with comments »

OLD	NEW
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 18 matching lines...) Expand all Loading...
29 #include "third_party/WebKit/public/web/WebDocument.h"	29 #include "third_party/WebKit/public/web/WebDocument.h"

30 #include "third_party/WebKit/public/web/WebElement.h"	30 #include "third_party/WebKit/public/web/WebElement.h"

31 #include "third_party/WebKit/public/web/WebInputEvent.h"	31 #include "third_party/WebKit/public/web/WebInputEvent.h"

32 #include "third_party/WebKit/public/web/WebLocalFrame.h"	32 #include "third_party/WebKit/public/web/WebLocalFrame.h"

33 #include "third_party/WebKit/public/web/WebScriptSource.h"	33 #include "third_party/WebKit/public/web/WebScriptSource.h"

34 #include "third_party/WebKit/public/web/WebSettings.h"	34 #include "third_party/WebKit/public/web/WebSettings.h"

35 #include "third_party/WebKit/public/web/WebView.h"	35 #include "third_party/WebKit/public/web/WebView.h"

36 #include "third_party/mojo/src/mojo/public/cpp/application/connect.h"	36 #include "third_party/mojo/src/mojo/public/cpp/application/connect.h"

37 #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"	37 #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"

38 #include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h"	38 #include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h"

39 #include "third_party/mojo_services/src/surfaces/public/interfaces/surfaces_serv ice.mojom.h"	39 #include "third_party/mojo_services/src/surfaces/public/interfaces/surfaces.mojo m.h"

40 #include "third_party/mojo_services/src/view_manager/public/cpp/view.h"	40 #include "third_party/mojo_services/src/view_manager/public/cpp/view.h"

41 #include "third_party/skia/include/core/SkCanvas.h"	41 #include "third_party/skia/include/core/SkCanvas.h"

42 #include "third_party/skia/include/core/SkColor.h"	42 #include "third_party/skia/include/core/SkColor.h"

43 #include "third_party/skia/include/core/SkDevice.h"	43 #include "third_party/skia/include/core/SkDevice.h"

44	44

45 using mojo::AxProvider;	45 using mojo::AxProvider;

46 using mojo::Rect;	46 using mojo::Rect;

47 using mojo::ServiceProviderPtr;	47 using mojo::ServiceProviderPtr;

48 using mojo::URLResponsePtr;	48 using mojo::URLResponsePtr;

49 using mojo::View;	49 using mojo::View;

(...skipping 247 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
297 }	297 }

298	298

299 void HTMLDocument::OnViewInputEvent(View* view, const mojo::EventPtr& event) {	299 void HTMLDocument::OnViewInputEvent(View* view, const mojo::EventPtr& event) {

300 scoped_ptr<blink::WebInputEvent> web_event =	300 scoped_ptr<blink::WebInputEvent> web_event =

301 event.To<scoped_ptr<blink::WebInputEvent>>();	301 event.To<scoped_ptr<blink::WebInputEvent>>();

302 if (web_event)	302 if (web_event)

303 web_view_->handleInputEvent(*web_event);	303 web_view_->handleInputEvent(*web_event);

304 }	304 }

305	305

306 } // namespace html_viewer	306 } // namespace html_viewer

OLD	NEW