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

Unified Diff: Source/core/paint/SVGInlineFlowBoxPainter.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/paint/SVGImagePainter.cpp ('k') | Source/core/paint/SVGShapePainter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/SVGInlineFlowBoxPainter.cpp
diff --git a/Source/core/paint/SVGInlineFlowBoxPainter.cpp b/Source/core/paint/SVGInlineFlowBoxPainter.cpp
index 238528a5342520abf5672f5b552ff1a41ecee09e..de2e7bd373189553571147f2b7fca61e4dee1969 100644
--- a/Source/core/paint/SVGInlineFlowBoxPainter.cpp
+++ b/Source/core/paint/SVGInlineFlowBoxPainter.cpp
@@ -8,7 +8,7 @@
#include "core/layout/LayoutInline.h"
#include "core/layout/svg/line/SVGInlineFlowBox.h"
#include "core/layout/svg/line/SVGInlineTextBox.h"
-#include "core/paint/InlinePainter.h"
+#include "core/paint/ObjectPainter.h"
#include "core/paint/PaintInfo.h"
#include "core/paint/SVGInlineTextBoxPainter.h"
#include "core/paint/SVGPaintContext.h"
@@ -40,8 +40,11 @@ void SVGInlineFlowBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoin
}
}
- if (m_svgInlineFlowBox.layoutObject().isLayoutInline())
- InlinePainter(toLayoutInline(m_svgInlineFlowBox.layoutObject())).paintOutline(paintInfo, paintOffset);
+ if (m_svgInlineFlowBox.layoutObject().styleRef().hasOutline()) {
+ PaintInfo outlinePaintInfo(paintInfo);
+ outlinePaintInfo.phase = PaintPhaseSelfOutline;
+ ObjectPainter(m_svgInlineFlowBox.layoutObject()).paintOutline(outlinePaintInfo, paintOffset);
+ }
}
} // namespace blink
« no previous file with comments | « Source/core/paint/SVGImagePainter.cpp ('k') | Source/core/paint/SVGShapePainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698