Title: [87666] branches/safari-534-branch/Source/WebCore
Diff
Modified: branches/safari-534-branch/Source/WebCore/ChangeLog (87665 => 87666)
--- branches/safari-534-branch/Source/WebCore/ChangeLog 2011-05-30 04:32:09 UTC (rev 87665)
+++ branches/safari-534-branch/Source/WebCore/ChangeLog 2011-05-30 04:34:15 UTC (rev 87666)
@@ -1,5 +1,23 @@
2011-05-29 Mark Rowe <[email protected]>
+ Merge r87643.
+
+ 2011-05-29 Darin Adler <[email protected]>
+
+ Reviewed by Dan Bernstein.
+
+ Fix assertion seen when entering full screen mode for standalone video
+ https://bugs.webkit.org/show_bug.cgi?id=61708
+
+ We don't currently have a way to make a regression test for this.
+
+ * dom/Document.cpp:
+ (WebCore::Document::setAnimatingFullScreen): Call scheduleForcedStyleRecalc,
+ because scheduleStyleRecalc is intended to only be called when the style
+ system itself detects recalc is needed.
+
+2011-05-29 Mark Rowe <[email protected]>
+
Merge r87660.
2011-05-29 Jer Noble <[email protected]>
Modified: branches/safari-534-branch/Source/WebCore/dom/Document.cpp (87665 => 87666)
--- branches/safari-534-branch/Source/WebCore/dom/Document.cpp 2011-05-30 04:32:09 UTC (rev 87665)
+++ branches/safari-534-branch/Source/WebCore/dom/Document.cpp 2011-05-30 04:34:15 UTC (rev 87666)
@@ -5048,7 +5048,7 @@
if (m_fullScreenElement && m_fullScreenElement->isDescendantOf(this)) {
m_fullScreenElement->setNeedsStyleRecalc();
- scheduleStyleRecalc();
+ scheduleForcedStyleRecalc();
}
#if USE(ACCELERATED_COMPOSITING)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
