| 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 dde57604ead2e4bee5f30088a22f35878153e8ab..74adaa57ef1618d0f446fa4095f1cbd9cffc7572 100644
|
| --- a/third_party/WebKit/Source/core/frame/Frame.h
|
| +++ b/third_party/WebKit/Source/core/frame/Frame.h
|
| @@ -98,7 +98,7 @@ class CORE_EXPORT Frame : public GarbageCollectedFinalized<Frame> {
|
| bool IsLocalRoot() const;
|
|
|
| FrameOwner* Owner() const;
|
| - void SetOwner(FrameOwner* owner) { owner_ = owner; }
|
| + void SetOwner(FrameOwner*);
|
| HTMLFrameOwnerElement* DeprecatedLocalOwner() const;
|
|
|
| DOMWindow* DomWindow() const { return dom_window_; }
|
| @@ -154,6 +154,12 @@ class CORE_EXPORT Frame : public GarbageCollectedFinalized<Frame> {
|
| // the given frame.
|
| bool IsFeatureEnabled(WebFeaturePolicyFeature) const;
|
|
|
| + // Called to make a frame inert or non-inert. A frame is inert when there
|
| + // is a modal dialog displayed within an ancestor frame, and this frame
|
| + // itself is not within the dialog.
|
| + virtual void SetIsInert(bool) = 0;
|
| + void UpdateInertIfPossible();
|
| +
|
| protected:
|
| Frame(FrameClient*, Page&, FrameOwner*, WindowProxyManager*);
|
|
|
| @@ -167,6 +173,11 @@ class CORE_EXPORT Frame : public GarbageCollectedFinalized<Frame> {
|
|
|
| FrameLifecycle lifecycle_;
|
|
|
| + // This is set to true if this is a subframe, and the frame element in the
|
| + // parent frame's document becomes inert. This should always be false for
|
| + // the main frame.
|
| + bool is_inert_ = false;
|
| +
|
| private:
|
| Member<FrameClient> client_;
|
| const Member<WindowProxyManager> window_proxy_manager_;
|
|
|