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

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

Issue 1653673002: Even more explicit LayoutUnit conversion (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moarConstructors
Patch Set: address comments 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) 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 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 FloatRect oldBoundaries = objectBoundingBox(); 381 FloatRect oldBoundaries = objectBoundingBox();
382 ASSERT(childrenInline()); 382 ASSERT(childrenInline());
383 383
384 rebuildFloatsFromIntruding(); 384 rebuildFloatsFromIntruding();
385 385
386 LayoutUnit beforeEdge = borderBefore() + paddingBefore(); 386 LayoutUnit beforeEdge = borderBefore() + paddingBefore();
387 LayoutUnit afterEdge = borderAfter() + paddingAfter() + scrollbarLogicalHeig ht(); 387 LayoutUnit afterEdge = borderAfter() + paddingAfter() + scrollbarLogicalHeig ht();
388 setLogicalHeight(beforeEdge); 388 setLogicalHeight(beforeEdge);
389 389
390 LayoutState state(*this, locationOffset()); 390 LayoutState state(*this, locationOffset());
391 LayoutUnit paintInvalidationLogicalTop = 0; 391 LayoutUnit paintInvalidationLogicalTop;
392 LayoutUnit paintInvalidationLogicalBottom = 0; 392 LayoutUnit paintInvalidationLogicalBottom;
393 layoutInlineChildren(true, paintInvalidationLogicalTop, paintInvalidationLog icalBottom, afterEdge); 393 layoutInlineChildren(true, paintInvalidationLogicalTop, paintInvalidationLog icalBottom, afterEdge);
394 394
395 if (m_needsReordering) 395 if (m_needsReordering)
396 m_needsReordering = false; 396 m_needsReordering = false;
397 397
398 // If we don't have any line boxes, then make sure the frame rect is still c leared. 398 // If we don't have any line boxes, then make sure the frame rect is still c leared.
399 if (!firstLineBox()) 399 if (!firstLineBox())
400 setFrameRect(LayoutRect()); 400 setFrameRect(LayoutRect());
401 401
402 m_overflow.clear(); 402 m_overflow.clear();
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 paintInvalidationState.pushDelayedPaintInvalidationTarget(*this); 530 paintInvalidationState.pushDelayedPaintInvalidationTarget(*this);
531 531
532 ForceHorriblySlowRectMapping slowRectMapping(&paintInvalidationState); 532 ForceHorriblySlowRectMapping slowRectMapping(&paintInvalidationState);
533 PaintInvalidationState childTreeWalkState(paintInvalidationState, *this, pai ntInvalidationState.paintInvalidationContainer()); 533 PaintInvalidationState childTreeWalkState(paintInvalidationState, *this, pai ntInvalidationState.paintInvalidationContainer());
534 if (reason == PaintInvalidationSVGResourceChange) 534 if (reason == PaintInvalidationSVGResourceChange)
535 childTreeWalkState.setForceSubtreeInvalidationWithinContainer(); 535 childTreeWalkState.setForceSubtreeInvalidationWithinContainer();
536 invalidatePaintOfSubtreesIfNeeded(childTreeWalkState); 536 invalidatePaintOfSubtreesIfNeeded(childTreeWalkState);
537 } 537 }
538 538
539 } // namespace blink 539 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698