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

Side by Side Diff: Source/core/loader/cache/CachedResourceLoader.cpp

Issue 14054023: Add loadedNonEmptyDocument flag in FrameLoader for Resource Timing (Closed) Base URL: http://chromium.googlesource.com/chromium/blink.git@master
Patch Set: store loadedNonEmptyDocument state in HTMLIFrameElement Created 7 years, 7 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) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
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 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 if (!memoryCache()->add(resource.get())) 480 if (!memoryCache()->add(resource.get()))
481 resource->setOwningCachedResourceLoader(this); 481 resource->setOwningCachedResourceLoader(this);
482 storeResourceTimingInitiatorInformation(resource, request); 482 storeResourceTimingInitiatorInformation(resource, request);
483 return resource; 483 return resource;
484 } 484 }
485 485
486 void CachedResourceLoader::storeResourceTimingInitiatorInformation(const CachedR esourceHandle<CachedResource>& resource, const CachedResourceRequest& request) 486 void CachedResourceLoader::storeResourceTimingInitiatorInformation(const CachedR esourceHandle<CachedResource>& resource, const CachedResourceRequest& request)
487 { 487 {
488 if (resource->type() == CachedResource::MainResource) { 488 if (resource->type() == CachedResource::MainResource) {
489 // <iframe>s should report the initial navigation requested by the paren t document, but not subsequent navigations. 489 // <iframe>s should report the initial navigation requested by the paren t document, but not subsequent navigations.
490 if (frame()->ownerElement() && m_documentLoader->frameLoader()->stateMac hine()->committingFirstRealLoad()) { 490 if (frame()->ownerElement() && !frame()->ownerElement()->loadedNonEmptyD ocument()) {
Nate Chapin 2013/04/30 19:55:58 I think this is the only use of committingFirstRea
Pan 2013/05/07 08:45:52 yes, right, glad to remove :)
491 InitiatorInfo info = { frame()->ownerElement()->localName(), monoton icallyIncreasingTime() }; 491 InitiatorInfo info = { frame()->ownerElement()->localName(), monoton icallyIncreasingTime() };
492 m_initiatorMap.add(resource.get(), info); 492 m_initiatorMap.add(resource.get(), info);
493 } 493 }
494 } else { 494 } else {
495 InitiatorInfo info = { request.initiatorName(), monotonicallyIncreasingT ime() }; 495 InitiatorInfo info = { request.initiatorName(), monotonicallyIncreasingT ime() };
496 m_initiatorMap.add(resource.get(), info); 496 m_initiatorMap.add(resource.get(), info);
497 } 497 }
498 } 498 }
499 499
500 CachedResourceLoader::RevalidationPolicy CachedResourceLoader::determineRevalida tionPolicy(CachedResource::Type type, ResourceRequest& request, bool forPreload, CachedResource* existingResource, CachedResourceRequest::DeferOption defer) con st 500 CachedResourceLoader::RevalidationPolicy CachedResourceLoader::determineRevalida tionPolicy(CachedResource::Type type, ResourceRequest& request, bool forPreload, CachedResource* existingResource, CachedResourceRequest::DeferOption defer) con st
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
927 info.ignoreMember(m_initiatorMap); 927 info.ignoreMember(m_initiatorMap);
928 } 928 }
929 929
930 const ResourceLoaderOptions& CachedResourceLoader::defaultCachedResourceOptions( ) 930 const ResourceLoaderOptions& CachedResourceLoader::defaultCachedResourceOptions( )
931 { 931 {
932 static ResourceLoaderOptions options(SendCallbacks, SniffContent, BufferData , AllowStoredCredentials, AskClientForCrossOriginCredentials, DoSecurityCheck); 932 static ResourceLoaderOptions options(SendCallbacks, SniffContent, BufferData , AllowStoredCredentials, AskClientForCrossOriginCredentials, DoSecurityCheck);
933 return options; 933 return options;
934 } 934 }
935 935
936 } 936 }
OLDNEW
« Source/core/loader/FrameLoader.cpp ('K') | « Source/core/loader/FrameLoader.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698