mirror of
https://github.com/aphrody-labs/cef.git
synced 2026-10-14 05:09:23 +00:00
Marshall Greenblatt
a26ddfd279
win: dxil.dll is no longer distributed mac: Xcode 27 (macOS 26.6+) is now required
57 lines
2.6 KiB
Diff
57 lines
2.6 KiB
Diff
diff --git content/browser/browser_plugin/browser_plugin_embedder.h content/browser/browser_plugin/browser_plugin_embedder.h
|
|
index ea2891a279371f7967786e44188aee9afe19607f..595e5b8eb2cb66d0a8cdf70629fed806314d8374 100644
|
|
--- content/browser/browser_plugin/browser_plugin_embedder.h
|
|
+++ content/browser/browser_plugin/browser_plugin_embedder.h
|
|
@@ -15,6 +15,7 @@
|
|
#define CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_EMBEDDER_H_
|
|
|
|
#include "base/memory/raw_ptr.h"
|
|
+#include "content/common/content_export.h"
|
|
|
|
namespace input {
|
|
struct NativeWebKeyboardEvent;
|
|
@@ -29,7 +30,7 @@ class WebContentsImpl;
|
|
|
|
// TODO(wjmaclean): Get rid of "BrowserPlugin" in the name of this class.
|
|
// Perhaps "WebContentsEmbedderDelegate" would be better?
|
|
-class BrowserPluginEmbedder {
|
|
+class CONTENT_EXPORT BrowserPluginEmbedder {
|
|
public:
|
|
BrowserPluginEmbedder(const BrowserPluginEmbedder&) = delete;
|
|
BrowserPluginEmbedder& operator=(const BrowserPluginEmbedder&) = delete;
|
|
diff --git content/browser/browser_plugin/browser_plugin_guest.cc content/browser/browser_plugin/browser_plugin_guest.cc
|
|
index 791474a502c1b730aceaecd97ce47ff87fc14311..021417d8342017401afab175458cfd656c08dca4 100644
|
|
--- content/browser/browser_plugin/browser_plugin_guest.cc
|
|
+++ content/browser/browser_plugin/browser_plugin_guest.cc
|
|
@@ -49,6 +49,8 @@ std::unique_ptr<WebContentsImpl> BrowserPluginGuest::CreateNewGuestWindow(
|
|
}
|
|
|
|
void BrowserPluginGuest::InitInternal(WebContentsImpl* owner_web_contents) {
|
|
+ owner_web_contents_ = owner_web_contents;
|
|
+
|
|
RenderWidgetHostImpl* rwhi =
|
|
GetWebContents()->GetPrimaryMainFrame()->GetRenderWidgetHost();
|
|
CHECK(rwhi, base::NotFatalUntil::M159);
|
|
diff --git content/browser/browser_plugin/browser_plugin_guest.h content/browser/browser_plugin/browser_plugin_guest.h
|
|
index 91c9f60d586972c294da016e8ae19ddda02a2023..987b2f68146044f130b7ff94fbe972ca4e78b164 100644
|
|
--- content/browser/browser_plugin/browser_plugin_guest.h
|
|
+++ content/browser/browser_plugin/browser_plugin_guest.h
|
|
@@ -68,6 +68,8 @@ class BrowserPluginGuest : public WebContentsObserver {
|
|
WebContentsImpl* GetWebContents() const;
|
|
RenderFrameHostImpl* GetProspectiveOuterDocument();
|
|
|
|
+ WebContentsImpl* owner_web_contents() const { return owner_web_contents_; }
|
|
+
|
|
private:
|
|
// BrowserPluginGuest is a WebContentsObserver of |web_contents| and
|
|
// |web_contents| has to stay valid for the lifetime of BrowserPluginGuest.
|
|
@@ -78,6 +80,8 @@ class BrowserPluginGuest : public WebContentsObserver {
|
|
|
|
// May be null during guest destruction.
|
|
const base::WeakPtr<BrowserPluginGuestDelegate> delegate_;
|
|
+
|
|
+ raw_ptr<WebContentsImpl> owner_web_contents_ = nullptr;
|
|
};
|
|
|
|
} // namespace content
|