Title: [160777] trunk/Source/WebCore
- Revision
- 160777
- Author
- [email protected]
- Date
- 2013-12-18 10:32:55 -0800 (Wed, 18 Dec 2013)
Log Message
Do not create cue subtree just to delete it
https://bugs.webkit.org/show_bug.cgi?id=125904
Reviewed by Jer Noble.
No new tests, covered by existing tests.
* html/track/TextTrackCue.cpp:
(WebCore::TextTrackCue::setIsActive): Return early if display tree is NULL.
(WebCore::TextTrackCue::removeDisplayTree): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160776 => 160777)
--- trunk/Source/WebCore/ChangeLog 2013-12-18 18:30:07 UTC (rev 160776)
+++ trunk/Source/WebCore/ChangeLog 2013-12-18 18:32:55 UTC (rev 160777)
@@ -1,3 +1,16 @@
+2013-12-18 Eric Carlson <[email protected]>
+
+ Do not create cue subtree just to delete it
+ https://bugs.webkit.org/show_bug.cgi?id=125904
+
+ Reviewed by Jer Noble.
+
+ No new tests, covered by existing tests.
+
+ * html/track/TextTrackCue.cpp:
+ (WebCore::TextTrackCue::setIsActive): Return early if display tree is NULL.
+ (WebCore::TextTrackCue::removeDisplayTree): Ditto.
+
2013-12-17 Oliver Hunt <[email protected]>
Remove JSInlineGetOwnPropertySlot attribute as it is no longer necessary
Modified: trunk/Source/WebCore/html/track/TextTrackCue.cpp (160776 => 160777)
--- trunk/Source/WebCore/html/track/TextTrackCue.cpp 2013-12-18 18:30:07 UTC (rev 160776)
+++ trunk/Source/WebCore/html/track/TextTrackCue.cpp 2013-12-18 18:32:55 UTC (rev 160777)
@@ -571,6 +571,9 @@
m_isActive = active;
if (!active) {
+ if (!hasDisplayTree())
+ return;
+
// Remove the display tree as soon as the cue becomes inactive.
displayTreeInternal()->remove(ASSERT_NO_EXCEPTION);
}
@@ -846,6 +849,8 @@
void TextTrackCue::removeDisplayTree()
{
+ if (!hasDisplayTree())
+ return;
displayTreeInternal()->remove(ASSERT_NO_EXCEPTION);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
