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

Side by Side Diff: Source/core/rendering/RenderBlockLineLayout.cpp

Issue 397723006: Move RenderBlockFlow::constructTextRun out. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.cpp ('k') | Source/core/rendering/RenderCombineText.cpp » ('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) 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 13 matching lines...) Expand all
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/RenderObjectInlines.h"
31 #include "core/rendering/RenderRegion.h" 31 #include "core/rendering/RenderRegion.h"
32 #include "core/rendering/RenderRubyRun.h" 32 #include "core/rendering/RenderRubyRun.h"
33 #include "core/rendering/RenderView.h" 33 #include "core/rendering/RenderView.h"
34 #include "core/rendering/TextRunConstructor.h"
34 #include "core/rendering/TrailingFloatsRootInlineBox.h" 35 #include "core/rendering/TrailingFloatsRootInlineBox.h"
35 #include "core/rendering/VerticalPositionCache.h" 36 #include "core/rendering/VerticalPositionCache.h"
36 #include "core/rendering/line/BreakingContextInlineHeaders.h" 37 #include "core/rendering/line/BreakingContextInlineHeaders.h"
37 #include "core/rendering/line/LineLayoutState.h" 38 #include "core/rendering/line/LineLayoutState.h"
38 #include "core/rendering/line/LineWidth.h" 39 #include "core/rendering/line/LineWidth.h"
39 #include "core/rendering/line/RenderTextInfo.h" 40 #include "core/rendering/line/RenderTextInfo.h"
40 #include "core/rendering/line/WordMeasurement.h" 41 #include "core/rendering/line/WordMeasurement.h"
41 #include "core/rendering/svg/SVGRootInlineBox.h" 42 #include "core/rendering/svg/SVGRootInlineBox.h"
42 #include "platform/fonts/Character.h" 43 #include "platform/fonts/Character.h"
43 #include "platform/text/BidiResolver.h" 44 #include "platform/text/BidiResolver.h"
(...skipping 1264 matching lines...) Expand 10 before | Expand all | Expand 10 after
1308 child->borderStart(); 1309 child->borderStart();
1309 } 1310 }
1310 1311
1311 static inline void stripTrailingSpace(float& inlineMax, float& inlineMin, Render Object* trailingSpaceChild) 1312 static inline void stripTrailingSpace(float& inlineMax, float& inlineMin, Render Object* trailingSpaceChild)
1312 { 1313 {
1313 if (trailingSpaceChild && trailingSpaceChild->isText()) { 1314 if (trailingSpaceChild && trailingSpaceChild->isText()) {
1314 // Collapse away the trailing space at the end of a block. 1315 // Collapse away the trailing space at the end of a block.
1315 RenderText* t = toRenderText(trailingSpaceChild); 1316 RenderText* t = toRenderText(trailingSpaceChild);
1316 const UChar space = ' '; 1317 const UChar space = ' ';
1317 const Font& font = t->style()->font(); // FIXME: This ignores first-line . 1318 const Font& font = t->style()->font(); // FIXME: This ignores first-line .
1318 float spaceWidth = font.width(RenderBlockFlow::constructTextRun(t, font, &space, 1, t->style(), LTR)); 1319 float spaceWidth = font.width(constructTextRun(t, font, &space, 1, t->st yle(), LTR));
1319 inlineMax -= spaceWidth + font.fontDescription().wordSpacing(); 1320 inlineMax -= spaceWidth + font.fontDescription().wordSpacing();
1320 if (inlineMin > inlineMax) 1321 if (inlineMin > inlineMax)
1321 inlineMin = inlineMax; 1322 inlineMin = inlineMax;
1322 } 1323 }
1323 } 1324 }
1324 1325
1325 static inline void updatePreferredWidth(LayoutUnit& preferredWidth, float& resul t) 1326 static inline void updatePreferredWidth(LayoutUnit& preferredWidth, float& resul t)
1326 { 1327 {
1327 LayoutUnit snappedResult = LayoutUnit::fromFloatCeil(result); 1328 LayoutUnit snappedResult = LayoutUnit::fromFloatCeil(result);
1328 preferredWidth = std::max(snappedResult, preferredWidth); 1329 preferredWidth = std::max(snappedResult, preferredWidth);
(...skipping 857 matching lines...) Expand 10 before | Expand all | Expand 10 after
2186 float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat (); 2187 float logicalLeft = logicalLeftOffsetForLine(logicalHeight(), false).toFloat ();
2187 float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal se) - logicalLeft; 2188 float availableLogicalWidth = logicalRightOffsetForLine(logicalHeight(), fal se) - logicalLeft;
2188 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid th, availableLogicalWidth, 0); 2189 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid th, availableLogicalWidth, 0);
2189 2190
2190 if (!style()->isLeftToRightDirection()) 2191 if (!style()->isLeftToRightDirection())
2191 return logicalWidth() - logicalLeft; 2192 return logicalWidth() - logicalLeft;
2192 return logicalLeft; 2193 return logicalLeft;
2193 } 2194 }
2194 2195
2195 } 2196 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.cpp ('k') | Source/core/rendering/RenderCombineText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698