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

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

Issue 2458823002: Don't establish LayoutState for LayoutTableRow objects. (Closed)
Patch Set: Created 4 years, 1 month 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/Source/core/layout/LayoutVTTCue.cpp ('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) 2006 Apple Computer, Inc. 2 * Copyright (C) 2006 Apple Computer, Inc.
3 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org> 3 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
4 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> 4 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
5 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> 5 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
6 * Copyright (C) 2008 Rob Buis <buis@kde.org> 6 * Copyright (C) 2008 Rob Buis <buis@kde.org>
7 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> 7 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
8 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved. 8 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved.
9 * Copyright (C) 2012 Google Inc. 9 * Copyright (C) 2012 Google Inc.
10 * 10 *
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 FloatRect oldBoundaries = objectBoundingBox(); 237 FloatRect oldBoundaries = objectBoundingBox();
238 ASSERT(childrenInline()); 238 ASSERT(childrenInline());
239 239
240 rebuildFloatsFromIntruding(); 240 rebuildFloatsFromIntruding();
241 241
242 LayoutUnit beforeEdge = borderBefore() + paddingBefore(); 242 LayoutUnit beforeEdge = borderBefore() + paddingBefore();
243 LayoutUnit afterEdge = 243 LayoutUnit afterEdge =
244 borderAfter() + paddingAfter() + scrollbarLogicalHeight(); 244 borderAfter() + paddingAfter() + scrollbarLogicalHeight();
245 setLogicalHeight(beforeEdge); 245 setLogicalHeight(beforeEdge);
246 246
247 LayoutState state(*this, locationOffset()); 247 LayoutState state(*this);
248 layoutInlineChildren(true, afterEdge); 248 layoutInlineChildren(true, afterEdge);
249 249
250 m_needsReordering = false; 250 m_needsReordering = false;
251 251
252 // If we don't have any line boxes, then make sure the frame rect is still 252 // If we don't have any line boxes, then make sure the frame rect is still
253 // cleared. 253 // cleared.
254 if (!firstLineBox()) 254 if (!firstLineBox())
255 setFrameRect(LayoutRect()); 255 setFrameRect(LayoutRect());
256 256
257 m_overflow.reset(); 257 m_overflow.reset();
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 400
401 void LayoutSVGText::invalidateTreeIfNeeded( 401 void LayoutSVGText::invalidateTreeIfNeeded(
402 const PaintInvalidationState& paintInvalidationState) { 402 const PaintInvalidationState& paintInvalidationState) {
403 // TODO(wangxianzhu): Verify if the inherited 403 // TODO(wangxianzhu): Verify if the inherited
404 // LayoutBoxModelObject::invalidateTreeIfNeeded() 404 // LayoutBoxModelObject::invalidateTreeIfNeeded()
405 // is applicable here. If yes, remove this overriding method. 405 // is applicable here. If yes, remove this overriding method.
406 LayoutObject::invalidateTreeIfNeeded(paintInvalidationState); 406 LayoutObject::invalidateTreeIfNeeded(paintInvalidationState);
407 } 407 }
408 408
409 } // namespace blink 409 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutVTTCue.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698