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

Unified Diff: WebCore/page/Frame.cpp

Issue 5564003: Merge 72863 - Crash when iframe transfers from one page to another and has ch... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/597/
Patch Set: Created 10 years 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 | « WebCore/ChangeLog ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: WebCore/page/Frame.cpp
===================================================================
--- WebCore/page/Frame.cpp (revision 73175)
+++ WebCore/page/Frame.cpp (working copy)
@@ -734,7 +734,7 @@
}
// Update the frame tree.
- didTransfer = newParent->tree()->transferChild(this);
+ didTransfer = newParent->tree()->transferChild(this) || didTransfer;
// Avoid unnecessary calls to client and frame subtree if the frame ended
// up on the same page and under the same parent frame.
« no previous file with comments | « WebCore/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698