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

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

Issue 640463003: MemoryCache: Enable MemoryCache to have multiple isolated resource maps (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: tweak variable names Created 6 years, 1 month 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 | « Source/core/inspector/InspectorResourceAgent.cpp ('k') | Source/core/testing/Internals.cpp » ('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 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 url = document.completeURL(sourceURI(imageSourceURL)); 358 url = document.completeURL(sourceURI(imageSourceURL));
359 return url; 359 return url;
360 } 360 }
361 361
362 bool ImageLoader::shouldLoadImmediately(const KURL& url, LoadType loadType) cons t 362 bool ImageLoader::shouldLoadImmediately(const KURL& url, LoadType loadType) cons t
363 { 363 {
364 return (m_loadingImageDocument 364 return (m_loadingImageDocument
365 || isHTMLObjectElement(m_element) 365 || isHTMLObjectElement(m_element)
366 || isHTMLEmbedElement(m_element) 366 || isHTMLEmbedElement(m_element)
367 || url.protocolIsData() 367 || url.protocolIsData()
368 || memoryCache()->resourceForURL(url) 368 || memoryCache()->resourceForURL(url, m_element->document().fetcher()->g etCacheIdentifier())
369 || loadType == ForceLoadImmediately); 369 || loadType == ForceLoadImmediately);
370 } 370 }
371 371
372 void ImageLoader::notifyFinished(Resource* resource) 372 void ImageLoader::notifyFinished(Resource* resource)
373 { 373 {
374 WTF_LOG(Timers, "ImageLoader::notifyFinished %p; m_hasPendingLoadEvent=%d", 374 WTF_LOG(Timers, "ImageLoader::notifyFinished %p; m_hasPendingLoadEvent=%d",
375 this, m_hasPendingLoadEvent); 375 this, m_hasPendingLoadEvent);
376 376
377 ASSERT(m_failedLoadURL.isEmpty()); 377 ASSERT(m_failedLoadURL.isEmpty());
378 ASSERT(resource == m_image.get()); 378 ASSERT(resource == m_image.get());
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 } 572 }
573 573
574 #if ENABLE(OILPAN) 574 #if ENABLE(OILPAN)
575 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover() 575 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover()
576 { 576 {
577 m_loader.willRemoveClient(m_client); 577 m_loader.willRemoveClient(m_client);
578 } 578 }
579 #endif 579 #endif
580 580
581 } 581 }
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorResourceAgent.cpp ('k') | Source/core/testing/Internals.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698