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

Unified Diff: third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.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/html/HTMLFrameOwnerElement.h
diff --git a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h
index 6e9a4b3eb14d18d5ad966794c6acb566aa83d5ba..bd608f3168b4725f0caf32f7ebeb3455edd19702 100644
--- a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h
@@ -44,7 +44,6 @@ class CORE_EXPORT HTMLFrameOwnerElement : public HTMLElement,
public:
~HTMLFrameOwnerElement() override;
- Frame* contentFrame() const { return m_contentFrame; }
DOMWindow* contentWindow() const;
Document* contentDocument() const;
@@ -76,10 +75,11 @@ class CORE_EXPORT HTMLFrameOwnerElement : public HTMLElement,
};
// FrameOwner overrides:
- void setContentFrame(Frame&) override;
- void clearContentFrame() override;
- void dispatchLoad() override;
- SandboxFlags getSandboxFlags() const override { return m_sandboxFlags; }
+ Frame* contentFrame() const final { return m_contentFrame; }
+ void setContentFrame(Frame&) final;
+ void clearContentFrame() final;
+ void dispatchLoad() final;
+ SandboxFlags getSandboxFlags() const final { return m_sandboxFlags; }
bool canRenderFallbackContent() const override { return false; }
void renderFallbackContent() override {}
ScrollbarMode scrollingMode() const override { return ScrollbarAuto; }
@@ -106,8 +106,8 @@ class CORE_EXPORT HTMLFrameOwnerElement : public HTMLElement,
private:
// Intentionally private to prevent redundant checks when the type is
// already HTMLFrameOwnerElement.
- bool isLocal() const override { return true; }
- bool isRemote() const override { return false; }
+ bool isLocal() const final { return true; }
+ bool isRemote() const final { return false; }
bool isFrameOwnerElement() const final { return true; }

Powered by Google App Engine
This is Rietveld 408576698