| 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/accessibility/AXObjectCache.h" | 25 #include "core/accessibility/AXObjectCache.h" | 
| 26 #include "core/rendering/RenderCounter.h" | 26 #include "core/rendering/RenderCounter.h" | 
| 27 #include "core/rendering/RenderFlowThread.h" | 27 #include "core/rendering/RenderFlowThread.h" | 
| 28 #include "core/rendering/RenderLayer.h" | 28 #include "core/rendering/RenderLayer.h" | 
| 29 #include "core/rendering/RenderListMarker.h" | 29 #include "core/rendering/RenderListMarker.h" | 
|  | 30 #include "core/rendering/RenderObjectInlines.h" | 
| 30 #include "core/rendering/RenderRegion.h" | 31 #include "core/rendering/RenderRegion.h" | 
| 31 #include "core/rendering/RenderRubyRun.h" | 32 #include "core/rendering/RenderRubyRun.h" | 
| 32 #include "core/rendering/RenderView.h" | 33 #include "core/rendering/RenderView.h" | 
| 33 #include "core/rendering/TrailingFloatsRootInlineBox.h" | 34 #include "core/rendering/TrailingFloatsRootInlineBox.h" | 
| 34 #include "core/rendering/VerticalPositionCache.h" | 35 #include "core/rendering/VerticalPositionCache.h" | 
| 35 #include "core/rendering/line/BreakingContextInlineHeaders.h" | 36 #include "core/rendering/line/BreakingContextInlineHeaders.h" | 
| 36 #include "core/rendering/line/LineLayoutState.h" | 37 #include "core/rendering/line/LineLayoutState.h" | 
| 37 #include "core/rendering/line/LineWidth.h" | 38 #include "core/rendering/line/LineWidth.h" | 
| 38 #include "core/rendering/line/RenderTextInfo.h" | 39 #include "core/rendering/line/RenderTextInfo.h" | 
| 39 #include "core/rendering/line/WordMeasurement.h" | 40 #include "core/rendering/line/WordMeasurement.h" | 
| (...skipping 2145 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2185     float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat
      (); | 2186     float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat
      (); | 
| 2186     float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal
      se) - logicalLeft; | 2187     float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal
      se) - logicalLeft; | 
| 2187     updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid
      th, availableLogicalWidth, 0); | 2188     updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid
      th, availableLogicalWidth, 0); | 
| 2188 | 2189 | 
| 2189     if (!style()->isLeftToRightDirection()) | 2190     if (!style()->isLeftToRightDirection()) | 
| 2190         return logicalWidth() - logicalLeft; | 2191         return logicalWidth() - logicalLeft; | 
| 2191     return logicalLeft; | 2192     return logicalLeft; | 
| 2192 } | 2193 } | 
| 2193 | 2194 | 
| 2194 } | 2195 } | 
| OLD | NEW | 
|---|