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

Unified Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 2883033003: Propagate inert state to OOPIFs when a modal dialog is active (Closed)
Patch Set: Trying to fix patch application problem Created 3 years, 7 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/LocalFrame.cpp
diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
index f4a6a65466ab9494f0dacba9795c92f1b89cf16a..e09dab6235fafda78189cbfc19f479a36c558955 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -573,6 +573,18 @@ void LocalFrame::DidChangeVisibilityState() {
Frame::DidChangeVisibilityState();
}
+void LocalFrame::SetIsInert(bool inert) {
+ is_inert_ = inert;
+ for (Frame* child = Tree().FirstChild(); child;
+ child = child->Tree().NextSibling()) {
+ if (child->Owner()) {
+ DCHECK(child->Owner()->IsLocal());
+ child->SetIsInert(inert ||
+ ToHTMLFrameOwnerElement(child->Owner())->IsInert());
+ }
+ }
+}
+
LocalFrame& LocalFrame::LocalFrameRoot() const {
const LocalFrame* cur_frame = this;
while (cur_frame && cur_frame->Tree().Parent() &&
@@ -900,6 +912,7 @@ inline LocalFrame::LocalFrame(LocalFrameClient* client,
page_zoom_factor_(ParentPageZoomFactor(this)),
text_zoom_factor_(ParentTextZoomFactor(this)),
in_view_source_mode_(false),
+ is_inert_(false),
interface_provider_(interface_provider),
interface_registry_(interface_registry) {
if (IsLocalRoot()) {

Powered by Google App Engine
This is Rietveld 408576698