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

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

Issue 1515963005: SVGImage: check requestCount() to check all subresources are loaded (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: auto-Rebase Created 4 years, 8 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/svg/graphics/SVGImage.h » ('j') | 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) 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 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 m_imageComplete = true; 474 m_imageComplete = true;
475 ImageResource* cachedImage = m_image.get(); 475 ImageResource* cachedImage = m_image.get();
476 ASSERT(cachedImage); 476 ASSERT(cachedImage);
477 477
478 // Update ImageAnimationPolicy for |cachedImage|. 478 // Update ImageAnimationPolicy for |cachedImage|.
479 if (cachedImage) 479 if (cachedImage)
480 cachedImage->updateImageAnimationPolicy(); 480 cachedImage->updateImageAnimationPolicy();
481 481
482 updateLayoutObject(); 482 updateLayoutObject();
483 483
484 if (cachedImage && cachedImage->getImage() && cachedImage->getImage()->isSVG Image()) 484 if (cachedImage && cachedImage->getImage() && cachedImage->getImage()->isSVG Image()) {
485 toSVGImage(m_image->getImage())->assertSubresourcesLoaded();
485 toSVGImage(cachedImage->getImage())->updateUseCounters(element()->docume nt()); 486 toSVGImage(cachedImage->getImage())->updateUseCounters(element()->docume nt());
487 }
486 488
487 finishInternal(cachedImage); 489 finishInternal(cachedImage);
488 490
489 // Dispatches image's load/error event. 491 // Dispatches image's load/error event.
490 if (m_hasPendingLoadEvent) { 492 if (m_hasPendingLoadEvent) {
491 m_hasPendingLoadEvent = false; 493 m_hasPendingLoadEvent = false;
492 494
493 if (cachedImage->errorOccurred()) { 495 if (cachedImage->errorOccurred()) {
494 if (cachedImage->resourceError().isAccessCheck()) 496 if (cachedImage->resourceError().isAccessCheck())
495 crossSiteOrCSPViolationOccurred(AtomicString(cachedImage->resour ceError().failingURL())); 497 crossSiteOrCSPViolationOccurred(AtomicString(cachedImage->resour ceError().failingURL()));
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 m_loadDelayCounterForMicrotask->documentChanged(m_element->document()); 613 m_loadDelayCounterForMicrotask->documentChanged(m_element->document());
612 if (m_loadDelayCounterForFinish) 614 if (m_loadDelayCounterForFinish)
613 m_loadDelayCounterForFinish->documentChanged(m_element->document()); 615 m_loadDelayCounterForFinish->documentChanged(m_element->document());
614 if (m_loadDelayCounterForError) 616 if (m_loadDelayCounterForError)
615 m_loadDelayCounterForError->documentChanged(m_element->document()); 617 m_loadDelayCounterForError->documentChanged(m_element->document());
616 clearFailedLoadURL(); 618 clearFailedLoadURL();
617 setImage(0); 619 setImage(0);
618 } 620 }
619 621
620 } // namespace blink 622 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/svg/graphics/SVGImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698