Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 695 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 706 // FIXME: XPointer references are ignored (https://bugs.webkit.org/show_ bug.cgi?id=17491) | 706 // FIXME: XPointer references are ignored (https://bugs.webkit.org/show_ bug.cgi?id=17491) |
| 707 if (renderer && hadUseCurrentView) | 707 if (renderer && hadUseCurrentView) |
| 708 markForLayoutAndParentResourceInvalidation(renderer); | 708 markForLayoutAndParentResourceInvalidation(renderer); |
| 709 return; | 709 return; |
| 710 } | 710 } |
| 711 | 711 |
| 712 if (fragmentIdentifier.startsWith("svgView(")) { | 712 if (fragmentIdentifier.startsWith("svgView(")) { |
| 713 if (!view) | 713 if (!view) |
| 714 view = currentView(); // Create the SVGViewSpec. | 714 view = currentView(); // Create the SVGViewSpec. |
| 715 | 715 |
| 716 view->reset(); | |
|
fs
2015/03/18 13:43:08
It feels like this ought to go together with the c
| |
| 717 | |
| 716 if (view->parseViewSpec(fragmentIdentifier)) | 718 if (view->parseViewSpec(fragmentIdentifier)) |
| 717 m_useCurrentView = true; | 719 m_useCurrentView = true; |
| 718 else | 720 else |
| 719 view->reset(); | 721 view->reset(); |
| 720 | 722 |
| 721 if (renderer && (hadUseCurrentView || m_useCurrentView)) | 723 if (renderer && (hadUseCurrentView || m_useCurrentView)) |
| 722 markForLayoutAndParentResourceInvalidation(renderer); | 724 markForLayoutAndParentResourceInvalidation(renderer); |
| 723 return; | 725 return; |
| 724 } | 726 } |
| 725 | 727 |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 793 visitor->trace(m_width); | 795 visitor->trace(m_width); |
| 794 visitor->trace(m_height); | 796 visitor->trace(m_height); |
| 795 visitor->trace(m_translation); | 797 visitor->trace(m_translation); |
| 796 visitor->trace(m_timeContainer); | 798 visitor->trace(m_timeContainer); |
| 797 visitor->trace(m_viewSpec); | 799 visitor->trace(m_viewSpec); |
| 798 SVGGraphicsElement::trace(visitor); | 800 SVGGraphicsElement::trace(visitor); |
| 799 SVGFitToViewBox::trace(visitor); | 801 SVGFitToViewBox::trace(visitor); |
| 800 } | 802 } |
| 801 | 803 |
| 802 } // namespace blink | 804 } // namespace blink |
| OLD | NEW |