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

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

Issue 27030009: Revert "Make compositingState explicit (re-land #2 with bogus ASSERT removed)" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix build error Created 7 years, 2 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
« no previous file with comments | « Source/core/rendering/RenderWidget.cpp ('k') | Source/web/LinkHighlight.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 renderer = renderer->parent(); 219 renderer = renderer->parent();
220 } 220 }
221 221
222 // Continue walking up the layer tree, accumulating CSS transforms. 222 // Continue walking up the layer tree, accumulating CSS transforms.
223 RenderLayer* layer = renderer ? renderer->enclosingLayer() : 0; 223 RenderLayer* layer = renderer ? renderer->enclosingLayer() : 0;
224 while (layer) { 224 while (layer) {
225 if (TransformationMatrix* layerTransform = layer->transform()) 225 if (TransformationMatrix* layerTransform = layer->transform())
226 absoluteTransform = layerTransform->toAffineTransform() * absoluteTr ansform; 226 absoluteTransform = layerTransform->toAffineTransform() * absoluteTr ansform;
227 227
228 // We can stop at compositing layers, to match the backing resolution. 228 // We can stop at compositing layers, to match the backing resolution.
229 // FIXME: should we be computing the transform to the nearest composited layer, 229 if (layer->isComposited())
230 // or the nearest composited layer that does not paint into its ancestor ?
231 if (layer->compositedLayerMapping())
232 break; 230 break;
233 231
234 layer = layer->parent(); 232 layer = layer->parent();
235 } 233 }
236 234
237 if (deviceScaleFactor != 1) 235 if (deviceScaleFactor != 1)
238 absoluteTransform.scale(deviceScaleFactor); 236 absoluteTransform.scale(deviceScaleFactor);
239 } 237 }
240 238
241 bool SVGRenderingContext::createImageBufferForPattern(const FloatRect& absoluteT argetRect, const FloatRect& clampedAbsoluteTargetRect, OwnPtr<ImageBuffer>& imag eBuffer, RenderingMode renderingMode) 239 bool SVGRenderingContext::createImageBufferForPattern(const FloatRect& absoluteT argetRect, const FloatRect& clampedAbsoluteTargetRect, OwnPtr<ImageBuffer>& imag eBuffer, RenderingMode renderingMode)
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 toRenderSVGImage(m_object)->paintForeground(bufferedInfo); 321 toRenderSVGImage(m_object)->paintForeground(bufferedInfo);
324 } else 322 } else
325 return false; 323 return false;
326 } 324 }
327 325
328 m_paintInfo->context->drawImageBuffer(imageBuffer.get(), boundingBox); 326 m_paintInfo->context->drawImageBuffer(imageBuffer.get(), boundingBox);
329 return true; 327 return true;
330 } 328 }
331 329
332 } 330 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderWidget.cpp ('k') | Source/web/LinkHighlight.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698