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

Side by Side Diff: third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp

Issue 2488743003: (Re-)introduce AncestorThrottle to handle 'X-Frame-Options'. (Closed)
Patch Set: Addressed comments (@alexmos #2) Created 4 years 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 } 132 }
133 133
134 void didReceiveResourceResponseButCanceled(LocalFrame* frame, 134 void didReceiveResourceResponseButCanceled(LocalFrame* frame,
135 DocumentLoader* loader, 135 DocumentLoader* loader,
136 unsigned long identifier, 136 unsigned long identifier,
137 const ResourceResponse& r, 137 const ResourceResponse& r,
138 Resource* resource) { 138 Resource* resource) {
139 didReceiveResourceResponse(frame, identifier, loader, r, resource); 139 didReceiveResourceResponse(frame, identifier, loader, r, resource);
140 } 140 }
141 141
142 void continueAfterXFrameOptionsDenied(LocalFrame* frame, 142 void canceledAfterReceivedResourceResponse(LocalFrame* frame,
143 DocumentLoader* loader, 143 DocumentLoader* loader,
144 unsigned long identifier, 144 unsigned long identifier,
145 const ResourceResponse& r, 145 const ResourceResponse& r,
146 Resource* resource) { 146 Resource* resource) {
147 didReceiveResourceResponseButCanceled(frame, loader, identifier, r, resource); 147 didReceiveResourceResponseButCanceled(frame, loader, identifier, r, resource);
148 } 148 }
149 149
150 void continueWithPolicyIgnore(LocalFrame* frame, 150 void continueWithPolicyIgnore(LocalFrame* frame,
151 DocumentLoader* loader, 151 DocumentLoader* loader,
152 unsigned long identifier, 152 unsigned long identifier,
153 const ResourceResponse& r, 153 const ResourceResponse& r,
154 Resource* resource) { 154 Resource* resource) {
155 didReceiveResourceResponseButCanceled(frame, loader, identifier, r, resource); 155 didReceiveResourceResponseButCanceled(frame, loader, identifier, r, resource);
156 } 156 }
(...skipping 14 matching lines...) Expand all
171 return instrumentingAgentsFor(toWorkerGlobalScope(context)); 171 return instrumentingAgentsFor(toWorkerGlobalScope(context));
172 if (context->isMainThreadWorkletGlobalScope()) 172 if (context->isMainThreadWorkletGlobalScope())
173 return instrumentingAgentsFor( 173 return instrumentingAgentsFor(
174 toMainThreadWorkletGlobalScope(context)->frame()); 174 toMainThreadWorkletGlobalScope(context)->frame());
175 return nullptr; 175 return nullptr;
176 } 176 }
177 177
178 } // namespace InspectorInstrumentation 178 } // namespace InspectorInstrumentation
179 179
180 } // namespace blink 180 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698