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

Side by Side Diff: Source/core/svg/SVGImageLoader.cpp

Issue 329943003: Fix resolving protocol-agnostic <svg:image> URLs in about:blank iframes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « LayoutTests/http/tests/svg/image-base-within-aboutblank-iframe-expected.html ('k') | 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) 2005, 2005 Alexander Kellett <lypanov@kde.org> 2 * Copyright (C) 2005, 2005 Alexander Kellett <lypanov@kde.org>
3 * Copyright (C) 2008 Rob Buis <buis@kde.org> 3 * Copyright (C) 2008 Rob Buis <buis@kde.org>
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 29 matching lines...) Expand all
40 element()->dispatchEvent(Event::create(EventTypeNames::error)); 40 element()->dispatchEvent(Event::create(EventTypeNames::error));
41 else { 41 else {
42 SVGImageElement* imageElement = toSVGImageElement(element()); 42 SVGImageElement* imageElement = toSVGImageElement(element());
43 imageElement->sendSVGLoadEventIfPossible(true); 43 imageElement->sendSVGLoadEventIfPossible(true);
44 } 44 }
45 } 45 }
46 46
47 String SVGImageLoader::sourceURI(const AtomicString& attribute) const 47 String SVGImageLoader::sourceURI(const AtomicString& attribute) const
48 { 48 {
49 KURL base = element()->baseURI(); 49 KURL base = element()->baseURI();
50 if (base.isValid()) 50 if (!base.isValid())
51 return KURL(base, stripLeadingAndTrailingHTMLSpaces(attribute)).string() ; 51 base = element()->document().baseURI();
52 return element()->document().completeURL(stripLeadingAndTrailingHTMLSpaces(a ttribute)); 52 return element()->document().completeURLWithOverride(stripLeadingAndTrailing HTMLSpaces(attribute), base);
53 } 53 }
54 54
55 } 55 }
OLDNEW
« no previous file with comments | « LayoutTests/http/tests/svg/image-base-within-aboutblank-iframe-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698