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

Side by Side Diff: Source/core/rendering/svg/RenderSVGResourceClipper.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) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Rob Buis <buis@kde.org>
4 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
5 * Copyright (C) 2011 Dirk Schulze <krit@webkit.org> 5 * Copyright (C) 2011 Dirk Schulze <krit@webkit.org>
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 if (!clipperData->clipMaskImage) { 148 if (!clipperData->clipMaskImage) {
149 if (pathOnlyClipping(context, animatedLocalTransform, objectBoundingBox) ) 149 if (pathOnlyClipping(context, animatedLocalTransform, objectBoundingBox) )
150 return true; 150 return true;
151 shouldCreateClipData = true; 151 shouldCreateClipData = true;
152 } 152 }
153 153
154 AffineTransform absoluteTransform; 154 AffineTransform absoluteTransform;
155 SVGRenderingContext::calculateTransformationToOutermostCoordinateSystem(obje ct, absoluteTransform); 155 SVGRenderingContext::calculateTransformationToOutermostCoordinateSystem(obje ct, absoluteTransform);
156 156
157 if (shouldCreateClipData && !repaintRect.isEmpty()) { 157 if (shouldCreateClipData && !repaintRect.isEmpty()) {
158 if (!SVGRenderingContext::createImageBuffer(repaintRect, absoluteTransfo rm, clipperData->clipMaskImage, ColorSpaceDeviceRGB, Unaccelerated)) 158 if (!SVGRenderingContext::createImageBuffer(repaintRect, absoluteTransfo rm, clipperData->clipMaskImage, Unaccelerated))
159 return false; 159 return false;
160 160
161 GraphicsContext* maskContext = clipperData->clipMaskImage->context(); 161 GraphicsContext* maskContext = clipperData->clipMaskImage->context();
162 ASSERT(maskContext); 162 ASSERT(maskContext);
163 163
164 maskContext->concatCTM(animatedLocalTransform); 164 maskContext->concatCTM(animatedLocalTransform);
165 165
166 // clipPath can also be clipped by another clipPath. 166 // clipPath can also be clipped by another clipPath.
167 SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObj ect(this); 167 SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObj ect(this);
168 RenderSVGResourceClipper* clipper; 168 RenderSVGResourceClipper* clipper;
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 AffineTransform transform; 316 AffineTransform transform;
317 transform.translate(objectBoundingBox.x(), objectBoundingBox.y()); 317 transform.translate(objectBoundingBox.x(), objectBoundingBox.y());
318 transform.scaleNonUniform(objectBoundingBox.width(), objectBoundingBox.h eight()); 318 transform.scaleNonUniform(objectBoundingBox.width(), objectBoundingBox.h eight());
319 return transform.mapRect(m_clipBoundaries); 319 return transform.mapRect(m_clipBoundaries);
320 } 320 }
321 321
322 return m_clipBoundaries; 322 return m_clipBoundaries;
323 } 323 }
324 324
325 } 325 }
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/RenderSVGPath.cpp ('k') | Source/core/rendering/svg/RenderSVGResourceFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698