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

Side by Side Diff: third_party/WebKit/Source/core/loader/ImageLoader.cpp

Issue 2201313002: Revert of Load data URI images in an async way according to spec (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
OLDNEW
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 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 421
422 bool ImageLoader::shouldLoadImmediately(const KURL& url) const 422 bool ImageLoader::shouldLoadImmediately(const KURL& url) const
423 { 423 {
424 // We force any image loads which might require alt content through the asyn chronous path so that we can add the shadow DOM 424 // We force any image loads which might require alt content through the asyn chronous path so that we can add the shadow DOM
425 // for the alt-text content when style recalc is over and DOM mutation is al lowed again. 425 // for the alt-text content when style recalc is over and DOM mutation is al lowed again.
426 if (!url.isNull()) { 426 if (!url.isNull()) {
427 Resource* resource = memoryCache()->resourceForURL(url, m_element->docum ent().fetcher()->getCacheIdentifier()); 427 Resource* resource = memoryCache()->resourceForURL(url, m_element->docum ent().fetcher()->getCacheIdentifier());
428 if (resource && !resource->errorOccurred()) 428 if (resource && !resource->errorOccurred())
429 return true; 429 return true;
430 } 430 }
431 return (isHTMLObjectElement(m_element) || isHTMLEmbedElement(m_element)); 431 return (isHTMLObjectElement(m_element) || isHTMLEmbedElement(m_element) || u rl.protocolIsData());
432 } 432 }
433 433
434 void ImageLoader::imageNotifyFinished(ImageResource* resource) 434 void ImageLoader::imageNotifyFinished(ImageResource* resource)
435 { 435 {
436 WTF_LOG(ResourceLoading, "ImageLoader::imageNotifyFinished %p; m_hasPendingL oadEvent=%d", 436 WTF_LOG(ResourceLoading, "ImageLoader::imageNotifyFinished %p; m_hasPendingL oadEvent=%d",
437 this, m_hasPendingLoadEvent); 437 this, m_hasPendingLoadEvent);
438 438
439 ASSERT(m_failedLoadURL.isEmpty()); 439 ASSERT(m_failedLoadURL.isEmpty());
440 ASSERT(resource == m_image.get()); 440 ASSERT(resource == m_image.get());
441 441
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 604
605 void ImageLoader::elementDidMoveToNewDocument() 605 void ImageLoader::elementDidMoveToNewDocument()
606 { 606 {
607 if (m_loadDelayCounter) 607 if (m_loadDelayCounter)
608 m_loadDelayCounter->documentChanged(m_element->document()); 608 m_loadDelayCounter->documentChanged(m_element->document());
609 clearFailedLoadURL(); 609 clearFailedLoadURL();
610 setImage(0); 610 setImage(0);
611 } 611 }
612 612
613 } // namespace blink 613 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698