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

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

Issue 343513003: Restore a document.isActive() check to fix perf regression (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 { 168 {
169 // We don't need to call clearLoader here: Either we were called from the 169 // We don't need to call clearLoader here: Either we were called from the
170 // task, or our caller updateFromElement cleared the task's loader (and set 170 // task, or our caller updateFromElement cleared the task's loader (and set
171 // m_pendingTask to null). 171 // m_pendingTask to null).
172 m_pendingTask.clear(); 172 m_pendingTask.clear();
173 // Make sure to only decrement the count when we exit this function 173 // Make sure to only decrement the count when we exit this function
174 OwnPtr<IncrementLoadEventDelayCount> delayLoad; 174 OwnPtr<IncrementLoadEventDelayCount> delayLoad;
175 delayLoad.swap(m_delayLoad); 175 delayLoad.swap(m_delayLoad);
176 176
177 Document& document = m_element->document(); 177 Document& document = m_element->document();
178 if (!document.isActive())
179 return;
178 180
179 AtomicString attr = m_element->imageSourceURL(); 181 AtomicString attr = m_element->imageSourceURL();
180 182
181 KURL url = imageURL(); 183 KURL url = imageURL();
182 ResourcePtr<ImageResource> newImage = 0; 184 ResourcePtr<ImageResource> newImage = 0;
183 if (!url.isNull()) { 185 if (!url.isNull()) {
184 FetchRequest request(ResourceRequest(url), element()->localName()); 186 FetchRequest request(ResourceRequest(url), element()->localName());
185 if (bypassMainWorldCSP) 187 if (bypassMainWorldCSP)
186 request.setContentSecurityCheck(DoNotCheckContentSecurityPolicy); 188 request.setContentSecurityCheck(DoNotCheckContentSecurityPolicy);
187 189
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 } 541 }
540 542
541 #if ENABLE(OILPAN) 543 #if ENABLE(OILPAN)
542 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover() 544 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover()
543 { 545 {
544 m_loader.willRemoveClient(m_client); 546 m_loader.willRemoveClient(m_client);
545 } 547 }
546 #endif 548 #endif
547 549
548 } 550 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698