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

Side by Side Diff: Source/core/layout/line/InlineTextBox.cpp

Issue 931633003: Move and rename RenderBR to LayoutBR. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « Source/core/layout/LayoutTreeAsText.cpp ('k') | Source/core/rendering/RenderBR.h » ('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 * (C) 1999 Lars Knoll (knoll@kde.org) 2 * (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Dirk Mueller (mueller@kde.org) 3 * (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights 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 #include "core/layout/line/InlineTextBox.h" 24 #include "core/layout/line/InlineTextBox.h"
25 25
26 #include "core/layout/HitTestResult.h" 26 #include "core/layout/HitTestResult.h"
27 #include "core/layout/LayoutBR.h"
27 #include "core/layout/LayoutRubyRun.h" 28 #include "core/layout/LayoutRubyRun.h"
28 #include "core/layout/LayoutRubyText.h" 29 #include "core/layout/LayoutRubyText.h"
29 #include "core/layout/PaintInfo.h" 30 #include "core/layout/PaintInfo.h"
30 #include "core/layout/line/AbstractInlineTextBox.h" 31 #include "core/layout/line/AbstractInlineTextBox.h"
31 #include "core/layout/line/EllipsisBox.h" 32 #include "core/layout/line/EllipsisBox.h"
32 #include "core/paint/InlineTextBoxPainter.h" 33 #include "core/paint/InlineTextBoxPainter.h"
33 #include "core/rendering/RenderBR.h"
34 #include "core/rendering/RenderBlock.h" 34 #include "core/rendering/RenderBlock.h"
35 #include "platform/fonts/FontCache.h" 35 #include "platform/fonts/FontCache.h"
36 #include "platform/fonts/shaping/SimpleShaper.h" 36 #include "platform/fonts/shaping/SimpleShaper.h"
37 #include "wtf/Vector.h" 37 #include "wtf/Vector.h"
38 #include "wtf/text/StringBuilder.h" 38 #include "wtf/text/StringBuilder.h"
39 39
40 #include <algorithm> 40 #include <algorithm>
41 41
42 namespace blink { 42 namespace blink {
43 43
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 if (parent()->renderer() == renderer().parent()) 106 if (parent()->renderer() == renderer().parent())
107 return parent()->baselinePosition(baselineType); 107 return parent()->baselinePosition(baselineType);
108 return toRenderBoxModelObject(renderer().parent())->baselinePosition(baselin eType, isFirstLineStyle(), isHorizontal() ? HorizontalLine : VerticalLine, Posit ionOnContainingLine); 108 return toRenderBoxModelObject(renderer().parent())->baselinePosition(baselin eType, isFirstLineStyle(), isHorizontal() ? HorizontalLine : VerticalLine, Posit ionOnContainingLine);
109 } 109 }
110 110
111 LayoutUnit InlineTextBox::lineHeight() const 111 LayoutUnit InlineTextBox::lineHeight() const
112 { 112 {
113 if (!isText() || !renderer().parent()) 113 if (!isText() || !renderer().parent())
114 return 0; 114 return 0;
115 if (renderer().isBR()) 115 if (renderer().isBR())
116 return toRenderBR(renderer()).lineHeight(isFirstLineStyle()); 116 return toLayoutBR(renderer()).lineHeight(isFirstLineStyle());
117 if (parent()->renderer() == renderer().parent()) 117 if (parent()->renderer() == renderer().parent())
118 return parent()->lineHeight(); 118 return parent()->lineHeight();
119 return toRenderBoxModelObject(renderer().parent())->lineHeight(isFirstLineSt yle(), isHorizontal() ? HorizontalLine : VerticalLine, PositionOnContainingLine) ; 119 return toRenderBoxModelObject(renderer().parent())->lineHeight(isFirstLineSt yle(), isHorizontal() ? HorizontalLine : VerticalLine, PositionOnContainingLine) ;
120 } 120 }
121 121
122 bool InlineTextBox::isSelected(int startPos, int endPos) const 122 bool InlineTextBox::isSelected(int startPos, int endPos) const
123 { 123 {
124 int sPos = std::max(startPos - m_start, 0); 124 int sPos = std::max(startPos - m_start, 0);
125 // The position after a hard line break is considered to be past its end. 125 // The position after a hard line break is considered to be past its end.
126 // See the corresponding code in InlineTextBox::selectionState. 126 // See the corresponding code in InlineTextBox::selectionState.
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 printedCharacters = fprintf(stderr, "\t%s %p", obj.renderName(), &obj); 543 printedCharacters = fprintf(stderr, "\t%s %p", obj.renderName(), &obj);
544 const int rendererCharacterOffset = 75; 544 const int rendererCharacterOffset = 75;
545 for (; printedCharacters < rendererCharacterOffset; printedCharacters++) 545 for (; printedCharacters < rendererCharacterOffset; printedCharacters++)
546 fputc(' ', stderr); 546 fputc(' ', stderr);
547 fprintf(stderr, "(%d,%d) \"%s\"\n", start(), start() + len(), value.utf8().d ata()); 547 fprintf(stderr, "(%d,%d) \"%s\"\n", start(), start() + len(), value.utf8().d ata());
548 } 548 }
549 549
550 #endif 550 #endif
551 551
552 } // namespace blink 552 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutTreeAsText.cpp ('k') | Source/core/rendering/RenderBR.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698