50b9c7051e
* chore: bump chromium in DEPS to 675d7dc9f3334b15c3ec28c27db3dc19b26bd12e * chore: update patches * chore: bump chromium in DEPS to dce3562696f165a324273fcb6893f0e1fef42ab1 * chore: const interfaces are being removed from //content Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1631749 Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=908139 * chore: update patches * chore: blink::MediaStreamType is now consistent and deduplicated * chore: update patches and printing code for ref -> uniq * chore: bridge_impl() --> GetInProcessNSWindowBridge Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1642988 * fixme: TotalMarkedObjectSize has been removed * chore: fix linting * chore: bump chromium in DEPS to 9503e1a2fcbf17db08094d8caae3e1407e918af3 * chore: fix slightly broken printing patch * chore: update patches for SiteInstanceImpl changes Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1612025 * chore: update patches for SiteInstanceImpl changes * chore: bump chromium in DEPS to 6801e6c1ddd1b7b73e594e97157ddd539ca335d7 * chore: update patches * chore: bump chromium in DEPS to 27e198912d7c1767052ec785c22e2e88b2cb4d8b * chore: remove system_request_context Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1647172 * chore: creation of FtpProtocolHandler needs an auth cache Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1639683 * fixme: disable marked spec * chore: bump chromium in DEPS to 3dcd7fe453ad13a22b114b95f05590eba74c5471 * chore: bump chromium in DEPS to bdc24128b75008743d819e298557a53205706e7c * chore: bump chromium in DEPS to 7da330b58fbe0ba94b9b94abbb8085bead220228 * update patches * remove TotalMarkedObjectSize https://chromium-review.googlesource.com/c/chromium/src/+/1631708 * add libvulkan.so to dist zip manifest on linux * chore: bump chromium in DEPS to 1e85d0f45b52649efd0010cc9dab6d2804f24443 * update patches * add angle features to gpuinfo https://chromium-review.googlesource.com/c/chromium/src/+/1638658 * mark 'marked' property as deprecated * disable webview resize test * FIXME: disable vulkan on 32-bit arm * chore: bump chromium in DEPS to cd0297c6a83fdd2b1f6bc312e7d5acca736a3c56 * Revert "FIXME: disable vulkan on 32-bit arm" This reverts commit 5c1e0ef302a6db1e72231d4e823f91bb08e281af. * backport from upstream: fix swiftshader build on arm https://swiftshader-review.googlesource.com/c/SwiftShader/+/32768/ * update patches * viz: update OutputDeviceWin to new shared memory api https://chromium-review.googlesource.com/c/chromium/src/+/1649574 * base::Contains{Key,Value} => base::Contains https://chromium-review.googlesource.com/c/chromium/src/+/1649478 * fixup! viz: update OutputDeviceWin to new shared memory api * stub out StatusIconLinuxDbus-related delegate methods https://chromium-review.googlesource.com/c/chromium/src/+/1638180 * chore: bump chromium in DEPS to 964ea3fd4bdc006d62533f5755043076220181f1 * Remove the BrowserContext methods to create URLRequestContexts for main/media partitions when a partition_domain is specified https://chromium-review.googlesource.com/c/chromium/src/+/1655087 * fixup! stub out StatusIconLinuxDbus-related delegate methods * add remote_cocoa to chromium_src deps https://chromium-review.googlesource.com/c/chromium/src/+/1657068 * fixup! stub out StatusIconLinuxDbus-related delegate methods * attempt at fix linux-debug build * add swiftshader/libvulkan.so to arm manifest * chore: bump chromium in DEPS to 28688f76afef27c36631aa274691e333ddecdc22 * update patches * chore: bump chromium in DEPS to fe7450e1578a9584189f87d59d0d1a8548bf6b90 * chore: bump chromium in DEPS to f304dfd682dc86a755a6c49a16ee6876e0db45fb * chore: bump chromium in DEPS to f0fd4d6c365aad9edd83bdfff9954c47d271b75c * Update patches * Remove no longer needed WOA patch * Put back IOThread in BrowserProcess We need this until we enable the network service. * move atom.ico to inputs * Update to latest LKGR to fix no template named 'bitset' in namespace 'std' * fixup! Put back IOThread in BrowserProcess * chore: bump chromium in DEPS to dcf9662dc9a896a175d791001350324167b1cad3 * Update patches content_allow_embedder_to_prevent_locking_scheme_registry.patch is no longer necessary as it was upstreamed via https://chromium-review.googlesource.com/c/chromium/src/+/1637040 * Fix renamed enum * Use newer docker container Contains updated dependencies * Try to track down arm test failures * Fix arm tests * chore: bump chromium in DEPS to 8cbceef57b37ee14b9c4c3405a3f7663922c5b5d * Update patches * Add needed dependencies for testing 32-bit linux * Remove arm debugging. * Remove additional debugging * Fix compiler errors * Handle new macOS helper * Fix compile error on Linux * chore: bump chromium in DEPS to 66a93991ddaff6a9f1b13d110959947cb03a1860 * Add new helper files to manifests * fix BUILD.gn for macOS * Fix compile errors * Add patch to put back colors needed for autofill/datalist * chore: bump chromium in DEPS to e89617079f11e33f33cdb3924f719a579c73704b * Updated patches * Remove no longer needed patch * Remove no longer needed patch * Fix compile error with patch * Really fix the patch * chore: bump chromium in DEPS to c70f12476a45840408f1d5ff5968e7f7ceaad9d4 * chore: bump chromium in DEPS to 06d2dd7a8933b41545a7c26349c802f570563fd5 * chore: bump chromium in DEPS to b0b9ff8f727deb519ccbec7cf1c8d9ed543d88ab * Update patches * Fix compiler errors * Fix removed ChromeNetLog * Revert "Fix removed ChromeNetLog" This reverts commit 426dfd90b5ab0a9c1df415d71c88e8aed2bd5bbe. * Remove ChromeNetLog. https://chromium-review.googlesource.com/c/chromium/src/+/1663846 * chore: bump chromium in DEPS to fefcc4926d58dccd59ac95be65eab3a4ebfe2f29 * Update patches * Update v8 patches * Fix lint error * Fix compile errors * chore: bump chromium in DEPS to 4de815ef92ef2eef515506fe09bdc466526a8fd9 * Use custom protocol to test baseURLForDataURL * Use newer SDK (10.0.18362) for Windows * Update patches * Update arm manifest since swiftshader reenabled. * Don't delete dir that isn't ever there. * Fix compile errors. * Need src dir created * Update for removed InspectorFrontendAPI.addExtensions * Revert "Use newer SDK (10.0.18362) for Windows" This reverts commit 68763a0c88cdc44b971462e49662aecc167d3d99. * Revert "Need src dir created" This reverts commit 7daedc29d0844316d4097648dde7f40f1a3848fb. * Revert "Don't delete dir that isn't ever there." This reverts commit bf424bc30ffcb23b1d9a634d4df410342536640e. * chore: bump chromium in DEPS to 97dab6b0124ea53244caf123921b5d14893bcca7 * chore: bump chromium in DEPS to c87d16d49a85dc7122781f6c979d354c20f7f78b * chore: bump chromium in DEPS to 004bcee2ea336687cedfda8f8a151806ac757d15 * chore: bump chromium in DEPS to 24428b26a9d15a013b2a253e1084ec3cb54b660b * chore: bump chromium in DEPS to fd25914e875237df88035a6abf89a70bf1360b57 * Update patches * Update node to fix build error * Fix compile errors * chore: bump chromium in DEPS to 3062b7cf090f1d9522c04ca8fa0a906f88ababe9 * chore: update node ref for pushed tags * chore: update patches for new chromium * chore: fix printing patches * Use new (10.0.18362) Windows SDK * roll node to fix v8 build issues in debug build * Add support for plugin helper * fix: add patch to fix gpu info enumeration Can be removed once CL lands upstream. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1685993 * spec: navigator.requestMIDIAccess now requires a secure origin This test requires a secure origin so we fake one. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1657952 * FIXME: temporarily disable SharedWorker tests * use released version of node-abstractsocket * fix abstract-socket
493 lines
19 KiB
Diff
493 lines
19 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Thu, 20 Sep 2018 17:48:09 -0700
|
|
Subject: pepper_flash.patch
|
|
|
|
Allows building chrome pepper flash integration for Electron.
|
|
|
|
diff --git a/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h b/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h
|
|
index 735da93c3cabb8c6139971295740ba14a30d1b69..533f53fbc42397608e3762e370cc935c045ce3f1 100644
|
|
--- a/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h
|
|
+++ b/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h
|
|
@@ -5,6 +5,7 @@
|
|
#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_CHROME_BROWSER_PEPPER_HOST_FACTORY_H_
|
|
#define CHROME_BROWSER_RENDERER_HOST_PEPPER_CHROME_BROWSER_PEPPER_HOST_FACTORY_H_
|
|
|
|
+#include "base/component_export.h"
|
|
#include "base/macros.h"
|
|
#include "ppapi/host/host_factory.h"
|
|
|
|
@@ -12,7 +13,8 @@ namespace content {
|
|
class BrowserPpapiHost;
|
|
} // namespace content
|
|
|
|
-class ChromeBrowserPepperHostFactory : public ppapi::host::HostFactory {
|
|
+class COMPONENT_EXPORT(PEPPER_FLASH) ChromeBrowserPepperHostFactory
|
|
+ : public ppapi::host::HostFactory {
|
|
public:
|
|
// Non-owning pointer to the filter must outlive this class.
|
|
explicit ChromeBrowserPepperHostFactory(content::BrowserPpapiHost* host);
|
|
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 83cedb4c9e1323259afd041e571240cd971e1241..3686ae2fab5f400cf119a54aea547a72655c2b0a 100644
|
|
--- a/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc
|
|
+++ b/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc
|
|
@@ -7,10 +7,12 @@
|
|
#include <string>
|
|
|
|
#include "base/task/post_task.h"
|
|
+#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"
|
|
@@ -59,6 +61,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 =
|
|
@@ -70,5 +73,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 016007f0edad06739a8ad1f9874d5dd5d49e0780..c4ae6ae33d552952e2277255015396cd758344aa 100644
|
|
--- a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc
|
|
+++ b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc
|
|
@@ -8,9 +8,11 @@
|
|
#include "base/task/post_task.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"
|
|
@@ -42,6 +44,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) {
|
|
@@ -55,6 +58,7 @@ scoped_refptr<content_settings::CookieSettings> GetCookieSettings(
|
|
}
|
|
return NULL;
|
|
}
|
|
+#endif
|
|
|
|
void PepperBindConnectorRequest(
|
|
service_manager::mojom::ConnectorRequest connector_request) {
|
|
@@ -70,7 +74,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,
|
|
&PepperFlashBrowserHost::OnDelayTimerFired),
|
|
weak_factory_(this) {
|
|
@@ -122,6 +128,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
|
|
@@ -142,9 +149,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,
|
|
@@ -173,6 +182,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 154120ce5156d77dd302b85cb17e2f14fb69cc2d..5152fd847c012fc2f40017687db426fab955a905 100644
|
|
--- a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h
|
|
+++ b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h
|
|
@@ -23,9 +23,11 @@ namespace content {
|
|
class BrowserPpapiHost;
|
|
}
|
|
|
|
+#if 0
|
|
namespace content_settings {
|
|
class CookieSettings;
|
|
}
|
|
+#endif
|
|
|
|
class GURL;
|
|
|
|
@@ -49,15 +51,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
|
|
@@ -65,8 +71,10 @@ class PepperFlashBrowserHost : public ppapi::host::ResourceHost {
|
|
device::mojom::WakeLockPtr 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_;
|
|
|
|
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 b007195efb9202f2cc8aeeb20821afbf5e8af74d..50b50a5eb48cc4efb71ffa0719bcd1f0363853e1 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"
|
|
@@ -128,7 +129,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();
|
|
}
|
|
@@ -151,12 +154,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(
|
|
@@ -185,6 +194,7 @@ int32_t PepperFlashDRMHost::OnHostMsgMonitorIsExternal(
|
|
return PP_OK;
|
|
}
|
|
|
|
+#if 0
|
|
void PepperFlashDRMHost::GotDeviceID(
|
|
ppapi::host::ReplyMessageContext reply_context,
|
|
const std::string& id,
|
|
@@ -197,3 +207,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 aa4433cccff4bc637ce5e71039de3c4352e7cd6b..d9630fdf6b87e11fb9657814895dff36b04ccea8 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_;
|
|
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 0d083bb09ff17a691c6399d2a5746b44e3196873..2023dc0240220362a1b503da07aa9fab4cb4b434 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
|
|
@@ -8,17 +8,21 @@
|
|
|
|
#include "base/stl_util.h"
|
|
#include "base/task/post_task.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"
|
|
@@ -27,12 +31,11 @@
|
|
#include "ppapi/shared_impl/file_system_util.h"
|
|
#include "storage/browser/fileapi/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 {
|
|
|
|
@@ -42,6 +45,7 @@ const char* kPredefinedAllowedCrxFsOrigins[] = {
|
|
};
|
|
|
|
} // namespace
|
|
+#endif
|
|
|
|
// static
|
|
PepperIsolatedFileSystemMessageFilter*
|
|
@@ -69,8 +73,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::
|
|
@@ -96,6 +102,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();
|
|
@@ -122,6 +129,7 @@ PepperIsolatedFileSystemMessageFilter::CreateCrxFileSystem(Profile* profile) {
|
|
return storage::IsolatedContext::ScopedFSHandle();
|
|
#endif
|
|
}
|
|
+#endif
|
|
|
|
int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
|
|
ppapi::host::HostMessageContext* context,
|
|
@@ -130,7 +138,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);
|
|
}
|
|
@@ -140,6 +148,7 @@ int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
|
|
return PP_ERROR_FAILED;
|
|
}
|
|
|
|
+#if 0
|
|
int32_t PepperIsolatedFileSystemMessageFilter::OpenCrxFileSystem(
|
|
ppapi::host::HostMessageContext* context) {
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
@@ -180,6 +189,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 1d5ff1f6aa14812f2a6552f601900b03f3e3c8e7..5b6d0297c874146c21af37b983b2d8ee387b31ce 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/fileapi/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 d63e90b6c5079ab3237c4bad3d5e63ce2f99c657..c98a7bd07ddd9527fc67b05b24463ed4b05ec316 100644
|
|
--- a/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
|
|
+++ b/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
|
|
@@ -10,8 +10,10 @@
|
|
#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"
|
|
#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"
|
|
@@ -86,6 +88,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
|
|
}
|
|
}
|
|
|
|
+#if 0
|
|
if (host_->GetPpapiHost()->permissions().HasPermission(
|
|
ppapi::PERMISSION_PDF)) {
|
|
switch (message.type()) {
|
|
@@ -104,6 +107,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 36edbfd997d0dfaa998a4e288caf29af418a28f5..7f4012a4a5b8194a1e44f35f458612099e09fbe4 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
|
|
@@ -376,6 +380,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;
|