87f7625c5d
* chore: bump chromium in DEPS to 96.0.4662.0 * chore: bump chromium in DEPS to 96.0.4663.0 * chore: update patches * [Extensions] Remove RuntimeData entirely https://chromium-review.googlesource.com/c/chromium/src/+/3177328 * Make helper macros behave consistently for //content/public UserData types https://chromium-review.googlesource.com/c/chromium/src/+/3198788 * Enabling sandboxing for the speech recognition service browser tests https://chromium-review.googlesource.com/c/chromium/src/+/3146090 * [devtools] Add 'RegisterPreference' host binding https://chromium-review.googlesource.com/c/chromium/src/+/3162281 * [Reland][Extensions]: Add persistAcrossSessions flag (scripting API) https://chromium-review.googlesource.com/c/chromium/src/+/3175161 * [Bluetooth] Add Passkey prompt dialog for bonding. https://chromium-review.googlesource.com/c/chromium/src/+/2841104 * Clipboard: Remove ReadImage path in browser https://chromium-review.googlesource.com/c/chromium/src/+/3194826 * Split printing metafile code into its own target. https://chromium-review.googlesource.com/c/chromium/src/+/3164925 * Cleanup unused DesktopMediaListObserver params https://chromium-review.googlesource.com/c/chromium/src/+/3179203 * Remove base::DictionaryValue::GetBinary https://chromium-review.googlesource.com/c/chromium/src/+/3201974 * Window Placement: change RWHV::GetDisplayList to GetScreenInfos https://chromium-review.googlesource.com/c/chromium/src/+/3138774 * Add a preview to the Tab Capture picker dialog https://chromium-review.googlesource.com/c/chromium/src/+/3045268 * Add service-based usage to update print settings https://chromium-review.googlesource.com/c/chromium/src/+/3155426 * chore: bump chromium in DEPS to 96.0.4664.2 * chore: update patches * chore: bump chromium in DEPS to 96.0.4664.4 * chore: update patches * chore: bump chromium in DEPS to 97.0.4666.0 * Revert "chore: bump chromium in DEPS to 97.0.4666.0" This reverts commit d73caae8ba4b39efc9b3ea4de52685b9c92ef3d0. * Reland "Block external protocol handler with sandbox." https://chromium-review.googlesource.com/c/chromium/src/+/3198263 * fixup for lint * Add CookiePartitionKeychain parameter to CookeManager.GetCookieList. https://chromium-review.googlesource.com/c/chromium/src/+/3206016 * Move ui/gfx/transform*,rrect*,mask_filter_info* into ui/gfx/geometry https://chromium-review.googlesource.com/c/chromium/src/+/3200392 * fixup Move ui/gfx/transform*,rrect*,mask_filter_info* into ui/gfx/geometry * ozone: //chrome/browser clean up from USE_X11 https://chromium-review.googlesource.com/c/chromium/src/+/3186490 * content: don't load v8 snapshot in browser process https://chromium-review.googlesource.com/c/chromium/src/+/3183394 * [devtools] Add 'RegisterPreference' host binding https://chromium-review.googlesource.com/c/chromium/src/+/3162281 * 3186491: Add 'devtools.sync_preferences' preference https://chromium-review.googlesource.com/c/chromium/src/+/3186491 * 2951147: DCHECK accessible names for focusable Views https://chromium-review.googlesource.com/c/chromium/src/+/2951147 * 3201014: Use real font size for calculation of SmallTextRatio https://chromium-review.googlesource.com/c/chromium/src/+/3201014 * fixup Clipboard: Remove ReadImage path in browser * chore: update patches * fix: disable PlzServiceWorker to fix custom protocol SW script loading Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3199761 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
234 lines
8.6 KiB
Diff
234 lines
8.6 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/pepper_isolated_file_system_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
|
|
index d75adab3141094e2897b2ed4ca9005bf82d70979..7ee78a7345e29a3ee8836a7a06af9a63258d7340 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/cxx17_backports.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();
|
|
@@ -118,6 +125,7 @@ PepperIsolatedFileSystemMessageFilter::CreateCrxFileSystem(Profile* profile) {
|
|
return storage::IsolatedContext::ScopedFSHandle();
|
|
#endif
|
|
}
|
|
+#endif
|
|
|
|
int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
|
|
ppapi::host::HostMessageContext* context,
|
|
@@ -126,7 +134,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);
|
|
}
|
|
@@ -136,6 +144,7 @@ int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
|
|
return PP_ERROR_FAILED;
|
|
}
|
|
|
|
+#if 0
|
|
int32_t PepperIsolatedFileSystemMessageFilter::OpenCrxFileSystem(
|
|
ppapi::host::HostMessageContext* context) {
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
@@ -176,6 +185,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 b94f5144538258555cda5d42fe7bd5e5af3ac902..2be302b4c7d85ed4382561202e4c03fb71166069 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;
|
|
@@ -59,6 +61,7 @@ class PepperIsolatedFileSystemMessageFilter
|
|
|
|
~PepperIsolatedFileSystemMessageFilter() override;
|
|
|
|
+#if 0
|
|
Profile* GetProfile();
|
|
|
|
// Returns filesystem id of isolated filesystem if valid, or empty string
|
|
@@ -66,10 +69,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_;
|
|
@@ -80,8 +86,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
|
|
};
|
|
|
|
#endif // CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_ISOLATED_FILE_SYSTEM_MESSAGE_FILTER_H_
|
|
diff --git a/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc b/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
|
|
index 60cfd89dfd18eced6f6d103267b80d547d2e9f26..95d36e99832f434d878a2a2fc3101a611926acb2 100644
|
|
--- a/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
|
|
+++ b/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
|
|
@@ -7,8 +7,13 @@
|
|
#include "base/check_op.h"
|
|
#include "chrome/renderer/pepper/pepper_flash_font_file_host.h"
|
|
#include "chrome/renderer/pepper/pepper_flash_fullscreen_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 "pdf/buildflags.h"
|
|
#include "ppapi/host/ppapi_host.h"
|
|
@@ -37,6 +42,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
|
|
if (!host_->IsValidInstance(instance))
|
|
return nullptr;
|
|
|
|
+#if 0
|
|
if (host_->GetPpapiHost()->permissions().HasPermission(
|
|
ppapi::PERMISSION_FLASH)) {
|
|
switch (message.type()) {
|
|
@@ -46,6 +52,7 @@ 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
|
|
@@ -68,7 +75,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
|
|
}
|
|
}
|
|
|
|
-#if BUILDFLAG(ENABLE_PDF)
|
|
+#if BUILDFLAG(ENABLE_PDF_VIEWER)
|
|
if (host_->GetPpapiHost()->permissions().HasPermission(
|
|
ppapi::PERMISSION_PDF)) {
|
|
switch (message.type()) {
|
|
@@ -79,6 +86,7 @@ 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
|
|
@@ -88,6 +96,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
|
|
return std::make_unique<PepperUMAHost>(host_, instance, resource);
|
|
}
|
|
}
|
|
+#endif
|
|
|
|
return nullptr;
|
|
}
|
|
diff --git a/chrome/renderer/pepper/pepper_helper.h b/chrome/renderer/pepper/pepper_helper.h
|
|
index 0f67ff54227f1a49314592188d719feeb27ae2cf..14fce2e8f9dcbd5273784aaf561a45cb1df19d42 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);
|
|
|