| 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 * |
| 11 * This library is distributed in the hope that it will be useful, | 11 * This library is distributed in the hope that it will be useful, |
| 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 14 * Library General Public License for more details. | 14 * Library General Public License for more details. |
| 15 * | 15 * |
| 16 * You should have received a copy of the GNU Library General Public License | 16 * You should have received a copy of the GNU Library General Public License |
| 17 * along with this library; see the file COPYING.LIB. If not, write to | 17 * along with this library; see the file COPYING.LIB. If not, write to |
| 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 19 * Boston, MA 02110-1301, USA. | 19 * Boston, MA 02110-1301, USA. |
| 20 * | 20 * |
| 21 */ | 21 */ |
| 22 | 22 |
| 23 #include "config.h" | 23 #include "config.h" |
| 24 | 24 |
| 25 #include "core/page/Settings.h" | |
| 26 #include "core/platform/Logging.h" | |
| 27 #include "core/platform/text/BidiResolver.h" | 25 #include "core/platform/text/BidiResolver.h" |
| 28 #include "core/platform/text/Hyphenation.h" | 26 #include "core/platform/text/Hyphenation.h" |
| 29 #include "core/rendering/exclusions/ExclusionShapeInsideInfo.h" | 27 #include "core/rendering/exclusions/ExclusionShapeInsideInfo.h" |
| 30 #include "core/rendering/InlineIterator.h" | 28 #include "core/rendering/InlineIterator.h" |
| 31 #include "core/rendering/InlineTextBox.h" | 29 #include "core/rendering/InlineTextBox.h" |
| 32 #include "core/rendering/RenderArena.h" | |
| 33 #include "core/rendering/RenderCombineText.h" | 30 #include "core/rendering/RenderCombineText.h" |
| 34 #include "core/rendering/RenderCounter.h" | 31 #include "core/rendering/RenderCounter.h" |
| 35 #include "core/rendering/RenderFlowThread.h" | 32 #include "core/rendering/RenderFlowThread.h" |
| 36 #include "core/rendering/RenderInline.h" | 33 #include "core/rendering/RenderInline.h" |
| 37 #include "core/rendering/RenderLayer.h" | 34 #include "core/rendering/RenderLayer.h" |
| 38 #include "core/rendering/RenderListMarker.h" | 35 #include "core/rendering/RenderListMarker.h" |
| 39 #include "core/rendering/RenderRegion.h" | 36 #include "core/rendering/RenderRegion.h" |
| 40 #include "core/rendering/RenderRubyRun.h" | 37 #include "core/rendering/RenderRubyRun.h" |
| 41 #include "core/rendering/RenderView.h" | 38 #include "core/rendering/RenderView.h" |
| 42 #include "core/rendering/TrailingFloatsRootInlineBox.h" | 39 #include "core/rendering/TrailingFloatsRootInlineBox.h" |
| (...skipping 3328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3371 lineGridBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, ver
ticalPositionCache); | 3368 lineGridBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, ver
ticalPositionCache); |
| 3372 | 3369 |
| 3373 setLineGridBox(lineGridBox); | 3370 setLineGridBox(lineGridBox); |
| 3374 | 3371 |
| 3375 // FIXME: If any of the characteristics of the box change compared to the ol
d one, then we need to do a deep dirtying | 3372 // FIXME: If any of the characteristics of the box change compared to the ol
d one, then we need to do a deep dirtying |
| 3376 // (similar to what happens when the page height changes). Ideally, though,
we only do this if someone is actually snapping | 3373 // (similar to what happens when the page height changes). Ideally, though,
we only do this if someone is actually snapping |
| 3377 // to this grid. | 3374 // to this grid. |
| 3378 } | 3375 } |
| 3379 | 3376 |
| 3380 } | 3377 } |
| OLD | NEW |