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

Unified Diff: third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp

Issue 2792473002: [TEST] Do not suspend for frame (Closed)
Patch Set: 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp
index 097190ad126078692b3ade36bd3d0efe4c140a42..41ae780cc8304bf6d1d31da799f7bfc6f6093ff8 100644
--- a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp
@@ -117,7 +117,7 @@ HTMLFrameOwnerElement::UpdateSuspendScope::~UpdateSuspendScope() {
// Unlike moveWidgetToParentSoon, this will not call dispose the Widget.
void temporarilyRemoveWidgetFromParentSoon(FrameViewBase* frameViewBase) {
- if (s_updateSuspendCount) {
+ if (s_updateSuspendCount && !frameViewBase->isFrameView()) {
widgetsPendingTemporaryRemovalFromParent().insert(frameViewBase);
} else {
if (toFrameView(frameViewBase->parent()))
@@ -126,7 +126,7 @@ void temporarilyRemoveWidgetFromParentSoon(FrameViewBase* frameViewBase) {
}
void moveWidgetToParentSoon(FrameViewBase* child, FrameView* parent) {
- if (!s_updateSuspendCount) {
+ if (!s_updateSuspendCount || child->isFrameView()) {
if (parent) {
parent->addChild(child);
} else if (toFrameView(child->parent())) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698