Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Unified Diff: Source/WebCore/rendering/RenderObjectChildList.cpp

Issue 7497055: Merge 92744 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/platform/mac/fast/css-generated-content/table-table-before-after-child-add-expected.png ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderObjectChildList.cpp
===================================================================
--- Source/WebCore/rendering/RenderObjectChildList.cpp (revision 92744)
+++ Source/WebCore/rendering/RenderObjectChildList.cpp (working copy)
@@ -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
« no previous file with comments | « LayoutTests/platform/mac/fast/css-generated-content/table-table-before-after-child-add-expected.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698