Combine outline and focus ring code paths

Source/core/layout/LayoutBlock.cpp

Index: Source/core/layout/LayoutBlock.cpp
diff --git a/Source/core/layout/LayoutBlock.cpp b/Source/core/layout/LayoutBlock.cpp
index fdc0818c158799e144d8768c6b39321e8e34e436..7e7f1ed39613995e3276583ba130cc554fe2b5ce 100644
--- a/Source/core/layout/LayoutBlock.cpp
+++ b/Source/core/layout/LayoutBlock.cpp
@@ -1284,28 +1284,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())
@@ -2876,19 +2854,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