| OLD | NEW |
| 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 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 575 if (!headerContentLanguage.isEmpty()) { | 575 if (!headerContentLanguage.isEmpty()) { |
| 576 m_frame->document()->setContentLanguage( | 576 m_frame->document()->setContentLanguage( |
| 577 AtomicString(headerContentLanguage)); | 577 AtomicString(headerContentLanguage)); |
| 578 } | 578 } |
| 579 } | 579 } |
| 580 | 580 |
| 581 OriginTrialContext::addTokensFromHeader( | 581 OriginTrialContext::addTokensFromHeader( |
| 582 m_frame->document(), | 582 m_frame->document(), |
| 583 m_documentLoader->response().httpHeaderField(HTTPNames::Origin_Trial)); | 583 m_documentLoader->response().httpHeaderField(HTTPNames::Origin_Trial)); |
| 584 if (RuntimeEnabledFeatures::featurePolicyEnabled()) { | 584 if (RuntimeEnabledFeatures::featurePolicyEnabled()) { |
| 585 FeaturePolicy* parentFeaturePolicy = | 585 WebFeaturePolicy* parentFeaturePolicy = |
| 586 (isLoadingMainFrame() ? nullptr | 586 (isLoadingMainFrame() ? nullptr |
| 587 : m_frame->client() | 587 : m_frame->client() |
| 588 ->parent() | 588 ->parent() |
| 589 ->securityContext() | 589 ->securityContext() |
| 590 ->getFeaturePolicy()); | 590 ->getFeaturePolicy()); |
| 591 const String& featurePolicyHeader = | 591 const String& featurePolicyHeader = |
| 592 m_documentLoader->response().httpHeaderField( | 592 m_documentLoader->response().httpHeaderField( |
| 593 HTTPNames::Feature_Policy); | 593 HTTPNames::Feature_Policy); |
| 594 Vector<String> messages; | 594 Vector<String> messages; |
| 595 const WebParsedFeaturePolicyHeader& parsedHeader = | 595 const WebParsedFeaturePolicyHeader& parsedHeader = |
| (...skipping 1414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2010 frameLoadRequest.clientRedirect()); | 2010 frameLoadRequest.clientRedirect()); |
| 2011 | 2011 |
| 2012 loader->setLoadType(loadType); | 2012 loader->setLoadType(loadType); |
| 2013 loader->setNavigationType(navigationType); | 2013 loader->setNavigationType(navigationType); |
| 2014 loader->setReplacesCurrentHistoryItem(loadType == | 2014 loader->setReplacesCurrentHistoryItem(loadType == |
| 2015 FrameLoadTypeReplaceCurrentItem); | 2015 FrameLoadTypeReplaceCurrentItem); |
| 2016 return loader; | 2016 return loader; |
| 2017 } | 2017 } |
| 2018 | 2018 |
| 2019 } // namespace blink | 2019 } // namespace blink |
| OLD | NEW |