| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv
ed. | 4 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv
ed. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 OwnPtr<IncrementLoadEventDelayCount> loadDelayCounter; | 245 OwnPtr<IncrementLoadEventDelayCount> loadDelayCounter; |
| 246 loadDelayCounter.swap(m_loadDelayCounter); | 246 loadDelayCounter.swap(m_loadDelayCounter); |
| 247 | 247 |
| 248 Document& document = m_element->document(); | 248 Document& document = m_element->document(); |
| 249 if (!document.isActive()) | 249 if (!document.isActive()) |
| 250 return; | 250 return; |
| 251 | 251 |
| 252 AtomicString imageSourceURL = m_element->imageSourceURL(); | 252 AtomicString imageSourceURL = m_element->imageSourceURL(); |
| 253 KURL url = imageSourceToKURL(imageSourceURL); | 253 KURL url = imageSourceToKURL(imageSourceURL); |
| 254 ResourcePtr<ImageResource> newImage = 0; | 254 ResourcePtr<ImageResource> newImage = 0; |
| 255 RefPtrWillBeRawPtr<Element> protectElement(m_element); | 255 RefPtrWillBeRawPtr<Element> protectElement(m_element.get()); |
| 256 if (!url.isNull()) { | 256 if (!url.isNull()) { |
| 257 // Unlike raw <img>, we block mixed content inside of <picture> or <img
srcset>. | 257 // Unlike raw <img>, we block mixed content inside of <picture> or <img
srcset>. |
| 258 ResourceLoaderOptions resourceLoaderOptions = ResourceFetcher::defaultRe
sourceOptions(); | 258 ResourceLoaderOptions resourceLoaderOptions = ResourceFetcher::defaultRe
sourceOptions(); |
| 259 ResourceRequest resourceRequest(url); | 259 ResourceRequest resourceRequest(url); |
| 260 resourceRequest.setFetchCredentialsMode(WebURLRequest::FetchCredentialsM
odeSameOrigin); | 260 resourceRequest.setFetchCredentialsMode(WebURLRequest::FetchCredentialsM
odeSameOrigin); |
| 261 if (isHTMLPictureElement(element()->parentNode()) || !element()->fastGet
Attribute(HTMLNames::srcsetAttr).isNull()) { | 261 if (isHTMLPictureElement(element()->parentNode()) || !element()->fastGet
Attribute(HTMLNames::srcsetAttr).isNull()) { |
| 262 resourceLoaderOptions.mixedContentBlockingTreatment = TreatAsActiveC
ontent; | 262 resourceLoaderOptions.mixedContentBlockingTreatment = TreatAsActiveC
ontent; |
| 263 resourceRequest.setRequestContext(WebURLRequest::RequestContextImage
Set); | 263 resourceRequest.setRequestContext(WebURLRequest::RequestContextImage
Set); |
| 264 } | 264 } |
| 265 FetchRequest request(resourceRequest, element()->localName(), resourceLo
aderOptions); | 265 FetchRequest request(resourceRequest, element()->localName(), resourceLo
aderOptions); |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 588 #endif | 588 #endif |
| 589 } | 589 } |
| 590 | 590 |
| 591 #if ENABLE(OILPAN) | 591 #if ENABLE(OILPAN) |
| 592 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover() | 592 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover() |
| 593 { | 593 { |
| 594 m_loader.willRemoveClient(m_client); | 594 m_loader.willRemoveClient(m_client); |
| 595 } | 595 } |
| 596 #endif | 596 #endif |
| 597 } | 597 } |
| OLD | NEW |