Title: [92745] branches/chromium/835
- Revision
- 92745
- Author
- [email protected]
- Date
- 2011-08-09 19:10:11 -0700 (Tue, 09 Aug 2011)
Log Message
Merge 92744
BUG=88670
Review URL: http://codereview.chromium.org/7497055
Modified Paths
Diff
Modified: branches/chromium/835/LayoutTests/platform/mac/fast/css-generated-content/table-row-before-after-child-add-expected.png
(Binary files differ)
Modified: branches/chromium/835/LayoutTests/platform/mac/fast/css-generated-content/table-table-before-after-child-add-expected.png
(Binary files differ)
Modified: branches/chromium/835/Source/WebCore/rendering/RenderObjectChildList.cpp (92744 => 92745)
--- branches/chromium/835/Source/WebCore/rendering/RenderObjectChildList.cpp 2011-08-10 02:04:06 UTC (rev 92744)
+++ branches/chromium/835/Source/WebCore/rendering/RenderObjectChildList.cpp 2011-08-10 02:10:11 UTC (rev 92745)
@@ -258,7 +258,7 @@
RenderObject* beforeAfterParent = object;
while (beforeAfterParent && !(beforeAfterParent->isText() || beforeAfterParent->isImage()))
beforeAfterParent = beforeAfterParent->firstChild();
- return beforeAfterParent;
+ return beforeAfterParent ? beforeAfterParent->parent() : 0;
}
RenderObject* RenderObjectChildList::beforePseudoElementRenderer(const RenderObject* owner) const
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
