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

Side by Side Diff: content/shell/renderer/test_runner/web_frame_test_proxy.h

Issue 293363016: [abort] [webkit test runner] Complete location change when a frame is detached. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/shell/renderer/test_runner/web_test_proxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "content/shell/renderer/test_runner/TestInterfaces.h" 9 #include "content/shell/renderer/test_runner/TestInterfaces.h"
10 #include "content/shell/renderer/test_runner/WebTestDelegate.h" 10 #include "content/shell/renderer/test_runner/WebTestDelegate.h"
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 172
173 virtual void didDetectXSS(blink::WebLocalFrame* frame, 173 virtual void didDetectXSS(blink::WebLocalFrame* frame,
174 const blink::WebURL& insecureURL, 174 const blink::WebURL& insecureURL,
175 bool didBlockEntirePage) { 175 bool didBlockEntirePage) {
176 // This is not implemented in RenderFrameImpl, so need to explicitly call 176 // This is not implemented in RenderFrameImpl, so need to explicitly call
177 // into the base proxy. 177 // into the base proxy.
178 base_proxy_->DidDetectXSS(frame, insecureURL, didBlockEntirePage); 178 base_proxy_->DidDetectXSS(frame, insecureURL, didBlockEntirePage);
179 Base::didDetectXSS(frame, insecureURL, didBlockEntirePage); 179 Base::didDetectXSS(frame, insecureURL, didBlockEntirePage);
180 } 180 }
181 181
182 virtual void frameDetached(blink::WebFrame* frame) {
183 base_proxy_->FrameDetached(frame);
184 Base::frameDetached(frame);
185 }
186
182 virtual void didDispatchPingLoader(blink::WebLocalFrame* frame, 187 virtual void didDispatchPingLoader(blink::WebLocalFrame* frame,
183 const blink::WebURL& url) { 188 const blink::WebURL& url) {
184 // This is not implemented in RenderFrameImpl, so need to explicitly call 189 // This is not implemented in RenderFrameImpl, so need to explicitly call
185 // into the base proxy. 190 // into the base proxy.
186 base_proxy_->DidDispatchPingLoader(frame, url); 191 base_proxy_->DidDispatchPingLoader(frame, url);
187 Base::didDispatchPingLoader(frame, url); 192 Base::didDispatchPingLoader(frame, url);
188 } 193 }
189 194
190 virtual void willRequestResource(blink::WebLocalFrame* frame, 195 virtual void willRequestResource(blink::WebLocalFrame* frame,
191 const blink::WebCachedURLRequest& request) { 196 const blink::WebCachedURLRequest& request) {
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 } 283 }
279 284
280 WebTestProxyBase* base_proxy_; 285 WebTestProxyBase* base_proxy_;
281 286
282 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); 287 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
283 }; 288 };
284 289
285 } // namespace content 290 } // namespace content
286 291
287 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 292 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
OLDNEW
« no previous file with comments | « no previous file | content/shell/renderer/test_runner/web_test_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698