8bbdc224ac
* chore: bump chromium in DEPS to 7fb9778894d73378bff51087ce869ea5aa6e5d5d * chore: bump chromium in DEPS to 83da426e53d423f0530fc23433b6d2c4d0548442 * update patches * remove chromeos-only TtsControllerDelegate Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2255314 * SharedUserScriptMaster -> SharedUserScriptManager Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2258357 * avoid deprecated DISALLOW_COPY_AND_ASSIGN https://groups.google.com/a/chromium.org/forum/#!msg/cxx/qwH2hxaEjac/TUKq6eqfCwAJ * chore: bump chromium in DEPS to b2eaf9ff4e6b03267bf279583ea20ceb2b25e9d0 * update patches * rename GetHighContrastColorScheme -> GetPlatformHighContrastColorScheme Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2250224 * remove vulkan info collection Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2252818 * add max_xcode_version build var Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2264867 * add missing headers * chore: bump chromium in DEPS to cded18ca1138f7e8efc904f077ddcca34f0135cf * update patches * add empty floc blocklist to BrowserProcessImpl Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2240873 * chore: bump chromium in DEPS to f06602226cd80bf677b2ce013a94a2fb7f6ac58d * chore: bump chromium in DEPS to 747aa4bfc74fc6cf7f08ee72624cd69ae41ae28d * chore: bump chromium in DEPS to 31c0105e50fcc4e94de33e5c8602c755ace4a32b * chore: update patches * Reland "[base] Stop including check.h, notreached.h, etc. in logging.h" https://chromium-review.googlesource.com/c/chromium/src/+/2264297 * X11 and Ozone: make sure gfx::AcceleratedWidget to be uint32_t https://chromium-review.googlesource.com/c/chromium/src/+/2260554 * Move zygote from //services/service_manager back to //content https://chromium-review.googlesource.com/c/chromium/src/+/2252466 * chore: update v8 patches * [XProto] Remove usage of Shape extension https://chromium-review.googlesource.com/c/chromium/src/+/2262113 * fixup! add empty floc blocklist to BrowserProcessImpl * Require macOS 10.15.1 sdk https://chromium-review.googlesource.com/c/chromium/src/+/2238504 * Use newer Xcode version 11.5.0 * update src cache * chore: bump chromium in DEPS to 60a9883e35db3f6f91916f0878e88e1849c17b11 * chore: update patches * Reland "Reland "New toolchain for Windows 10 19041 SDK"" https://chromium-review.googlesource.com/c/chromium/src/+/2255527 * update patches * Convert raw NonClientFrameViews to unique_ptrs https://chromium-review.googlesource.com/c/chromium/src/+/2240417 * [printing] Move PrintHostMsg_DidPreviewDocument_Params to print.mojom https://chromium-review.googlesource.com/c/chromium/src/+/2257035 * chore: bump chromium in DEPS to 12c233c2a85bfa28fb279f390121ba681e52a71b * chore: update patches * Removing oppressive language for the directory chrome/browser/apps https://chromium-review.googlesource.com/c/chromium/src/+/2269822 * Inclusion: rename SpellcheckLanguageBlacklistPolicyHandler https://chromium-review.googlesource.com/c/chromium/src/+/2267646 * Clean up duplicate WebContents "is fullscreen" functions https://chromium-review.googlesource.com/c/chromium/src/+/2275148 * Adds icon loading service with sandbox for Windows. https://chromium-review.googlesource.com/c/chromium/src/+/1987273 * No more Vulkan info collection for UMA on Windows https://chromium-review.googlesource.com/c/chromium/src/+/2252818 * fix lint * chore: update buildflag conditions * chore: bump chromium in DEPS to a837d4c4230ace4f10b2768728f4044b7995dfa5 * update hunspell files * chore: update patches * Make content::FileSelectListener a RefCounted https://chromium-review.googlesource.com/c/chromium/src/+/2275338 * fix build failures on MAS * update patches * fixup! Reland "[base] Stop including check.h, notreached.h, etc. in logging.h" * fix build on windows * Check for GDI exhaustion if window creation fails https://chromium-review.googlesource.com/c/chromium/src/+/2244124 * chore: bump chromium in DEPS to 2c9b2a73be4ef9ec22d8b6da8e174cb80753f125 * chore: update patches * Network Service: Move DeleteCookiePredicate into public folder https://chromium-review.googlesource.com/c/chromium/src/+/2264186 * chore: bump chromium in DEPS to fa2606299bcc02c362528d26b5dcf8c8a0db0735 * chore: bump chromium in DEPS to d9c235d1227204dbae3708daae851573a3566b94 * chore: bump chromium in DEPS to 2f82c284243c035f49a747fd1ead6c44b4b31093 * chore: update patches * Move creating the LayerTreeSettings into blink. https://chromium-review.googlesource.com/c/chromium/src/+/2267720 * chore: bump chromium in DEPS to 914112f1d9af9e4974059dc403da62699a55550f * update patches * chore: bump chromium in DEPS to e0bc1ffae6393fc543a2da94c88167df75859b36 * refactor: match upstream print preview handling (#24452) * update patches * chore: bump chromium in DEPS to 0881423156abe084164b51ab58ce93a8bd380524 * update patches * update patches * give a type to pendingPromise * chore: bump chromium in DEPS to 11a8c1534b16d130075d378a64187360ba4e7820 * update patches * 2272609: Move //services/service_manager/sandbox to //sandbox/policy. https://chromium-review.googlesource.com/c/chromium/src/+/2272609 * update patches * fixup! 2272609: Move //services/service_manager/sandbox to //sandbox/policy. * fixup! 2272609: Move //services/service_manager/sandbox to //sandbox/policy. * 2264511: Cookies: Update SetCanonicalCookie to return CookieAccessResult https://chromium-review.googlesource.com/c/chromium/src/+/2264511 * chore: fix setAlwaysOnTop test The window must be visible for state to be updated properly. * Revert "Migrate modules/desktop_capture and modules/video_capture to webrtc::Mutex." https://webrtc-review.googlesource.com/c/src/+/179080 * update patches Co-authored-by: Andy Locascio <andy@slack-corp.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org>
543 lines
21 KiB
Diff
543 lines
21 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Thu, 20 Sep 2018 17:46:17 -0700
|
|
Subject: pepper plugin support
|
|
|
|
This tweaks Chrome's pepper flash and PDF plugin support to make it
|
|
usable from Electron.
|
|
|
|
diff --git a/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc b/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc
|
|
index 2e328c0fb5a6598c3ae911655b3e5016a02b7405..304364f7e02c19d2ad7d16433e92dcfecfc8eb41 100644
|
|
--- a/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc
|
|
+++ b/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc
|
|
@@ -11,6 +11,7 @@
|
|
#include "chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h"
|
|
#include "chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h"
|
|
#include "content/public/browser/browser_ppapi_host.h"
|
|
+#include "electron/buildflags/buildflags.h"
|
|
#include "ppapi/host/message_filter_host.h"
|
|
#include "ppapi/host/ppapi_host.h"
|
|
#include "ppapi/host/resource_host.h"
|
|
@@ -52,6 +53,7 @@ ChromeBrowserPepperHostFactory::CreateResourceHost(
|
|
}
|
|
}
|
|
|
|
+#if BUILDFLAG(ENABLE_PEPPER_FLASH)
|
|
// Flash interfaces.
|
|
if (host_->GetPpapiHost()->permissions().HasPermission(
|
|
ppapi::PERMISSION_FLASH)) {
|
|
@@ -70,6 +72,7 @@ ChromeBrowserPepperHostFactory::CreateResourceHost(
|
|
new PepperFlashDRMHost(host_, instance, resource));
|
|
}
|
|
}
|
|
+#endif
|
|
|
|
// Permissions for the following interfaces will be checked at the
|
|
// time of the corresponding instance's methods calls (because
|
|
diff --git a/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc
|
|
index 82fa5b7026e62cfe69700f30fcc84731fc30afe8..f4ad9fbc72a5cb27ed22ab014ccb2fcb4cb49284 100644
|
|
--- a/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc
|
|
+++ b/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc
|
|
@@ -6,10 +6,12 @@
|
|
|
|
#include <string>
|
|
|
|
+#if 0
|
|
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
|
|
#include "chrome/browser/profiles/profile.h"
|
|
#include "components/content_settings/core/browser/host_content_settings_map.h"
|
|
#include "components/content_settings/core/common/content_settings.h"
|
|
+#endif
|
|
#include "content/public/browser/browser_ppapi_host.h"
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
@@ -58,6 +60,7 @@ int32_t PepperBrokerMessageFilter::OnIsAllowed(
|
|
RenderProcessHost::FromID(render_process_id_);
|
|
if (!render_process_host)
|
|
return PP_ERROR_FAILED;
|
|
+#if 0
|
|
Profile* profile =
|
|
Profile::FromBrowserContext(render_process_host->GetBrowserContext());
|
|
HostContentSettingsMap* content_settings =
|
|
@@ -67,5 +70,6 @@ int32_t PepperBrokerMessageFilter::OnIsAllowed(
|
|
std::string());
|
|
if (setting == CONTENT_SETTING_ALLOW)
|
|
return PP_OK;
|
|
- return PP_ERROR_FAILED;
|
|
+#endif
|
|
+ return PP_OK;
|
|
}
|
|
diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc
|
|
index 084feb824e8383c0813691cd877e8fde3f6b095f..9c8158c92a6f780652afdccc588a56cfde3ee8cf 100644
|
|
--- a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc
|
|
+++ b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc
|
|
@@ -7,9 +7,11 @@
|
|
#include "base/bind.h"
|
|
#include "base/time/time.h"
|
|
#include "build/build_config.h"
|
|
+#if 0
|
|
#include "chrome/browser/content_settings/cookie_settings_factory.h"
|
|
#include "chrome/browser/profiles/profile.h"
|
|
#include "components/content_settings/core/browser/cookie_settings.h"
|
|
+#endif
|
|
#include "content/public/browser/browser_context.h"
|
|
#include "content/public/browser/browser_ppapi_host.h"
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
@@ -39,6 +41,7 @@ using content::RenderProcessHost;
|
|
|
|
namespace {
|
|
|
|
+#if 0
|
|
// Get the CookieSettings on the UI thread for the given render process ID.
|
|
scoped_refptr<content_settings::CookieSettings> GetCookieSettings(
|
|
int render_process_id) {
|
|
@@ -52,6 +55,7 @@ scoped_refptr<content_settings::CookieSettings> GetCookieSettings(
|
|
}
|
|
return nullptr;
|
|
}
|
|
+#endif
|
|
|
|
void BindWakeLockProviderOnUIThread(
|
|
mojo::PendingReceiver<device::mojom::WakeLockProvider> receiver) {
|
|
@@ -65,7 +69,9 @@ PepperFlashBrowserHost::PepperFlashBrowserHost(BrowserPpapiHost* host,
|
|
PP_Instance instance,
|
|
PP_Resource resource)
|
|
: ResourceHost(host->GetPpapiHost(), instance, resource),
|
|
+#if 0
|
|
host_(host),
|
|
+#endif
|
|
delay_timer_(FROM_HERE,
|
|
base::TimeDelta::FromSeconds(45),
|
|
this,
|
|
@@ -118,6 +124,7 @@ int32_t PepperFlashBrowserHost::OnGetLocalTimeZoneOffset(
|
|
|
|
int32_t PepperFlashBrowserHost::OnGetLocalDataRestrictions(
|
|
ppapi::host::HostMessageContext* context) {
|
|
+#if 0
|
|
// Getting the Flash LSO settings requires using the CookieSettings which
|
|
// belong to the profile which lives on the UI thread. We lazily initialize
|
|
// |cookie_settings_| by grabbing the reference from the UI thread and then
|
|
@@ -137,9 +144,11 @@ int32_t PepperFlashBrowserHost::OnGetLocalDataRestrictions(
|
|
context->MakeReplyMessageContext(), document_url,
|
|
plugin_url));
|
|
}
|
|
- return PP_OK_COMPLETIONPENDING;
|
|
+#endif
|
|
+ return PP_FLASHLSORESTRICTIONS_IN_MEMORY;
|
|
}
|
|
|
|
+#if 0
|
|
void PepperFlashBrowserHost::GetLocalDataRestrictions(
|
|
ppapi::host::ReplyMessageContext reply_context,
|
|
const GURL& document_url,
|
|
@@ -168,6 +177,7 @@ void PepperFlashBrowserHost::GetLocalDataRestrictions(
|
|
PpapiPluginMsg_Flash_GetLocalDataRestrictionsReply(
|
|
static_cast<int32_t>(restrictions)));
|
|
}
|
|
+#endif
|
|
|
|
device::mojom::WakeLock* PepperFlashBrowserHost::GetWakeLock() {
|
|
// Here is a lazy binding, and will not reconnect after connection error.
|
|
diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h
|
|
index 6b13bae8def62d9a26d68ac8396b4bf6f7439c1a..d92b5a5855c0cebf94922a31f686e15e3a6cd833 100644
|
|
--- a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h
|
|
+++ b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h
|
|
@@ -24,9 +24,11 @@ namespace content {
|
|
class BrowserPpapiHost;
|
|
}
|
|
|
|
+#if 0
|
|
namespace content_settings {
|
|
class CookieSettings;
|
|
}
|
|
+#endif
|
|
|
|
class GURL;
|
|
|
|
@@ -50,15 +52,19 @@ class PepperFlashBrowserHost : public ppapi::host::ResourceHost {
|
|
const base::Time& t);
|
|
int32_t OnGetLocalDataRestrictions(ppapi::host::HostMessageContext* context);
|
|
|
|
+#if 0
|
|
void GetLocalDataRestrictions(
|
|
ppapi::host::ReplyMessageContext reply_context,
|
|
const GURL& document_url,
|
|
const GURL& plugin_url,
|
|
scoped_refptr<content_settings::CookieSettings> cookie_settings);
|
|
+#endif
|
|
|
|
device::mojom::WakeLock* GetWakeLock();
|
|
|
|
+#if 0
|
|
content::BrowserPpapiHost* host_;
|
|
+#endif
|
|
int render_process_id_;
|
|
|
|
// Requests a wake lock to prevent going to sleep, and a timer to cancel it
|
|
@@ -66,8 +72,10 @@ class PepperFlashBrowserHost : public ppapi::host::ResourceHost {
|
|
mojo::Remote<device::mojom::WakeLock> wake_lock_;
|
|
base::DelayTimer delay_timer_;
|
|
|
|
+#if 0
|
|
// For fetching the Flash LSO settings.
|
|
scoped_refptr<content_settings::CookieSettings> cookie_settings_;
|
|
+#endif
|
|
base::WeakPtrFactory<PepperFlashBrowserHost> weak_factory_{this};
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(PepperFlashBrowserHost);
|
|
diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
|
|
index 7b774366e2ebd2405e0b85cdfbf1885c394afd0d..26996b7540d652ddb454cbb2fe3510d2a8aa31bf 100644
|
|
--- a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
|
|
+++ b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
|
|
@@ -20,6 +20,7 @@
|
|
#include "content/public/browser/child_process_security_policy.h"
|
|
#include "content/public/browser/render_frame_host.h"
|
|
#include "content/public/common/pepper_plugin_info.h"
|
|
+#include "net/base/network_interfaces.h"
|
|
#include "ppapi/c/pp_errors.h"
|
|
#include "ppapi/host/dispatch_host_message.h"
|
|
#include "ppapi/host/host_message_context.h"
|
|
@@ -127,7 +128,9 @@ PepperFlashDRMHost::PepperFlashDRMHost(BrowserPpapiHost* host,
|
|
content::ChildProcessSecurityPolicy::GetInstance()->GrantReadFile(
|
|
render_process_id, voucher_file);
|
|
|
|
+#if 0
|
|
fetcher_ = new DeviceIDFetcher(render_process_id);
|
|
+#endif
|
|
monitor_finder_ = new MonitorFinder(render_process_id, render_frame_id);
|
|
monitor_finder_->GetMonitor();
|
|
}
|
|
@@ -150,12 +153,18 @@ int32_t PepperFlashDRMHost::OnResourceMessageReceived(
|
|
|
|
int32_t PepperFlashDRMHost::OnHostMsgGetDeviceID(
|
|
ppapi::host::HostMessageContext* context) {
|
|
+#if 0
|
|
if (!fetcher_->Start(base::Bind(&PepperFlashDRMHost::GotDeviceID,
|
|
weak_factory_.GetWeakPtr(),
|
|
context->MakeReplyMessageContext()))) {
|
|
return PP_ERROR_INPROGRESS;
|
|
}
|
|
- return PP_OK_COMPLETIONPENDING;
|
|
+#endif
|
|
+ static std::string id;
|
|
+ if (id.empty())
|
|
+ id = net::GetHostName();
|
|
+ context->reply_msg = PpapiPluginMsg_FlashDRM_GetDeviceIDReply(id);
|
|
+ return PP_OK;
|
|
}
|
|
|
|
int32_t PepperFlashDRMHost::OnHostMsgGetHmonitor(
|
|
@@ -184,6 +193,7 @@ int32_t PepperFlashDRMHost::OnHostMsgMonitorIsExternal(
|
|
return PP_OK;
|
|
}
|
|
|
|
+#if 0
|
|
void PepperFlashDRMHost::GotDeviceID(
|
|
ppapi::host::ReplyMessageContext reply_context,
|
|
const std::string& id,
|
|
@@ -196,3 +206,4 @@ void PepperFlashDRMHost::GotDeviceID(
|
|
host()->SendReply(reply_context,
|
|
PpapiPluginMsg_FlashDRM_GetDeviceIDReply(id));
|
|
}
|
|
+#endif
|
|
diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h
|
|
index b9d2ce7f7f6837ee7b304daac82d21a3147c6faf..4d4b023d62d12b4d119acbfdee64f4157494ccb3 100644
|
|
--- a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h
|
|
+++ b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h
|
|
@@ -11,7 +11,9 @@
|
|
|
|
#include "base/macros.h"
|
|
#include "base/memory/weak_ptr.h"
|
|
+#if 0
|
|
#include "chrome/browser/renderer_host/pepper/device_id_fetcher.h"
|
|
+#endif
|
|
#include "ppapi/host/host_message_context.h"
|
|
#include "ppapi/host/resource_host.h"
|
|
|
|
@@ -49,7 +51,9 @@ class PepperFlashDRMHost : public ppapi::host::ResourceHost {
|
|
const std::string& id,
|
|
int32_t result);
|
|
|
|
+#if 0
|
|
scoped_refptr<DeviceIDFetcher> fetcher_;
|
|
+#endif
|
|
scoped_refptr<MonitorFinder> monitor_finder_;
|
|
|
|
base::WeakPtrFactory<PepperFlashDRMHost> weak_factory_{this};
|
|
diff --git a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
|
|
index 0a04a1e0ec56126a7e44537141d024332b22a190..5384d7ac2f2eaf708bf001dd885f401783ac7133 100644
|
|
--- a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
|
|
+++ b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
|
|
@@ -7,17 +7,21 @@
|
|
#include <stddef.h>
|
|
|
|
#include "base/stl_util.h"
|
|
+#if 0
|
|
#include "chrome/browser/browser_process.h"
|
|
#include "chrome/browser/profiles/profile.h"
|
|
#include "chrome/browser/profiles/profile_manager.h"
|
|
#include "chrome/common/chrome_switches.h"
|
|
#include "chrome/common/pepper_permission_util.h"
|
|
+#endif
|
|
#include "content/public/browser/browser_ppapi_host.h"
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "content/public/browser/child_process_security_policy.h"
|
|
#include "content/public/browser/render_view_host.h"
|
|
+#if 0
|
|
#include "extensions/buildflags/buildflags.h"
|
|
+#endif
|
|
#include "ppapi/c/pp_errors.h"
|
|
#include "ppapi/host/dispatch_host_message.h"
|
|
#include "ppapi/host/host_message_context.h"
|
|
@@ -26,12 +30,11 @@
|
|
#include "ppapi/shared_impl/file_system_util.h"
|
|
#include "storage/browser/file_system/isolated_context.h"
|
|
|
|
-#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
+#if 0
|
|
#include "extensions/browser/extension_registry.h"
|
|
#include "extensions/common/constants.h"
|
|
#include "extensions/common/extension.h"
|
|
#include "extensions/common/extension_set.h"
|
|
-#endif
|
|
|
|
namespace {
|
|
|
|
@@ -41,6 +44,7 @@ const char* kPredefinedAllowedCrxFsOrigins[] = {
|
|
};
|
|
|
|
} // namespace
|
|
+#endif
|
|
|
|
// static
|
|
PepperIsolatedFileSystemMessageFilter*
|
|
@@ -68,8 +72,10 @@ PepperIsolatedFileSystemMessageFilter::PepperIsolatedFileSystemMessageFilter(
|
|
profile_directory_(profile_directory),
|
|
document_url_(document_url),
|
|
ppapi_host_(ppapi_host) {
|
|
+#if 0
|
|
for (size_t i = 0; i < base::size(kPredefinedAllowedCrxFsOrigins); ++i)
|
|
allowed_crxfs_origins_.insert(kPredefinedAllowedCrxFsOrigins[i]);
|
|
+#endif
|
|
}
|
|
|
|
PepperIsolatedFileSystemMessageFilter::
|
|
@@ -94,6 +100,7 @@ int32_t PepperIsolatedFileSystemMessageFilter::OnResourceMessageReceived(
|
|
return PP_ERROR_FAILED;
|
|
}
|
|
|
|
+#if 0
|
|
Profile* PepperIsolatedFileSystemMessageFilter::GetProfile() {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
ProfileManager* profile_manager = g_browser_process->profile_manager();
|
|
@@ -120,6 +127,7 @@ PepperIsolatedFileSystemMessageFilter::CreateCrxFileSystem(Profile* profile) {
|
|
return storage::IsolatedContext::ScopedFSHandle();
|
|
#endif
|
|
}
|
|
+#endif
|
|
|
|
int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
|
|
ppapi::host::HostMessageContext* context,
|
|
@@ -128,7 +136,7 @@ int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
|
|
case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_INVALID:
|
|
break;
|
|
case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_CRX:
|
|
- return OpenCrxFileSystem(context);
|
|
+ return PP_ERROR_NOTSUPPORTED;
|
|
case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_PLUGINPRIVATE:
|
|
return OpenPluginPrivateFileSystem(context);
|
|
}
|
|
@@ -138,6 +146,7 @@ int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
|
|
return PP_ERROR_FAILED;
|
|
}
|
|
|
|
+#if 0
|
|
int32_t PepperIsolatedFileSystemMessageFilter::OpenCrxFileSystem(
|
|
ppapi::host::HostMessageContext* context) {
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
@@ -178,6 +187,7 @@ int32_t PepperIsolatedFileSystemMessageFilter::OpenCrxFileSystem(
|
|
return PP_ERROR_NOTSUPPORTED;
|
|
#endif
|
|
}
|
|
+#endif
|
|
|
|
int32_t PepperIsolatedFileSystemMessageFilter::OpenPluginPrivateFileSystem(
|
|
ppapi::host::HostMessageContext* context) {
|
|
diff --git a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h
|
|
index 56a23e8f41bb418d414f11af5797b30571d4cc2b..6f9f577f16de80dd2ab194b557bbd9ec89599280 100644
|
|
--- a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h
|
|
+++ b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h
|
|
@@ -20,7 +20,9 @@
|
|
#include "storage/browser/file_system/isolated_context.h"
|
|
#include "url/gurl.h"
|
|
|
|
+#if 0
|
|
class Profile;
|
|
+#endif
|
|
|
|
namespace content {
|
|
class BrowserPpapiHost;
|
|
@@ -54,6 +56,7 @@ class PepperIsolatedFileSystemMessageFilter
|
|
|
|
~PepperIsolatedFileSystemMessageFilter() override;
|
|
|
|
+#if 0
|
|
Profile* GetProfile();
|
|
|
|
// Returns filesystem id of isolated filesystem if valid, or empty string
|
|
@@ -61,10 +64,13 @@ class PepperIsolatedFileSystemMessageFilter
|
|
// allows access on that thread.
|
|
storage::IsolatedContext::ScopedFSHandle CreateCrxFileSystem(
|
|
Profile* profile);
|
|
+#endif
|
|
|
|
int32_t OnOpenFileSystem(ppapi::host::HostMessageContext* context,
|
|
PP_IsolatedFileSystemType_Private type);
|
|
+#if 0
|
|
int32_t OpenCrxFileSystem(ppapi::host::HostMessageContext* context);
|
|
+#endif
|
|
int32_t OpenPluginPrivateFileSystem(ppapi::host::HostMessageContext* context);
|
|
|
|
const int render_process_id_;
|
|
@@ -75,8 +81,10 @@ class PepperIsolatedFileSystemMessageFilter
|
|
// Not owned by this object.
|
|
ppapi::host::PpapiHost* ppapi_host_;
|
|
|
|
+#if 0
|
|
// Set of origins that can use CrxFs private APIs from NaCl.
|
|
std::set<std::string> allowed_crxfs_origins_;
|
|
+#endif
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(PepperIsolatedFileSystemMessageFilter);
|
|
};
|
|
diff --git a/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc b/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
|
|
index 375ca0233a74ef6a6e91102947ce0b63585d48ff..1c4bb268c5bd21126551414b1864d495a07844b6 100644
|
|
--- a/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
|
|
+++ b/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
|
|
@@ -10,8 +10,13 @@
|
|
#include "chrome/renderer/pepper/pepper_flash_fullscreen_host.h"
|
|
#include "chrome/renderer/pepper/pepper_flash_menu_host.h"
|
|
#include "chrome/renderer/pepper/pepper_flash_renderer_host.h"
|
|
+#if 0
|
|
#include "chrome/renderer/pepper/pepper_uma_host.h"
|
|
+#endif
|
|
+#include "electron/buildflags/buildflags.h"
|
|
+#if BUILDFLAG(ENABLE_PDF_VIEWER)
|
|
#include "components/pdf/renderer/pepper_pdf_host.h"
|
|
+#endif
|
|
#include "content/public/renderer/renderer_ppapi_host.h"
|
|
#include "ppapi/host/ppapi_host.h"
|
|
#include "ppapi/host/resource_host.h"
|
|
@@ -39,6 +44,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
|
|
if (!host_->IsValidInstance(instance))
|
|
return nullptr;
|
|
|
|
+#if BUILDFLAG(ENABLE_PEPPER_FLASH)
|
|
if (host_->GetPpapiHost()->permissions().HasPermission(
|
|
ppapi::PERMISSION_FLASH)) {
|
|
switch (message.type()) {
|
|
@@ -61,10 +67,12 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
|
|
}
|
|
}
|
|
}
|
|
+#endif
|
|
|
|
// TODO(raymes): PDF also needs access to the FlashFontFileHost currently.
|
|
// We should either rename PPB_FlashFont_File to PPB_FontFile_Private or get
|
|
// rid of its use in PDF if possible.
|
|
+#if BUILDFLAG(ENABLE_PEPPER_FLASH) || BUILDFLAG(ENABLE_PDF_VIEWER)
|
|
if (host_->GetPpapiHost()->permissions().HasPermission(
|
|
ppapi::PERMISSION_FLASH) ||
|
|
host_->GetPpapiHost()->permissions().HasPermission(
|
|
@@ -80,12 +88,16 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
|
|
}
|
|
break;
|
|
}
|
|
+#if BUILDFLAG(ENABLE_PEPPER_FLASH)
|
|
case PpapiHostMsg_FlashDRM_Create::ID:
|
|
return std::make_unique<PepperFlashDRMRendererHost>(host_, instance,
|
|
resource);
|
|
+#endif
|
|
}
|
|
}
|
|
+#endif
|
|
|
|
+#if BUILDFLAG(ENABLE_PDF_VIEWER)
|
|
if (host_->GetPpapiHost()->permissions().HasPermission(
|
|
ppapi::PERMISSION_PDF)) {
|
|
switch (message.type()) {
|
|
@@ -94,7 +106,9 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
|
|
}
|
|
}
|
|
}
|
|
+#endif
|
|
|
|
+#if 0
|
|
// Permissions for the following interfaces will be checked at the
|
|
// time of the corresponding instance's method calls. Currently these
|
|
// interfaces are available only for whitelisted apps which may not have
|
|
@@ -104,6 +118,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
|
|
return std::make_unique<PepperUMAHost>(host_, instance, resource);
|
|
}
|
|
}
|
|
+#endif
|
|
|
|
return nullptr;
|
|
}
|
|
diff --git a/chrome/renderer/pepper/pepper_flash_renderer_host.cc b/chrome/renderer/pepper/pepper_flash_renderer_host.cc
|
|
index fc3ef9c9888d84c993fe7682afef0a188da12894..fb5782894ed8aa9fd7ccff09cff8d7f5520af8dd 100644
|
|
--- a/chrome/renderer/pepper/pepper_flash_renderer_host.cc
|
|
+++ b/chrome/renderer/pepper/pepper_flash_renderer_host.cc
|
|
@@ -13,7 +13,9 @@
|
|
#include "base/no_destructor.h"
|
|
#include "base/stl_util.h"
|
|
#include "base/strings/string_util.h"
|
|
+#if 0
|
|
#include "components/pdf/renderer/pepper_pdf_host.h"
|
|
+#endif
|
|
#include "content/public/renderer/pepper_plugin_instance.h"
|
|
#include "content/public/renderer/render_thread.h"
|
|
#include "content/public/renderer/renderer_ppapi_host.h"
|
|
@@ -133,9 +135,11 @@ bool IsSimpleHeader(const std::string& lower_case_header_name,
|
|
}
|
|
|
|
void RecordFlashNavigateUsage(FlashNavigateUsage usage) {
|
|
+#if 0
|
|
DCHECK_NE(FLASH_NAVIGATE_USAGE_ENUM_COUNT, usage);
|
|
UMA_HISTOGRAM_ENUMERATION(
|
|
"Plugin.FlashNavigateUsage", usage, FLASH_NAVIGATE_USAGE_ENUM_COUNT);
|
|
+#endif
|
|
}
|
|
|
|
} // namespace
|
|
@@ -374,6 +378,8 @@ int32_t PepperFlashRendererHost::OnIsRectTopmost(
|
|
|
|
int32_t PepperFlashRendererHost::OnInvokePrinting(
|
|
ppapi::host::HostMessageContext* host_context) {
|
|
+#if 0
|
|
pdf::PepperPDFHost::InvokePrintingForInstance(pp_instance());
|
|
- return PP_OK;
|
|
+#endif
|
|
+ return PP_ERROR_FAILED;
|
|
}
|
|
diff --git a/chrome/renderer/pepper/pepper_helper.h b/chrome/renderer/pepper/pepper_helper.h
|
|
index e021c964da3d467530775164a67d5cadaf6dc741..e035f0fb9e2baa6a9148b43765b09c52bc45599b 100644
|
|
--- a/chrome/renderer/pepper/pepper_helper.h
|
|
+++ b/chrome/renderer/pepper/pepper_helper.h
|
|
@@ -6,12 +6,14 @@
|
|
#define CHROME_RENDERER_PEPPER_PEPPER_HELPER_H_
|
|
|
|
#include "base/compiler_specific.h"
|
|
+#include "base/component_export.h"
|
|
#include "base/macros.h"
|
|
#include "content/public/renderer/render_frame_observer.h"
|
|
|
|
// This class listens for Pepper creation events from the RenderFrame and
|
|
// attaches the parts required for Chrome-specific plugin support.
|
|
-class PepperHelper : public content::RenderFrameObserver {
|
|
+class COMPONENT_EXPORT(PEPPER_FLASH) PepperHelper
|
|
+ : public content::RenderFrameObserver {
|
|
public:
|
|
explicit PepperHelper(content::RenderFrame* render_frame);
|
|
~PepperHelper() override;
|