Title: [137674] trunk/Source/WebCore
- Revision
- 137674
- Author
- [email protected]
- Date
- 2012-12-13 15:52:35 -0800 (Thu, 13 Dec 2012)
Log Message
Add a missing nullity check in RenderObject::containingBlock
https://bugs.webkit.org/show_bug.cgi?id=104961
Reviewed by Adrienne Walker.
Adds a missing nullity check in an assert.
No new tests, no change in functionality.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::containingBlock):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (137673 => 137674)
--- trunk/Source/WebCore/ChangeLog 2012-12-13 23:49:06 UTC (rev 137673)
+++ trunk/Source/WebCore/ChangeLog 2012-12-13 23:52:35 UTC (rev 137674)
@@ -1,3 +1,17 @@
+2012-12-13 Ian Vollick <[email protected]>
+
+ Add a missing nullity check in RenderObject::containingBlock
+ https://bugs.webkit.org/show_bug.cgi?id=104961
+
+ Reviewed by Adrienne Walker.
+
+ Adds a missing nullity check in an assert.
+
+ No new tests, no change in functionality.
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::containingBlock):
+
2012-12-13 Tab Atkins <[email protected]>
Switch the gradient drawing code to use bearing angles
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (137673 => 137674)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2012-12-13 23:49:06 UTC (rev 137673)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2012-12-13 23:52:35 UTC (rev 137674)
@@ -768,7 +768,7 @@
#endif
o = o->parent();
}
- ASSERT(!o->isAnonymousBlock());
+ ASSERT(!o || !o->isAnonymousBlock());
} else if (!isText() && m_style->position() == AbsolutePosition) {
while (o) {
// For relpositioned inlines, we return the nearest non-anonymous enclosing block. We don't try
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
