chore: bump chromium to 6b9fa6b352d824d052222e1abe541 (master) (#25558)
* chore: bump chromium in DEPS to d5c9bf9e2a18fa508201a88e5803bec1d107b1ae * chore: bump chromium in DEPS to 45f1316afae33e52c92480b34bf4f7fe4a7db898 * update patches * WillCreateURLLoaderFactory now gets a ukm_source_id Refs:2346803* ink_drop_visible_opacity -> GetInkDropVisibleOpacity Refs:2415368* chore: bump chromium in DEPS to ddb5b6db5e35ab1a7b5adbd9f15373af6c35ea2a * 2418471: PDF Viewer update: Add missing aria-labels to various buttons.2418471* update printing.patch given print settings mojoification Refs:2409467* update patches * content::BluetoothChooser::Event -> content::BluetoothChooserEvent Refs:2387901* set_ink_drop_base_color -> SetInkDropBaseColor Refs:2419388* chore: bump chromium in DEPS to ecf7c9ee830d4d85f300b461a2fa13aa40c79a4c * update patches * gfx::ConvertPointToPixel -> gfx::ConvertPointToPixels Refs:2418568* remove ContentSettingsObserver::AllowStorage() Refs:2401847* service_manager::kCrashDumpSignal -> kCrashDumpSignal Refs:2417073* chore: bump chromium in DEPS to abdb7ebe5f8c8328b8f435283df90d0a3ecff7bd * chore: bump chromium in DEPS to 2a7e138ab1066534ceb2622e8a9d2c8ebf574215 * chore: bump chromium in DEPS to ab1884e75ced904e4276851eb4e1ad89919ca93b * chore: bump chromium in DEPS to a12413902380dcc2a73ac74d582328280a8af686 * Fixup printing patch2428623* Fixup OSR patch2415128* Make ExtensionURLLoaderFactory always owned by its |receivers_|.2357523* Add deprecated_default_sources_assignment_filter variable2416496* Fixup patch indices * Remove several references to BrowserPlugin from content2401031* Remove SurfaceEmbeddingTime and LocalSurfaceIdAllocation2415128* Add DragOperation and AllowedDragOperations Mojo types2196167* chore: bump chromium in DEPS to 378450342cf6aa160663d0ce3a178a11b570c25a * Fixup patch indices * Remove SurfaceEmbeddingTime and LocalSurfaceIdAllocation2415128* Add DragOperation and AllowedDragOperations Mojo types2196167* 2426564: Remove global sources assignment filter value2426564* Fixup blink_local_frame.patch * [XProto] Remove a subset of ui/gfx/x/x11.h2430328* Fixup patch indices * Remove several references to BrowserPlugin from content2401031* Remove lossy ConvertSizeToPixel() methods2419534* serial: Use USB driver name to disambiguate ports2413176* Remove set_sources_filter import * Fix ModMask usage * [XProto] Remove usage of all Xlib headers2392140* [XProto] Remove usage of Xlib Visuals2429933* Skip Angle manifest file2425197* Add whole src\third_party\angle\.git directory This directory is needed in order to properly generate gen/angle/angle_commit.h * [libvpx] Fix HighBD config on Windows ARM642437745* update patches * fix: correct calling convention for Windows on Arm2440717* Add third_party/angle/.git to the archive before adding the rest of the source * fixup source caching on Windows * Fixup erroneous close paren * fixup for goma issues * This should work * chore: bump chromium roll manually2435142This landed the day after we paused roller-bot and may resolve the visibility test flakes that we're seeing. h/t to @jkleinsc for finding this with me. * chore: remove obsoleted cherry-pick fix for libvpx2437745* chore: remove obsoleted cherry-pick libvpx patch2437745* chore: re-export patches * chore: add tracer comment to visibility-stat-spec. The line numbers between the source and the CI runs don't seem to match up, so this temp tracer is to help track the source of that difference. * chore: bump chromium in DEPS to 7c2b8cc3b8638aee8abeb013042a6c1d15b2da6b * update patches * impl SortingLSH service Refs:2425327* 2446525: [Flash] Remove some Flash APIs2446525* 2440974: Reland "Delete service_manager/embedder/switches.h"2440974* 2359402: Remove ContentBrowserClient::NonNetworkURLLoaderFactoryDeprecatedMap.2359402* 2250506: Implement tabs.removeCSS2250506* 2429143: Remove implicit-conversion-to-integer ConvertRectToPixel() methods.2429143* 2444430: Remove DataElementType::kBlob2444430* 2441964: Clean up WebView public API2441964* 2357523: Make ExtensionURLLoaderFactory always owned by its |receivers_|.2357523* 2461606: Use blink::mojom::PreferredColorScheme instead of blink::PreferredColorScheme2461606* 2461235: a11y inspect reorg: move PropertyFilter struct to a new location2461235* remove flash support * fix frame_host_manager patch * fix lint * remove flash info from docs * fix build * fix osr * chore: bump chromium in DEPS to 9269f9eb1d98d29564c2b2ab97f30c6e148c4e11 * fix visibilityState tests * 2463049: Replace all uses of web_pref::AutoplayPolicy with mojom::AutoplayPolicy2463049* update patches * fix tests harder * 2414921: Add Group and Ungroup functions to Tabs extension API2414921* more test fix * Remove all keyboard related usage of Xlib Refs:2436787* fix linux build * 2453807: [XProto] Remove usage of Xlib error handling2453807* lint * fixup! 2453807: [XProto] Remove usage of Xlib error handling * disable CalculateNativeWinOcclusion on win ci * remove UploadBlob from docs * Update appveyor.yml Co-authored-by: Andy Locascio <andy@slack-corp.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
This commit is contained in:
Electron Bot
GitHub
parent
20c6677a9c
commit
46f3491c7d
135 changed files with 1087 additions and 1609 deletions
|
|
@ -6,34 +6,6 @@ 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
|
||||
|
|
@ -67,203 +39,6 @@ index 82fa5b7026e62cfe69700f30fcc84731fc30afe8..f4ad9fbc72a5cb27ed22ab014ccb2fcb
|
|||
+#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 c233e20b2395761ca5579381321add2b82474b8c..4fb81db59cc83f12af9a9dc77dd68451fa00bb36 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 a28c87320c7e262c0a179fd462222fa0a45b790e..9e170ebb97a150cd2a9f02473b5095955a36c643 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
|
||||
|
|
@ -412,13 +187,13 @@ index 56a23e8f41bb418d414f11af5797b30571d4cc2b..6f9f577f16de80dd2ab194b557bbd9ec
|
|||
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
|
||||
index 7820a55f563d40865cd7bbf4a03e7f82db81043e..d9b1c4bc6abfa395782761455d4dd2e3105d7b14 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 @@
|
||||
@@ -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"
|
||||
#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
|
||||
|
|
@ -429,45 +204,28 @@ index 375ca0233a74ef6a6e91102947ce0b63585d48ff..1c4bb268c5bd21126551414b1864d495
|
|||
#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(
|
||||
@@ -36,19 +41,10 @@ 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
|
||||
|
||||
- if (host_->GetPpapiHost()->permissions().HasPermission(
|
||||
- ppapi::PERMISSION_FLASH)) {
|
||||
- switch (message.type()) {
|
||||
- case PpapiHostMsg_FlashFullscreen_Create::ID: {
|
||||
- return std::make_unique<PepperFlashFullscreenHost>(host_, instance,
|
||||
- resource);
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
// 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 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(
|
||||
@@ -75,7 +71,9 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -477,7 +235,7 @@ index 375ca0233a74ef6a6e91102947ce0b63585d48ff..1c4bb268c5bd21126551414b1864d495
|
|||
// 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(
|
||||
@@ -85,6 +83,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
|
||||
return std::make_unique<PepperUMAHost>(host_, instance, resource);
|
||||
}
|
||||
}
|
||||
|
|
@ -485,42 +243,6 @@ index 375ca0233a74ef6a6e91102947ce0b63585d48ff..1c4bb268c5bd21126551414b1864d495
|
|||
|
||||
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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue