Title: [99342] branches/chromium/874
- Revision
- 99342
- Author
- cev...@google.com
- Date
- 2011-11-04 18:00:34 -0700 (Fri, 04 Nov 2011)
Log Message
Merge 98935
BUG=101018
Review URL: http://codereview.chromium.org/8479023
Modified Paths
Added Paths
Diff
Copied: branches/chromium/874/LayoutTests/fullscreen/anonymous-block-merge-crash-expected.txt (from rev 98935, trunk/LayoutTests/fullscreen/anonymous-block-merge-crash-expected.txt) (0 => 99342)
--- branches/chromium/874/LayoutTests/fullscreen/anonymous-block-merge-crash-expected.txt (rev 0)
+++ branches/chromium/874/LayoutTests/fullscreen/anonymous-block-merge-crash-expected.txt 2011-11-05 01:00:34 UTC (rev 99342)
@@ -0,0 +1,2 @@
+PASS
+
Copied: branches/chromium/874/LayoutTests/fullscreen/anonymous-block-merge-crash.html (from rev 98935, trunk/LayoutTests/fullscreen/anonymous-block-merge-crash.html) (0 => 99342)
--- branches/chromium/874/LayoutTests/fullscreen/anonymous-block-merge-crash.html (rev 0)
+++ branches/chromium/874/LayoutTests/fullscreen/anonymous-block-merge-crash.html 2011-11-05 01:00:34 UTC (rev 99342)
@@ -0,0 +1,16 @@
+<span><object><div>PASS</div></span>
+<script src=""
+<script>
+ if (Element.prototype.webkitRequestFullScreen == undefined) {
+ } else {
+ var span = document.getElementsByTagName('span')[0];
+
+ document._onwebkitfullscreenchange_ = function(event) {
+ document.body.appendChild(document.createElement('div'));
+ document.webkitCancelFullScreen();
+ layoutTestController.notifyDone();
+ };
+
+ runWithKeyDown(function(){span.webkitRequestFullScreen()});
+ }
+</script>
Modified: branches/chromium/874/Source/WebCore/rendering/RenderFullScreen.cpp (99341 => 99342)
--- branches/chromium/874/Source/WebCore/rendering/RenderFullScreen.cpp 2011-11-05 00:58:27 UTC (rev 99341)
+++ branches/chromium/874/Source/WebCore/rendering/RenderFullScreen.cpp 2011-11-05 01:00:34 UTC (rev 99342)
@@ -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();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
