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

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: Fix empty focus ring on Mac 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
Index: Source/core/layout/LayoutBlock.h
diff --git a/Source/core/layout/LayoutBlock.h b/Source/core/layout/LayoutBlock.h
index 4225fc6b054c7947ed1bc3f4095b75b796336535..aeec0b8e47cb4dd013e1980f209395b4d5383ccc 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;
@@ -215,7 +209,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;
« no previous file with comments | « LayoutTests/svg/as-image/svg-object-intrinsic-size-expected.html ('k') | Source/core/layout/LayoutBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698