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

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

Issue 2738953002: Rename WebParsedFeaturePolicyHeader to WebParsedFeaturePolicy (Closed)
Patch Set: ParsedFeaturePolicyHeader => ParsedFeaturePolicy (content version) Created 3 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 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
6 * (http://www.torchmobile.com/) 6 * (http://www.torchmobile.com/)
7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
10 * Copyright (C) 2011 Google Inc. All rights reserved. 10 * Copyright (C) 2011 Google Inc. All rights reserved.
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 WebFeaturePolicy* parentFeaturePolicy = 589 WebFeaturePolicy* parentFeaturePolicy =
590 (isLoadingMainFrame() ? nullptr 590 (isLoadingMainFrame() ? nullptr
591 : m_frame->client() 591 : m_frame->client()
592 ->parent() 592 ->parent()
593 ->securityContext() 593 ->securityContext()
594 ->getFeaturePolicy()); 594 ->getFeaturePolicy());
595 const String& featurePolicyHeader = 595 const String& featurePolicyHeader =
596 m_documentLoader->response().httpHeaderField( 596 m_documentLoader->response().httpHeaderField(
597 HTTPNames::Feature_Policy); 597 HTTPNames::Feature_Policy);
598 Vector<String> messages; 598 Vector<String> messages;
599 const WebParsedFeaturePolicyHeader& parsedHeader = parseFeaturePolicy( 599 const WebParsedFeaturePolicy& parsedHeader = parseFeaturePolicy(
600 featurePolicyHeader, m_frame->securityContext()->getSecurityOrigin(), 600 featurePolicyHeader, m_frame->securityContext()->getSecurityOrigin(),
601 &messages); 601 &messages);
602 m_frame->securityContext()->initializeFeaturePolicy(parsedHeader, 602 m_frame->securityContext()->initializeFeaturePolicy(parsedHeader,
603 parentFeaturePolicy); 603 parentFeaturePolicy);
604 for (auto& message : messages) { 604 for (auto& message : messages) {
605 m_frame->document()->addConsoleMessage(ConsoleMessage::create( 605 m_frame->document()->addConsoleMessage(ConsoleMessage::create(
606 OtherMessageSource, ErrorMessageLevel, 606 OtherMessageSource, ErrorMessageLevel,
607 "Error with Feature-Policy header: " + message)); 607 "Error with Feature-Policy header: " + message));
608 } 608 }
609 if (!parsedHeader.isEmpty()) 609 if (!parsedHeader.isEmpty())
(...skipping 1370 matching lines...) Expand 10 before | Expand all | Expand 10 after
1980 frameLoadRequest.clientRedirect()); 1980 frameLoadRequest.clientRedirect());
1981 1981
1982 loader->setLoadType(loadType); 1982 loader->setLoadType(loadType);
1983 loader->setNavigationType(navigationType); 1983 loader->setNavigationType(navigationType);
1984 loader->setReplacesCurrentHistoryItem(loadType == 1984 loader->setReplacesCurrentHistoryItem(loadType ==
1985 FrameLoadTypeReplaceCurrentItem); 1985 FrameLoadTypeReplaceCurrentItem);
1986 return loader; 1986 return loader;
1987 } 1987 }
1988 1988
1989 } // namespace blink 1989 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698