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

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

Issue 2014483003: Rename OwnPtr::clear() to reset() in core/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 LayoutUnit paintInvalidationLogicalTop; 250 LayoutUnit paintInvalidationLogicalTop;
251 LayoutUnit paintInvalidationLogicalBottom; 251 LayoutUnit paintInvalidationLogicalBottom;
252 layoutInlineChildren(true, paintInvalidationLogicalTop, paintInvalidationLog icalBottom, afterEdge); 252 layoutInlineChildren(true, paintInvalidationLogicalTop, paintInvalidationLog icalBottom, afterEdge);
253 253
254 m_needsReordering = false; 254 m_needsReordering = false;
255 255
256 // If we don't have any line boxes, then make sure the frame rect is still c leared. 256 // If we don't have any line boxes, then make sure the frame rect is still c leared.
257 if (!firstLineBox()) 257 if (!firstLineBox())
258 setFrameRect(LayoutRect()); 258 setFrameRect(LayoutRect());
259 259
260 m_overflow.clear(); 260 m_overflow.reset();
261 addVisualEffectOverflow(); 261 addVisualEffectOverflow();
262 262
263 if (!updateParentBoundaries) 263 if (!updateParentBoundaries)
264 updateParentBoundaries = oldBoundaries != objectBoundingBox(); 264 updateParentBoundaries = oldBoundaries != objectBoundingBox();
265 265
266 // Invalidate all resources of this client if our layout changed. 266 // Invalidate all resources of this client if our layout changed.
267 if (everHadLayout() && selfNeedsLayout()) 267 if (everHadLayout() && selfNeedsLayout())
268 SVGResourcesCache::clientLayoutChanged(this); 268 SVGResourcesCache::clientLayoutChanged(this);
269 269
270 // If our bounds changed, notify the parents. 270 // If our bounds changed, notify the parents.
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 } 395 }
396 396
397 void LayoutSVGText::invalidateTreeIfNeeded(const PaintInvalidationState& paintIn validationState) 397 void LayoutSVGText::invalidateTreeIfNeeded(const PaintInvalidationState& paintIn validationState)
398 { 398 {
399 // TODO(wangxianzhu): Verify if the inherited LayoutBoxModelObject::invalida teTreeIfNeeded() 399 // TODO(wangxianzhu): Verify if the inherited LayoutBoxModelObject::invalida teTreeIfNeeded()
400 // is applicable here. If yes, remove this overriding method. 400 // is applicable here. If yes, remove this overriding method.
401 LayoutObject::invalidateTreeIfNeeded(paintInvalidationState); 401 LayoutObject::invalidateTreeIfNeeded(paintInvalidationState);
402 } 402 }
403 403
404 } // namespace blink 404 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698