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

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

Issue 2648423002: Rename feature policy classes. (Closed)
Patch Set: Rebase Created 3 years, 10 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 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 FeaturePolicy* parentFeaturePolicy = 583 FeaturePolicy* parentFeaturePolicy =
584 (isLoadingMainFrame() ? nullptr 584 (isLoadingMainFrame() ? nullptr
585 : m_frame->client() 585 : m_frame->client()
586 ->parent() 586 ->parent()
587 ->securityContext() 587 ->securityContext()
588 ->getFeaturePolicy()); 588 ->getFeaturePolicy());
589 const String& featurePolicyHeader = 589 const String& featurePolicyHeader =
590 m_documentLoader->response().httpHeaderField( 590 m_documentLoader->response().httpHeaderField(
591 HTTPNames::Feature_Policy); 591 HTTPNames::Feature_Policy);
592 Vector<String> messages; 592 Vector<String> messages;
593 const WebParsedFeaturePolicy& parsedHeader = 593 const WebParsedFeaturePolicyHeader& parsedHeader =
594 FeaturePolicy::parseFeaturePolicy( 594 FeaturePolicy::parseFeaturePolicy(
595 featurePolicyHeader, 595 featurePolicyHeader,
596 m_frame->securityContext()->getSecurityOrigin(), &messages); 596 m_frame->securityContext()->getSecurityOrigin(), &messages);
597 m_frame->securityContext()->setFeaturePolicyFromHeader( 597 m_frame->securityContext()->setFeaturePolicyFromHeader(
598 parsedHeader, parentFeaturePolicy); 598 parsedHeader, parentFeaturePolicy);
599 for (auto& message : messages) { 599 for (auto& message : messages) {
600 m_frame->document()->addConsoleMessage(ConsoleMessage::create( 600 m_frame->document()->addConsoleMessage(ConsoleMessage::create(
601 OtherMessageSource, ErrorMessageLevel, 601 OtherMessageSource, ErrorMessageLevel,
602 "Error with Feature-Policy header: " + message)); 602 "Error with Feature-Policy header: " + message));
603 } 603 }
(...skipping 1323 matching lines...) Expand 10 before | Expand all | Expand 10 after
1927 m_documentLoader ? m_documentLoader->url() : String()); 1927 m_documentLoader ? m_documentLoader->url() : String());
1928 return tracedValue; 1928 return tracedValue;
1929 } 1929 }
1930 1930
1931 inline void FrameLoader::takeObjectSnapshot() const { 1931 inline void FrameLoader::takeObjectSnapshot() const {
1932 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, 1932 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this,
1933 toTracedValue()); 1933 toTracedValue());
1934 } 1934 }
1935 1935
1936 } // namespace blink 1936 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/SecurityContext.cpp ('k') | third_party/WebKit/Source/core/loader/FrameLoaderClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698