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

Side by Side Diff: third_party/WebKit/Source/core/layout/svg/LayoutSVGRoot.cpp

Issue 1477463003: Remove unnecessary assert in LayoutSVGRoot (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added test Created 5 years 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
« no previous file with comments | « third_party/WebKit/LayoutTests/svg/custom/svg-fixed-position-expected.svg ('k') | no next file » | 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) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2007, 2008, 2009 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2007, 2008, 2009 Rob Buis <buis@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. 5 * Copyright (C) 2009 Google, Inc.
6 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 354
355 LayoutReplaced::mapRectToPaintInvalidationBacking(paintInvalidationContainer , rect, paintInvalidationState); 355 LayoutReplaced::mapRectToPaintInvalidationBacking(paintInvalidationContainer , rect, paintInvalidationState);
356 } 356 }
357 357
358 // This method expects local CSS box coordinates. 358 // This method expects local CSS box coordinates.
359 // Callers with local SVG viewport coordinates should first apply the localToBor derBoxTransform 359 // Callers with local SVG viewport coordinates should first apply the localToBor derBoxTransform
360 // to convert from SVG viewport coordinates to local CSS box coordinates. 360 // to convert from SVG viewport coordinates to local CSS box coordinates.
361 void LayoutSVGRoot::mapLocalToContainer(const LayoutBoxModelObject* paintInvalid ationContainer, TransformState& transformState, MapCoordinatesFlags mode, bool* wasFixed, const PaintInvalidationState* paintInvalidationState) const 361 void LayoutSVGRoot::mapLocalToContainer(const LayoutBoxModelObject* paintInvalid ationContainer, TransformState& transformState, MapCoordinatesFlags mode, bool* wasFixed, const PaintInvalidationState* paintInvalidationState) const
362 { 362 {
363 ASSERT(mode & ~IsFixed); // We should have no fixed content in the SVG layou t tree. 363 ASSERT(mode & ~IsFixed); // We should have no fixed content in the SVG layou t tree.
364 // We used to have this ASSERT here, but we removed it when enabling layer s quashing.
365 // See http://crbug.com/364901
366 // ASSERT(mode & UseTransforms); // mapping a point through SVG w/o respecti ng trasnforms is useless.
367 364
368 LayoutReplaced::mapLocalToContainer(paintInvalidationContainer, transformSta te, mode | ApplyContainerFlip, wasFixed, paintInvalidationState); 365 LayoutReplaced::mapLocalToContainer(paintInvalidationContainer, transformSta te, mode | ApplyContainerFlip, wasFixed, paintInvalidationState);
369 } 366 }
370 367
371 const LayoutObject* LayoutSVGRoot::pushMappingToContainer(const LayoutBoxModelOb ject* ancestorToStopAt, LayoutGeometryMap& geometryMap) const 368 const LayoutObject* LayoutSVGRoot::pushMappingToContainer(const LayoutBoxModelOb ject* ancestorToStopAt, LayoutGeometryMap& geometryMap) const
372 { 369 {
373 return LayoutReplaced::pushMappingToContainer(ancestorToStopAt, geometryMap) ; 370 return LayoutReplaced::pushMappingToContainer(ancestorToStopAt, geometryMap) ;
374 } 371 }
375 372
376 void LayoutSVGRoot::updateCachedBoundaries() 373 void LayoutSVGRoot::updateCachedBoundaries()
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 updateHitTestResult(result, pointInBorderBox); 411 updateHitTestResult(result, pointInBorderBox);
415 if (!result.addNodeToListBasedTestResult(node(), locationInContainer , boundsRect)) 412 if (!result.addNodeToListBasedTestResult(node(), locationInContainer , boundsRect))
416 return true; 413 return true;
417 } 414 }
418 } 415 }
419 416
420 return false; 417 return false;
421 } 418 }
422 419
423 } 420 }
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/svg/custom/svg-fixed-position-expected.svg ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698