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

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

Issue 138643003: Simpler return value of HashTable::add/HashMap:add and others (Closed)
Patch Set: Daily master update (now with base url?) Created 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 3 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 if (resourceMode & ApplyToTextMode) { 122 if (resourceMode & ApplyToTextMode) {
123 AffineTransform additionalTextTransformation; 123 AffineTransform additionalTextTransformation;
124 if (shouldTransformOnTextPainting(object, additionalTextTransformation)) 124 if (shouldTransformOnTextPainting(object, additionalTextTransformation))
125 patternData->transform *= additionalTextTransformation; 125 patternData->transform *= additionalTextTransformation;
126 } 126 }
127 patternData->pattern->setPatternSpaceTransform(patternData->transform); 127 patternData->pattern->setPatternSpaceTransform(patternData->transform);
128 128
129 // Various calls above may trigger invalidations in some fringe cases (Image Buffer allocation 129 // Various calls above may trigger invalidations in some fringe cases (Image Buffer allocation
130 // failures in the SVG image cache for example). To avoid having our Pattern Data deleted by 130 // failures in the SVG image cache for example). To avoid having our Pattern Data deleted by
131 // removeAllClientsFromCache(), we only make it visible in the cache at the very end. 131 // removeAllClientsFromCache(), we only make it visible in the cache at the very end.
132 return m_patternMap.set(object, patternData.release()).iterator->value.get() ; 132 return m_patternMap.set(object, patternData.release()).storedValue->value.ge t();
133 } 133 }
134 134
135 bool RenderSVGResourcePattern::applyResource(RenderObject* object, RenderStyle* style, GraphicsContext*& context, unsigned short resourceMode) 135 bool RenderSVGResourcePattern::applyResource(RenderObject* object, RenderStyle* style, GraphicsContext*& context, unsigned short resourceMode)
136 { 136 {
137 ASSERT(object); 137 ASSERT(object);
138 ASSERT(style); 138 ASSERT(style);
139 ASSERT(context); 139 ASSERT(context);
140 ASSERT(resourceMode != ApplyToDefaultMode); 140 ASSERT(resourceMode != ApplyToDefaultMode);
141 141
142 clearInvalidationMask(); 142 clearInvalidationMask();
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 continue; 271 continue;
272 if (node->renderer()->needsLayout()) 272 if (node->renderer()->needsLayout())
273 return nullptr; 273 return nullptr;
274 SVGRenderingContext::renderSubtree(tileImage->context(), node->renderer( ), contentTransformation); 274 SVGRenderingContext::renderSubtree(tileImage->context(), node->renderer( ), contentTransformation);
275 } 275 }
276 276
277 return tileImage.release(); 277 return tileImage.release();
278 } 278 }
279 279
280 } 280 }
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/RenderSVGResourceGradient.cpp ('k') | Source/core/rendering/svg/SVGResourcesCache.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698