Source/core/paint/EllipsisBoxPainter.cpp - Issue 1261653002: Move SelectionState out of LayoutObject and into Line Layout API

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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: 2 legit 5ever Created 5 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 side-by-side diff with in-line comments

Download patch

Index: Source/core/paint/EllipsisBoxPainter.cpp

diff --git a/Source/core/paint/EllipsisBoxPainter.cpp b/Source/core/paint/EllipsisBoxPainter.cpp

index 005d0be7699d1fecb3cc7e109136bdb7a37ea7d5..204dbd86000f0be58e6a90f1a43139639d1835da 100644

--- a/Source/core/paint/EllipsisBoxPainter.cpp

+++ b/Source/core/paint/EllipsisBoxPainter.cpp

@@ -6,6 +6,7 @@

#include "core/paint/EllipsisBoxPainter.h"

#include "core/layout/TextRunConstructor.h"

+#include "core/layout/api/SelectionState.h"

#include "core/layout/line/EllipsisBox.h"

#include "core/layout/line/RootInlineBox.h"

#include "core/paint/PaintInfo.h"

@@ -23,7 +24,7 @@ void EllipsisBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& pa

void EllipsisBoxPainter::paintEllipsis(const PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, const ComputedStyle& style)

{

- bool haveSelection = !paintInfo.isPrinting() && paintInfo.phase != PaintPhaseTextClip && m_ellipsisBox.selectionState() != LayoutObject::SelectionNone;

+ bool haveSelection = !paintInfo.isPrinting() && paintInfo.phase != PaintPhaseTextClip && m_ellipsisBox.selectionState() != SelectionNone;

LayoutRect paintRect(m_ellipsisBox.logicalFrameRect());

if (haveSelection)

« no previous file with comments | « Source/core/page/TouchAdjustment.cpp ('k') | Source/core/paint/InlineFlowBoxPainter.cpp » ('j') | no next file with comments »