OLD | NEW |
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 526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
537 virtual void didChangeResourcePriority(WebKit::WebFrame* frame, unsigned ide
ntifier, const WebKit::WebURLRequest::Priority& priority) | 537 virtual void didChangeResourcePriority(WebKit::WebFrame* frame, unsigned ide
ntifier, const WebKit::WebURLRequest::Priority& priority) |
538 { | 538 { |
539 WebTestProxyBase::didChangeResourcePriority(frame, identifier, priority)
; | 539 WebTestProxyBase::didChangeResourcePriority(frame, identifier, priority)
; |
540 Base::didChangeResourcePriority(frame, identifier, priority); | 540 Base::didChangeResourcePriority(frame, identifier, priority); |
541 } | 541 } |
542 virtual void didFinishResourceLoad(WebKit::WebFrame* frame, unsigned identif
ier) | 542 virtual void didFinishResourceLoad(WebKit::WebFrame* frame, unsigned identif
ier) |
543 { | 543 { |
544 WebTestProxyBase::didFinishResourceLoad(frame, identifier); | 544 WebTestProxyBase::didFinishResourceLoad(frame, identifier); |
545 Base::didFinishResourceLoad(frame, identifier); | 545 Base::didFinishResourceLoad(frame, identifier); |
546 } | 546 } |
547 virtual void didAddMessageToConsole(const WebKit::WebConsoleMessage& message
, const WebKit::WebString& sourceName, unsigned sourceLine) | 547 virtual void didAddMessageToConsole(const WebKit::WebConsoleMessage& message
, const WebKit::WebString& sourceName, unsigned sourceLine, const WebKit::WebStr
ing& stackTrace) |
548 { | 548 { |
549 WebTestProxyBase::didAddMessageToConsole(message, sourceName, sourceLine
); | 549 WebTestProxyBase::didAddMessageToConsole(message, sourceName, sourceLine
); |
550 Base::didAddMessageToConsole(message, sourceName, sourceLine); | 550 Base::didAddMessageToConsole(message, sourceName, sourceLine, stackTrace
); |
551 } | 551 } |
552 virtual void runModalAlertDialog(WebKit::WebFrame* frame, const WebKit::WebS
tring& message) | 552 virtual void runModalAlertDialog(WebKit::WebFrame* frame, const WebKit::WebS
tring& message) |
553 { | 553 { |
554 WebTestProxyBase::runModalAlertDialog(frame, message); | 554 WebTestProxyBase::runModalAlertDialog(frame, message); |
555 Base::runModalAlertDialog(frame, message); | 555 Base::runModalAlertDialog(frame, message); |
556 } | 556 } |
557 virtual bool runModalConfirmDialog(WebKit::WebFrame* frame, const WebKit::We
bString& message) | 557 virtual bool runModalConfirmDialog(WebKit::WebFrame* frame, const WebKit::We
bString& message) |
558 { | 558 { |
559 WebTestProxyBase::runModalConfirmDialog(frame, message); | 559 WebTestProxyBase::runModalConfirmDialog(frame, message); |
560 return Base::runModalConfirmDialog(frame, message); | 560 return Base::runModalConfirmDialog(frame, message); |
(...skipping 22 matching lines...) Expand all Loading... |
583 } | 583 } |
584 virtual WebKit::WebColorChooser* createColorChooser(WebKit::WebColorChooserC
lient* client, const WebKit::WebColor& color) | 584 virtual WebKit::WebColorChooser* createColorChooser(WebKit::WebColorChooserC
lient* client, const WebKit::WebColor& color) |
585 { | 585 { |
586 return WebTestProxyBase::createColorChooser(client, color); | 586 return WebTestProxyBase::createColorChooser(client, color); |
587 } | 587 } |
588 }; | 588 }; |
589 | 589 |
590 } | 590 } |
591 | 591 |
592 #endif // WebTestProxy_h | 592 #endif // WebTestProxy_h |
OLD | NEW |