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

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

Issue 379073002: Revert of Divorce PaintInvalidationState from LayoutState (https://codereview.chromium.org/36083300… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Correct revert order Created 6 years, 5 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
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 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2007, 2008 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. 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 * 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 } 45 }
46 46
47 RenderSVGContainer::~RenderSVGContainer() 47 RenderSVGContainer::~RenderSVGContainer()
48 { 48 {
49 } 49 }
50 50
51 void RenderSVGContainer::layout() 51 void RenderSVGContainer::layout()
52 { 52 {
53 ASSERT(needsLayout()); 53 ASSERT(needsLayout());
54 54
55 // RenderSVGRoot disables layoutState for the SVG rendering tree.
56 ASSERT(!view()->layoutStateCachedOffsetsEnabled());
57
55 // Allow RenderSVGViewportContainer to update its viewport. 58 // Allow RenderSVGViewportContainer to update its viewport.
56 calcViewport(); 59 calcViewport();
57 60
58 // Allow RenderSVGTransformableContainer to update its transform. 61 // Allow RenderSVGTransformableContainer to update its transform.
59 bool updatedTransform = calculateLocalTransform(); 62 bool updatedTransform = calculateLocalTransform();
60 63
61 // RenderSVGViewportContainer needs to set the 'layout size changed' flag. 64 // RenderSVGViewportContainer needs to set the 'layout size changed' flag.
62 determineIfLayoutSizeChanged(); 65 determineIfLayoutSizeChanged();
63 66
64 SVGRenderSupport::layoutChildren(this, selfNeedsLayout() || SVGRenderSupport ::filtersForceContainerLayout(this)); 67 SVGRenderSupport::layoutChildren(this, selfNeedsLayout() || SVGRenderSupport ::filtersForceContainerLayout(this));
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 if (objectBoundingBox().contains(localPoint)) { 191 if (objectBoundingBox().contains(localPoint)) {
189 updateHitTestResult(result, roundedLayoutPoint(localPoint)); 192 updateHitTestResult(result, roundedLayoutPoint(localPoint));
190 return true; 193 return true;
191 } 194 }
192 } 195 }
193 // 16.4: "If there are no graphics elements whose relevant graphics content is under the pointer (i.e., there is no target element), the event is not dispat ched." 196 // 16.4: "If there are no graphics elements whose relevant graphics content is under the pointer (i.e., there is no target element), the event is not dispat ched."
194 return false; 197 return false;
195 } 198 }
196 199
197 } 200 }
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/RenderSVGBlock.cpp ('k') | Source/core/rendering/svg/RenderSVGForeignObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698