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

Side by Side Diff: Source/core/rendering/svg/RenderSVGContainer.cpp

Issue 204093002: GraphicsContext culling support. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Drop GC cull stack, misc fixes. Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2007, 2008 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2007, 2008 Rob Buis <buis@kde.org>
4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
5 * Copyright (C) 2009 Google, Inc. All rights reserved. 5 * Copyright (C) 2009 Google, Inc. All rights reserved.
6 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> 6 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
11 * version 2 of the License, or (at your option) any later version. 11 * version 2 of the License, or (at your option) any later version.
12 * 12 *
13 * This library is distributed in the hope that it will be useful, 13 * This library is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 * Library General Public License for more details. 16 * Library General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU Library General Public License 18 * You should have received a copy of the GNU Library General Public License
19 * along with this library; see the file COPYING.LIB. If not, write to 19 * along with this library; see the file COPYING.LIB. If not, write to
20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
21 * Boston, MA 02110-1301, USA. 21 * Boston, MA 02110-1301, USA.
22 */ 22 */
23 23
24 #include "config.h" 24 #include "config.h"
25 25
26 #include "core/rendering/svg/RenderSVGContainer.h" 26 #include "core/rendering/svg/RenderSVGContainer.h"
27 27
28 #include "core/frame/Settings.h"
28 #include "core/rendering/GraphicsContextAnnotator.h" 29 #include "core/rendering/GraphicsContextAnnotator.h"
29 #include "core/rendering/LayoutRectRecorder.h" 30 #include "core/rendering/LayoutRectRecorder.h"
30 #include "core/rendering/LayoutRepainter.h" 31 #include "core/rendering/LayoutRepainter.h"
31 #include "core/rendering/RenderView.h" 32 #include "core/rendering/RenderView.h"
32 #include "core/rendering/svg/SVGRenderingContext.h" 33 #include "core/rendering/svg/SVGRenderingContext.h"
33 #include "core/rendering/svg/SVGResources.h" 34 #include "core/rendering/svg/SVGResources.h"
34 #include "core/rendering/svg/SVGResourcesCache.h" 35 #include "core/rendering/svg/SVGResourcesCache.h"
36 #include "platform/graphics/GraphicsContextCullSaver.h"
35 #include "platform/graphics/GraphicsContextStateSaver.h" 37 #include "platform/graphics/GraphicsContextStateSaver.h"
36 38
37 namespace WebCore { 39 namespace WebCore {
38 40
39 RenderSVGContainer::RenderSVGContainer(SVGElement* node) 41 RenderSVGContainer::RenderSVGContainer(SVGElement* node)
40 : RenderSVGModelObject(node) 42 : RenderSVGModelObject(node)
41 , m_objectBoundingBoxValid(false) 43 , m_objectBoundingBoxValid(false)
42 , m_needsBoundariesUpdate(true) 44 , m_needsBoundariesUpdate(true)
43 { 45 {
44 } 46 }
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 PaintInfo childPaintInfo(paintInfo); 125 PaintInfo childPaintInfo(paintInfo);
124 { 126 {
125 GraphicsContextStateSaver stateSaver(*childPaintInfo.context); 127 GraphicsContextStateSaver stateSaver(*childPaintInfo.context);
126 128
127 // Let the RenderSVGViewportContainer subclass clip if necessary 129 // Let the RenderSVGViewportContainer subclass clip if necessary
128 applyViewportClip(childPaintInfo); 130 applyViewportClip(childPaintInfo);
129 131
130 childPaintInfo.applyTransform(localToParentTransform()); 132 childPaintInfo.applyTransform(localToParentTransform());
131 133
132 SVGRenderingContext renderingContext; 134 SVGRenderingContext renderingContext;
135 GraphicsContextCullSaver cullSaver(*childPaintInfo.context);
133 bool continueRendering = true; 136 bool continueRendering = true;
134 if (childPaintInfo.phase == PaintPhaseForeground) { 137 if (childPaintInfo.phase == PaintPhaseForeground) {
135 renderingContext.prepareToRenderSVGContent(this, childPaintInfo); 138 renderingContext.prepareToRenderSVGContent(this, childPaintInfo);
136 continueRendering = renderingContext.isRenderingPrepared(); 139 continueRendering = renderingContext.isRenderingPrepared();
140
141 if (continueRendering && document().settings()->containerCullingEnab led())
142 cullSaver.cull(repaintRectInLocalCoordinates());
137 } 143 }
138 144
139 if (continueRendering) { 145 if (continueRendering) {
140 childPaintInfo.updatePaintingRootForChildren(this); 146 childPaintInfo.updatePaintingRootForChildren(this);
141 for (RenderObject* child = firstChild(); child; child = child->nextS ibling()) 147 for (RenderObject* child = firstChild(); child; child = child->nextS ibling())
142 child->paint(childPaintInfo, IntPoint()); 148 child->paint(childPaintInfo, IntPoint());
143 } 149 }
144 } 150 }
145 151
146 // FIXME: This really should be drawn from local coordinates, but currently we hack it 152 // FIXME: This really should be drawn from local coordinates, but currently we hack it
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 if (objectBoundingBox().contains(localPoint)) { 198 if (objectBoundingBox().contains(localPoint)) {
193 updateHitTestResult(result, roundedLayoutPoint(localPoint)); 199 updateHitTestResult(result, roundedLayoutPoint(localPoint));
194 return true; 200 return true;
195 } 201 }
196 } 202 }
197 // 16.4: "If there are no graphics elements whose relevant graphics content is under the pointer (i.e., there is no target element), the event is not dispat ched." 203 // 16.4: "If there are no graphics elements whose relevant graphics content is under the pointer (i.e., there is no target element), the event is not dispat ched."
198 return false; 204 return false;
199 } 205 }
200 206
201 } 207 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698