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

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

Issue 1504333002: Remove special handling of xpointer( as fragment url (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 void SVGSVGElement::setupInitialView(const String& fragmentIdentifier, Element* anchorNode) 681 void SVGSVGElement::setupInitialView(const String& fragmentIdentifier, Element* anchorNode)
682 { 682 {
683 LayoutObject* layoutObject = this->layoutObject(); 683 LayoutObject* layoutObject = this->layoutObject();
684 SVGViewSpec* view = m_viewSpec.get(); 684 SVGViewSpec* view = m_viewSpec.get();
685 if (view) 685 if (view)
686 view->reset(); 686 view->reset();
687 687
688 bool hadUseCurrentView = m_useCurrentView; 688 bool hadUseCurrentView = m_useCurrentView;
689 m_useCurrentView = false; 689 m_useCurrentView = false;
690 690
691 if (fragmentIdentifier.startsWith("xpointer(")) {
692 // FIXME: XPointer references are ignored (https://bugs.webkit.org/show_ bug.cgi?id=17491)
693 if (layoutObject && hadUseCurrentView)
694 markForLayoutAndParentResourceInvalidation(layoutObject);
695 return;
696 }
697
698 if (fragmentIdentifier.startsWith("svgView(")) { 691 if (fragmentIdentifier.startsWith("svgView(")) {
699 if (!view) 692 if (!view)
700 view = currentView(); // Create the SVGViewSpec. 693 view = currentView(); // Create the SVGViewSpec.
701 694
702 view->inheritViewAttributesFromElement(this); 695 view->inheritViewAttributesFromElement(this);
703 696
704 if (view->parseViewSpec(fragmentIdentifier)) { 697 if (view->parseViewSpec(fragmentIdentifier)) {
705 UseCounter::count(document(), UseCounter::SVGSVGElementFragmentSVGVi ew); 698 UseCounter::count(document(), UseCounter::SVGSVGElementFragmentSVGVi ew);
706 m_useCurrentView = true; 699 m_useCurrentView = true;
707 } else { 700 } else {
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 visitor->trace(m_width); 765 visitor->trace(m_width);
773 visitor->trace(m_height); 766 visitor->trace(m_height);
774 visitor->trace(m_translation); 767 visitor->trace(m_translation);
775 visitor->trace(m_timeContainer); 768 visitor->trace(m_timeContainer);
776 visitor->trace(m_viewSpec); 769 visitor->trace(m_viewSpec);
777 SVGGraphicsElement::trace(visitor); 770 SVGGraphicsElement::trace(visitor);
778 SVGFitToViewBox::trace(visitor); 771 SVGFitToViewBox::trace(visitor);
779 } 772 }
780 773
781 } // namespace blink 774 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698