| 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 * Copyright (C) 2013 Adobe Systems Incorporated. | 5 * Copyright (C) 2013 Adobe Systems Incorporated. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| 11 * | 11 * |
| 12 * This library is distributed in the hope that it will be useful, | 12 * This library is distributed in the hope that it will be useful, |
| 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 15 * Library General Public License for more details. | 15 * Library General Public License for more details. |
| 16 * | 16 * |
| 17 * You should have received a copy of the GNU Library General Public License | 17 * You should have received a copy of the GNU Library General Public License |
| 18 * along with this library; see the file COPYING.LIB. If not, write to | 18 * along with this library; see the file COPYING.LIB. If not, write to |
| 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 20 * Boston, MA 02110-1301, USA. | 20 * Boston, MA 02110-1301, USA. |
| 21 * | 21 * |
| 22 */ | 22 */ |
| 23 | 23 |
| 24 #include "config.h" | |
| 25 #include "core/layout/line/BreakingContextInlineHeaders.h" | 24 #include "core/layout/line/BreakingContextInlineHeaders.h" |
| 26 | 25 |
| 27 namespace blink { | 26 namespace blink { |
| 28 | 27 |
| 29 InlineIterator BreakingContext::handleEndOfLine() | 28 InlineIterator BreakingContext::handleEndOfLine() |
| 30 { | 29 { |
| 31 if (m_lineBreak == m_resolver.position() && (!m_lineBreak.object() || !m_lin
eBreak.object().isBR())) { | 30 if (m_lineBreak == m_resolver.position() && (!m_lineBreak.object() || !m_lin
eBreak.object().isBR())) { |
| 32 // we just add as much as possible | 31 // we just add as much as possible |
| 33 if (m_blockStyle->whiteSpace() == PRE && !m_current.offset()) { | 32 if (m_blockStyle->whiteSpace() == PRE && !m_current.offset()) { |
| 34 m_lineBreak.moveTo(m_lastObject, m_lastObject.isText() ? m_lastObjec
t.length() : 0); | 33 m_lineBreak.moveTo(m_lastObject, m_lastObject.isText() ? m_lastObjec
t.length() : 0); |
| (...skipping 25 matching lines...) Expand all Loading... |
| 60 do { | 59 do { |
| 61 m_lineBreak.setOffset(m_lineBreak.offset() - 1); | 60 m_lineBreak.setOffset(m_lineBreak.offset() - 1); |
| 62 m_lineBreak.increment(); | 61 m_lineBreak.increment(); |
| 63 } while (!m_lineBreak.atEnd() && isEmptyInline(m_lineBreak.object())); | 62 } while (!m_lineBreak.atEnd() && isEmptyInline(m_lineBreak.object())); |
| 64 } | 63 } |
| 65 | 64 |
| 66 return m_lineBreak; | 65 return m_lineBreak; |
| 67 } | 66 } |
| 68 | 67 |
| 69 } | 68 } |
| OLD | NEW |