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

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

Issue 222973003: Conversion of content_shell target to use WebLocalFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove some TODOs Created 6 years, 8 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_WEBTESTPROXY_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "content/shell/renderer/test_runner/WebTask.h" 13 #include "content/shell/renderer/test_runner/WebTask.h"
14 #include "third_party/WebKit/public/platform/WebRect.h" 14 #include "third_party/WebKit/public/platform/WebRect.h"
15 #include "third_party/WebKit/public/platform/WebURLError.h" 15 #include "third_party/WebKit/public/platform/WebURLError.h"
16 #include "third_party/WebKit/public/platform/WebURLRequest.h" 16 #include "third_party/WebKit/public/platform/WebURLRequest.h"
17 #include "third_party/WebKit/public/web/WebAXEnums.h" 17 #include "third_party/WebKit/public/web/WebAXEnums.h"
18 #include "third_party/WebKit/public/web/WebDOMMessageEvent.h" 18 #include "third_party/WebKit/public/web/WebDOMMessageEvent.h"
19 #include "third_party/WebKit/public/web/WebDataSource.h" 19 #include "third_party/WebKit/public/web/WebDataSource.h"
20 #include "third_party/WebKit/public/web/WebDragOperation.h" 20 #include "third_party/WebKit/public/web/WebDragOperation.h"
21 #include "third_party/WebKit/public/web/WebIconURL.h" 21 #include "third_party/WebKit/public/web/WebIconURL.h"
22 // TODO(dcheng): Temporary. Convert to a forward declare.
23 #include "third_party/WebKit/public/web/WebLocalFrame.h"
22 #include "third_party/WebKit/public/web/WebNavigationPolicy.h" 24 #include "third_party/WebKit/public/web/WebNavigationPolicy.h"
23 #include "third_party/WebKit/public/web/WebNavigationType.h" 25 #include "third_party/WebKit/public/web/WebNavigationType.h"
24 #include "third_party/WebKit/public/web/WebSecurityOrigin.h" 26 #include "third_party/WebKit/public/web/WebSecurityOrigin.h"
25 #include "third_party/WebKit/public/web/WebTextAffinity.h" 27 #include "third_party/WebKit/public/web/WebTextAffinity.h"
26 #include "third_party/WebKit/public/web/WebTextDirection.h" 28 #include "third_party/WebKit/public/web/WebTextDirection.h"
27 29
28 namespace blink { 30 namespace blink {
29 class WebAXObject; 31 class WebAXObject;
30 class WebAudioDevice; 32 class WebAudioDevice;
31 class WebCachedURLRequest; 33 class WebCachedURLRequest;
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 135
134 void didInvalidateRect(const blink::WebRect&); 136 void didInvalidateRect(const blink::WebRect&);
135 void didScrollRect(int, int, const blink::WebRect&); 137 void didScrollRect(int, int, const blink::WebRect&);
136 void scheduleAnimation(); 138 void scheduleAnimation();
137 bool isCompositorFramePending() const; 139 bool isCompositorFramePending() const;
138 // FIXME: Remove once we switch to use didForceResize. 140 // FIXME: Remove once we switch to use didForceResize.
139 void setWindowRect(const blink::WebRect&); 141 void setWindowRect(const blink::WebRect&);
140 void show(blink::WebNavigationPolicy); 142 void show(blink::WebNavigationPolicy);
141 void didAutoResize(const blink::WebSize&); 143 void didAutoResize(const blink::WebSize&);
142 void postAccessibilityEvent(const blink::WebAXObject&, blink::WebAXEvent); 144 void postAccessibilityEvent(const blink::WebAXObject&, blink::WebAXEvent);
143 void startDragging(blink::WebFrame*, const blink::WebDragData&, blink::WebDr agOperationsMask, const blink::WebImage&, const blink::WebPoint&); 145 void startDragging(blink::WebLocalFrame*,
146 const blink::WebDragData&,
147 blink::WebDragOperationsMask,
148 const blink::WebImage&,
149 const blink::WebPoint&);
144 void didChangeSelection(bool isEmptySelection); 150 void didChangeSelection(bool isEmptySelection);
145 void didChangeContents(); 151 void didChangeContents();
146 void didEndEditing(); 152 void didEndEditing();
147 bool createView(blink::WebFrame* creator, const blink::WebURLRequest&, const blink::WebWindowFeatures&, const blink::WebString& frameName, blink::WebNavigat ionPolicy, bool suppressOpener); 153 bool createView(blink::WebLocalFrame* creator,
148 blink::WebPlugin* createPlugin(blink::WebFrame*, const blink::WebPluginParam s&); 154 const blink::WebURLRequest&,
155 const blink::WebWindowFeatures&,
156 const blink::WebString& frameName,
157 blink::WebNavigationPolicy,
158 bool suppressOpener);
159 blink::WebPlugin* createPlugin(blink::WebLocalFrame*,
160 const blink::WebPluginParams&);
149 void setStatusText(const blink::WebString&); 161 void setStatusText(const blink::WebString&);
150 void didStopLoading(); 162 void didStopLoading();
151 void showContextMenu(blink::WebFrame*, const blink::WebContextMenuData&); 163 void showContextMenu(blink::WebLocalFrame*,
164 const blink::WebContextMenuData&);
152 blink::WebUserMediaClient* userMediaClient(); 165 blink::WebUserMediaClient* userMediaClient();
153 void printPage(blink::WebFrame*); 166 void printPage(blink::WebLocalFrame*);
154 blink::WebNotificationPresenter* notificationPresenter(); 167 blink::WebNotificationPresenter* notificationPresenter();
155 blink::WebMIDIClient* webMIDIClient(); 168 blink::WebMIDIClient* webMIDIClient();
156 blink::WebSpeechInputController* speechInputController(blink::WebSpeechInput Listener*); 169 blink::WebSpeechInputController* speechInputController(blink::WebSpeechInput Listener*);
157 blink::WebSpeechRecognizer* speechRecognizer(); 170 blink::WebSpeechRecognizer* speechRecognizer();
158 bool requestPointerLock(); 171 bool requestPointerLock();
159 void requestPointerUnlock(); 172 void requestPointerUnlock();
160 bool isPointerLocked(); 173 bool isPointerLocked();
161 void didFocus(); 174 void didFocus();
162 void didBlur(); 175 void didBlur();
163 void setToolTipText(const blink::WebString&, blink::WebTextDirection); 176 void setToolTipText(const blink::WebString&, blink::WebTextDirection);
164 void didAddMessageToConsole(const blink::WebConsoleMessage&, const blink::We bString& sourceName, unsigned sourceLine); 177 void didAddMessageToConsole(const blink::WebConsoleMessage&, const blink::We bString& sourceName, unsigned sourceLine);
165 void runModalAlertDialog(blink::WebFrame*, const blink::WebString&); 178 void runModalAlertDialog(blink::WebLocalFrame*, const blink::WebString&);
166 bool runModalConfirmDialog(blink::WebFrame*, const blink::WebString&); 179 bool runModalConfirmDialog(blink::WebLocalFrame*, const blink::WebString&);
167 bool runModalPromptDialog(blink::WebFrame*, const blink::WebString& message, const blink::WebString& defaultValue, blink::WebString* actualValue); 180 bool runModalPromptDialog(blink::WebLocalFrame*,
168 bool runModalBeforeUnloadDialog(blink::WebFrame*, const blink::WebString&); 181 const blink::WebString& message,
182 const blink::WebString& defaultValue,
183 blink::WebString* actualValue);
184 bool runModalBeforeUnloadDialog(blink::WebLocalFrame*,
185 const blink::WebString&);
169 186
170 void didStartProvisionalLoad(blink::WebFrame*); 187 void didStartProvisionalLoad(blink::WebLocalFrame*);
171 void didReceiveServerRedirectForProvisionalLoad(blink::WebFrame*); 188 void didReceiveServerRedirectForProvisionalLoad(blink::WebLocalFrame*);
172 bool didFailProvisionalLoad(blink::WebFrame*, const blink::WebURLError&); 189 bool didFailProvisionalLoad(blink::WebLocalFrame*,
173 void didCommitProvisionalLoad(blink::WebFrame*, bool isNewNavigation); 190 const blink::WebURLError&);
174 void didReceiveTitle(blink::WebFrame*, const blink::WebString& title, blink: :WebTextDirection); 191 void didCommitProvisionalLoad(blink::WebLocalFrame*, bool isNewNavigation);
175 void didChangeIcon(blink::WebFrame*, blink::WebIconURL::Type); 192 void didReceiveTitle(blink::WebLocalFrame*,
176 void didFinishDocumentLoad(blink::WebFrame*); 193 const blink::WebString& title,
177 void didHandleOnloadEvents(blink::WebFrame*); 194 blink::WebTextDirection);
178 void didFailLoad(blink::WebFrame*, const blink::WebURLError&); 195 void didChangeIcon(blink::WebLocalFrame*, blink::WebIconURL::Type);
179 void didFinishLoad(blink::WebFrame*); 196 void didFinishDocumentLoad(blink::WebLocalFrame*);
180 void didChangeLocationWithinPage(blink::WebFrame*); 197 void didHandleOnloadEvents(blink::WebLocalFrame*);
181 void didDetectXSS(blink::WebFrame*, const blink::WebURL& insecureURL, bool d idBlockEntirePage); 198 void didFailLoad(blink::WebLocalFrame*, const blink::WebURLError&);
182 void didDispatchPingLoader(blink::WebFrame*, const blink::WebURL&); 199 void didFinishLoad(blink::WebLocalFrame*);
183 void willRequestResource(blink::WebFrame*, const blink::WebCachedURLRequest& ); 200 void didChangeLocationWithinPage(blink::WebLocalFrame*);
184 void willSendRequest(blink::WebFrame*, unsigned identifier, blink::WebURLReq uest&, const blink::WebURLResponse& redirectResponse); 201 void didDetectXSS(blink::WebLocalFrame*,
185 void didReceiveResponse(blink::WebFrame*, unsigned identifier, const blink:: WebURLResponse&); 202 const blink::WebURL& insecureURL,
186 void didChangeResourcePriority(blink::WebFrame*, unsigned identifier, const blink::WebURLRequest::Priority&); 203 bool didBlockEntirePage);
187 void didFinishResourceLoad(blink::WebFrame*, unsigned identifier); 204 void didDispatchPingLoader(blink::WebLocalFrame*, const blink::WebURL&);
188 blink::WebNavigationPolicy decidePolicyForNavigation(blink::WebFrame*, blink ::WebDataSource::ExtraData*, const blink::WebURLRequest&, blink::WebNavigationTy pe, blink::WebNavigationPolicy defaultPolicy, bool isRedirect); 205 void willRequestResource(blink::WebLocalFrame*,
189 bool willCheckAndDispatchMessageEvent(blink::WebFrame* sourceFrame, blink::W ebFrame* targetFrame, blink::WebSecurityOrigin target, blink::WebDOMMessageEvent ); 206 const blink::WebCachedURLRequest&);
207 void willSendRequest(blink::WebLocalFrame*,
208 unsigned identifier,
209 blink::WebURLRequest&,
210 const blink::WebURLResponse& redirectResponse);
211 void didReceiveResponse(blink::WebLocalFrame*,
212 unsigned identifier,
213 const blink::WebURLResponse&);
214 void didChangeResourcePriority(blink::WebLocalFrame*,
215 unsigned identifier,
216 const blink::WebURLRequest::Priority&);
217 void didFinishResourceLoad(blink::WebLocalFrame*, unsigned identifier);
218 blink::WebNavigationPolicy decidePolicyForNavigation(
219 blink::WebLocalFrame*,
220 blink::WebDataSource::ExtraData*,
221 const blink::WebURLRequest&,
222 blink::WebNavigationType,
223 blink::WebNavigationPolicy defaultPolicy,
224 bool isRedirect);
225 bool willCheckAndDispatchMessageEvent(blink::WebLocalFrame* sourceFrame,
226 blink::WebFrame* targetFrame,
227 blink::WebSecurityOrigin target,
228 blink::WebDOMMessageEvent);
190 void resetInputMethod(); 229 void resetInputMethod();
191 230
192 private: 231 private:
193 template<class, typename, typename> friend class WebFrameTestProxy; 232 template<class, typename, typename> friend class WebFrameTestProxy;
194 void locationChangeDone(blink::WebFrame*); 233 void locationChangeDone(blink::WebLocalFrame*);
195 void paintRect(const blink::WebRect&); 234 void paintRect(const blink::WebRect&);
196 void paintInvalidatedRegion(); 235 void paintInvalidatedRegion();
197 void paintPagesWithBoundaries(); 236 void paintPagesWithBoundaries();
198 SkCanvas* canvas(); 237 SkCanvas* canvas();
199 void displayRepaintMask(); 238 void displayRepaintMask();
200 void invalidateAll(); 239 void invalidateAll();
201 void animateNow(); 240 void animateNow();
202 241
203 blink::WebWidget* webWidget(); 242 blink::WebWidget* webWidget();
204 243
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 virtual void didAutoResize(const blink::WebSize& newSize) 315 virtual void didAutoResize(const blink::WebSize& newSize)
277 { 316 {
278 WebTestProxyBase::didAutoResize(newSize); 317 WebTestProxyBase::didAutoResize(newSize);
279 Base::didAutoResize(newSize); 318 Base::didAutoResize(newSize);
280 } 319 }
281 virtual void postAccessibilityEvent(const blink::WebAXObject& object, blink: :WebAXEvent event) 320 virtual void postAccessibilityEvent(const blink::WebAXObject& object, blink: :WebAXEvent event)
282 { 321 {
283 WebTestProxyBase::postAccessibilityEvent(object, event); 322 WebTestProxyBase::postAccessibilityEvent(object, event);
284 Base::postAccessibilityEvent(object, event); 323 Base::postAccessibilityEvent(object, event);
285 } 324 }
286 virtual void startDragging(blink::WebFrame* frame, const blink::WebDragData& data, blink::WebDragOperationsMask mask, const blink::WebImage& image, const bl ink::WebPoint& point) 325 virtual void startDragging(blink::WebLocalFrame* frame,
287 { 326 const blink::WebDragData& data,
327 blink::WebDragOperationsMask mask,
328 const blink::WebImage& image,
329 const blink::WebPoint& point) {
288 WebTestProxyBase::startDragging(frame, data, mask, image, point); 330 WebTestProxyBase::startDragging(frame, data, mask, image, point);
289 // Don't forward this call to Base because we don't want to do a real dr ag-and-drop. 331 // Don't forward this call to Base because we don't want to do a real dr ag-and-drop.
290 } 332 }
291 virtual void didChangeContents() 333 virtual void didChangeContents()
292 { 334 {
293 WebTestProxyBase::didChangeContents(); 335 WebTestProxyBase::didChangeContents();
294 Base::didChangeContents(); 336 Base::didChangeContents();
295 } 337 }
296 virtual blink::WebView* createView(blink::WebFrame* creator, const blink::We bURLRequest& request, const blink::WebWindowFeatures& features, const blink::Web String& frameName, blink::WebNavigationPolicy policy, bool suppressOpener) 338 virtual blink::WebView* createView(blink::WebLocalFrame* creator,
297 { 339 const blink::WebURLRequest& request,
340 const blink::WebWindowFeatures& features,
341 const blink::WebString& frameName,
342 blink::WebNavigationPolicy policy,
343 bool suppressOpener) {
298 if (!WebTestProxyBase::createView(creator, request, features, frameName, policy, suppressOpener)) 344 if (!WebTestProxyBase::createView(creator, request, features, frameName, policy, suppressOpener))
299 return 0; 345 return 0;
300 return Base::createView(creator, request, features, frameName, policy, s uppressOpener); 346 return Base::createView(creator, request, features, frameName, policy, s uppressOpener);
301 } 347 }
302 virtual void setStatusText(const blink::WebString& text) 348 virtual void setStatusText(const blink::WebString& text)
303 { 349 {
304 WebTestProxyBase::setStatusText(text); 350 WebTestProxyBase::setStatusText(text);
305 Base::setStatusText(text); 351 Base::setStatusText(text);
306 } 352 }
307 virtual blink::WebUserMediaClient* userMediaClient() 353 virtual blink::WebUserMediaClient* userMediaClient()
308 { 354 {
309 return WebTestProxyBase::userMediaClient(); 355 return WebTestProxyBase::userMediaClient();
310 } 356 }
311 virtual void printPage(blink::WebFrame* frame) 357 virtual void printPage(blink::WebLocalFrame* frame) {
312 {
313 WebTestProxyBase::printPage(frame); 358 WebTestProxyBase::printPage(frame);
314 } 359 }
315 virtual blink::WebNotificationPresenter* notificationPresenter() 360 virtual blink::WebNotificationPresenter* notificationPresenter()
316 { 361 {
317 return WebTestProxyBase::notificationPresenter(); 362 return WebTestProxyBase::notificationPresenter();
318 } 363 }
319 virtual blink::WebMIDIClient* webMIDIClient() 364 virtual blink::WebMIDIClient* webMIDIClient()
320 { 365 {
321 return WebTestProxyBase::webMIDIClient(); 366 return WebTestProxyBase::webMIDIClient();
322 } 367 }
(...skipping 30 matching lines...) Expand all
353 virtual void setToolTipText(const blink::WebString& text, blink::WebTextDire ction hint) 398 virtual void setToolTipText(const blink::WebString& text, blink::WebTextDire ction hint)
354 { 399 {
355 WebTestProxyBase::setToolTipText(text, hint); 400 WebTestProxyBase::setToolTipText(text, hint);
356 Base::setToolTipText(text, hint); 401 Base::setToolTipText(text, hint);
357 } 402 }
358 virtual void resetInputMethod() 403 virtual void resetInputMethod()
359 { 404 {
360 WebTestProxyBase::resetInputMethod(); 405 WebTestProxyBase::resetInputMethod();
361 } 406 }
362 407
363 virtual void didStartProvisionalLoad(blink::WebFrame* frame) 408 virtual void didStartProvisionalLoad(blink::WebLocalFrame* frame) {
364 {
365 WebTestProxyBase::didStartProvisionalLoad(frame); 409 WebTestProxyBase::didStartProvisionalLoad(frame);
366 Base::didStartProvisionalLoad(frame); 410 Base::didStartProvisionalLoad(frame);
367 } 411 }
368 virtual void didReceiveServerRedirectForProvisionalLoad(blink::WebFrame* fra me) 412 virtual void didReceiveServerRedirectForProvisionalLoad(
369 { 413 blink::WebLocalFrame* frame) {
370 WebTestProxyBase::didReceiveServerRedirectForProvisionalLoad(frame); 414 WebTestProxyBase::didReceiveServerRedirectForProvisionalLoad(frame);
371 Base::didReceiveServerRedirectForProvisionalLoad(frame); 415 Base::didReceiveServerRedirectForProvisionalLoad(frame);
372 } 416 }
373 virtual void didFailProvisionalLoad(blink::WebFrame* frame, const blink::Web URLError& error) 417 virtual void didFailProvisionalLoad(blink::WebLocalFrame* frame,
374 { 418 const blink::WebURLError& error) {
375 // If the test finished, don't notify the embedder of the failed load, 419 // If the test finished, don't notify the embedder of the failed load,
376 // as we already destroyed the document loader. 420 // as we already destroyed the document loader.
377 if (WebTestProxyBase::didFailProvisionalLoad(frame, error)) 421 if (WebTestProxyBase::didFailProvisionalLoad(frame, error))
378 return; 422 return;
379 Base::didFailProvisionalLoad(frame, error); 423 Base::didFailProvisionalLoad(frame, error);
380 } 424 }
381 virtual void didCommitProvisionalLoad(blink::WebFrame* frame, bool isNewNavi gation) 425 virtual void didCommitProvisionalLoad(blink::WebLocalFrame* frame,
382 { 426 bool isNewNavigation) {
383 WebTestProxyBase::didCommitProvisionalLoad(frame, isNewNavigation); 427 WebTestProxyBase::didCommitProvisionalLoad(frame, isNewNavigation);
384 Base::didCommitProvisionalLoad(frame, isNewNavigation); 428 Base::didCommitProvisionalLoad(frame, isNewNavigation);
385 } 429 }
386 virtual void didReceiveTitle(blink::WebFrame* frame, const blink::WebString& title, blink::WebTextDirection direction) 430 virtual void didReceiveTitle(blink::WebLocalFrame* frame,
387 { 431 const blink::WebString& title,
432 blink::WebTextDirection direction) {
388 WebTestProxyBase::didReceiveTitle(frame, title, direction); 433 WebTestProxyBase::didReceiveTitle(frame, title, direction);
389 Base::didReceiveTitle(frame, title, direction); 434 Base::didReceiveTitle(frame, title, direction);
390 } 435 }
391 virtual void didChangeIcon(blink::WebFrame* frame, blink::WebIconURL::Type i conType) 436 virtual void didChangeIcon(blink::WebLocalFrame* frame,
392 { 437 blink::WebIconURL::Type iconType) {
393 WebTestProxyBase::didChangeIcon(frame, iconType); 438 WebTestProxyBase::didChangeIcon(frame, iconType);
394 Base::didChangeIcon(frame, iconType); 439 Base::didChangeIcon(frame, iconType);
395 } 440 }
396 virtual void didFinishDocumentLoad(blink::WebFrame* frame) 441 virtual void didFinishDocumentLoad(blink::WebLocalFrame* frame) {
397 {
398 WebTestProxyBase::didFinishDocumentLoad(frame); 442 WebTestProxyBase::didFinishDocumentLoad(frame);
399 Base::didFinishDocumentLoad(frame); 443 Base::didFinishDocumentLoad(frame);
400 } 444 }
401 virtual void didHandleOnloadEvents(blink::WebFrame* frame) 445 virtual void didHandleOnloadEvents(blink::WebLocalFrame* frame) {
402 {
403 WebTestProxyBase::didHandleOnloadEvents(frame); 446 WebTestProxyBase::didHandleOnloadEvents(frame);
404 Base::didHandleOnloadEvents(frame); 447 Base::didHandleOnloadEvents(frame);
405 } 448 }
406 virtual void didFailLoad(blink::WebFrame* frame, const blink::WebURLError& e rror) 449 virtual void didFailLoad(blink::WebLocalFrame* frame,
407 { 450 const blink::WebURLError& error) {
408 WebTestProxyBase::didFailLoad(frame, error); 451 WebTestProxyBase::didFailLoad(frame, error);
409 Base::didFailLoad(frame, error); 452 Base::didFailLoad(frame, error);
410 } 453 }
411 virtual void didFinishLoad(blink::WebFrame* frame) 454 virtual void didFinishLoad(blink::WebLocalFrame* frame) {
412 {
413 WebTestProxyBase::didFinishLoad(frame); 455 WebTestProxyBase::didFinishLoad(frame);
414 Base::didFinishLoad(frame); 456 Base::didFinishLoad(frame);
415 } 457 }
416 virtual void didDetectXSS(blink::WebFrame* frame, const blink::WebURL& insec ureURL, bool didBlockEntirePage) 458 virtual void didDetectXSS(blink::WebLocalFrame* frame,
417 { 459 const blink::WebURL& insecureURL,
460 bool didBlockEntirePage) {
418 WebTestProxyBase::didDetectXSS(frame, insecureURL, didBlockEntirePage); 461 WebTestProxyBase::didDetectXSS(frame, insecureURL, didBlockEntirePage);
419 Base::didDetectXSS(frame, insecureURL, didBlockEntirePage); 462 Base::didDetectXSS(frame, insecureURL, didBlockEntirePage);
420 } 463 }
421 virtual void willRequestResource(blink::WebFrame* frame, const blink::WebCac hedURLRequest& request) 464 virtual void willRequestResource(
422 { 465 blink::WebLocalFrame* frame,
466 const blink::WebCachedURLRequest& request) {
423 WebTestProxyBase::willRequestResource(frame, request); 467 WebTestProxyBase::willRequestResource(frame, request);
424 Base::willRequestResource(frame, request); 468 Base::willRequestResource(frame, request);
425 } 469 }
426 virtual void willSendRequest(blink::WebFrame* frame, unsigned identifier, bl ink::WebURLRequest& request, const blink::WebURLResponse& redirectResponse) 470 virtual void willSendRequest(
427 { 471 blink::WebLocalFrame* frame,
472 unsigned identifier,
473 blink::WebURLRequest& request,
474 const blink::WebURLResponse& redirectResponse) {
428 WebTestProxyBase::willSendRequest(frame, identifier, request, redirectRe sponse); 475 WebTestProxyBase::willSendRequest(frame, identifier, request, redirectRe sponse);
429 Base::willSendRequest(frame, identifier, request, redirectResponse); 476 Base::willSendRequest(frame, identifier, request, redirectResponse);
430 } 477 }
431 virtual void didReceiveResponse(blink::WebFrame* frame, unsigned identifier, const blink::WebURLResponse& response) 478 virtual void didReceiveResponse(blink::WebLocalFrame* frame,
432 { 479 unsigned identifier,
480 const blink::WebURLResponse& response) {
433 WebTestProxyBase::didReceiveResponse(frame, identifier, response); 481 WebTestProxyBase::didReceiveResponse(frame, identifier, response);
434 Base::didReceiveResponse(frame, identifier, response); 482 Base::didReceiveResponse(frame, identifier, response);
435 } 483 }
436 virtual void didChangeResourcePriority(blink::WebFrame* frame, unsigned iden tifier, const blink::WebURLRequest::Priority& priority) 484 virtual void didChangeResourcePriority(
437 { 485 blink::WebLocalFrame* frame,
486 unsigned identifier,
487 const blink::WebURLRequest::Priority& priority) {
438 WebTestProxyBase::didChangeResourcePriority(frame, identifier, priority) ; 488 WebTestProxyBase::didChangeResourcePriority(frame, identifier, priority) ;
439 Base::didChangeResourcePriority(frame, identifier, priority); 489 Base::didChangeResourcePriority(frame, identifier, priority);
440 } 490 }
441 virtual void didFinishResourceLoad(blink::WebFrame* frame, unsigned identifi er) 491 virtual void didFinishResourceLoad(blink::WebLocalFrame* frame,
442 { 492 unsigned identifier) {
443 WebTestProxyBase::didFinishResourceLoad(frame, identifier); 493 WebTestProxyBase::didFinishResourceLoad(frame, identifier);
444 Base::didFinishResourceLoad(frame, identifier); 494 Base::didFinishResourceLoad(frame, identifier);
445 } 495 }
446 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message, const blink::WebString& sourceName, unsigned sourceLine, const blink::WebString & stackTrace) 496 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message, const blink::WebString& sourceName, unsigned sourceLine, const blink::WebString & stackTrace)
447 { 497 {
448 WebTestProxyBase::didAddMessageToConsole(message, sourceName, sourceLine ); 498 WebTestProxyBase::didAddMessageToConsole(message, sourceName, sourceLine );
449 Base::didAddMessageToConsole(message, sourceName, sourceLine, stackTrace ); 499 Base::didAddMessageToConsole(message, sourceName, sourceLine, stackTrace );
450 } 500 }
451 virtual void runModalAlertDialog(blink::WebFrame* frame, const blink::WebStr ing& message) 501 virtual void runModalAlertDialog(blink::WebLocalFrame* frame,
452 { 502 const blink::WebString& message) {
453 WebTestProxyBase::runModalAlertDialog(frame, message); 503 WebTestProxyBase::runModalAlertDialog(frame, message);
454 Base::runModalAlertDialog(frame, message); 504 Base::runModalAlertDialog(frame, message);
455 } 505 }
456 virtual bool runModalConfirmDialog(blink::WebFrame* frame, const blink::WebS tring& message) 506 virtual bool runModalConfirmDialog(blink::WebLocalFrame* frame,
457 { 507 const blink::WebString& message) {
458 WebTestProxyBase::runModalConfirmDialog(frame, message); 508 WebTestProxyBase::runModalConfirmDialog(frame, message);
459 return Base::runModalConfirmDialog(frame, message); 509 return Base::runModalConfirmDialog(frame, message);
460 } 510 }
461 virtual bool runModalPromptDialog(blink::WebFrame* frame, const blink::WebSt ring& message, const blink::WebString& defaultValue, blink::WebString* actualVal ue) 511 virtual bool runModalPromptDialog(blink::WebLocalFrame* frame,
462 { 512 const blink::WebString& message,
513 const blink::WebString& defaultValue,
514 blink::WebString* actualValue) {
463 WebTestProxyBase::runModalPromptDialog(frame, message, defaultValue, act ualValue); 515 WebTestProxyBase::runModalPromptDialog(frame, message, defaultValue, act ualValue);
464 return Base::runModalPromptDialog(frame, message, defaultValue, actualVa lue); 516 return Base::runModalPromptDialog(frame, message, defaultValue, actualVa lue);
465 } 517 }
466 virtual bool runModalBeforeUnloadDialog(blink::WebFrame* frame, const blink: :WebString& message) 518 virtual bool runModalBeforeUnloadDialog(blink::WebLocalFrame* frame,
467 { 519 const blink::WebString& message) {
468 return WebTestProxyBase::runModalBeforeUnloadDialog(frame, message); 520 return WebTestProxyBase::runModalBeforeUnloadDialog(frame, message);
469 } 521 }
470 virtual bool willCheckAndDispatchMessageEvent(blink::WebFrame* sourceFrame, blink::WebFrame* targetFrame, blink::WebSecurityOrigin target, blink::WebDOMMess ageEvent event) 522 virtual bool willCheckAndDispatchMessageEvent(
471 { 523 blink::WebLocalFrame* sourceFrame,
524 blink::WebFrame* targetFrame,
525 blink::WebSecurityOrigin target,
526 blink::WebDOMMessageEvent event) {
472 if (WebTestProxyBase::willCheckAndDispatchMessageEvent(sourceFrame, targ etFrame, target, event)) 527 if (WebTestProxyBase::willCheckAndDispatchMessageEvent(sourceFrame, targ etFrame, target, event))
473 return true; 528 return true;
474 return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, target, event); 529 return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, target, event);
475 } 530 }
476 virtual blink::WebColorChooser* createColorChooser(blink::WebColorChooserCli ent* client, const blink::WebColor& color) 531 virtual blink::WebColorChooser* createColorChooser(blink::WebColorChooserCli ent* client, const blink::WebColor& color)
477 { 532 {
478 return WebTestProxyBase::createColorChooser(client, color); 533 return WebTestProxyBase::createColorChooser(client, color);
479 } 534 }
480 virtual blink::WebColorChooser* createColorChooser(blink::WebColorChooserCli ent* client, const blink::WebColor& color, const blink::WebVector<blink::WebColo rSuggestion>& suggestions) 535 virtual blink::WebColorChooser* createColorChooser(blink::WebColorChooserCli ent* client, const blink::WebColor& color, const blink::WebVector<blink::WebColo rSuggestion>& suggestions)
481 { 536 {
(...skipping 20 matching lines...) Expand all
502 WebTestProxyBase::postSpellCheckEvent(eventName); 557 WebTestProxyBase::postSpellCheckEvent(eventName);
503 } 558 }
504 559
505 private: 560 private:
506 DISALLOW_COPY_AND_ASSIGN(WebTestProxy); 561 DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
507 }; 562 };
508 563
509 } 564 }
510 565
511 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_ 566 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698