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

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

Issue 1697543002: Check IsFixed specifically instead of presence of other flags. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove potentially wrong IsFixed argument Created 4 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) 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 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 rect.intersect(LayoutRect(pixelSnappedBorderBoxRect())); 341 rect.intersect(LayoutRect(pixelSnappedBorderBoxRect()));
342 342
343 LayoutReplaced::mapToVisibleRectInAncestorSpace(ancestor, rect, paintInvalid ationState); 343 LayoutReplaced::mapToVisibleRectInAncestorSpace(ancestor, rect, paintInvalid ationState);
344 } 344 }
345 345
346 // This method expects local CSS box coordinates. 346 // This method expects local CSS box coordinates.
347 // Callers with local SVG viewport coordinates should first apply the localToBor derBoxTransform 347 // Callers with local SVG viewport coordinates should first apply the localToBor derBoxTransform
348 // to convert from SVG viewport coordinates to local CSS box coordinates. 348 // to convert from SVG viewport coordinates to local CSS box coordinates.
349 void LayoutSVGRoot::mapLocalToAncestor(const LayoutBoxModelObject* ancestor, Tra nsformState& transformState, MapCoordinatesFlags mode, bool* wasFixed, const Pai ntInvalidationState* paintInvalidationState) const 349 void LayoutSVGRoot::mapLocalToAncestor(const LayoutBoxModelObject* ancestor, Tra nsformState& transformState, MapCoordinatesFlags mode, bool* wasFixed, const Pai ntInvalidationState* paintInvalidationState) const
350 { 350 {
351 ASSERT(mode & ~IsFixed); // We should have no fixed content in the SVG layou t tree. 351 ASSERT(!(mode & IsFixed)); // We should have no fixed content in the SVG lay out tree.
352 352
353 LayoutReplaced::mapLocalToAncestor(ancestor, transformState, mode | ApplyCon tainerFlip, wasFixed, paintInvalidationState); 353 LayoutReplaced::mapLocalToAncestor(ancestor, transformState, mode | ApplyCon tainerFlip, wasFixed, paintInvalidationState);
354 } 354 }
355 355
356 const LayoutObject* LayoutSVGRoot::pushMappingToContainer(const LayoutBoxModelOb ject* ancestorToStopAt, LayoutGeometryMap& geometryMap) const 356 const LayoutObject* LayoutSVGRoot::pushMappingToContainer(const LayoutBoxModelOb ject* ancestorToStopAt, LayoutGeometryMap& geometryMap) const
357 { 357 {
358 return LayoutReplaced::pushMappingToContainer(ancestorToStopAt, geometryMap) ; 358 return LayoutReplaced::pushMappingToContainer(ancestorToStopAt, geometryMap) ;
359 } 359 }
360 360
361 void LayoutSVGRoot::updateCachedBoundaries() 361 void LayoutSVGRoot::updateCachedBoundaries()
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 updateHitTestResult(result, pointInBorderBox); 399 updateHitTestResult(result, pointInBorderBox);
400 if (result.addNodeToListBasedTestResult(node(), locationInContainer, boundsRect) == StopHitTesting) 400 if (result.addNodeToListBasedTestResult(node(), locationInContainer, boundsRect) == StopHitTesting)
401 return true; 401 return true;
402 } 402 }
403 } 403 }
404 404
405 return false; 405 return false;
406 } 406 }
407 407
408 } // namespace blink 408 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698