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

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 1627203002: Fix link header preload on subresources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added comment Created 4 years, 11 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) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
8 * Copyright (C) 2011 Google Inc. All rights reserved. 8 * Copyright (C) 2011 Google Inc. All rights reserved.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 ASSERT(m_frame->document()); 434 ASSERT(m_frame->document());
435 ASSERT(m_frame->document()->fetcher()); 435 ASSERT(m_frame->document()->fetcher());
436 m_frame->document()->setReadyState(Document::Loading); 436 m_frame->document()->setReadyState(Document::Loading);
437 437
438 if (dispatch) 438 if (dispatch)
439 dispatchDidClearDocumentOfWindowObject(); 439 dispatchDidClearDocumentOfWindowObject();
440 440
441 m_frame->document()->initContentSecurityPolicy(m_documentLoader ? m_document Loader->releaseContentSecurityPolicy() : ContentSecurityPolicy::create()); 441 m_frame->document()->initContentSecurityPolicy(m_documentLoader ? m_document Loader->releaseContentSecurityPolicy() : ContentSecurityPolicy::create());
442 if (m_documentLoader) { 442 if (m_documentLoader) {
443 m_frame->document()->clientHintsPreferences().updateFrom(m_documentLoade r->clientHintsPreferences()); 443 m_frame->document()->clientHintsPreferences().updateFrom(m_documentLoade r->clientHintsPreferences());
444 LinkLoader::loadLinkFromHeader(m_documentLoader->response().httpHeaderFi eld(HTTPNames::Link), m_frame->document(), NetworkHintsInterfaceImpl(), LinkLoad er::LoadResources); 444 LinkLoader::loadLinkFromHeader(m_documentLoader->response().httpHeaderFi eld(HTTPNames::Link), m_frame->document(), NetworkHintsInterfaceImpl(), LinkLoad er::OnlyLoadResources);
445 } 445 }
446 446
447 Settings* settings = m_frame->document()->settings(); 447 Settings* settings = m_frame->document()->settings();
448 if (settings) { 448 if (settings) {
449 m_frame->document()->fetcher()->setImagesEnabled(settings->imagesEnabled ()); 449 m_frame->document()->fetcher()->setImagesEnabled(settings->imagesEnabled ());
450 m_frame->document()->fetcher()->setAutoLoadImages(settings->loadsImagesA utomatically()); 450 m_frame->document()->fetcher()->setAutoLoadImages(settings->loadsImagesA utomatically());
451 } 451 }
452 452
453 if (m_documentLoader) { 453 if (m_documentLoader) {
454 const AtomicString& dnsPrefetchControl = m_documentLoader->response().ht tpHeaderField(HTTPNames::X_DNS_Prefetch_Control); 454 const AtomicString& dnsPrefetchControl = m_documentLoader->response().ht tpHeaderField(HTTPNames::X_DNS_Prefetch_Control);
(...skipping 1091 matching lines...) Expand 10 before | Expand all | Expand 10 after
1546 // FIXME: We need a way to propagate insecure requests policy flags to 1546 // FIXME: We need a way to propagate insecure requests policy flags to
1547 // out-of-process frames. For now, we'll always use default behavior. 1547 // out-of-process frames. For now, we'll always use default behavior.
1548 if (!parentFrame->isLocalFrame()) 1548 if (!parentFrame->isLocalFrame())
1549 return nullptr; 1549 return nullptr;
1550 1550
1551 ASSERT(toLocalFrame(parentFrame)->document()); 1551 ASSERT(toLocalFrame(parentFrame)->document());
1552 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1552 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1553 } 1553 }
1554 1554
1555 } // namespace blink 1555 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameFetchContext.cpp ('k') | third_party/WebKit/Source/core/loader/LinkLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698