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

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

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/loader/HttpEquiv.h" 5 #include "core/loader/HttpEquiv.h"
6 6
7 #include "core/dom/Document.h" 7 #include "core/dom/Document.h"
8 #include "core/dom/StyleEngine.h" 8 #include "core/dom/StyleEngine.h"
9 #include "core/fetch/ClientHintsPreferences.h" 9 #include "core/fetch/ClientHintsPreferences.h"
10 #include "core/frame/UseCounter.h" 10 #include "core/frame/UseCounter.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 void HttpEquiv::processHttpEquivXFrameOptions(Document& document, const AtomicSt ring& content) 95 void HttpEquiv::processHttpEquivXFrameOptions(Document& document, const AtomicSt ring& content)
96 { 96 {
97 LocalFrame* frame = document.frame(); 97 LocalFrame* frame = document.frame();
98 if (!frame) 98 if (!frame)
99 return; 99 return;
100 100
101 unsigned long requestIdentifier = document.loader()->mainResourceIdentifier( ); 101 unsigned long requestIdentifier = document.loader()->mainResourceIdentifier( );
102 if (!frame->loader().shouldInterruptLoadForXFrameOptions(content, document.u rl(), requestIdentifier)) 102 if (!frame->loader().shouldInterruptLoadForXFrameOptions(content, document.u rl(), requestIdentifier))
103 return; 103 return;
104 104
105 RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(S ecurityMessageSource, ErrorMessageLevel, 105 RawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(SecurityMessa geSource, ErrorMessageLevel,
106 "Refused to display '" + document.url().elidedString() + "' in a frame b ecause it set 'X-Frame-Options' to '" + content + "'."); 106 "Refused to display '" + document.url().elidedString() + "' in a frame b ecause it set 'X-Frame-Options' to '" + content + "'.");
107 consoleMessage->setRequestIdentifier(requestIdentifier); 107 consoleMessage->setRequestIdentifier(requestIdentifier);
108 document.addConsoleMessage(consoleMessage.release()); 108 document.addConsoleMessage(consoleMessage.release());
109 109
110 frame->loader().stopAllLoaders(); 110 frame->loader().stopAllLoaders();
111 // Stopping the loader isn't enough, as we're already parsing the document; to honor the header's 111 // Stopping the loader isn't enough, as we're already parsing the document; to honor the header's
112 // intent, we must navigate away from the possibly partially-rendered docume nt to a location that 112 // intent, we must navigate away from the possibly partially-rendered docume nt to a location that
113 // doesn't inherit the parent's SecurityOrigin. 113 // doesn't inherit the parent's SecurityOrigin.
114 // TODO(dglazkov): This should probably check document lifecycle instead. 114 // TODO(dglazkov): This should probably check document lifecycle instead.
115 if (document.frame()) 115 if (document.frame())
116 frame->navigate(document, SecurityOrigin::urlWithUniqueSecurityOrigin(), true, UserGestureStatus::None); 116 frame->navigate(document, SecurityOrigin::urlWithUniqueSecurityOrigin(), true, UserGestureStatus::None);
117 } 117 }
118 118
119 } // namespace blink 119 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698