diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/svg/SVGImageLoader.cpp')
-rw-r--r-- | chromium/third_party/WebKit/Source/core/svg/SVGImageLoader.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chromium/third_party/WebKit/Source/core/svg/SVGImageLoader.cpp b/chromium/third_party/WebKit/Source/core/svg/SVGImageLoader.cpp index e889c61b149..af9d5b7587e 100644 --- a/chromium/third_party/WebKit/Source/core/svg/SVGImageLoader.cpp +++ b/chromium/third_party/WebKit/Source/core/svg/SVGImageLoader.cpp @@ -23,7 +23,6 @@ #include "core/svg/SVGImageLoader.h" #include "core/events/Event.h" -#include "core/events/ThreadLocalEventNames.h" #include "core/fetch/ImageResource.h" #include "core/html/parser/HTMLParserIdioms.h" #include "core/svg/SVGImageElement.h" @@ -41,17 +40,16 @@ void SVGImageLoader::dispatchLoadEvent() element()->dispatchEvent(Event::create(EventTypeNames::error)); else { SVGImageElement* imageElement = toSVGImageElement(element()); - if (imageElement->externalResourcesRequiredBaseValue()) - imageElement->sendSVGLoadEventIfPossible(true); + imageElement->sendSVGLoadEventIfPossible(true); } } String SVGImageLoader::sourceURI(const AtomicString& attribute) const { KURL base = element()->baseURI(); - if (base.isValid()) - return KURL(base, stripLeadingAndTrailingHTMLSpaces(attribute)).string(); - return element()->document().completeURL(stripLeadingAndTrailingHTMLSpaces(attribute)); + if (!base.isValid()) + base = element()->document().baseURI(); + return element()->document().completeURLWithOverride(stripLeadingAndTrailingHTMLSpaces(attribute), base); } } |