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

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

Issue 571923002: Move geometry generation out of RenderSVGResource*::postApplyResource (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Drop curly braces. 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
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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 return; 56 return;
57 57
58 ASSERT(m_object && m_paintInfo); 58 ASSERT(m_object && m_paintInfo);
59 59
60 if (m_renderingFlags & PostApplyResources) { 60 if (m_renderingFlags & PostApplyResources) {
61 ASSERT(m_masker || m_clipper || m_filter); 61 ASSERT(m_masker || m_clipper || m_filter);
62 ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object)); 62 ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object));
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);
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_clipperState); 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);
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();
84 84
85 if (m_renderingFlags & RestoreGraphicsContext) 85 if (m_renderingFlags & RestoreGraphicsContext)
86 m_paintInfo->context->restore(); 86 m_paintInfo->context->restore();
87 } 87 }
88 88
(...skipping 213 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/SVGRenderSupport.cpp ('k') | Source/core/rendering/svg/SVGTextRunRenderingContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698