Source/core/rendering/InlineTextBox.h - Issue 219633002: Proper support for multiple text decorations.

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/rendering/InlineTextBox.h

Issue 219633002: Proper support for multiple text decorations. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 9 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:

Index: Source/core/rendering/InlineTextBox.h

diff --git a/Source/core/rendering/InlineTextBox.h b/Source/core/rendering/InlineTextBox.h

index 69b2a1d756b7b46c8c1a6644f7f9326de83774fd..03b0788207ab950617fce0b1c831d2efb4189368 100644

--- a/Source/core/rendering/InlineTextBox.h

+++ b/Source/core/rendering/InlineTextBox.h

@@ -31,8 +31,10 @@

namespace WebCore {

+class AppliedTextDecoration;

struct CompositionUnderline;

class DocumentMarker;

+struct PaintAppliedDecorationData;

const unsigned short cNoTruncation = USHRT_MAX;

const unsigned short cFullTruncation = USHRT_MAX - 1;

@@ -185,7 +187,9 @@ protected:

virtual void paintTextMatchMarker(GraphicsContext*, const FloatPoint& boxOrigin, DocumentMarker*, RenderStyle*, const Font&);

private:

- void paintDecoration(GraphicsContext*, const FloatPoint& boxOrigin, TextDecoration, const ShadowList*);

+ int computeUnderlineOffset(RenderStyle*, float textDecorationThickness);

+ void paintAppliedDecoration(GraphicsContext*, const AppliedTextDecoration&, const PaintAppliedDecorationData&);

+ void paintDecoration(GraphicsContext*, const FloatPoint& boxOrigin, RenderStyle*, const ShadowList*);

void paintSelection(GraphicsContext*, const FloatPoint& boxOrigin, RenderStyle*, const Font&, Color textColor);

TextRun::ExpansionBehavior expansionBehavior() const