summaryrefslogtreecommitdiff
path: root/chromium/chrome/services
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-10-24 11:30:15 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-10-30 12:56:19 +0000
commit6036726eb981b6c4b42047513b9d3f4ac865daac (patch)
tree673593e70678e7789766d1f732eb51f613a2703b /chromium/chrome/services
parent466052c4e7c052268fd931888cd58961da94c586 (diff)
downloadqtwebengine-chromium-6036726eb981b6c4b42047513b9d3f4ac865daac.tar.gz
BASELINE: Update Chromium to 70.0.3538.78
Change-Id: Ie634710bf039e26c1957f4ae45e101bd4c434ae7 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/chrome/services')
-rw-r--r--chromium/chrome/services/cups_ipp_validator/manifest.json6
-rw-r--r--chromium/chrome/services/file_util/manifest.json6
-rw-r--r--chromium/chrome/services/isolated_xr_device/BUILD.gn28
-rw-r--r--chromium/chrome/services/isolated_xr_device/manifest.json14
-rw-r--r--chromium/chrome/services/media_gallery_util/manifest.json6
-rw-r--r--chromium/chrome/services/printing/BUILD.gn3
-rw-r--r--chromium/chrome/services/printing/manifest.json9
-rw-r--r--chromium/chrome/services/printing/public/mojom/BUILD.gn2
-rw-r--r--chromium/chrome/services/printing/public/mojom/pdf_nup_converter.mojom56
-rw-r--r--chromium/chrome/services/removable_storage_writer/manifest.json6
-rw-r--r--chromium/chrome/services/util_win/manifest.json6
-rw-r--r--chromium/chrome/services/wifi_util_win/manifest.json6
12 files changed, 126 insertions, 22 deletions
diff --git a/chromium/chrome/services/cups_ipp_validator/manifest.json b/chromium/chrome/services/cups_ipp_validator/manifest.json
index 92284e18827..bbde2a560a0 100644
--- a/chromium/chrome/services/cups_ipp_validator/manifest.json
+++ b/chromium/chrome/services/cups_ipp_validator/manifest.json
@@ -1,14 +1,14 @@
{
"name": "cups_ipp_validator",
"display_name": "CUPS IPP Validator",
+ "options" : {
+ "instance_sharing" : "shared_instance_across_users"
+ },
"sandbox_type": "utility",
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"ipp_validator": [ "chrome.mojom.IppValidator" ]
- },
- "requires": {
- "service_manager": [ "service_manager:all_users" ]
}
}
}
diff --git a/chromium/chrome/services/file_util/manifest.json b/chromium/chrome/services/file_util/manifest.json
index 8d36bff9131..b871177f419 100644
--- a/chromium/chrome/services/file_util/manifest.json
+++ b/chromium/chrome/services/file_util/manifest.json
@@ -2,14 +2,14 @@
"name": "file_util",
"display_name": "Chrome File Utilities",
"sandbox_type": "utility",
+ "options" : {
+ "instance_sharing" : "shared_instance_across_users"
+ },
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"analyze_archive": [ "chrome.mojom.SafeArchiveAnalyzer" ],
"zip_file": [ "chrome.mojom.ZipFileCreator" ]
- },
- "requires": {
- "service_manager": [ "service_manager:all_users" ]
}
}
}
diff --git a/chromium/chrome/services/isolated_xr_device/BUILD.gn b/chromium/chrome/services/isolated_xr_device/BUILD.gn
new file mode 100644
index 00000000000..e371a3ff9f9
--- /dev/null
+++ b/chromium/chrome/services/isolated_xr_device/BUILD.gn
@@ -0,0 +1,28 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//services/service_manager/public/cpp/service.gni")
+import("//services/service_manager/public/service_manifest.gni")
+
+source_set("lib") {
+ sources = [
+ "xr_device_service.cc",
+ "xr_device_service.h",
+ "xr_runtime_provider.cc",
+ "xr_runtime_provider.h",
+ ]
+
+ deps = [
+ "//base",
+ "//device/vr:vr",
+ "//device/vr/public/mojom",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/mojom",
+ ]
+}
+
+service_manifest("manifest") {
+ name = "xr_device_service"
+ source = "manifest.json"
+}
diff --git a/chromium/chrome/services/isolated_xr_device/manifest.json b/chromium/chrome/services/isolated_xr_device/manifest.json
new file mode 100644
index 00000000000..5346733de14
--- /dev/null
+++ b/chromium/chrome/services/isolated_xr_device/manifest.json
@@ -0,0 +1,14 @@
+{
+ "name": "xr_device_service",
+ "display_name": "XR Isolated Device Service",
+ "sandbox_type": "none",
+ "interface_provider_specs": {
+ "service_manager:connector": {
+ "provides": {
+ "xr_device_provider": [ "device.mojom.IsolatedXRRuntimeProvider" ]
+ },
+ "requires": {
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/chromium/chrome/services/media_gallery_util/manifest.json b/chromium/chrome/services/media_gallery_util/manifest.json
index b027fecf6e2..ccfd346b080 100644
--- a/chromium/chrome/services/media_gallery_util/manifest.json
+++ b/chromium/chrome/services/media_gallery_util/manifest.json
@@ -2,13 +2,13 @@
"name": "media_gallery_util",
"display_name": "Chrome Media Gallery Utilities",
"sandbox_type": "utility",
+ "options" : {
+ "instance_sharing" : "shared_instance_across_users"
+ },
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"parse_media": [ "chrome.mojom.MediaParserFactory" ]
- },
- "requires": {
- "service_manager": [ "service_manager:all_users" ]
}
}
}
diff --git a/chromium/chrome/services/printing/BUILD.gn b/chromium/chrome/services/printing/BUILD.gn
index db6dc172371..f89a744e1b5 100644
--- a/chromium/chrome/services/printing/BUILD.gn
+++ b/chromium/chrome/services/printing/BUILD.gn
@@ -7,6 +7,8 @@ import("//services/service_manager/public/service_manifest.gni")
source_set("lib") {
sources = [
+ "pdf_nup_converter.cc",
+ "pdf_nup_converter.h",
"pdf_to_pwg_raster_converter.cc",
"pdf_to_pwg_raster_converter.h",
"printing_service.cc",
@@ -16,6 +18,7 @@ source_set("lib") {
deps = [
"//base",
"//components/pwg_encoder",
+ "//components/services/pdf_compositor/public/cpp:utils",
"//mojo/public/cpp/bindings",
]
diff --git a/chromium/chrome/services/printing/manifest.json b/chromium/chrome/services/printing/manifest.json
index ee22aecdbb3..8fc59279e66 100644
--- a/chromium/chrome/services/printing/manifest.json
+++ b/chromium/chrome/services/printing/manifest.json
@@ -2,16 +2,17 @@
"name": "chrome_printing",
"display_name": "Printing",
"sandbox_type": "utility",
+ "options" : {
+ "instance_sharing" : "shared_instance_across_users"
+ },
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"converter": [
+ "printing.mojom.PdfNupConverter",
"printing.mojom.PdfToEmfConverterFactory",
"printing.mojom.PdfToPwgRasterConverter" ]
- },
- "requires": {
- "service_manager": [ "service_manager:all_users" ]
}
}
}
-} \ No newline at end of file
+}
diff --git a/chromium/chrome/services/printing/public/mojom/BUILD.gn b/chromium/chrome/services/printing/public/mojom/BUILD.gn
index ec5252f7c7e..2eba7afb8ae 100644
--- a/chromium/chrome/services/printing/public/mojom/BUILD.gn
+++ b/chromium/chrome/services/printing/public/mojom/BUILD.gn
@@ -7,6 +7,7 @@ import("//mojo/public/tools/bindings/mojom.gni")
mojom("mojom") {
sources = [
"constants.mojom",
+ "pdf_nup_converter.mojom",
"pdf_render_settings.mojom",
"pdf_to_pwg_raster_converter.mojom",
]
@@ -17,6 +18,7 @@ mojom("mojom") {
public_deps = [
"//mojo/public/mojom/base",
+ "//url/mojom:url_mojom_gurl",
]
if (is_win) {
diff --git a/chromium/chrome/services/printing/public/mojom/pdf_nup_converter.mojom b/chromium/chrome/services/printing/public/mojom/pdf_nup_converter.mojom
new file mode 100644
index 00000000000..bf7f2e393cd
--- /dev/null
+++ b/chromium/chrome/services/printing/public/mojom/pdf_nup_converter.mojom
@@ -0,0 +1,56 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+module printing.mojom;
+
+import "mojo/public/mojom/base/shared_memory.mojom";
+import "ui/gfx/geometry/mojo/geometry.mojom";
+import "url/mojom/url.mojom";
+
+// This set of interfaces is used to do Nup PDF conversion.
+// Usage:
+// - generate a PdfNupConverter.
+//
+// - call PdfNupConverter.NupPageConvert() to import N PDF pages into one N-up
+// PDF page.
+//
+// - call PdfNupConverter.NupDocumentConvert() to convert a PDF document to a
+// N-up PDF document.
+//
+// - call PdfNupConverter.SetWebContentsURL() to set the URL that is committed
+// in the main frame of the WebContents for crash diagnosis.
+interface PdfNupConverter {
+
+ // The status of PDF conversion execution.
+ enum Status {
+ SUCCESS = 0,
+ CONVERSION_FAILURE = 1,
+ HANDLE_MAP_ERROR = 2,
+ };
+
+ // Convert a list of PDF pages to a N-up PDF.
+ // |pages_per_sheet| is the number of pages to put on a single sheet.
+ // |page_size| is the output page size, measured in PDF "user space" units.
+ // |pdf_page_regions| is a list of pdf pages to be converted to a N-up page.
+ // The number of items in |pdf_page_regions| can be different from N. It
+ // will return a N-up PDF document of
+ // Math.ceil(size of |pdf_page_regions| / N) pages in it.
+ NupPageConvert(
+ uint32 pages_per_sheet,
+ gfx.mojom.Size page_size,
+ array<mojo_base.mojom.ReadOnlySharedMemoryRegion> pdf_page_regions)
+ => (Status status, mojo_base.mojom.ReadOnlySharedMemoryRegion? pdf_region);
+
+ // Convert a PDF document to a N-up PDF document.
+ // |pages_per_sheet| is the number of pages to put on a single sheet.
+ // |page_size| is the output page size, measured in PDF "user space" units.
+ NupDocumentConvert(uint32 pages_per_sheet,
+ gfx.mojom.Size page_size,
+ mojo_base.mojom.ReadOnlySharedMemoryRegion src_pdf_region)
+ => (Status status, mojo_base.mojom.ReadOnlySharedMemoryRegion? pdf_region);
+
+ // Sets the URL which is committed in the main frame of the WebContents,
+ // for use in crash diagnosis.
+ SetWebContentsURL(url.mojom.Url url);
+};
diff --git a/chromium/chrome/services/removable_storage_writer/manifest.json b/chromium/chrome/services/removable_storage_writer/manifest.json
index 94ffe6e2228..0d2d8e55e19 100644
--- a/chromium/chrome/services/removable_storage_writer/manifest.json
+++ b/chromium/chrome/services/removable_storage_writer/manifest.json
@@ -2,13 +2,13 @@
"name": "removable_storage_writer",
"display_name": "Removable Storage Writer",
"sandbox_type": "none_and_elevated",
+ "options" : {
+ "instance_sharing" : "shared_instance_across_users"
+ },
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"removable_storage_writer": [ "chrome.mojom.RemovableStorageWriter" ]
- },
- "requires": {
- "service_manager": [ "service_manager:all_users" ]
}
}
}
diff --git a/chromium/chrome/services/util_win/manifest.json b/chromium/chrome/services/util_win/manifest.json
index 3ba51f3c4ef..8869f301e7b 100644
--- a/chromium/chrome/services/util_win/manifest.json
+++ b/chromium/chrome/services/util_win/manifest.json
@@ -2,13 +2,13 @@
"name": "util_win",
"display_name": "Windows Utilities",
"sandbox_type": "none",
+ "options" : {
+ "instance_sharing" : "shared_instance_across_users"
+ },
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"shell_util_win": [ "chrome.mojom.ShellUtilWin" ]
- },
- "requires": {
- "service_manager": [ "service_manager:all_users" ]
}
}
}
diff --git a/chromium/chrome/services/wifi_util_win/manifest.json b/chromium/chrome/services/wifi_util_win/manifest.json
index cf078b6c337..d5866b0c287 100644
--- a/chromium/chrome/services/wifi_util_win/manifest.json
+++ b/chromium/chrome/services/wifi_util_win/manifest.json
@@ -2,13 +2,13 @@
"name": "wifi_util_win",
"display_name": "Windows WiFi Utilities",
"sandbox_type": "none_and_elevated",
+ "options" : {
+ "instance_sharing" : "shared_instance_across_users"
+ },
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"wifi_credentials": [ "chrome.mojom.WiFiCredentialsGetter" ]
- },
- "requires": {
- "service_manager": [ "service_manager:all_users" ]
}
}
}