Title: [88864] branches/safari-534-branch/Source/WebCore
Diff
Modified: branches/safari-534-branch/Source/WebCore/ChangeLog (88863 => 88864)
--- branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-14 23:03:47 UTC (rev 88863)
+++ branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-14 23:05:32 UTC (rev 88864)
@@ -1,5 +1,27 @@
2011-06-14 Lucas Forschler <[email protected]>
+ Merged 88629.
+
+ 2011-06-12 Jer Noble <[email protected]>
+
+ Reviewed by Darin Adler.
+
+ REGRESSION (full screen video): Watch Again button is obscured after full screen playback ends at Apple trailers page
+ https://bugs.webkit.org/show_bug.cgi?id=62507
+
+ No new tests; DRT would have to be modified to delay between receiving exitFullScreenForElement() and calling
+ webkitWillExitFullScreenForElement() to be able to test this.
+
+ If the full-screen element is removed, and webkitWillExitFullScreenForElement() is not called before
+ fullScreenElementRemoved() returns, then ancestors of the full-screen element will not have their
+ containsFullScreenElement property removed. To protect against this, reset the property by calling
+ setContainsFullScreenElementRecursively() from within fullScreenElementRemoved().
+
+ * dom/Document.cpp:
+ (WebCore::Document::fullScreenElementRemoved): Added call to setContainsFullScreenElementRecursively.
+
+2011-06-14 Lucas Forschler <[email protected]>
+
Merged 88564.
2011-06-10 Simon Fraser <[email protected]>
Modified: branches/safari-534-branch/Source/WebCore/dom/Document.cpp (88863 => 88864)
--- branches/safari-534-branch/Source/WebCore/dom/Document.cpp 2011-06-14 23:03:47 UTC (rev 88863)
+++ branches/safari-534-branch/Source/WebCore/dom/Document.cpp 2011-06-14 23:05:32 UTC (rev 88864)
@@ -5037,6 +5037,7 @@
void Document::fullScreenElementRemoved()
{
+ setContainsFullScreenElementRecursively(m_fullScreenElement->parentElement() ? m_fullScreenElement->parentElement() : ownerElement(), false);
webkitCancelFullScreen();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
