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

Unified Diff: Source/WebCore/rendering/RenderFullScreen.cpp

Issue 8479023: Merge 98935 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 1 month 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 | « LayoutTests/fullscreen/anonymous-block-merge-crash-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderFullScreen.cpp
===================================================================
--- Source/WebCore/rendering/RenderFullScreen.cpp (revision 99341)
+++ Source/WebCore/rendering/RenderFullScreen.cpp (working copy)
@@ -125,14 +125,11 @@
void RenderFullScreen::unwrapRenderer()
{
RenderObject* holder = placeholder() ? placeholder() : this;
- RenderObject* parent = holder->parent();
- if (parent) {
- RenderObject* child = firstChild();
- while (child) {
- RenderObject* nextChild = child->nextSibling();
+ if (holder->parent()) {
+ RenderObject* child;
+ while ((child = firstChild())) {
child->remove();
- parent->addChild(child, holder);
- child = nextChild;
+ holder->parent()->addChild(child, holder);
}
}
remove();
« no previous file with comments | « LayoutTests/fullscreen/anonymous-block-merge-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698