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

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

Issue 1738133002: Add support for media attribute on link (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 9 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 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 ASSERT(m_frame->document()); 442 ASSERT(m_frame->document());
443 ASSERT(m_frame->document()->fetcher()); 443 ASSERT(m_frame->document()->fetcher());
444 m_frame->document()->setReadyState(Document::Loading); 444 m_frame->document()->setReadyState(Document::Loading);
445 445
446 if (dispatch) 446 if (dispatch)
447 dispatchDidClearDocumentOfWindowObject(); 447 dispatchDidClearDocumentOfWindowObject();
448 448
449 m_frame->document()->initContentSecurityPolicy(m_documentLoader ? m_document Loader->releaseContentSecurityPolicy() : ContentSecurityPolicy::create()); 449 m_frame->document()->initContentSecurityPolicy(m_documentLoader ? m_document Loader->releaseContentSecurityPolicy() : ContentSecurityPolicy::create());
450 if (m_documentLoader && !m_documentLoader->suboriginName().isNull()) 450 if (m_documentLoader && !m_documentLoader->suboriginName().isNull())
451 m_frame->document()->enforceSuborigin(m_documentLoader->suboriginName()) ; 451 m_frame->document()->enforceSuborigin(m_documentLoader->suboriginName()) ;
452 if (m_documentLoader) { 452 if (m_documentLoader)
453 m_frame->document()->clientHintsPreferences().updateFrom(m_documentLoade r->clientHintsPreferences()); 453 m_frame->document()->clientHintsPreferences().updateFrom(m_documentLoade r->clientHintsPreferences());
454 LinkLoader::loadLinkFromHeader(m_documentLoader->response().httpHeaderFi eld(HTTPNames::Link), m_documentLoader->response().url(),
455 m_frame->document(), NetworkHintsInterfaceImpl(), LinkLoader::OnlyLo adResources);
456 }
457 454
458 Settings* settings = m_frame->document()->settings(); 455 Settings* settings = m_frame->document()->settings();
459 if (settings) { 456 if (settings) {
460 m_frame->document()->fetcher()->setImagesEnabled(settings->imagesEnabled ()); 457 m_frame->document()->fetcher()->setImagesEnabled(settings->imagesEnabled ());
461 m_frame->document()->fetcher()->setAutoLoadImages(settings->loadsImagesA utomatically()); 458 m_frame->document()->fetcher()->setAutoLoadImages(settings->loadsImagesA utomatically());
462 } 459 }
463 460
464 if (m_documentLoader) { 461 if (m_documentLoader) {
465 const AtomicString& dnsPrefetchControl = m_documentLoader->response().ht tpHeaderField(HTTPNames::X_DNS_Prefetch_Control); 462 const AtomicString& dnsPrefetchControl = m_documentLoader->response().ht tpHeaderField(HTTPNames::X_DNS_Prefetch_Control);
466 if (!dnsPrefetchControl.isEmpty()) 463 if (!dnsPrefetchControl.isEmpty())
(...skipping 1107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1574 // FIXME: We need a way to propagate insecure requests policy flags to 1571 // FIXME: We need a way to propagate insecure requests policy flags to
1575 // out-of-process frames. For now, we'll always use default behavior. 1572 // out-of-process frames. For now, we'll always use default behavior.
1576 if (!parentFrame->isLocalFrame()) 1573 if (!parentFrame->isLocalFrame())
1577 return nullptr; 1574 return nullptr;
1578 1575
1579 ASSERT(toLocalFrame(parentFrame)->document()); 1576 ASSERT(toLocalFrame(parentFrame)->document());
1580 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1577 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1581 } 1578 }
1582 1579
1583 } // namespace blink 1580 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698