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

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

Issue 1261653002: Move SelectionState out of LayoutObject and into Line Layout API (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 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
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/layout/TextRunConstructor.h" 8 #include "core/layout/TextRunConstructor.h"
9 #include "core/layout/api/SelectionState.h"
9 #include "core/layout/line/EllipsisBox.h" 10 #include "core/layout/line/EllipsisBox.h"
10 #include "core/layout/line/RootInlineBox.h" 11 #include "core/layout/line/RootInlineBox.h"
11 #include "core/paint/PaintInfo.h" 12 #include "core/paint/PaintInfo.h"
12 #include "core/paint/TextPainter.h" 13 #include "core/paint/TextPainter.h"
13 #include "platform/graphics/GraphicsContextStateSaver.h" 14 #include "platform/graphics/GraphicsContextStateSaver.h"
14 #include "platform/graphics/paint/DrawingRecorder.h" 15 #include "platform/graphics/paint/DrawingRecorder.h"
15 16
16 namespace blink { 17 namespace blink {
17 18
18 void EllipsisBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& pa intOffset, LayoutUnit lineTop, LayoutUnit lineBottom) 19 void EllipsisBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& pa intOffset, LayoutUnit lineTop, LayoutUnit lineBottom)
19 { 20 {
20 const ComputedStyle& style = m_ellipsisBox.layoutObject().styleRef(m_ellipsi sBox.isFirstLineStyle()); 21 const ComputedStyle& style = m_ellipsisBox.layoutObject().styleRef(m_ellipsi sBox.isFirstLineStyle());
21 paintEllipsis(paintInfo, paintOffset, lineTop, lineBottom, style); 22 paintEllipsis(paintInfo, paintOffset, lineTop, lineBottom, style);
22 } 23 }
23 24
24 void EllipsisBoxPainter::paintEllipsis(const PaintInfo& paintInfo, const LayoutP oint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, const ComputedStyl e& style) 25 void EllipsisBoxPainter::paintEllipsis(const PaintInfo& paintInfo, const LayoutP oint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, const ComputedStyl e& style)
25 { 26 {
26 bool isPrinting = paintInfo.isPrinting(); 27 bool isPrinting = paintInfo.isPrinting();
27 bool haveSelection = !isPrinting && paintInfo.phase != PaintPhaseTextClip && m_ellipsisBox.selectionState() != LayoutObject::SelectionNone; 28 bool haveSelection = !isPrinting && paintInfo.phase != PaintPhaseTextClip && m_ellipsisBox.selectionState() != SelectionNone;
28 29
29 LayoutRect paintRect(m_ellipsisBox.logicalFrameRect()); 30 LayoutRect paintRect(m_ellipsisBox.logicalFrameRect());
30 if (haveSelection) 31 if (haveSelection)
31 paintRect.unite(LayoutRect(m_ellipsisBox.selectionRect())); 32 paintRect.unite(LayoutRect(m_ellipsisBox.selectionRect()));
32 m_ellipsisBox.logicalRectToPhysicalRect(paintRect); 33 m_ellipsisBox.logicalRectToPhysicalRect(paintRect);
33 paintRect.moveBy(paintOffset); 34 paintRect.moveBy(paintOffset);
34 35
35 GraphicsContext* context = paintInfo.context; 36 GraphicsContext* context = paintInfo.context;
36 DisplayItem::Type displayItemType = DisplayItem::paintPhaseToDrawingType(pai ntInfo.phase); 37 DisplayItem::Type displayItemType = DisplayItem::paintPhaseToDrawingType(pai ntInfo.phase);
37 if (DrawingRecorder::useCachedDrawingIfPossible(*context, m_ellipsisBox, dis playItemType)) 38 if (DrawingRecorder::useCachedDrawingIfPossible(*context, m_ellipsisBox, dis playItemType))
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 LayoutUnit top = m_ellipsisBox.root().selectionTop(); 83 LayoutUnit top = m_ellipsisBox.root().selectionTop();
83 LayoutUnit h = m_ellipsisBox.root().selectionHeight(); 84 LayoutUnit h = m_ellipsisBox.root().selectionHeight();
84 const int deltaY = roundToInt(m_ellipsisBox.layoutObject().styleRef().isFlip pedLinesWritingMode() ? selectionBottom - m_ellipsisBox.logicalBottom() : m_elli psisBox.logicalTop() - top); 85 const int deltaY = roundToInt(m_ellipsisBox.layoutObject().styleRef().isFlip pedLinesWritingMode() ? selectionBottom - m_ellipsisBox.logicalBottom() : m_elli psisBox.logicalTop() - top);
85 const LayoutPoint localOrigin(boxOrigin.x(), boxOrigin.y() - deltaY); 86 const LayoutPoint localOrigin(boxOrigin.x(), boxOrigin.y() - deltaY);
86 LayoutRect clipRect(localOrigin, LayoutSize(m_ellipsisBox.logicalWidth(), h) ); 87 LayoutRect clipRect(localOrigin, LayoutSize(m_ellipsisBox.logicalWidth(), h) );
87 context->clip(clipRect); 88 context->clip(clipRect);
88 context->drawHighlightForText(font, constructTextRun(font, m_ellipsisBox.ell ipsisStr(), style, TextRun::AllowTrailingExpansion), FloatPoint(localOrigin), h, c); 89 context->drawHighlightForText(font, constructTextRun(font, m_ellipsisBox.ell ipsisStr(), style, TextRun::AllowTrailingExpansion), FloatPoint(localOrigin), h, c);
89 } 90 }
90 91
91 } // namespace blink 92 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698