28ada6ea8b
* chore: bump chromium in DEPS to 99.0.4819.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4824.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4827.0
* chore: update patches
* 3352511: PiP: Add inkdrop and pointer cursor to PiP window buttons
https://chromium-review.googlesource.com/c/chromium/src/+/3352511
* 3309164: webhid: Show FIDO devices in the chooser if allowed
https://chromium-review.googlesource.com/c/chromium/src/+/3309164
* 3297868: hid: Add experimental HIDDevice.forget()
https://chromium-review.googlesource.com/c/chromium/src/+/3297868
* 3362491: [Extensions] Move i18n API to //extensions
https://chromium-review.googlesource.com/c/chromium/src/+/3362491
* MCC Refactor step0: Allow embedders to register associated_interface binders with RenderFrameHostImpl::associated_registry_.
https://chromium-review.googlesource.com/c/chromium/src/+/3281481
* 3352616: [Gtk] Remove libgtk from the link-line
https://chromium-review.googlesource.com/c/chromium/src/+/3352616
* 3249211: Clear-Site-Data support for partitioned cookies
https://chromium-review.googlesource.com/c/chromium/src/+/3249211
* [Extensions][COIL] Use [allow|block]list in //extensions/common
https://chromium-review.googlesource.com/c/chromium/src/+/3372668
* Begin ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3376154
* [Code Health] Refactor PrefService GetDict + GetList to use base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3343526
* 3354997: [CodeHealth] Remove deprecated SetDictionary method
https://chromium-review.googlesource.com/c/chromium/src/+/3354997
* 3287323: Add LacrosPrefStore for lacros settings
https://chromium-review.googlesource.com/c/chromium/src/+/3287323
* 3365916: [PA] Clean up remaining lazy commit code
https://chromium-review.googlesource.com/c/chromium/src/+/3365916
* [MPArch] Target the external protocol error at the responsible frame.
https://chromium-review.googlesource.com/c/chromium/src/+/3011560
* Pass origin to RegisterNonNetworkSubresourceURLLoaderFactories
https://chromium-review.googlesource.com/c/chromium/src/+/3350608
* Linux: Send OSCrypt raw encryption key to the Network Service
https://chromium-review.googlesource.com/c/chromium/src/+/3320484
* [PlzServiceWorker] Remove remaining references to PlzServiceWorker.
https://chromium-review.googlesource.com/c/chromium/src/+/3359441
* chore: fixup for lint
* 3327621: Fix tablet mode detection for Win 11.
https://chromium-review.googlesource.com/c/chromium/src/+/3327621
* 3342428: ax_mac: move AXTextMarker conversion utils under ui umbrella
https://chromium-review.googlesource.com/c/chromium/src/+/3342428
* 3353974: Mac: Use base::Feature for overlay features
https://chromium-review.googlesource.com/c/chromium/src/+/3353974
* chore: bump chromium in DEPS to 99.0.4828.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4837.0
* chore: update patches
* chore: update patches
* 3379142: Drop FALLTHROUGH macro
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3379142
* 3381749: C++17: Allow use of std::map::try_emplace and std::map::insert_or_assign
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3381749
* chore: bump chromium in DEPS to 99.0.4839.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4840.0
* chore: bump chromium in DEPS to 99.0.4844.0
* 3395881: [api] Deprecate Local<v8::Context> v8::Object::CreationContext()
Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3395881
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4845.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4847.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4849.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4851.0
* chore: bump chromium in DEPS to 100.0.4853.0
* update patches
* chore: update patches
* update patches
* 3383599: Fonts Access: Remove prototype that uses a font picker.
https://chromium-review.googlesource.com/c/chromium/src/+/3383599
* 3404768: Remove ALLOW_UNUSED macros
https://chromium-review.googlesource.com/c/chromium/src/+/3404768
* 3374762: Remove ignore_result.h
https://chromium-review.googlesource.com/c/chromium/src/+/3374762
* 3399305: [unseasoned-pdf] Apply proper frame offsets for touch selections
https://chromium-review.googlesource.com/c/chromium/src/+/3399305
* 3402210: [Extensions] Don't trigger unload event for already unloaded extension
https://chromium-review.googlesource.com/c/chromium/src/+/3402210
* 3410912: Combine URLLoaderClient OnReceiveResponse and OnStartLoadingResponseBody.
https://chromium-review.googlesource.com/c/chromium/src/+/3410912
* 3370428: Make the AuthSchemes policy support dynamic refresh
https://chromium-review.googlesource.com/c/chromium/src/+/3370428
* 3407603: Finish ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3407603
* 3378352: ozone/x11: move code from //ui/p/x11 to //ui/ozone/p/x11
https://chromium-review.googlesource.com/c/chromium/src/+/3378352
* 3370810: Delete chrome/service, AKA the Cloud Print service process.
https://chromium-review.googlesource.com/c/chromium/src/+/3370810
* chore: bump chromium in DEPS to 100.0.4855.0
* chore: update patches
* fixup! 3370810: Delete chrome/service, AKA the Cloud Print service process.
* revert 3348007 to fix windows build
* 3318572: [Code health] Fix gn check errors in //extensions/browser:*
https://chromium-review.googlesource.com/c/chromium/src/+/3318572
* fix printing.patch
* fix iwyu issue
* 3408515: win: Make ShorcutOperation an enum class and modernize names
https://chromium-review.googlesource.com/c/chromium/src/+/3408515
* 3388333: [UIA] Remove dead code accessibility_misc_utils.h/cc
https://chromium-review.googlesource.com/c/chromium/src/+/3388333
* fix windows build? i hope
* patch gn visibility of //ui/ozone/platform/x11
* missing include base/logging.h
* use BUILDFLAG for USE_NSS_CERTS
https://chromium-review.googlesource.com/c/chromium/src/+/3379123
* defined(OS_*) ==> BUILDFLAG(IS_*)
https://bugs.chromium.org/p/chromium/issues/detail?id=1234043
* fixup! 3404768: Remove ALLOW_UNUSED macros
* another attempt to fix windows build
* temporarily disable the custom scheme service worker test
https://github.com/electron/electron/issues/32664
* fix loading mv3 extensions
not sure what cl broke this unfort.
* fixup! 3404768: Remove ALLOW_UNUSED macros
* patch nan
https://chromium-review.googlesource.com/c/v8/v8/+/3395880
* fix node test
* fix nullptr in FindPdfFrame
* patch perfetto to fix build issue on win-ia32
bc44c3c753
* fix build for linux-x64-testing-no-run-as-node
* fix patch
* skip <webview>.capturePage() test
https://github.com/electron/electron/issues/32705
* test: fix failing tests of focus/blur events of WebContents (#32711)
* inherit stdio from app module test child processes
this prevents them from timing out due to full stdout buffers
* test to see if we can get better logs on windows ci
* try again for appveyor log things
* skip contentTracing tests on ia32
* ci: disable gpu compositing
* drop applied patch
* fix merge fail
* Revert "ci: disable gpu compositing"
This reverts commit 0344129fcb19ea3e87e06c1110d751f22eba3fec.
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: VerteDinde <khammond@slack-corp.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
219 lines
8 KiB
Diff
219 lines
8 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 308e7bff4ea829f5e68a93e77e0205f3f6a509c4..88a1e057ed8873f05e0d11160e7994bc244092d2 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*
|
|
@@ -64,11 +68,16 @@ PepperIsolatedFileSystemMessageFilter::PepperIsolatedFileSystemMessageFilter(
|
|
const base::FilePath& profile_directory,
|
|
const GURL& document_url,
|
|
ppapi::host::PpapiHost* ppapi_host)
|
|
+#if 0
|
|
: render_process_id_(render_process_id),
|
|
profile_directory_(profile_directory),
|
|
document_url_(document_url) {
|
|
for (size_t i = 0; i < base::size(kPredefinedAllowedCrxFsOrigins); ++i)
|
|
allowed_crxfs_origins_.insert(kPredefinedAllowedCrxFsOrigins[i]);
|
|
+#else
|
|
+ : profile_directory_(profile_directory),
|
|
+ document_url_(document_url) {
|
|
+#endif
|
|
}
|
|
|
|
PepperIsolatedFileSystemMessageFilter::
|
|
@@ -93,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();
|
|
@@ -117,6 +127,7 @@ PepperIsolatedFileSystemMessageFilter::CreateCrxFileSystem(Profile* profile) {
|
|
return storage::IsolatedContext::ScopedFSHandle();
|
|
#endif
|
|
}
|
|
+#endif
|
|
|
|
int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
|
|
ppapi::host::HostMessageContext* context,
|
|
@@ -125,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;
|
|
}
|
|
NOTREACHED();
|
|
context->reply_msg =
|
|
@@ -133,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)
|
|
@@ -173,3 +185,4 @@ int32_t PepperIsolatedFileSystemMessageFilter::OpenCrxFileSystem(
|
|
return PP_ERROR_NOTSUPPORTED;
|
|
#endif
|
|
}
|
|
+#endif
|
|
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 40fafdbed313800a3f420d9d5a3daf8bbbdb7d95..1367725e04455ba5f299b8341a28f222f51c4cd2 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
|
|
@@ -19,7 +19,9 @@
|
|
#include "storage/browser/file_system/isolated_context.h"
|
|
#include "url/gurl.h"
|
|
|
|
+#if 0
|
|
class Profile;
|
|
+#endif
|
|
|
|
namespace content {
|
|
class BrowserPpapiHost;
|
|
@@ -58,6 +60,7 @@ class PepperIsolatedFileSystemMessageFilter
|
|
|
|
~PepperIsolatedFileSystemMessageFilter() override;
|
|
|
|
+#if 0
|
|
Profile* GetProfile();
|
|
|
|
// Returns filesystem id of isolated filesystem if valid, or empty string
|
|
@@ -65,18 +68,23 @@ 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);
|
|
|
|
const int render_process_id_;
|
|
+#endif
|
|
// Keep a copy from original thread.
|
|
const base::FilePath profile_directory_;
|
|
const GURL document_url_;
|
|
|
|
+#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 4b84f4ef068a76fa2be244a7f7ca2c6a8734bd46..13ae0a57535dfb516eb70b272fdaa5a4720d0591 100644
|
|
--- a/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
|
|
+++ b/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
|
|
@@ -6,8 +6,13 @@
|
|
|
|
#include "base/check_op.h"
|
|
#include "chrome/renderer/pepper/pepper_flash_font_file_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"
|
|
@@ -55,7 +60,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
|
|
}
|
|
}
|
|
|
|
-#if BUILDFLAG(ENABLE_PDF)
|
|
+#if BUILDFLAG(ENABLE_PDF_VIEWER)
|
|
if (host_->GetPpapiHost()->permissions().HasPermission(
|
|
ppapi::PERMISSION_PDF)) {
|
|
switch (message.type()) {
|
|
@@ -66,6 +71,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
|
|
@@ -75,6 +81,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 5794ac83e62c7f966920a2692246e7677b297695..01d5a609ad34bb2829bd5714e70930b90c549661 100644
|
|
--- a/chrome/renderer/pepper/pepper_helper.h
|
|
+++ b/chrome/renderer/pepper/pepper_helper.h
|
|
@@ -5,11 +5,13 @@
|
|
#ifndef CHROME_RENDERER_PEPPER_PEPPER_HELPER_H_
|
|
#define CHROME_RENDERER_PEPPER_PEPPER_HELPER_H_
|
|
|
|
+#include "base/component_export.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);
|
|
|