Source/core/layout/LayoutBlock.h - Issue 1224933002: Combine outline and focus ring code paths

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/layout/LayoutBlock.h

Issue 1224933002: Combine outline and focus ring code paths (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Rebase 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « LayoutTests/svg/as-image/svg-object-intrinsic-size-expected.html ('k') | Source/core/layout/LayoutBlock.cpp » ('j') | Source/core/paint/ObjectPainter.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/layout/LayoutBlock.h

diff --git a/Source/core/layout/LayoutBlock.h b/Source/core/layout/LayoutBlock.h

index 69543099cec8d9d2116b1adbc40f674b130f3bc2..9acd57ffd3897373bf8bd302ee212ad0b11295c8 100644

--- a/Source/core/layout/LayoutBlock.h

+++ b/Source/core/layout/LayoutBlock.h

@@ -49,10 +49,6 @@ typedef Vector<WordMeasurement, 64> WordMeasurements;

enum ContainingBlockState { NewContainingBlock, SameContainingBlock };

-typedef WTF::HashMap<LayoutBlock*, OwnPtr<ListHashSet<LayoutInline*>>> ContinuationOutlineTableMap;

-ContinuationOutlineTableMap* continuationOutlineTable();

class CORE_EXPORT LayoutBlock : public LayoutBox {

public:

friend class LineLayoutState;

@@ -164,8 +160,6 @@ public:

int heightForLineCount(int);

void clearTruncation();

- void addContinuationWithOutline(LayoutInline*);

LayoutBoxModelObject* virtualContinuation() const final { return continuation(); }

bool isAnonymousBlockContinuation() const { return continuation() && isAnonymousBlock(); }

LayoutInline* inlineElementContinuation() const;

@@ -211,7 +205,6 @@ public:

#if ENABLE(ASSERT)

void checkPositionedObjectsNeedLayout();

- bool paintsContinuationOutline(LayoutInline* flow);

#endif

#ifndef NDEBUG

void showLineTreeAndMark(const InlineBox* = nullptr, const char* = nullptr, const InlineBox* = nullptr, const char* = nullptr, const LayoutObject* = nullptr) const;