Combine outline and focus ring code paths

LayoutTests/TestExpectations

Index: LayoutTests/TestExpectations
diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
index 828309c2fe450e6fb8f3808922dcc582a216d1fb..50f4d014a7934001c3018db41d87228d9e2922e6 100644
--- a/LayoutTests/TestExpectations
+++ b/LayoutTests/TestExpectations
@@ -784,6 +784,30 @@ crbug.com/374643 [ Mac ] fast/text-autosizing/tables/table-with-inline-block.htm
 # Started failing after r162705.
 crbug.com/324370 compositing/video/video-reflection.html [ Failure ]
 
+crbug.com/506669 compositing/geometry/fixed-in-composited.html [ NeedsRebaseline ]
+crbug.com/506669 fast/block/positioning/absolute-in-inline-ltr-2.html [ NeedsRebaseline ]
+crbug.com/506669 fast/block/positioning/absolute-in-inline-ltr-3.html [ NeedsRebaseline ]
+crbug.com/506669 fast/block/positioning/absolute-in-inline-ltr.html [ NeedsRebaseline ]
+crbug.com/506669 fast/block/positioning/absolute-in-inline-rtl-2.html [ NeedsRebaseline ]
+crbug.com/506669 fast/block/positioning/absolute-in-inline-rtl-3.html [ NeedsRebaseline ]
+crbug.com/506669 fast/block/positioning/absolute-in-inline-rtl.html [ NeedsRebaseline ]
+crbug.com/506669 fast/block/positioning/absolute-in-inline-short-ltr.html [ NeedsRebaseline ]
+crbug.com/506669 fast/block/positioning/absolute-in-inline-short-rtl.html [ NeedsRebaseline ]
+crbug.com/506669 fast/borders/outline-alpha-inline.html [ NeedsRebaseline ]
+crbug.com/506669 fast/box-shadow/inset-box-shadow-radius.html [ NeedsRebaseline ]
+crbug.com/506669 fast/css/outline-auto-location.html [ NeedsRebaseline ]
+crbug.com/506669 fast/css/outline-narrowLine.html [ NeedsRebaseline ]
+crbug.com/506669 fast/forms/control-clip.html [ NeedsRebaseline ]
+crbug.com/506669 fast/inline/continuation-outlines-with-layers.html [ NeedsRebaseline ]
+crbug.com/506669 fast/inline/outline-continuations.html [ NeedsRebaseline ]
+crbug.com/506669 fast/inline/outline-offset.html [ NeedsRebaseline ]
+crbug.com/506669 fast/layers/opacity-transforms.html [ NeedsRebaseline ]
+crbug.com/506669 fast/repaint/outline-change-offset.html [ NeedsRebaseline ]
+crbug.com/506669 paint/inline/outline-offset.html [ NeedsRebaseline ]
+crbug.com/506669 svg/as-image/svg-object-intrinsic-size.html [ NeedsRebaseline ]
+crbug.com/506669 svg/repaint/shape-with-nested-outline.html [ NeedsRebaseline ]
+crbug.com/506669 transforms/2d/transform-borderbox.html [ NeedsRebaseline ]
+
 crbug.com/390377 [ Release ] fast/dom/private_script_unittest.html [ Skip ]
 
 crbug.com/357427 http/tests/workers/terminate-during-sync-operation-file.html [ Crash Pass Slow Timeout ]
@@ -1156,7 +1180,6 @@ crbug.com/509025 [ Yosemite ] virtual/prefer_compositing_to_lcd_text/scrollbars/
 crbug.com/509025 [ Yosemite ] virtual/prefer_compositing_to_lcd_text/scrollbars/short-scrollbar.html [ ImageOnlyFailure ]
 crbug.com/509025 [ Yosemite ] virtual/threaded/compositing/visibility/visibility-image-layers.html [ ImageOnlyFailure ]
 crbug.com/509025 [ Yosemite ] virtual/threaded/printing/return-from-printing-mode.html [ ImageOnlyFailure ]
-crbug.com/509025 [ Yosemite ] paint/inline/outline-offset.html [ Missing ]
 crbug.com/509025 [ Yosemite ] fast/block/lineboxcontain/block-with-ideographs.xhtml [ Failure ]
 # TODO(tkent): Needs to increase padding-right.
 crbug.com/509025 [ Yosemite ] fast/encoding/denormalised-voiced-japanese-chars.html [ Failure ]