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

Side by Side Diff: Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h

Issue 14264012: Create errors (especially cancellation errors) internally to WebCore, rather (Closed) Base URL: svn://svn.chromium.org/blink/trunk/
Patch Set: Created 7 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 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 void didFinishDocumentLoad(WebKit::WebFrame*); 178 void didFinishDocumentLoad(WebKit::WebFrame*);
179 void didHandleOnloadEvents(WebKit::WebFrame*); 179 void didHandleOnloadEvents(WebKit::WebFrame*);
180 void didFailLoad(WebKit::WebFrame*, const WebKit::WebURLError&); 180 void didFailLoad(WebKit::WebFrame*, const WebKit::WebURLError&);
181 void didFinishLoad(WebKit::WebFrame*); 181 void didFinishLoad(WebKit::WebFrame*);
182 void didChangeLocationWithinPage(WebKit::WebFrame*); 182 void didChangeLocationWithinPage(WebKit::WebFrame*);
183 void didDisplayInsecureContent(WebKit::WebFrame*); 183 void didDisplayInsecureContent(WebKit::WebFrame*);
184 void didRunInsecureContent(WebKit::WebFrame*, const WebKit::WebSecurityOrigi n&, const WebKit::WebURL& insecureURL); 184 void didRunInsecureContent(WebKit::WebFrame*, const WebKit::WebSecurityOrigi n&, const WebKit::WebURL& insecureURL);
185 void didDetectXSS(WebKit::WebFrame*, const WebKit::WebURL& insecureURL, bool didBlockEntirePage); 185 void didDetectXSS(WebKit::WebFrame*, const WebKit::WebURL& insecureURL, bool didBlockEntirePage);
186 void assignIdentifierToRequest(WebKit::WebFrame*, unsigned identifier, const WebKit::WebURLRequest&); 186 void assignIdentifierToRequest(WebKit::WebFrame*, unsigned identifier, const WebKit::WebURLRequest&);
187 void willRequestResource(WebKit::WebFrame*, const WebKit::WebCachedURLReques t&); 187 void willRequestResource(WebKit::WebFrame*, const WebKit::WebCachedURLReques t&);
188 bool canHandleRequest(WebKit::WebFrame*, const WebKit::WebURLRequest&);
189 WebKit::WebURLError cannotHandleRequestError(WebKit::WebFrame*, const WebKit ::WebURLRequest&);
190 void didCreateDataSource(WebKit::WebFrame*, WebKit::WebDataSource*); 188 void didCreateDataSource(WebKit::WebFrame*, WebKit::WebDataSource*);
191 void willSendRequest(WebKit::WebFrame*, unsigned identifier, WebKit::WebURLR equest&, const WebKit::WebURLResponse& redirectResponse); 189 void willSendRequest(WebKit::WebFrame*, unsigned identifier, WebKit::WebURLR equest&, const WebKit::WebURLResponse& redirectResponse);
192 void didReceiveResponse(WebKit::WebFrame*, unsigned identifier, const WebKit ::WebURLResponse&); 190 void didReceiveResponse(WebKit::WebFrame*, unsigned identifier, const WebKit ::WebURLResponse&);
193 void didChangeResourcePriority(WebKit::WebFrame*, unsigned identifier, const WebKit::WebURLRequest::Priority&); 191 void didChangeResourcePriority(WebKit::WebFrame*, unsigned identifier, const WebKit::WebURLRequest::Priority&);
194 void didFinishResourceLoad(WebKit::WebFrame*, unsigned identifier); 192 void didFinishResourceLoad(WebKit::WebFrame*, unsigned identifier);
195 void didFailResourceLoad(WebKit::WebFrame*, unsigned identifier, const WebKi t::WebURLError&); 193 void didFailResourceLoad(WebKit::WebFrame*, unsigned identifier, const WebKi t::WebURLError&);
196 void unableToImplementPolicyWithError(WebKit::WebFrame*, const WebKit::WebUR LError&);
197 void didAddMessageToConsole(const WebKit::WebConsoleMessage&, const WebKit:: WebString& sourceName, unsigned sourceLine); 194 void didAddMessageToConsole(const WebKit::WebConsoleMessage&, const WebKit:: WebString& sourceName, unsigned sourceLine);
198 void runModalAlertDialog(WebKit::WebFrame*, const WebKit::WebString&); 195 void runModalAlertDialog(WebKit::WebFrame*, const WebKit::WebString&);
199 bool runModalConfirmDialog(WebKit::WebFrame*, const WebKit::WebString&); 196 bool runModalConfirmDialog(WebKit::WebFrame*, const WebKit::WebString&);
200 bool runModalPromptDialog(WebKit::WebFrame*, const WebKit::WebString& messag e, const WebKit::WebString& defaultValue, WebKit::WebString* actualValue); 197 bool runModalPromptDialog(WebKit::WebFrame*, const WebKit::WebString& messag e, const WebKit::WebString& defaultValue, WebKit::WebString* actualValue);
201 bool runModalBeforeUnloadDialog(WebKit::WebFrame*, const WebKit::WebString&) ; 198 bool runModalBeforeUnloadDialog(WebKit::WebFrame*, const WebKit::WebString&) ;
202 WebKit::WebNavigationPolicy decidePolicyForNavigation(WebKit::WebFrame*, con st WebKit::WebURLRequest&, WebKit::WebNavigationType, WebKit::WebNavigationPolic y defaultPolicy, bool isRedirect); 199 WebKit::WebNavigationPolicy decidePolicyForNavigation(WebKit::WebFrame*, con st WebKit::WebURLRequest&, WebKit::WebNavigationType, WebKit::WebNavigationPolic y defaultPolicy, bool isRedirect);
203 bool willCheckAndDispatchMessageEvent(WebKit::WebFrame* sourceFrame, WebKit: :WebFrame* targetFrame, WebKit::WebSecurityOrigin target, WebKit::WebDOMMessageE vent); 200 bool willCheckAndDispatchMessageEvent(WebKit::WebFrame* sourceFrame, WebKit: :WebFrame* targetFrame, WebKit::WebSecurityOrigin target, WebKit::WebDOMMessageE vent);
204 201
205 private: 202 private:
206 void locationChangeDone(WebKit::WebFrame*); 203 void locationChangeDone(WebKit::WebFrame*);
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 virtual void assignIdentifierToRequest(WebKit::WebFrame* frame, unsigned ide ntifier, const WebKit::WebURLRequest& request) 512 virtual void assignIdentifierToRequest(WebKit::WebFrame* frame, unsigned ide ntifier, const WebKit::WebURLRequest& request)
516 { 513 {
517 WebTestProxyBase::assignIdentifierToRequest(frame, identifier, request); 514 WebTestProxyBase::assignIdentifierToRequest(frame, identifier, request);
518 Base::assignIdentifierToRequest(frame, identifier, request); 515 Base::assignIdentifierToRequest(frame, identifier, request);
519 } 516 }
520 virtual void willRequestResource(WebKit::WebFrame* frame, const WebKit::WebC achedURLRequest& request) 517 virtual void willRequestResource(WebKit::WebFrame* frame, const WebKit::WebC achedURLRequest& request)
521 { 518 {
522 WebTestProxyBase::willRequestResource(frame, request); 519 WebTestProxyBase::willRequestResource(frame, request);
523 Base::willRequestResource(frame, request); 520 Base::willRequestResource(frame, request);
524 } 521 }
525 virtual bool canHandleRequest(WebKit::WebFrame* frame, const WebKit::WebURLR equest& request)
526 {
527 if (!WebTestProxyBase::canHandleRequest(frame, request))
528 return false;
529 return Base::canHandleRequest(frame, request);
530 }
531 virtual WebKit::WebURLError cannotHandleRequestError(WebKit::WebFrame* frame , const WebKit::WebURLRequest& request)
532 {
533 return WebTestProxyBase::cannotHandleRequestError(frame, request);
534 }
535 virtual void didCreateDataSource(WebKit::WebFrame* frame, WebKit::WebDataSou rce* ds) 522 virtual void didCreateDataSource(WebKit::WebFrame* frame, WebKit::WebDataSou rce* ds)
536 { 523 {
537 WebTestProxyBase::didCreateDataSource(frame, ds); 524 WebTestProxyBase::didCreateDataSource(frame, ds);
538 Base::didCreateDataSource(frame, ds); 525 Base::didCreateDataSource(frame, ds);
539 } 526 }
540 virtual void willSendRequest(WebKit::WebFrame* frame, unsigned identifier, W ebKit::WebURLRequest& request, const WebKit::WebURLResponse& redirectResponse) 527 virtual void willSendRequest(WebKit::WebFrame* frame, unsigned identifier, W ebKit::WebURLRequest& request, const WebKit::WebURLResponse& redirectResponse)
541 { 528 {
542 WebTestProxyBase::willSendRequest(frame, identifier, request, redirectRe sponse); 529 WebTestProxyBase::willSendRequest(frame, identifier, request, redirectRe sponse);
543 Base::willSendRequest(frame, identifier, request, redirectResponse); 530 Base::willSendRequest(frame, identifier, request, redirectResponse);
544 } 531 }
(...skipping 10 matching lines...) Expand all
555 virtual void didFinishResourceLoad(WebKit::WebFrame* frame, unsigned identif ier) 542 virtual void didFinishResourceLoad(WebKit::WebFrame* frame, unsigned identif ier)
556 { 543 {
557 WebTestProxyBase::didFinishResourceLoad(frame, identifier); 544 WebTestProxyBase::didFinishResourceLoad(frame, identifier);
558 Base::didFinishResourceLoad(frame, identifier); 545 Base::didFinishResourceLoad(frame, identifier);
559 } 546 }
560 virtual void didFailResourceLoad(WebKit::WebFrame* frame, unsigned identifie r, const WebKit::WebURLError& error) 547 virtual void didFailResourceLoad(WebKit::WebFrame* frame, unsigned identifie r, const WebKit::WebURLError& error)
561 { 548 {
562 WebTestProxyBase::didFailResourceLoad(frame, identifier, error); 549 WebTestProxyBase::didFailResourceLoad(frame, identifier, error);
563 Base::didFailResourceLoad(frame, identifier, error); 550 Base::didFailResourceLoad(frame, identifier, error);
564 } 551 }
565 virtual void unableToImplementPolicyWithError(WebKit::WebFrame* frame, const WebKit::WebURLError& error)
566 {
567 WebTestProxyBase::unableToImplementPolicyWithError(frame, error);
568 Base::unableToImplementPolicyWithError(frame, error);
569 }
570 virtual void didAddMessageToConsole(const WebKit::WebConsoleMessage& message , const WebKit::WebString& sourceName, unsigned sourceLine) 552 virtual void didAddMessageToConsole(const WebKit::WebConsoleMessage& message , const WebKit::WebString& sourceName, unsigned sourceLine)
571 { 553 {
572 WebTestProxyBase::didAddMessageToConsole(message, sourceName, sourceLine ); 554 WebTestProxyBase::didAddMessageToConsole(message, sourceName, sourceLine );
573 Base::didAddMessageToConsole(message, sourceName, sourceLine); 555 Base::didAddMessageToConsole(message, sourceName, sourceLine);
574 } 556 }
575 virtual void runModalAlertDialog(WebKit::WebFrame* frame, const WebKit::WebS tring& message) 557 virtual void runModalAlertDialog(WebKit::WebFrame* frame, const WebKit::WebS tring& message)
576 { 558 {
577 WebTestProxyBase::runModalAlertDialog(frame, message); 559 WebTestProxyBase::runModalAlertDialog(frame, message);
578 Base::runModalAlertDialog(frame, message); 560 Base::runModalAlertDialog(frame, message);
579 } 561 }
(...skipping 22 matching lines...) Expand all
602 { 584 {
603 if (WebTestProxyBase::willCheckAndDispatchMessageEvent(sourceFrame, targ etFrame, target, event)) 585 if (WebTestProxyBase::willCheckAndDispatchMessageEvent(sourceFrame, targ etFrame, target, event))
604 return true; 586 return true;
605 return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, target, event); 587 return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, target, event);
606 } 588 }
607 }; 589 };
608 590
609 } 591 }
610 592
611 #endif // WebTestProxy_h 593 #endif // WebTestProxy_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698