Title: [150372] trunk/Source/WebCore
- Revision
- 150372
- Author
- eric.carl...@apple.com
- Date
- 2013-05-20 10:21:02 -0700 (Mon, 20 May 2013)
Log Message
[iOS] media/event-queue-crash.html ASSERTs in notifyChildInserted
https://bugs.webkit.org/show_bug.cgi?id=116444
Reviewed by Jer Noble.
No new tests, covered by existing tests.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::configureMediaControls): Only create media controls when the
element is in a Document.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (150371 => 150372)
--- trunk/Source/WebCore/ChangeLog 2013-05-20 16:47:07 UTC (rev 150371)
+++ trunk/Source/WebCore/ChangeLog 2013-05-20 17:21:02 UTC (rev 150372)
@@ -1,3 +1,16 @@
+2013-05-20 Eric Carlson <eric.carl...@apple.com>
+
+ [iOS] media/event-queue-crash.html ASSERTs in notifyChildInserted
+ https://bugs.webkit.org/show_bug.cgi?id=116444
+
+ Reviewed by Jer Noble.
+
+ No new tests, covered by existing tests.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::configureMediaControls): Only create media controls when the
+ element is in a Document.
+
2013-05-20 Antoine Quint <grao...@apple.com>
[Mac] captions menu should behave more like a menu
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (150371 => 150372)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-05-20 16:47:07 UTC (rev 150371)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-05-20 17:21:02 UTC (rev 150372)
@@ -4617,11 +4617,11 @@
mediaControls()->show();
#else
- if (!hasMediaControls())
- createMediaControls();
-
if (m_player)
m_player->setControls(controls());
+
+ if (!hasMediaControls() && inDocument())
+ createMediaControls();
#endif
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
