| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ight reserved. | 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ight reserved. |
| 4 * Copyright (C) 2010 Google Inc. All rights reserved. | 4 * Copyright (C) 2010 Google 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 26 matching lines...) Expand all Loading... |
| 37 #include "core/rendering/line/LineLayoutState.h" | 37 #include "core/rendering/line/LineLayoutState.h" |
| 38 #include "core/rendering/svg/SVGRootInlineBox.h" | 38 #include "core/rendering/svg/SVGRootInlineBox.h" |
| 39 #include "platform/text/BidiResolver.h" | 39 #include "platform/text/BidiResolver.h" |
| 40 #include "wtf/RefCountedLeakCounter.h" | 40 #include "wtf/RefCountedLeakCounter.h" |
| 41 #include "wtf/StdLibExtras.h" | 41 #include "wtf/StdLibExtras.h" |
| 42 #include "wtf/Vector.h" | 42 #include "wtf/Vector.h" |
| 43 #include "wtf/unicode/CharacterNames.h" | 43 #include "wtf/unicode/CharacterNames.h" |
| 44 | 44 |
| 45 namespace WebCore { | 45 namespace WebCore { |
| 46 | 46 |
| 47 using namespace std; |
| 48 using namespace WTF::Unicode; |
| 49 |
| 47 static IndentTextOrNot requiresIndent(bool isFirstLine, bool isAfterHardLineBrea
k, RenderStyle* style) | 50 static IndentTextOrNot requiresIndent(bool isFirstLine, bool isAfterHardLineBrea
k, RenderStyle* style) |
| 48 { | 51 { |
| 49 if (isFirstLine) | 52 if (isFirstLine) |
| 50 return IndentText; | 53 return IndentText; |
| 51 if (isAfterHardLineBreak && style->textIndentLine() == TextIndentEachLine) | 54 if (isAfterHardLineBreak && style->textIndentLine() == TextIndentEachLine) |
| 52 return IndentText; | 55 return IndentText; |
| 53 | 56 |
| 54 return DoNotIndentText; | 57 return DoNotIndentText; |
| 55 } | 58 } |
| 56 | 59 |
| (...skipping 2188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2245 lineGridBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, ver
ticalPositionCache); | 2248 lineGridBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, ver
ticalPositionCache); |
| 2246 | 2249 |
| 2247 setLineGridBox(lineGridBox); | 2250 setLineGridBox(lineGridBox); |
| 2248 | 2251 |
| 2249 // FIXME: If any of the characteristics of the box change compared to the ol
d one, then we need to do a deep dirtying | 2252 // FIXME: If any of the characteristics of the box change compared to the ol
d one, then we need to do a deep dirtying |
| 2250 // (similar to what happens when the page height changes). Ideally, though,
we only do this if someone is actually snapping | 2253 // (similar to what happens when the page height changes). Ideally, though,
we only do this if someone is actually snapping |
| 2251 // to this grid. | 2254 // to this grid. |
| 2252 } | 2255 } |
| 2253 | 2256 |
| 2254 } | 2257 } |
| OLD | NEW |