Title: [181433] branches/safari-600.1.4.15-branch/Source/WebCore
- Revision
- 181433
- Author
- [email protected]
- Date
- 2015-03-11 23:22:31 -0700 (Wed, 11 Mar 2015)
Log Message
Merged patch for rdar://problem/20128911.
Modified Paths
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (181432 => 181433)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-03-12 06:18:02 UTC (rev 181432)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-03-12 06:22:31 UTC (rev 181433)
@@ -1,5 +1,9 @@
2015-03-11 Babak Shafiei <[email protected]>
+ Merge patch for rdar://problem/20128911.
+
+2015-03-11 Babak Shafiei <[email protected]>
+
Merge r181351.
2015-03-10 Enrica Casucci <[email protected]>
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (181432 => 181433)
--- branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2015-03-12 06:18:02 UTC (rev 181432)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2015-03-12 06:22:31 UTC (rev 181433)
@@ -255,7 +255,7 @@
static inline RenderInline* startOfContinuations(RenderObject* r)
{
- if (r->isInlineElementContinuation() && r->node()->renderer()->isRenderInline())
+ if (r->isInlineElementContinuation() && r->node() && r->node()->renderer() && r->node()->renderer()->isRenderInline())
return toRenderInline(r->node()->renderer());
// Blocks with a previous continuation always have a next continuation
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
