Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(261)

Unified Diff: third_party/WebKit/Source/core/frame/Frame.h

Issue 2702273004: bindings: Simplifies WindowProxyManager and its relation to Frame. (Closed)
Patch Set: Fixed WindowProxyManager::createWindowProxy(ForFrame). Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/frame/Frame.h
diff --git a/third_party/WebKit/Source/core/frame/Frame.h b/third_party/WebKit/Source/core/frame/Frame.h
index 3b5501c02bb0623b89f3186d646c203cfc9901de..ee53c6122c22baacf8b8f7455e6bc105ac146791 100644
--- a/third_party/WebKit/Source/core/frame/Frame.h
+++ b/third_party/WebKit/Source/core/frame/Frame.h
@@ -54,7 +54,7 @@ class Page;
class SecurityContext;
class Settings;
class WindowProxy;
-class WindowProxyManagerBase;
+class WindowProxyManager;
struct FrameLoadRequest;
enum class FrameDetachType { Remove, Swap };
@@ -74,8 +74,6 @@ class CORE_EXPORT Frame : public GarbageCollectedFinalized<Frame> {
virtual bool isLocalFrame() const = 0;
virtual bool isRemoteFrame() const = 0;
- virtual WindowProxy* windowProxy(DOMWrapperWorld&) = 0;
-
virtual void navigate(Document& originDocument,
const KURL&,
bool replaceCurrentItem,
@@ -141,7 +139,10 @@ class CORE_EXPORT Frame : public GarbageCollectedFinalized<Frame> {
void setIsLoading(bool isLoading) { m_isLoading = isLoading; }
bool isLoading() const { return m_isLoading; }
- virtual WindowProxyManagerBase* getWindowProxyManager() const = 0;
+ WindowProxyManager* getWindowProxyManager() const {
+ return m_windowProxyManager;
+ }
+ WindowProxy* windowProxy(DOMWrapperWorld&);
virtual void didChangeVisibilityState();
@@ -155,7 +156,7 @@ class CORE_EXPORT Frame : public GarbageCollectedFinalized<Frame> {
bool isFeatureEnabled(WebFeaturePolicyFeature) const;
protected:
- Frame(FrameClient*, FrameHost*, FrameOwner*);
+ Frame(FrameClient*, FrameHost*, FrameOwner*, WindowProxyManager*);
mutable FrameTree m_treeNode;
@@ -170,6 +171,7 @@ class CORE_EXPORT Frame : public GarbageCollectedFinalized<Frame> {
bool canNavigateWithoutFramebusting(const Frame&, String& errorReason);
Member<FrameClient> m_client;
+ const Member<WindowProxyManager> m_windowProxyManager;
bool m_isLoading;
};

Powered by Google App Engine
This is Rietveld 408576698