components/html_viewer/html_document.cc - Issue 1150093003: Move GLES2, GPU & Surfaces into the ViewManager directory. This does not merge the applications, th…

Side by Side Diff: components/html_viewer/html_document.cc

Issue 1150093003: Move GLES2, GPU & Surfaces into the ViewManager directory. This does not merge the applications, th… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 5 years, 7 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 | « components/html_viewer/BUILD.gn ('k') | components/html_viewer/web_layer_tree_view_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 "components/html_viewer/html_document.h"	5 #include "components/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"

11 #include "base/single_thread_task_runner.h"	11 #include "base/single_thread_task_runner.h"

12 #include "base/stl_util.h"	12 #include "base/stl_util.h"

13 #include "base/strings/string_util.h"	13 #include "base/strings/string_util.h"

14 #include "base/thread_task_runner_handle.h"	14 #include "base/thread_task_runner_handle.h"

15 #include "components/html_viewer/blink_input_events_type_converters.h"	15 #include "components/html_viewer/blink_input_events_type_converters.h"

16 #include "components/html_viewer/blink_url_request_type_converters.h"	16 #include "components/html_viewer/blink_url_request_type_converters.h"

17 #include "components/html_viewer/setup.h"	17 #include "components/html_viewer/setup.h"

18 #include "components/html_viewer/web_layer_tree_view_impl.h"	18 #include "components/html_viewer/web_layer_tree_view_impl.h"

19 #include "components/html_viewer/web_media_player_factory.h"	19 #include "components/html_viewer/web_media_player_factory.h"

20 #include "components/html_viewer/web_storage_namespace_impl.h"	20 #include "components/html_viewer/web_storage_namespace_impl.h"

21 #include "components/html_viewer/web_url_loader_impl.h"	21 #include "components/html_viewer/web_url_loader_impl.h"

22 #include "components/surfaces/public/interfaces/surfaces.mojom.h"

23 #include "components/view_manager/public/cpp/view.h"	22 #include "components/view_manager/public/cpp/view.h"

	23 #include "components/view_manager/public/interfaces/surfaces.mojom.h"

24 #include "media/blink/webencryptedmediaclient_impl.h"	24 #include "media/blink/webencryptedmediaclient_impl.h"

25 #include "media/cdm/default_cdm_factory.h"	25 #include "media/cdm/default_cdm_factory.h"

26 #include "media/filters/default_media_permission.h"	26 #include "media/filters/default_media_permission.h"

27 #include "mojo/application/public/cpp/application_impl.h"	27 #include "mojo/application/public/cpp/application_impl.h"

28 #include "mojo/application/public/cpp/connect.h"	28 #include "mojo/application/public/cpp/connect.h"

29 #include "mojo/application/public/interfaces/shell.mojom.h"	29 #include "mojo/application/public/interfaces/shell.mojom.h"

30 #include "skia/ext/refptr.h"	30 #include "skia/ext/refptr.h"

31 #include "third_party/WebKit/public/platform/Platform.h"	31 #include "third_party/WebKit/public/platform/Platform.h"

32 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"	32 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"

33 #include "third_party/WebKit/public/platform/WebSize.h"	33 #include "third_party/WebKit/public/platform/WebSize.h"

(...skipping 361 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
395 return media_permission_.get();	395 return media_permission_.get();

396 }	396 }

397	397

398 media::CdmFactory* HTMLDocument::GetCdmFactory() {	398 media::CdmFactory* HTMLDocument::GetCdmFactory() {

399 if (!cdm_factory_)	399 if (!cdm_factory_)

400 cdm_factory_.reset(new media::DefaultCdmFactory());	400 cdm_factory_.reset(new media::DefaultCdmFactory());

401 return cdm_factory_.get();	401 return cdm_factory_.get();

402 }	402 }

403	403

404 } // namespace html_viewer	404 } // namespace html_viewer

OLD	NEW