Title: [167524] trunk/Source/WebCore
- Revision
- 167524
- Author
- [email protected]
- Date
- 2014-04-18 17:49:07 -0700 (Fri, 18 Apr 2014)
Log Message
Harden RenderInline::inlineElementContinuation()
<https://bugs.webkit.org/show_bug.cgi?id=131858>
Reviewed by Sam Weinig.
No new tests, as there are no known cases of this happening.
* rendering/RenderInline.cpp:
(WebCore::RenderInline::inlineElementContinuation):
Return nullptr if the continuation is neither a RenderInline nor a
RenderBlock.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (167523 => 167524)
--- trunk/Source/WebCore/ChangeLog 2014-04-19 00:44:50 UTC (rev 167523)
+++ trunk/Source/WebCore/ChangeLog 2014-04-19 00:49:07 UTC (rev 167524)
@@ -1,3 +1,18 @@
+2014-04-18 Jon Honeycutt <[email protected]>
+
+ Harden RenderInline::inlineElementContinuation()
+
+ <https://bugs.webkit.org/show_bug.cgi?id=131858>
+
+ Reviewed by Sam Weinig.
+
+ No new tests, as there are no known cases of this happening.
+
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::inlineElementContinuation):
+ Return nullptr if the continuation is neither a RenderInline nor a
+ RenderBlock.
+
2014-04-18 Stephanie Lewis <[email protected]>
We shouldn’t create page throttlers for other pages than WebKit2 pages.
Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (167523 => 167524)
--- trunk/Source/WebCore/rendering/RenderInline.cpp 2014-04-19 00:44:50 UTC (rev 167523)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2014-04-19 00:49:07 UTC (rev 167524)
@@ -119,9 +119,13 @@
RenderInline* RenderInline::inlineElementContinuation() const
{
RenderBoxModelObject* continuation = this->continuation();
- if (!continuation || continuation->isRenderInline())
+ if (!continuation)
+ return nullptr;
+
+ if (continuation->isRenderInline())
return toRenderInline(continuation);
- return toRenderBlock(continuation)->inlineElementContinuation();
+
+ return continuation->isRenderBlock() ? toRenderBlock(continuation)->inlineElementContinuation() : nullptr;
}
void RenderInline::updateFromStyle()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
