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

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

Issue 2631233003: Avoid mutating frame owner when detaching a provisional frame. (Closed)
Patch Set: Fix test to actually test the changed behavior. Created 3 years, 11 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/FrameOwner.h
diff --git a/third_party/WebKit/Source/core/frame/FrameOwner.h b/third_party/WebKit/Source/core/frame/FrameOwner.h
index 352d8ed4f7033308c419c75be0fa8e484b78769e..614932460b72cc3abeac01bd5e9f9dc18b634736 100644
--- a/third_party/WebKit/Source/core/frame/FrameOwner.h
+++ b/third_party/WebKit/Source/core/frame/FrameOwner.h
@@ -27,6 +27,7 @@ class CORE_EXPORT FrameOwner : public GarbageCollectedMixin {
virtual bool isLocal() const = 0;
virtual bool isRemote() const = 0;
+ virtual Frame* contentFrame() const = 0;
virtual void setContentFrame(Frame&) = 0;
virtual void clearContentFrame() = 0;
@@ -47,6 +48,9 @@ class CORE_EXPORT FrameOwner : public GarbageCollectedMixin {
virtual const WebVector<WebPermissionType>& delegatedPermissions() const = 0;
};
+// TODO(dcheng): This class is an internal implementation detail of provisional
+// frames. Move this into WebLocalFrameImpl.cpp and remove existing dependencies
+// on it.
class CORE_EXPORT DummyFrameOwner
: public GarbageCollectedFinalized<DummyFrameOwner>,
public FrameOwner {
@@ -58,6 +62,7 @@ class CORE_EXPORT DummyFrameOwner
DEFINE_INLINE_VIRTUAL_TRACE() { FrameOwner::trace(visitor); }
// FrameOwner overrides:
+ Frame* contentFrame() const override { return nullptr; }
void setContentFrame(Frame&) override {}
void clearContentFrame() override {}
SandboxFlags getSandboxFlags() const override { return SandboxNone; }

Powered by Google App Engine
This is Rietveld 408576698