Title: [145428] trunk/Source/WebCore
- Revision
- 145428
- Author
- [email protected]
- Date
- 2013-03-11 16:40:19 -0700 (Mon, 11 Mar 2013)
Log Message
Don't rely on the fact that StaticPosition happens to be defined as 0
https://bugs.webkit.org/show_bug.cgi?id=110123
Also made the _expression_ slightly less convoluted.
Patch by Morten Stenshorne <[email protected]> on 2013-03-11
Reviewed by Alexey Proskuryakov.
No new tests. This is just code cleanup.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::containingBlock):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (145427 => 145428)
--- trunk/Source/WebCore/ChangeLog 2013-03-11 23:39:05 UTC (rev 145427)
+++ trunk/Source/WebCore/ChangeLog 2013-03-11 23:40:19 UTC (rev 145428)
@@ -1,3 +1,17 @@
+2013-03-11 Morten Stenshorne <[email protected]>
+
+ Don't rely on the fact that StaticPosition happens to be defined as 0
+ https://bugs.webkit.org/show_bug.cgi?id=110123
+
+ Also made the _expression_ slightly less convoluted.
+
+ Reviewed by Alexey Proskuryakov.
+
+ No new tests. This is just code cleanup.
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::containingBlock):
+
2013-03-11 Adam Barth <[email protected]>
Unreviewed attempt to fix build after http://trac.webkit.org/changeset/145421.
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (145427 => 145428)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2013-03-11 23:39:05 UTC (rev 145427)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2013-03-11 23:40:19 UTC (rev 145428)
@@ -783,7 +783,7 @@
// list in all RenderInlines and lets us return a strongly-typed RenderBlock* result
// from this method. The container() method can actually be used to obtain the
// inline directly.
- if (!o->style()->position() == StaticPosition && !(o->isInline() && !o->isReplaced()))
+ if (o->style()->position() != StaticPosition && (!o->isInline() || o->isReplaced()))
break;
if (o->isRenderView())
break;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
