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

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

Issue 799563002: Use DrawingRecorder::canUseCachedDrawing (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/paint/DrawingRecorderTest.cpp ('k') | Source/core/paint/FieldsetPainter.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 // 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 "config.h" 5 #include "config.h"
6 #include "core/paint/EllipsisBoxPainter.h" 6 #include "core/paint/EllipsisBoxPainter.h"
7 7
8 #include "core/paint/RenderDrawingRecorder.h" 8 #include "core/paint/RenderDrawingRecorder.h"
9 #include "core/paint/TextPainter.h" 9 #include "core/paint/TextPainter.h"
10 #include "core/rendering/EllipsisBox.h" 10 #include "core/rendering/EllipsisBox.h"
11 #include "core/rendering/PaintInfo.h" 11 #include "core/rendering/PaintInfo.h"
12 #include "core/rendering/RootInlineBox.h" 12 #include "core/rendering/RootInlineBox.h"
13 #include "core/rendering/TextRunConstructor.h" 13 #include "core/rendering/TextRunConstructor.h"
14 #include "platform/graphics/GraphicsContextStateSaver.h" 14 #include "platform/graphics/GraphicsContextStateSaver.h"
15 15
16 namespace blink { 16 namespace blink {
17 17
18 void EllipsisBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& pa intOffset, LayoutUnit lineTop, LayoutUnit lineBottom) 18 void EllipsisBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& pa intOffset, LayoutUnit lineTop, LayoutUnit lineBottom)
19 { 19 {
20 RenderStyle* style = m_ellipsisBox.renderer().style(m_ellipsisBox.isFirstLin eStyle()); 20 RenderStyle* style = m_ellipsisBox.renderer().style(m_ellipsisBox.isFirstLin eStyle());
21 paintEllipsis(paintInfo, paintOffset, lineTop, lineBottom, style); 21 paintEllipsis(paintInfo, paintOffset, lineTop, lineBottom, style);
22 paintMarkupBox(paintInfo, paintOffset, lineTop, lineBottom, style); 22 paintMarkupBox(paintInfo, paintOffset, lineTop, lineBottom, style);
23 } 23 }
24 24
25 void EllipsisBoxPainter::paintEllipsis(const PaintInfo& paintInfo, const LayoutP oint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, RenderStyle* style ) 25 void EllipsisBoxPainter::paintEllipsis(const PaintInfo& paintInfo, const LayoutP oint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, RenderStyle* style )
26 { 26 {
27 GraphicsContext* context = paintInfo.context; 27 GraphicsContext* context = paintInfo.context;
28 const Font& font = style->font();
29 FloatPoint boxOrigin = m_ellipsisBox.locationIncludingFlipping(); 28 FloatPoint boxOrigin = m_ellipsisBox.locationIncludingFlipping();
30 boxOrigin.moveBy(FloatPoint(paintOffset)); 29 boxOrigin.moveBy(FloatPoint(paintOffset));
31 if (!m_ellipsisBox.isHorizontal()) 30 if (!m_ellipsisBox.isHorizontal())
32 boxOrigin.move(0, -m_ellipsisBox.virtualLogicalHeight()); 31 boxOrigin.move(0, -m_ellipsisBox.virtualLogicalHeight());
33 FloatRect boxRect(boxOrigin, FloatSize(m_ellipsisBox.logicalWidth(), m_ellip sisBox.virtualLogicalHeight())); 32 FloatRect boxRect(boxOrigin, FloatSize(m_ellipsisBox.logicalWidth(), m_ellip sisBox.virtualLogicalHeight()));
34 33
35 RenderDrawingRecorder recorder(paintInfo.context, &m_ellipsisBox.renderer(), paintInfo.phase, boxRect); 34 RenderDrawingRecorder recorder(context, m_ellipsisBox.renderer(), paintInfo. phase, boxRect);
35 if (recorder.canUseCachedDrawing())
36 return;
36 37
37 GraphicsContextStateSaver stateSaver(*context); 38 GraphicsContextStateSaver stateSaver(*context);
38 if (!m_ellipsisBox.isHorizontal()) 39 if (!m_ellipsisBox.isHorizontal())
39 context->concatCTM(TextPainter::rotation(boxRect, TextPainter::Clockwise )); 40 context->concatCTM(TextPainter::rotation(boxRect, TextPainter::Clockwise ));
41 const Font& font = style->font();
40 FloatPoint textOrigin(boxOrigin.x(), boxOrigin.y() + font.fontMetrics().asce nt()); 42 FloatPoint textOrigin(boxOrigin.x(), boxOrigin.y() + font.fontMetrics().asce nt());
41 43
42 bool isPrinting = m_ellipsisBox.renderer().document().printing(); 44 bool isPrinting = m_ellipsisBox.renderer().document().printing();
43 bool haveSelection = !isPrinting && paintInfo.phase != PaintPhaseTextClip && m_ellipsisBox.selectionState() != RenderObject::SelectionNone; 45 bool haveSelection = !isPrinting && paintInfo.phase != PaintPhaseTextClip && m_ellipsisBox.selectionState() != RenderObject::SelectionNone;
44 46
45 if (haveSelection) 47 if (haveSelection)
46 paintSelection(context, boxOrigin, style, font); 48 paintSelection(context, boxOrigin, style, font);
47 else if (paintInfo.phase == PaintPhaseSelection) 49 else if (paintInfo.phase == PaintPhaseSelection)
48 return; 50 return;
49 51
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 LayoutUnit top = m_ellipsisBox.root().selectionTop(); 87 LayoutUnit top = m_ellipsisBox.root().selectionTop();
86 LayoutUnit h = m_ellipsisBox.root().selectionHeight(); 88 LayoutUnit h = m_ellipsisBox.root().selectionHeight();
87 const int deltaY = roundToInt(m_ellipsisBox.renderer().style()->isFlippedLin esWritingMode() ? selectionBottom - m_ellipsisBox.logicalBottom() : m_ellipsisBo x.logicalTop() - top); 89 const int deltaY = roundToInt(m_ellipsisBox.renderer().style()->isFlippedLin esWritingMode() ? selectionBottom - m_ellipsisBox.logicalBottom() : m_ellipsisBo x.logicalTop() - top);
88 const FloatPoint localOrigin(boxOrigin.x(), boxOrigin.y() - deltaY); 90 const FloatPoint localOrigin(boxOrigin.x(), boxOrigin.y() - deltaY);
89 FloatRect clipRect(localOrigin, FloatSize(m_ellipsisBox.logicalWidth(), h.to Float())); 91 FloatRect clipRect(localOrigin, FloatSize(m_ellipsisBox.logicalWidth(), h.to Float()));
90 context->clip(clipRect); 92 context->clip(clipRect);
91 context->drawHighlightForText(font, constructTextRun(&m_ellipsisBox.renderer (), font, m_ellipsisBox.ellipsisStr(), style, TextRun::AllowTrailingExpansion), localOrigin, h, c); 93 context->drawHighlightForText(font, constructTextRun(&m_ellipsisBox.renderer (), font, m_ellipsisBox.ellipsisStr(), style, TextRun::AllowTrailingExpansion), localOrigin, h, c);
92 } 94 }
93 95
94 } // namespace blink 96 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/paint/DrawingRecorderTest.cpp ('k') | Source/core/paint/FieldsetPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698