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

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

Issue 1287783003: Make ClientHintsPreferences class work like a class. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/FrameFetchContextTest.cpp ('k') | Source/core/loader/HttpEquiv.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) 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 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 ASSERT(m_frame); 433 ASSERT(m_frame);
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()->setClientHintsPreferences(m_documentLoader->clientH intsPreferences()); 443 m_frame->document()->clientHintsPreferences().updateFrom(m_documentLoade r->clientHintsPreferences());
444 444
445 Settings* settings = m_frame->document()->settings(); 445 Settings* settings = m_frame->document()->settings();
446 if (settings) { 446 if (settings) {
447 m_frame->document()->fetcher()->setImagesEnabled(settings->imagesEnabled ()); 447 m_frame->document()->fetcher()->setImagesEnabled(settings->imagesEnabled ());
448 m_frame->document()->fetcher()->setAutoLoadImages(settings->loadsImagesA utomatically()); 448 m_frame->document()->fetcher()->setAutoLoadImages(settings->loadsImagesA utomatically());
449 } 449 }
450 450
451 if (m_documentLoader) { 451 if (m_documentLoader) {
452 const AtomicString& dnsPrefetchControl = m_documentLoader->response().ht tpHeaderField("X-DNS-Prefetch-Control"); 452 const AtomicString& dnsPrefetchControl = m_documentLoader->response().ht tpHeaderField("X-DNS-Prefetch-Control");
453 if (!dnsPrefetchControl.isEmpty()) 453 if (!dnsPrefetchControl.isEmpty())
(...skipping 1060 matching lines...) Expand 10 before | Expand all | Expand 10 after
1514 // FIXME: We need a way to propagate insecure requests policy flags to 1514 // FIXME: We need a way to propagate insecure requests policy flags to
1515 // out-of-process frames. For now, we'll always use default behavior. 1515 // out-of-process frames. For now, we'll always use default behavior.
1516 if (!parentFrame->isLocalFrame()) 1516 if (!parentFrame->isLocalFrame())
1517 return nullptr; 1517 return nullptr;
1518 1518
1519 ASSERT(toLocalFrame(parentFrame)->document()); 1519 ASSERT(toLocalFrame(parentFrame)->document());
1520 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1520 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1521 } 1521 }
1522 1522
1523 } // namespace blink 1523 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/loader/FrameFetchContextTest.cpp ('k') | Source/core/loader/HttpEquiv.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698