Title: [203879] branches/safari-602-branch/Source/WebCore
- Revision
- 203879
- Author
- bshaf...@apple.com
- Date
- 2016-07-29 00:12:07 -0700 (Fri, 29 Jul 2016)
Log Message
Merge r203737. rdar://problem/21090897
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (203878 => 203879)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-29 07:12:05 UTC (rev 203878)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-29 07:12:07 UTC (rev 203879)
@@ -1,5 +1,20 @@
2016-07-28 Babak Shafiei <bshaf...@apple.com>
+ Merge r203737. rdar://problem/21090897
+
+ 2016-07-26 Eric Carlson <eric.carl...@apple.com>
+
+ Occasional crash in WebCore::RenderVTTCue::initializeLayoutParameters
+ https://bugs.webkit.org/show_bug.cgi?id=160208
+
+ Reviewed by Darin Adler.
+
+ * rendering/RenderVTTCue.cpp:
+ (WebCore::RenderVTTCue::initializeLayoutParameters): Return when firstChild is NULL so a
+ release build will not crash.
+
+2016-07-28 Babak Shafiei <bshaf...@apple.com>
+
Merge r203711. rdar://problem/27279453
2016-07-25 Nan Wang <n_w...@apple.com>
Modified: branches/safari-602-branch/Source/WebCore/rendering/RenderVTTCue.cpp (203878 => 203879)
--- branches/safari-602-branch/Source/WebCore/rendering/RenderVTTCue.cpp 2016-07-29 07:12:05 UTC (rev 203878)
+++ branches/safari-602-branch/Source/WebCore/rendering/RenderVTTCue.cpp 2016-07-29 07:12:07 UTC (rev 203879)
@@ -70,6 +70,8 @@
bool RenderVTTCue::initializeLayoutParameters(InlineFlowBox*& firstLineBox, LayoutUnit& step, LayoutUnit& position)
{
ASSERT(firstChild());
+ if (!firstChild())
+ return false;
RenderBlock* parentBlock = containingBlock();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
