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

Unified Diff: Source/core/paint/SVGInlineFlowBoxPainter.cpp

Issue 671943004: Move SVG inline flow box paint code to SVGInlineFlowBoxPainter (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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/SVGInlineFlowBoxPainter.h ('k') | Source/core/paint/SVGRootInlineBoxPainter.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/SVGRootInlineBoxPainter.cpp b/Source/core/paint/SVGInlineFlowBoxPainter.cpp
similarity index 50%
copy from Source/core/paint/SVGRootInlineBoxPainter.cpp
copy to Source/core/paint/SVGInlineFlowBoxPainter.cpp
index 0e619dc7e6c63fe6bdf373e4adee244a3415f220..540cdb7dcfac9242a5943b4749e22d3981db44e0 100644
--- a/Source/core/paint/SVGRootInlineBoxPainter.cpp
+++ b/Source/core/paint/SVGInlineFlowBoxPainter.cpp
@@ -3,39 +3,38 @@
// found in the LICENSE file.
#include "config.h"
-#include "core/paint/SVGRootInlineBoxPainter.h"
+#include "core/paint/SVGInlineFlowBoxPainter.h"
#include "core/paint/SVGInlineTextBoxPainter.h"
#include "core/rendering/PaintInfo.h"
#include "core/rendering/svg/SVGInlineFlowBox.h"
#include "core/rendering/svg/SVGInlineTextBox.h"
#include "core/rendering/svg/SVGRenderingContext.h"
-#include "core/rendering/svg/SVGRootInlineBox.h"
#include "platform/graphics/GraphicsContextStateSaver.h"
namespace blink {
-void SVGRootInlineBoxPainter::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
+void SVGInlineFlowBoxPainter::paintSelectionBackground(PaintInfo& paintInfo)
{
ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseSelection);
- bool isPrinting = m_svgRootInlineBox.renderer().document().printing();
- bool hasSelection = !isPrinting && m_svgRootInlineBox.selectionState() != RenderObject::SelectionNone;
-
PaintInfo childPaintInfo(paintInfo);
- if (hasSelection) {
- for (InlineBox* child = m_svgRootInlineBox.firstChild(); child; child = child->nextOnLine()) {
- if (child->isSVGInlineTextBox())
- SVGInlineTextBoxPainter(*toSVGInlineTextBox(child)).paintSelectionBackground(childPaintInfo);
- else if (child->isSVGInlineFlowBox())
- toSVGInlineFlowBox(child)->paintSelectionBackground(childPaintInfo);
- }
+ for (InlineBox* child = m_svgInlineFlowBox.firstChild(); child; child = child->nextOnLine()) {
+ if (child->isSVGInlineTextBox())
+ SVGInlineTextBoxPainter(*toSVGInlineTextBox(child)).paintSelectionBackground(childPaintInfo);
+ else if (child->isSVGInlineFlowBox())
+ SVGInlineFlowBoxPainter(*toSVGInlineFlowBox(child)).paintSelectionBackground(childPaintInfo);
}
+}
+
+void SVGInlineFlowBoxPainter::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
+{
+ ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseSelection);
GraphicsContextStateSaver stateSaver(*paintInfo.context);
- SVGRenderingContext renderingContext(&m_svgRootInlineBox.renderer(), paintInfo);
+ SVGRenderingContext renderingContext(&m_svgInlineFlowBox.renderer(), paintInfo);
if (renderingContext.isRenderingPrepared()) {
- for (InlineBox* child = m_svgRootInlineBox.firstChild(); child; child = child->nextOnLine())
+ for (InlineBox* child = m_svgInlineFlowBox.firstChild(); child; child = child->nextOnLine())
child->paint(paintInfo, paintOffset, 0, 0);
}
}
« no previous file with comments | « Source/core/paint/SVGInlineFlowBoxPainter.h ('k') | Source/core/paint/SVGRootInlineBoxPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698