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

Side by Side Diff: Source/core/paint/SVGTextPainter.cpp

Issue 802833003: Remove the SVG paint culling optimization (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update PaintInfo rect when leaving SVG Created 6 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/paint/SVGTextPainter.h" 6 #include "core/paint/SVGTextPainter.h"
7 7
8 #include "core/paint/BlockPainter.h" 8 #include "core/paint/BlockPainter.h"
9 #include "core/rendering/PaintInfo.h" 9 #include "core/rendering/PaintInfo.h"
10 #include "core/rendering/svg/RenderSVGText.h" 10 #include "core/rendering/svg/RenderSVGText.h"
11 #include "core/rendering/svg/SVGRenderSupport.h"
11 #include "platform/graphics/GraphicsContextStateSaver.h" 12 #include "platform/graphics/GraphicsContextStateSaver.h"
12 13
13 namespace blink { 14 namespace blink {
14 15
15 void SVGTextPainter::paint(const PaintInfo& paintInfo) 16 void SVGTextPainter::paint(const PaintInfo& paintInfo)
16 { 17 {
17 if (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhase Selection) 18 if (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhase Selection)
18 return; 19 return;
19 20
20 PaintInfo blockInfo(paintInfo); 21 PaintInfo blockInfo(paintInfo);
21 GraphicsContextStateSaver stateSaver(*blockInfo.context, false); 22 GraphicsContextStateSaver stateSaver(*blockInfo.context, false);
22 23
23 blockInfo.applyTransform(m_renderSVGText.localToParentTransform(), &stateSav er); 24 blockInfo.applyTransform(m_renderSVGText.localToParentTransform(), &stateSav er);
24 25
26 // When transitioning from SVG to HTML painters we need to keep the PaintInf o rect up-to-date
27 // because it can be used for clipping.
28 // FIXME: We need to find an approach that's not O(n^2).
29 const AffineTransform& transform = SVGRenderSupport::transformToRootBorderBo x(m_renderSVGText, m_renderSVGText.localToParentTransform());
30 blockInfo.rect = enclosingIntRect(transform.mapRect(FloatRect(blockInfo.rect )));
31
25 BlockPainter(m_renderSVGText).paint(blockInfo, LayoutPoint()); 32 BlockPainter(m_renderSVGText).paint(blockInfo, LayoutPoint());
26 33
27 // Paint the outlines, if any 34 // Paint the outlines, if any
28 if (paintInfo.phase == PaintPhaseForeground) { 35 if (paintInfo.phase == PaintPhaseForeground) {
29 blockInfo.phase = PaintPhaseSelfOutline; 36 blockInfo.phase = PaintPhaseSelfOutline;
30 BlockPainter(m_renderSVGText).paint(blockInfo, LayoutPoint()); 37 BlockPainter(m_renderSVGText).paint(blockInfo, LayoutPoint());
31 } 38 }
32 } 39 }
33 40
34 } // namespace blink 41 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698