mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
chore: bump chromium to 87.0.4280.11 (11-x-y) (#25802)
* chore: bump chromium in DEPS to 87.0.4280.6 * chore: bump chromium in DEPS to 87.0.4280.11 * chore: update patches * Add deprecated_default_sources_assignment_filter variable https://chromium-review.googlesource.com/c/chromium/src/+/2416496 * 2426564: Remove global sources assignment filter value https://chromium-review.googlesource.com/c/chromium/src/+/2426564 * Remove set_sources_filter import * chore: fixup printing patch * Add DragOperation and AllowedDragOperations Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/2196167 * Add DragOperation and AllowedDragOperations Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/2196167 * Remove several references to BrowserPlugin from content https://chromium-review.googlesource.com/c/chromium/src/+/2401031 * Remove SurfaceEmbeddingTime and LocalSurfaceIdAllocation https://chromium-review.googlesource.com/c/chromium/src/+/2415128 * Remove several references to BrowserPlugin from content https://chromium-review.googlesource.com/c/chromium/src/+/2401031 * Service Manager embedders switches have been removed or moved Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2440974 * Remove SurfaceEmbeddingTime and LocalSurfaceIdAllocation https://chromium-review.googlesource.com/c/chromium/src/+/2415128 * [XProto] Remove usage of Xlib Visuals https://chromium-review.googlesource.com/c/chromium/src/+/2429933 * Implement tabs.removeCSS in electrons TabsExecuteScriptFunction Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2250506 * Remove lossy ConvertSizeToPixel() methods https://chromium-review.googlesource.com/c/chromium/src/+/2419534 * Remove all keyboard related usage of Xlib Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2436787 * fix: use parent namespace for zygote switches * ConvertRectToPixel methods have been removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2429143 * impl SortingLSH service Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2425327 * chore: update patches * chore: fix servicemanager removed namespace * chore: revert removed methods * chore: update patches * ExtensionURLLoaderFactory is now owned by its receivers Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2357523 * chore: fix linting * Skip Angle manifest file https://chromium-review.googlesource.com/c/angle/angle/+/2425197 Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
This commit is contained in:
@@ -57,8 +57,4 @@ void GuestViewContainer::DidResizeElement(const gfx::Size& new_size) {
|
||||
FROM_HERE, base::BindOnce(element_resize_callback_, new_size));
|
||||
}
|
||||
|
||||
base::WeakPtr<content::BrowserPluginDelegate> GuestViewContainer::GetWeakPtr() {
|
||||
return weak_ptr_factory_.GetWeakPtr();
|
||||
}
|
||||
|
||||
} // namespace electron
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
#define SHELL_RENDERER_GUEST_VIEW_CONTAINER_H_
|
||||
|
||||
#include "base/callback.h"
|
||||
#include "content/public/renderer/browser_plugin_delegate.h"
|
||||
#include "content/public/renderer/render_frame.h"
|
||||
|
||||
namespace gfx {
|
||||
@@ -15,21 +14,18 @@ class Size;
|
||||
|
||||
namespace electron {
|
||||
|
||||
class GuestViewContainer : public content::BrowserPluginDelegate {
|
||||
class GuestViewContainer {
|
||||
public:
|
||||
typedef base::Callback<void(const gfx::Size&)> ResizeCallback;
|
||||
|
||||
explicit GuestViewContainer(content::RenderFrame* render_frame);
|
||||
~GuestViewContainer() override;
|
||||
virtual ~GuestViewContainer();
|
||||
|
||||
static GuestViewContainer* FromID(int element_instance_id);
|
||||
|
||||
void RegisterElementResizeCallback(const ResizeCallback& callback);
|
||||
|
||||
// content::BrowserPluginDelegate:
|
||||
void SetElementInstanceID(int element_instance_id) final;
|
||||
void DidResizeElement(const gfx::Size& new_size) final;
|
||||
base::WeakPtr<BrowserPluginDelegate> GetWeakPtr() final;
|
||||
void SetElementInstanceID(int element_instance_id);
|
||||
void DidResizeElement(const gfx::Size& new_size);
|
||||
|
||||
private:
|
||||
int element_instance_id_;
|
||||
|
||||
@@ -363,7 +363,7 @@ void RendererClientBase::DidSetUserAgent(const std::string& user_agent) {
|
||||
#endif
|
||||
}
|
||||
|
||||
content::BrowserPluginDelegate* RendererClientBase::CreateBrowserPluginDelegate(
|
||||
guest_view::GuestViewContainer* RendererClientBase::CreateBrowserPluginDelegate(
|
||||
content::RenderFrame* render_frame,
|
||||
const content::WebPluginInfo& info,
|
||||
const std::string& mime_type,
|
||||
|
||||
@@ -30,8 +30,15 @@ class SpellCheck;
|
||||
namespace extensions {
|
||||
class ExtensionsClient;
|
||||
}
|
||||
namespace content {
|
||||
struct WebPluginInfo;
|
||||
}
|
||||
#endif
|
||||
|
||||
namespace guest_view {
|
||||
class GuestViewContainer;
|
||||
}
|
||||
|
||||
namespace electron {
|
||||
|
||||
#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
|
||||
@@ -100,11 +107,11 @@ class RendererClientBase : public content::ContentRendererClient
|
||||
override;
|
||||
bool IsKeySystemsUpdateNeeded() override;
|
||||
void DidSetUserAgent(const std::string& user_agent) override;
|
||||
content::BrowserPluginDelegate* CreateBrowserPluginDelegate(
|
||||
guest_view::GuestViewContainer* CreateBrowserPluginDelegate(
|
||||
content::RenderFrame* render_frame,
|
||||
const content::WebPluginInfo& info,
|
||||
const std::string& mime_type,
|
||||
const GURL& original_url) override;
|
||||
const GURL& original_url);
|
||||
bool IsPluginHandledExternally(content::RenderFrame* render_frame,
|
||||
const blink::WebElement& plugin_element,
|
||||
const GURL& original_url,
|
||||
|
||||
Reference in New Issue
Block a user