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

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

Issue 1185553002: ResourceTiming should not depend on Document (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 void FrameFetchContext::didLoadResource() 303 void FrameFetchContext::didLoadResource()
304 { 304 {
305 frame()->loader().checkCompleted(); 305 frame()->loader().checkCompleted();
306 } 306 }
307 307
308 void FrameFetchContext::addResourceTiming(ResourceTimingInfo* info, bool isMainR esource) 308 void FrameFetchContext::addResourceTiming(ResourceTimingInfo* info, bool isMainR esource)
309 { 309 {
310 Document* initiatorDocument = m_document && isMainResource ? m_document->par entDocument() : m_document.get(); 310 Document* initiatorDocument = m_document && isMainResource ? m_document->par entDocument() : m_document.get();
311 if (!initiatorDocument || !initiatorDocument->domWindow()) 311 if (!initiatorDocument || !initiatorDocument->domWindow())
312 return; 312 return;
313 DOMWindowPerformance::performance(*initiatorDocument->domWindow())->addResou rceTiming(*info, initiatorDocument); 313 DOMWindowPerformance::performance(*initiatorDocument->domWindow())->addResou rceTiming(*info, initiatorDocument->securityOrigin());
314 } 314 }
315 315
316 bool FrameFetchContext::allowImage(bool imagesEnabled, const KURL& url) const 316 bool FrameFetchContext::allowImage(bool imagesEnabled, const KURL& url) const
317 { 317 {
318 return frame()->loader().client()->allowImage(imagesEnabled, url); 318 return frame()->loader().client()->allowImage(imagesEnabled, url);
319 } 319 }
320 320
321 void FrameFetchContext::printAccessDeniedMessage(const KURL& url) const 321 void FrameFetchContext::printAccessDeniedMessage(const KURL& url) const
322 { 322 {
323 if (url.isNull()) 323 if (url.isNull())
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 fetchRequest.mutableResourceRequest().addHTTPHeaderField("CSP", "active" ); 641 fetchRequest.mutableResourceRequest().addHTTPHeaderField("CSP", "active" );
642 } 642 }
643 643
644 DEFINE_TRACE(FrameFetchContext) 644 DEFINE_TRACE(FrameFetchContext)
645 { 645 {
646 visitor->trace(m_document); 646 visitor->trace(m_document);
647 FetchContext::trace(visitor); 647 FetchContext::trace(visitor);
648 } 648 }
649 649
650 } // namespace blink 650 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/timing/PerformanceBase.h » ('j') | Source/core/timing/PerformanceBase.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698