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

Unified Diff: Source/core/layout/LayoutBlock.cpp

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
« no previous file with comments | « Source/core/layout/LayoutBlock.h ('k') | Source/core/layout/LayoutInline.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutBlock.cpp
diff --git a/Source/core/layout/LayoutBlock.cpp b/Source/core/layout/LayoutBlock.cpp
index f9a4e434cf19610c9211a54a49f60fc627167371..acc2e552792c88be9a9db9cf09abf2b8cc18fecc 100644
--- a/Source/core/layout/LayoutBlock.cpp
+++ b/Source/core/layout/LayoutBlock.cpp
@@ -1285,28 +1285,6 @@ LayoutInline* LayoutBlock::inlineElementContinuation() const
return continuation && continuation->isInline() ? toLayoutInline(continuation) : 0;
}
-ContinuationOutlineTableMap* continuationOutlineTable()
-{
- DEFINE_STATIC_LOCAL(ContinuationOutlineTableMap, table, ());
- return &table;
-}
-
-void LayoutBlock::addContinuationWithOutline(LayoutInline* flow)
-{
- // We can't make this work if the inline is in a layer. We'll just rely on the broken
- // way of painting.
- ASSERT(!flow->layer() && !flow->isInlineElementContinuation());
-
- ContinuationOutlineTableMap* table = continuationOutlineTable();
- ListHashSet<LayoutInline*>* continuations = table->get(this);
- if (!continuations) {
- continuations = new ListHashSet<LayoutInline*>;
- table->set(this, adoptPtr(continuations));
- }
-
- continuations->add(flow);
-}
-
bool LayoutBlock::isSelectionRoot() const
{
if (isPseudoElement())
@@ -2886,19 +2864,6 @@ void LayoutBlock::checkPositionedObjectsNeedLayout()
}
}
-bool LayoutBlock::paintsContinuationOutline(LayoutInline* flow)
-{
- ContinuationOutlineTableMap* table = continuationOutlineTable();
- if (table->isEmpty())
- return false;
-
- ListHashSet<LayoutInline*>* continuations = table->get(this);
- if (!continuations)
- return false;
-
- return continuations->contains(flow);
-}
-
#endif
#ifndef NDEBUG
« no previous file with comments | « Source/core/layout/LayoutBlock.h ('k') | Source/core/layout/LayoutInline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698