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

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

Issue 1544473004: Revert of SVGImage: check requestCount() to check all subresources are loaded (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 ASSERT(resource == m_image.get()); 480 ASSERT(resource == m_image.get());
481 481
482 m_imageComplete = true; 482 m_imageComplete = true;
483 483
484 // Update ImageAnimationPolicy for m_image. 484 // Update ImageAnimationPolicy for m_image.
485 if (m_image) 485 if (m_image)
486 m_image->updateImageAnimationPolicy(); 486 m_image->updateImageAnimationPolicy();
487 487
488 updateLayoutObject(); 488 updateLayoutObject();
489 489
490 if (m_image && m_image->image() && m_image->image()->isSVGImage()) { 490 if (m_image && m_image->image() && m_image->image()->isSVGImage())
491 toSVGImage(m_image->image())->assertSubresourcesLoaded();
492 toSVGImage(m_image->image())->updateUseCounters(element()->document()); 491 toSVGImage(m_image->image())->updateUseCounters(element()->document());
493 }
494 492
495 if (!m_hasPendingLoadEvent) 493 if (!m_hasPendingLoadEvent)
496 return; 494 return;
497 495
498 if (resource->errorOccurred()) { 496 if (resource->errorOccurred()) {
499 loadEventSender().cancelEvent(this); 497 loadEventSender().cancelEvent(this);
500 m_hasPendingLoadEvent = false; 498 m_hasPendingLoadEvent = false;
501 499
502 if (resource->resourceError().isAccessCheck()) 500 if (resource->resourceError().isAccessCheck())
503 crossSiteOrCSPViolationOccurred(AtomicString(resource->resourceError ().failingURL())); 501 crossSiteOrCSPViolationOccurred(AtomicString(resource->resourceError ().failingURL()));
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 677
680 void ImageLoader::sourceImageChanged() 678 void ImageLoader::sourceImageChanged()
681 { 679 {
682 for (auto& client : m_clients) { 680 for (auto& client : m_clients) {
683 ImageLoaderClient* handle = client; 681 ImageLoaderClient* handle = client;
684 handle->notifyImageSourceChanged(); 682 handle->notifyImageSourceChanged();
685 } 683 }
686 } 684 }
687 685
688 } // namespace blink 686 } // 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