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

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

Issue 892293002: First version of new merge algorithm (not enabled yet) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Traverse indices vector Created 5 years, 10 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 27 matching lines...) Expand all
38 38
39 namespace blink { 39 namespace blink {
40 40
41 SVGRenderingContext::~SVGRenderingContext() 41 SVGRenderingContext::~SVGRenderingContext()
42 { 42 {
43 if (m_filter) { 43 if (m_filter) {
44 ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object)); 44 ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object));
45 ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object)->filt er() == m_filter); 45 ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object)->filt er() == m_filter);
46 46
47 RenderDrawingRecorder recorder(m_originalPaintInfo->context, *m_object, DisplayItem::SVGFilter, LayoutRect::infiniteRect()); 47 RenderDrawingRecorder recorder(m_originalPaintInfo->context, *m_object, DisplayItem::SVGFilter, LayoutRect::infiniteRect());
48 if (!recorder.canUseCachedDrawing()) 48 ASSERT(!recorder.canUseCachedDrawing());
49 m_filter->finishEffect(m_object, m_originalPaintInfo->context); 49 m_filter->finishEffect(m_object, m_originalPaintInfo->context);
50 50
51 // Reset the paint info after the filter effect has been completed. 51 // Reset the paint info after the filter effect has been completed.
52 // This isn't strictly required (e.g., m_paintInfo.rect is not used 52 // This isn't strictly required (e.g., m_paintInfo.rect is not used
53 // after this). 53 // after this).
54 m_paintInfo.context = m_originalPaintInfo->context; 54 m_paintInfo.context = m_originalPaintInfo->context;
55 m_paintInfo.rect = m_originalPaintInfo->rect; 55 m_paintInfo.rect = m_originalPaintInfo->rect;
56 } 56 }
57 57
58 if (m_masker) { 58 if (m_masker) {
59 ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object)); 59 ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object));
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 { 251 {
252 ASSERT(context); 252 ASSERT(context);
253 ASSERT(item); 253 ASSERT(item);
254 ASSERT(!item->needsLayout()); 254 ASSERT(!item->needsLayout());
255 255
256 PaintInfo info(context, LayoutRect::infiniteIntRect(), PaintPhaseForeground, PaintBehaviorNormal); 256 PaintInfo info(context, LayoutRect::infiniteIntRect(), PaintPhaseForeground, PaintBehaviorNormal);
257 item->paint(info, IntPoint()); 257 item->paint(info, IntPoint());
258 } 258 }
259 259
260 } // namespace blink 260 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698