Title: [104051] branches/safari-534.54-branch
Diff
Modified: branches/safari-534.54-branch/LayoutTests/ChangeLog (104050 => 104051)
--- branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-04 19:25:19 UTC (rev 104050)
+++ branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-04 19:35:36 UTC (rev 104051)
@@ -1,3 +1,18 @@
+2011-1-4 Lucas Forschler <[email protected]>
+
+ Merge 95059
+
+ 2011-09-13 Jeremy Apthorp <[email protected]>
+
+ Removing an iframe from the document during a transition to fullscreen
+ should not crash.
+ https://bugs.webkit.org/show_bug.cgi?id=67960
+
+ Reviewed by Adam Barth.
+
+ * fullscreen/full-screen-remove-ancestor-during-transition-expected.txt: Added.
+ * fullscreen/full-screen-remove-ancestor-during-transition.html: Added.
+
2011-12-22 Oliver Hunt <[email protected]>
Merge 103127
Copied: branches/safari-534.54-branch/LayoutTests/fullscreen/full-screen-remove-ancestor-during-transition-expected.txt (from rev 95059, trunk/LayoutTests/fullscreen/full-screen-remove-ancestor-during-transition-expected.txt) (0 => 104051)
--- branches/safari-534.54-branch/LayoutTests/fullscreen/full-screen-remove-ancestor-during-transition-expected.txt (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/fullscreen/full-screen-remove-ancestor-during-transition-expected.txt 2012-01-04 19:35:36 UTC (rev 104051)
@@ -0,0 +1 @@
+PASS
Copied: branches/safari-534.54-branch/LayoutTests/fullscreen/full-screen-remove-ancestor-during-transition.html (from rev 95059, trunk/LayoutTests/fullscreen/full-screen-remove-ancestor-during-transition.html) (0 => 104051)
--- branches/safari-534.54-branch/LayoutTests/fullscreen/full-screen-remove-ancestor-during-transition.html (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/fullscreen/full-screen-remove-ancestor-during-transition.html 2012-01-04 19:35:36 UTC (rev 104051)
@@ -0,0 +1,43 @@
+<script src=""
+<script>
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+}
+
+function runWithKeyDown(fn)
+{
+ document.addEventListener('mousedown', function() { fn(); }, false);
+ if (window.layoutTestController) {
+ eventSender.mouseDown();
+ }
+}
+
+function init() {
+ // Bail out early if the full screen API is not enabled or is missing:
+ if (Element.prototype.webkitRequestFullScreen == undefined) {
+ alert("Fullscreen API not available.");
+ } else {
+ runWithKeyDown(goFullScreen);
+ }
+}
+
+function goFullScreen() {
+ var iframe = document.getElementById('block1');
+ var element = iframe.contentDocument.documentElement;
+ setTimeout(function () {
+ iframe.parentNode.removeChild(iframe);
+ gc();
+ setTimeout(function () {
+ if (window.layoutTestController) {
+ layoutTestController.notifyDone();
+ }
+ }, 0);
+ }, 0);
+ element.webkitRequestFullScreen();
+}
+</script>
+<body _onload_="init()">
+ <iframe webkitallowfullscreen src="" id="block1"></iframe>
+ PASS
+</body>
Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (104050 => 104051)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-04 19:25:19 UTC (rev 104050)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-04 19:35:36 UTC (rev 104051)
@@ -1,3 +1,22 @@
+2011-1-4 Lucas Forschler <[email protected]>
+
+ Merge 95059
+
+ 2011-09-13 Jeremy Apthorp <[email protected]>
+
+ Fix crash when an iframe element is removed during a transition to
+ fullscreen.
+ https://bugs.webkit.org/show_bug.cgi?id=67960
+
+ Reviewed by Adam Barth.
+
+ Test: fullscreen/full-screen-remove-ancestor-during-transition.html
+
+ * dom/Document.cpp:
+ (WebCore::Document::~Document):
+ Clear the list of elements to which we need to send a fullscreenchange
+ event.
+
2011-12-21 Oliver Hunt <[email protected]>
Merged _javascript_Core and related changes from r99898-r102985
Modified: branches/safari-534.54-branch/Source/WebCore/dom/Document.cpp (104050 => 104051)
--- branches/safari-534.54-branch/Source/WebCore/dom/Document.cpp 2012-01-04 19:25:19 UTC (rev 104050)
+++ branches/safari-534.54-branch/Source/WebCore/dom/Document.cpp 2012-01-04 19:35:36 UTC (rev 104051)
@@ -544,6 +544,10 @@
(*m_pageGroupUserSheets)[i]->clearOwnerNode();
}
+#if ENABLE(FULLSCREEN_API)
+ m_fullScreenChangeEventTargetQueue.clear();
+#endif
+
deleteRetiredCustomFonts();
m_weakReference->clear();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
