Improvement handling of background and outline paint phases

third_party/WebKit/Source/core/paint/InlinePainter.cpp

Index: third_party/WebKit/Source/core/paint/InlinePainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/InlinePainter.cpp b/third_party/WebKit/Source/core/paint/InlinePainter.cpp
index 02def36e0fc61c599a4a1b3927cf0f32be728c17..70adeb57948d4dc943630f6ab1926665789686fd 100644
--- a/third_party/WebKit/Source/core/paint/InlinePainter.cpp
+++ b/third_party/WebKit/Source/core/paint/InlinePainter.cpp
@@ -36,11 +36,11 @@ void InlinePainter::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOf
     if (paintInfo.phase == PaintPhaseForeground && paintInfo.isPrinting())
         ObjectPainter(m_layoutInline).addPDFURLRectIfNeeded(paintInfo, paintOffset);
 
-    if (paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSelfOutline || paintInfo.phase == PaintPhaseDescendantOutlines) {
+    if (shouldPaintSelfOutline(paintInfo.phase) || shouldPaintDescendantOutlines(paintInfo.phase)) {
         ObjectPainter painter(m_layoutInline);
-        if (paintInfo.phase != PaintPhaseSelfOutline)
+        if (shouldPaintDescendantOutlines(paintInfo.phase))
             painter.paintInlineChildrenOutlines(paintInfo, paintOffset);
-        if (paintInfo.phase != PaintPhaseDescendantOutlines && !m_layoutInline.isElementContinuation())
+        if (shouldPaintSelfOutline(paintInfo.phase) && !m_layoutInline.isElementContinuation())
             painter.paintOutline(paintInfo, paintOffset);
         return;
     }