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

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

Issue 1896793002: Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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, 2006 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Rob Buis <buis@kde.org>
4 * Copyright (C) 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2007 Apple Inc. All rights reserved.
5 * Copyright (C) 2014 Google, Inc. 5 * Copyright (C) 2014 Google, Inc.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 for (SVGGraphicsElement& element : Traversal<SVGGraphicsElement>::descendant sOf(*root)) { 354 for (SVGGraphicsElement& element : Traversal<SVGGraphicsElement>::descendant sOf(*root)) {
355 if (checkIntersectionOrEnclosure(element, rect, mode)) 355 if (checkIntersectionOrEnclosure(element, rect, mode))
356 nodes.append(&element); 356 nodes.append(&element);
357 } 357 }
358 358
359 return StaticNodeList::adopt(nodes); 359 return StaticNodeList::adopt(nodes);
360 } 360 }
361 361
362 StaticNodeList* SVGSVGElement::getIntersectionList(SVGRectTearOff* rect, SVGElem ent* referenceElement) const 362 StaticNodeList* SVGSVGElement::getIntersectionList(SVGRectTearOff* rect, SVGElem ent* referenceElement) const
363 { 363 {
364 document().updateLayoutIgnorePendingStylesheets(); 364 document().updateStyleAndLayoutIgnorePendingStylesheets();
365 365
366 return collectIntersectionOrEnclosureList(rect->target()->value(), reference Element, CheckIntersection); 366 return collectIntersectionOrEnclosureList(rect->target()->value(), reference Element, CheckIntersection);
367 } 367 }
368 368
369 StaticNodeList* SVGSVGElement::getEnclosureList(SVGRectTearOff* rect, SVGElement * referenceElement) const 369 StaticNodeList* SVGSVGElement::getEnclosureList(SVGRectTearOff* rect, SVGElement * referenceElement) const
370 { 370 {
371 document().updateLayoutIgnorePendingStylesheets(); 371 document().updateStyleAndLayoutIgnorePendingStylesheets();
372 372
373 return collectIntersectionOrEnclosureList(rect->target()->value(), reference Element, CheckEnclosure); 373 return collectIntersectionOrEnclosureList(rect->target()->value(), reference Element, CheckEnclosure);
374 } 374 }
375 375
376 bool SVGSVGElement::checkIntersection(SVGElement* element, SVGRectTearOff* rect) const 376 bool SVGSVGElement::checkIntersection(SVGElement* element, SVGRectTearOff* rect) const
377 { 377 {
378 ASSERT(element); 378 ASSERT(element);
379 document().updateLayoutIgnorePendingStylesheets(); 379 document().updateStyleAndLayoutIgnorePendingStylesheets();
380 380
381 return checkIntersectionOrEnclosure(*element, rect->target()->value(), Check Intersection); 381 return checkIntersectionOrEnclosure(*element, rect->target()->value(), Check Intersection);
382 } 382 }
383 383
384 bool SVGSVGElement::checkEnclosure(SVGElement* element, SVGRectTearOff* rect) co nst 384 bool SVGSVGElement::checkEnclosure(SVGElement* element, SVGRectTearOff* rect) co nst
385 { 385 {
386 ASSERT(element); 386 ASSERT(element);
387 document().updateLayoutIgnorePendingStylesheets(); 387 document().updateStyleAndLayoutIgnorePendingStylesheets();
388 388
389 return checkIntersectionOrEnclosure(*element, rect->target()->value(), Check Enclosure); 389 return checkIntersectionOrEnclosure(*element, rect->target()->value(), Check Enclosure);
390 } 390 }
391 391
392 void SVGSVGElement::deselectAll() 392 void SVGSVGElement::deselectAll()
393 { 393 {
394 if (LocalFrame* frame = document().frame()) 394 if (LocalFrame* frame = document().frame())
395 frame->selection().clear(); 395 frame->selection().clear();
396 } 396 }
397 397
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 visitor->trace(m_width); 739 visitor->trace(m_width);
740 visitor->trace(m_height); 740 visitor->trace(m_height);
741 visitor->trace(m_translation); 741 visitor->trace(m_translation);
742 visitor->trace(m_timeContainer); 742 visitor->trace(m_timeContainer);
743 visitor->trace(m_viewSpec); 743 visitor->trace(m_viewSpec);
744 SVGGraphicsElement::trace(visitor); 744 SVGGraphicsElement::trace(visitor);
745 SVGFitToViewBox::trace(visitor); 745 SVGFitToViewBox::trace(visitor);
746 } 746 }
747 747
748 } // namespace blink 748 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGPathElement.cpp ('k') | third_party/WebKit/Source/core/svg/SVGTextContentElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698