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

Side by Side Diff: third_party/WebKit/Source/core/paint/EllipsisBoxPainter.cpp

Issue 2536453002: Rename some functions about layout locations (Closed)
Patch Set: Rebase Created 4 years 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/paint/EllipsisBoxPainter.h" 5 #include "core/paint/EllipsisBoxPainter.h"
6 6
7 #include "core/layout/TextRunConstructor.h" 7 #include "core/layout/TextRunConstructor.h"
8 #include "core/layout/api/LineLayoutItem.h" 8 #include "core/layout/api/LineLayoutItem.h"
9 #include "core/layout/api/SelectionState.h" 9 #include "core/layout/api/SelectionState.h"
10 #include "core/layout/line/EllipsisBox.h" 10 #include "core/layout/line/EllipsisBox.h"
(...skipping 15 matching lines...) Expand all
26 const ComputedStyle& style = m_ellipsisBox.getLineLayoutItem().styleRef( 26 const ComputedStyle& style = m_ellipsisBox.getLineLayoutItem().styleRef(
27 m_ellipsisBox.isFirstLineStyle()); 27 m_ellipsisBox.isFirstLineStyle());
28 paintEllipsis(paintInfo, paintOffset, lineTop, lineBottom, style); 28 paintEllipsis(paintInfo, paintOffset, lineTop, lineBottom, style);
29 } 29 }
30 30
31 void EllipsisBoxPainter::paintEllipsis(const PaintInfo& paintInfo, 31 void EllipsisBoxPainter::paintEllipsis(const PaintInfo& paintInfo,
32 const LayoutPoint& paintOffset, 32 const LayoutPoint& paintOffset,
33 LayoutUnit lineTop, 33 LayoutUnit lineTop,
34 LayoutUnit lineBottom, 34 LayoutUnit lineBottom,
35 const ComputedStyle& style) { 35 const ComputedStyle& style) {
36 LayoutRect paintRect(m_ellipsisBox.logicalFrameRect()); 36 LayoutPoint boxOrigin = m_ellipsisBox.physicalLocation();
37 m_ellipsisBox.logicalRectToPhysicalRect(paintRect); 37 boxOrigin.moveBy(paintOffset);
38 paintRect.moveBy(paintOffset); 38 LayoutRect paintRect(boxOrigin, m_ellipsisBox.size());
39 39
40 GraphicsContext& context = paintInfo.context; 40 GraphicsContext& context = paintInfo.context;
41 DisplayItem::Type displayItemType = 41 DisplayItem::Type displayItemType =
42 DisplayItem::paintPhaseToDrawingType(paintInfo.phase); 42 DisplayItem::paintPhaseToDrawingType(paintInfo.phase);
43 if (DrawingRecorder::useCachedDrawingIfPossible(context, m_ellipsisBox, 43 if (DrawingRecorder::useCachedDrawingIfPossible(context, m_ellipsisBox,
44 displayItemType)) 44 displayItemType))
45 return; 45 return;
46 46
47 DrawingRecorder recorder(context, m_ellipsisBox, displayItemType, 47 DrawingRecorder recorder(context, m_ellipsisBox, displayItemType,
48 FloatRect(paintRect)); 48 FloatRect(paintRect));
49 49
50 LayoutPoint boxOrigin = m_ellipsisBox.locationIncludingFlipping();
51 boxOrigin.moveBy(paintOffset);
52 LayoutRect boxRect(boxOrigin, 50 LayoutRect boxRect(boxOrigin,
53 LayoutSize(m_ellipsisBox.logicalWidth(), 51 LayoutSize(m_ellipsisBox.logicalWidth(),
54 m_ellipsisBox.virtualLogicalHeight())); 52 m_ellipsisBox.virtualLogicalHeight()));
55 53
56 GraphicsContextStateSaver stateSaver(context); 54 GraphicsContextStateSaver stateSaver(context);
57 if (!m_ellipsisBox.isHorizontal()) 55 if (!m_ellipsisBox.isHorizontal())
58 context.concatCTM(TextPainter::rotation(boxRect, TextPainter::Clockwise)); 56 context.concatCTM(TextPainter::rotation(boxRect, TextPainter::Clockwise));
59 57
60 const Font& font = style.font(); 58 const Font& font = style.font();
61 const SimpleFontData* fontData = font.primaryFont(); 59 const SimpleFontData* fontData = font.primaryFont();
62 DCHECK(fontData); 60 DCHECK(fontData);
63 if (!fontData) 61 if (!fontData)
64 return; 62 return;
65 63
66 TextPainter::Style textStyle = TextPainter::textPaintingStyle( 64 TextPainter::Style textStyle = TextPainter::textPaintingStyle(
67 m_ellipsisBox.getLineLayoutItem(), style, paintInfo); 65 m_ellipsisBox.getLineLayoutItem(), style, paintInfo);
68 TextRun textRun = constructTextRun(font, m_ellipsisBox.ellipsisStr(), style, 66 TextRun textRun = constructTextRun(font, m_ellipsisBox.ellipsisStr(), style,
69 TextRun::AllowTrailingExpansion); 67 TextRun::AllowTrailingExpansion);
70 LayoutPoint textOrigin(boxOrigin.x(), 68 LayoutPoint textOrigin(boxOrigin.x(),
71 boxOrigin.y() + fontData->getFontMetrics().ascent()); 69 boxOrigin.y() + fontData->getFontMetrics().ascent());
72 TextPainter textPainter(context, font, textRun, textOrigin, boxRect, 70 TextPainter textPainter(context, font, textRun, textOrigin, boxRect,
73 m_ellipsisBox.isHorizontal()); 71 m_ellipsisBox.isHorizontal());
74 textPainter.paint(0, m_ellipsisBox.ellipsisStr().length(), 72 textPainter.paint(0, m_ellipsisBox.ellipsisStr().length(),
75 m_ellipsisBox.ellipsisStr().length(), textStyle); 73 m_ellipsisBox.ellipsisStr().length(), textStyle);
76 } 74 }
77 75
78 } // namespace blink 76 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698