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

Side by Side Diff: third_party/WebKit/Source/core/fetch/ImageResource.cpp

Issue 2175593003: Revert "Ensure |m_image| is (re-)created in ImageResource::didAddClient()" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785
Patch Set: Created 4 years, 5 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) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
6 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 6 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 void ImageResource::markClientsAndObserversFinished() 108 void ImageResource::markClientsAndObserversFinished()
109 { 109 {
110 HashCountedSet<ImageResourceObserver*> observers; 110 HashCountedSet<ImageResourceObserver*> observers;
111 m_observers.swap(observers); 111 m_observers.swap(observers);
112 for (const auto& it : observers) 112 for (const auto& it : observers)
113 m_finishedObservers.add(it.key, it.value); 113 m_finishedObservers.add(it.key, it.value);
114 114
115 Resource::markClientsAndObserversFinished(); 115 Resource::markClientsAndObserversFinished();
116 } 116 }
117 117
118 void ImageResource::ensureImage()
119 {
120 if (m_data && !m_image && !errorOccurred()) {
121 createImage();
122 m_image->setData(m_data, true);
123 }
124 }
125
126 void ImageResource::didAddClient(ResourceClient* client)
127 {
128 ensureImage();
129 Resource::didAddClient(client);
130 }
131
132 void ImageResource::addObserver(ImageResourceObserver* observer) 118 void ImageResource::addObserver(ImageResourceObserver* observer)
133 { 119 {
134 willAddClientOrObserver(); 120 willAddClientOrObserver();
135 121
136 m_observers.add(observer); 122 m_observers.add(observer);
137 123
138 if (isCacheValidator()) 124 if (isCacheValidator())
139 return; 125 return;
140 126
141 ensureImage(); 127 if (m_data && !m_image && !errorOccurred()) {
128 createImage();
129 m_image->setData(m_data, true);
130 }
142 131
143 if (m_image && !m_image->isNull()) { 132 if (m_image && !m_image->isNull()) {
144 observer->imageChanged(this); 133 observer->imageChanged(this);
145 } 134 }
146 135
147 if (isLoaded()) { 136 if (isLoaded()) {
148 observer->imageNotifyFinished(this); 137 observer->imageNotifyFinished(this);
149 if (m_observers.contains(observer)) { 138 if (m_observers.contains(observer)) {
150 m_finishedObservers.add(observer); 139 m_finishedObservers.add(observer);
151 m_observers.remove(observer); 140 m_observers.remove(observer);
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 if (response().wasFetchedViaServiceWorker()) 567 if (response().wasFetchedViaServiceWorker())
579 return response().serviceWorkerResponseType() != WebServiceWorkerRespons eTypeOpaque; 568 return response().serviceWorkerResponseType() != WebServiceWorkerRespons eTypeOpaque;
580 if (!getImage()->currentFrameHasSingleSecurityOrigin()) 569 if (!getImage()->currentFrameHasSingleSecurityOrigin())
581 return false; 570 return false;
582 if (passesAccessControlCheck(securityOrigin)) 571 if (passesAccessControlCheck(securityOrigin))
583 return true; 572 return true;
584 return !securityOrigin->taintsCanvas(response().url()); 573 return !securityOrigin->taintsCanvas(response().url());
585 } 574 }
586 575
587 } // namespace blink 576 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ImageResource.h ('k') | third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698