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

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

Issue 2685113002: Cleanup SVGElement::layoutObjectIsNeeded. (Closed)
Patch Set: Preserving behavior Created 3 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) 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 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 return transform.multiply(viewBoxTransform); 503 return transform.multiply(viewBoxTransform);
504 } 504 }
505 505
506 bool SVGSVGElement::layoutObjectIsNeeded(const ComputedStyle& style) { 506 bool SVGSVGElement::layoutObjectIsNeeded(const ComputedStyle& style) {
507 // FIXME: We should respect display: none on the documentElement svg element 507 // FIXME: We should respect display: none on the documentElement svg element
508 // but many things in FrameView and SVGImage depend on the LayoutSVGRoot when 508 // but many things in FrameView and SVGImage depend on the LayoutSVGRoot when
509 // they should instead depend on the LayoutView. 509 // they should instead depend on the LayoutView.
510 // https://bugs.webkit.org/show_bug.cgi?id=103493 510 // https://bugs.webkit.org/show_bug.cgi?id=103493
511 if (document().documentElement() == this) 511 if (document().documentElement() == this)
512 return true; 512 return true;
513 return Element::layoutObjectIsNeeded(style); 513 return SVGElement::layoutObjectIsNeeded(style);
514 } 514 }
515 515
516 LayoutObject* SVGSVGElement::createLayoutObject(const ComputedStyle&) { 516 LayoutObject* SVGSVGElement::createLayoutObject(const ComputedStyle&) {
517 if (isOutermostSVGSVGElement()) 517 if (isOutermostSVGSVGElement())
518 return new LayoutSVGRoot(this); 518 return new LayoutSVGRoot(this);
519 519
520 return new LayoutSVGViewportContainer(this); 520 return new LayoutSVGViewportContainer(this);
521 } 521 }
522 522
523 Node::InsertionNotificationRequest SVGSVGElement::insertedInto( 523 Node::InsertionNotificationRequest SVGSVGElement::insertedInto(
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 visitor->trace(m_width); 760 visitor->trace(m_width);
761 visitor->trace(m_height); 761 visitor->trace(m_height);
762 visitor->trace(m_translation); 762 visitor->trace(m_translation);
763 visitor->trace(m_timeContainer); 763 visitor->trace(m_timeContainer);
764 visitor->trace(m_viewSpec); 764 visitor->trace(m_viewSpec);
765 SVGGraphicsElement::trace(visitor); 765 SVGGraphicsElement::trace(visitor);
766 SVGFitToViewBox::trace(visitor); 766 SVGFitToViewBox::trace(visitor);
767 } 767 }
768 768
769 } // namespace blink 769 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGGElement.cpp ('k') | third_party/WebKit/Source/core/svg/SVGTSpanElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698