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

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

Issue 1077473002: Stop rendering text inside flex boxes. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: make p default to display: paragraph Created 5 years, 8 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 unified diff | Download patch
« no previous file with comments | « sky/engine/core/css/resolver/StyleResolver.cpp ('k') | sky/engine/core/rendering/RenderBlock.h » ('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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 { 97 {
98 if (isEditingText()) 98 if (isEditingText())
99 return true; 99 return true;
100 100
101 if (!length()) 101 if (!length())
102 return false; 102 return false;
103 103
104 if (style.display() == NONE) 104 if (style.display() == NONE)
105 return false; 105 return false;
106 106
107 if (style.requiresOnlyBlockChildren())
108 return false;
109
107 if (!containsOnlyWhitespace()) 110 if (!containsOnlyWhitespace())
108 return true; 111 return true;
109 112
110 if (!parent.canHaveWhitespaceChildren()) 113 if (!parent.canHaveWhitespaceChildren())
111 return false; 114 return false;
112 115
113 if (style.preserveNewline()) // pre/pre-wrap/pre-line always make renderers. 116 if (style.preserveNewline()) // pre/pre-wrap/pre-line always make renderers.
114 return true; 117 return true;
115 118
116 const RenderObject* prev = NodeRenderingTraversal::previousSiblingRenderer(t his); 119 const RenderObject* prev = NodeRenderingTraversal::previousSiblingRenderer(t his);
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 result.appendLiteral("; "); 209 result.appendLiteral("; ");
207 result.appendLiteral("value="); 210 result.appendLiteral("value=");
208 result.append(s); 211 result.append(s);
209 } 212 }
210 213
211 strncpy(buffer, result.toString().utf8().data(), length - 1); 214 strncpy(buffer, result.toString().utf8().data(), length - 1);
212 } 215 }
213 #endif 216 #endif
214 217
215 } // namespace blink 218 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/css/resolver/StyleResolver.cpp ('k') | sky/engine/core/rendering/RenderBlock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698