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

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

Issue 547723003: Change RenderSVGResourceClipper's ClipperContext class into an enum (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Variables have to be initialized?!? Created 6 years, 3 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
« no previous file with comments | « Source/core/rendering/svg/SVGRenderingContext.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008 Rob Buis <buis@kde.org> 2 * Copyright (C) 2007, 2008 Rob Buis <buis@kde.org>
3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> 3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@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 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. 7 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 if (m_filter) { 64 if (m_filter) {
65 ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object)-> filter() == m_filter); 65 ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object)-> filter() == m_filter);
66 m_filter->postApplyResource(m_object, m_paintInfo->context, ApplyToD efaultMode, 0, 0); 66 m_filter->postApplyResource(m_object, m_paintInfo->context, ApplyToD efaultMode, 0, 0);
67 m_paintInfo->context = m_savedContext; 67 m_paintInfo->context = m_savedContext;
68 m_paintInfo->rect = m_savedPaintRect; 68 m_paintInfo->rect = m_savedPaintRect;
69 } 69 }
70 70
71 if (m_clipper) { 71 if (m_clipper) {
72 ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object)-> clipper() == m_clipper); 72 ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object)-> clipper() == m_clipper);
73 m_clipper->postApplyStatefulResource(m_object, m_paintInfo->context, m_clipperContext); 73 m_clipper->postApplyStatefulResource(m_object, m_paintInfo->context, m_clipperState);
74 } 74 }
75 75
76 if (m_masker) { 76 if (m_masker) {
77 ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object)-> masker() == m_masker); 77 ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object)-> masker() == m_masker);
78 m_masker->postApplyResource(m_object, m_paintInfo->context, ApplyToD efaultMode, 0, 0); 78 m_masker->postApplyResource(m_object, m_paintInfo->context, ApplyToD efaultMode, 0, 0);
79 } 79 }
80 } 80 }
81 81
82 if (m_renderingFlags & EndOpacityLayer) 82 if (m_renderingFlags & EndOpacityLayer)
83 m_paintInfo->context->endLayer(); 83 m_paintInfo->context->endLayer();
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 if (RenderSVGResourceMasker* masker = resources->masker()) { 156 if (RenderSVGResourceMasker* masker = resources->masker()) {
157 if (!masker->applyResource(m_object, style, m_paintInfo->context, Ap plyToDefaultMode)) 157 if (!masker->applyResource(m_object, style, m_paintInfo->context, Ap plyToDefaultMode))
158 return; 158 return;
159 m_masker = masker; 159 m_masker = masker;
160 m_renderingFlags |= PostApplyResources; 160 m_renderingFlags |= PostApplyResources;
161 } 161 }
162 } 162 }
163 163
164 RenderSVGResourceClipper* clipper = resources->clipper(); 164 RenderSVGResourceClipper* clipper = resources->clipper();
165 if (!clipPathOperation && clipper) { 165 if (!clipPathOperation && clipper) {
166 if (!clipper->applyStatefulResource(m_object, m_paintInfo->context, m_cl ipperContext)) 166 if (!clipper->applyStatefulResource(m_object, m_paintInfo->context, m_cl ipperState))
167 return; 167 return;
168 m_clipper = clipper; 168 m_clipper = clipper;
169 m_renderingFlags |= PostApplyResources; 169 m_renderingFlags |= PostApplyResources;
170 } 170 }
171 171
172 if (!isRenderingMask) { 172 if (!isRenderingMask) {
173 m_filter = resources->filter(); 173 m_filter = resources->filter();
174 if (m_filter) { 174 if (m_filter) {
175 m_savedContext = m_paintInfo->context; 175 m_savedContext = m_paintInfo->context;
176 m_savedPaintRect = m_paintInfo->rect; 176 m_savedPaintRect = m_paintInfo->rect;
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 toRenderSVGImage(m_object)->paintForeground(bufferedInfo); 302 toRenderSVGImage(m_object)->paintForeground(bufferedInfo);
303 } else 303 } else
304 return false; 304 return false;
305 } 305 }
306 306
307 m_paintInfo->context->drawImageBuffer(imageBuffer.get(), boundingBox); 307 m_paintInfo->context->drawImageBuffer(imageBuffer.get(), boundingBox);
308 return true; 308 return true;
309 } 309 }
310 310
311 } // namespace blink 311 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/SVGRenderingContext.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698