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

Side by Side Diff: sky/engine/core/dom/Text.cpp

Issue 748943002: remove childrenInline & setChildrenInline (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: cr comments Created 6 years 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 unified diff | Download patch
« no previous file with comments | « no previous file | sky/engine/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 if (style.preserveNewline()) // pre/pre-wrap/pre-line always make renderers. 113 if (style.preserveNewline()) // pre/pre-wrap/pre-line always make renderers.
114 return true; 114 return true;
115 115
116 const RenderObject* prev = NodeRenderingTraversal::previousSiblingRenderer(t his); 116 const RenderObject* prev = NodeRenderingTraversal::previousSiblingRenderer(t his);
117 117
118 if (parent.isRenderInline()) { 118 if (parent.isRenderInline()) {
119 // <span><div/> <div/></span> 119 // <span><div/> <div/></span>
120 if (prev && !prev->isInline()) 120 if (prev && !prev->isInline())
121 return false; 121 return false;
122 } else { 122 } else {
123 if (parent.isRenderBlock() && !parent.childrenInline() && (!prev || !pre v->isInline())) 123 if (parent.isRenderBlock() && !parent.isRenderParagraph() && (!prev || ! prev->isInline()))
124 return false; 124 return false;
125 125
126 // Avoiding creation of a Renderer for the text node is a non-essential memory optimization. 126 // Avoiding creation of a Renderer for the text node is a non-essential memory optimization.
127 // So to avoid blowing up on very wide DOMs, we limit the number of sibl ings to visit. 127 // So to avoid blowing up on very wide DOMs, we limit the number of sibl ings to visit.
128 unsigned maxSiblingsToVisit = 50; 128 unsigned maxSiblingsToVisit = 50;
129 129
130 RenderObject* first = parent.slowFirstChild(); 130 RenderObject* first = parent.slowFirstChild();
131 while (first && first->isFloatingOrOutOfFlowPositioned() && maxSiblingsT oVisit--) 131 while (first && first->isFloatingOrOutOfFlowPositioned() && maxSiblingsT oVisit--)
132 first = first->nextSibling(); 132 first = first->nextSibling();
133 if (!first || NodeRenderingTraversal::nextSiblingRenderer(this) == first ) 133 if (!first || NodeRenderingTraversal::nextSiblingRenderer(this) == first )
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 result.appendLiteral("; "); 208 result.appendLiteral("; ");
209 result.appendLiteral("value="); 209 result.appendLiteral("value=");
210 result.append(s); 210 result.append(s);
211 } 211 }
212 212
213 strncpy(buffer, result.toString().utf8().data(), length - 1); 213 strncpy(buffer, result.toString().utf8().data(), length - 1);
214 } 214 }
215 #endif 215 #endif
216 216
217 } // namespace blink 217 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | sky/engine/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698