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

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

Issue 16357011: Remove support for -webkit-color-correction (which we've never supported on (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: resolve merge conflicts, obey brace style changes Created 7 years, 6 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) Research In Motion Limited 2009-2010. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 92
93 if (!maskerData->maskImage && !repaintRect.isEmpty()) { 93 if (!maskerData->maskImage && !repaintRect.isEmpty()) {
94 SVGMaskElement* maskElement = static_cast<SVGMaskElement*>(node()); 94 SVGMaskElement* maskElement = static_cast<SVGMaskElement*>(node());
95 if (!maskElement) 95 if (!maskElement)
96 return false; 96 return false;
97 97
98 ASSERT(style()); 98 ASSERT(style());
99 const SVGRenderStyle* svgStyle = style()->svgStyle(); 99 const SVGRenderStyle* svgStyle = style()->svgStyle();
100 ASSERT(svgStyle); 100 ASSERT(svgStyle);
101 ColorSpace colorSpace = svgStyle->colorInterpolation() == CI_LINEARRGB ? ColorSpaceLinearRGB : ColorSpaceDeviceRGB; 101 ColorSpace colorSpace = svgStyle->colorInterpolation() == CI_LINEARRGB ? ColorSpaceLinearRGB : ColorSpaceDeviceRGB;
102 if (!SVGRenderingContext::createImageBuffer(repaintRect, absoluteTransfo rm, maskerData->maskImage, colorSpace, Unaccelerated)) 102 if (!SVGRenderingContext::createImageBuffer(repaintRect, absoluteTransfo rm, maskerData->maskImage, Unaccelerated))
103 return false; 103 return false;
104 104
105 if (!drawContentIntoMaskImage(maskerData, colorSpace, maskElement, objec t)) { 105 if (!drawContentIntoMaskImage(maskerData, colorSpace, maskElement, objec t)) {
106 maskerData->maskImage.clear(); 106 maskerData->maskImage.clear();
107 } 107 }
108 } 108 }
109 109
110 if (!maskerData->maskImage) 110 if (!maskerData->maskImage)
111 return false; 111 return false;
112 112
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 transform.translate(objectBoundingBox.x(), objectBoundingBox.y()); 186 transform.translate(objectBoundingBox.x(), objectBoundingBox.y());
187 transform.scaleNonUniform(objectBoundingBox.width(), objectBoundingBox.h eight()); 187 transform.scaleNonUniform(objectBoundingBox.width(), objectBoundingBox.h eight());
188 maskRect = transform.mapRect(maskRect); 188 maskRect = transform.mapRect(maskRect);
189 } 189 }
190 190
191 maskRect.intersect(maskBoundaries); 191 maskRect.intersect(maskBoundaries);
192 return maskRect; 192 return maskRect;
193 } 193 }
194 194
195 } 195 }
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/RenderSVGResourceFilter.cpp ('k') | Source/core/rendering/svg/RenderSVGResourcePattern.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698