diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-06 21:36:31 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-01-07 10:36:05 +0000 |
| commit | 4a156157940f51b91eadd76f6c86f862ec0a1da0 (patch) | |
| tree | ee905fa007e14522848f571215c1054734db9269 /WebCore/page/Frame.cpp | |
| parent | 21d8d81a756ca7e60b5131e5f1006f52799179b0 (diff) | |
| download | external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.zip external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.tar.gz external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.tar.bz2 | |
Merge WebKit at Chromium 9.0.597.55: trivial merge by git
Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
Diffstat (limited to 'WebCore/page/Frame.cpp')
| -rw-r--r-- | WebCore/page/Frame.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp index ae987b4..17062c5 100644 --- a/WebCore/page/Frame.cpp +++ b/WebCore/page/Frame.cpp @@ -738,7 +738,7 @@ void Frame::transferChildFrameToNewDocument() } // 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. |