| 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 517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 528 virtual void didChangeResourcePriority(WebKit::WebFrame* frame, unsigned ide
ntifier, const WebKit::WebURLRequest::Priority& priority) | 528 virtual void didChangeResourcePriority(WebKit::WebFrame* frame, unsigned ide
ntifier, const WebKit::WebURLRequest::Priority& priority) |
| 529 { | 529 { |
| 530 WebTestProxyBase::didChangeResourcePriority(frame, identifier, priority)
; | 530 WebTestProxyBase::didChangeResourcePriority(frame, identifier, priority)
; |
| 531 Base::didChangeResourcePriority(frame, identifier, priority); | 531 Base::didChangeResourcePriority(frame, identifier, priority); |
| 532 } | 532 } |
| 533 virtual void didFinishResourceLoad(WebKit::WebFrame* frame, unsigned identif
ier) | 533 virtual void didFinishResourceLoad(WebKit::WebFrame* frame, unsigned identif
ier) |
| 534 { | 534 { |
| 535 WebTestProxyBase::didFinishResourceLoad(frame, identifier); | 535 WebTestProxyBase::didFinishResourceLoad(frame, identifier); |
| 536 Base::didFinishResourceLoad(frame, identifier); | 536 Base::didFinishResourceLoad(frame, identifier); |
| 537 } | 537 } |
| 538 virtual void didAddMessageToConsole(const WebKit::WebConsoleMessage& message
, const WebKit::WebString& sourceName, unsigned sourceLine) | 538 virtual void didAddMessageToConsole(const WebKit::WebConsoleMessage& message
, const WebKit::WebString& sourceName, unsigned sourceLine, const WebKit::WebStr
ing& stackTrace) |
| 539 { | 539 { |
| 540 WebTestProxyBase::didAddMessageToConsole(message, sourceName, sourceLine
); | 540 WebTestProxyBase::didAddMessageToConsole(message, sourceName, sourceLine
); |
| 541 Base::didAddMessageToConsole(message, sourceName, sourceLine); | 541 Base::didAddMessageToConsole(message, sourceName, sourceLine, stackTrace
); |
| 542 } | 542 } |
| 543 virtual void runModalAlertDialog(WebKit::WebFrame* frame, const WebKit::WebS
tring& message) | 543 virtual void runModalAlertDialog(WebKit::WebFrame* frame, const WebKit::WebS
tring& message) |
| 544 { | 544 { |
| 545 WebTestProxyBase::runModalAlertDialog(frame, message); | 545 WebTestProxyBase::runModalAlertDialog(frame, message); |
| 546 Base::runModalAlertDialog(frame, message); | 546 Base::runModalAlertDialog(frame, message); |
| 547 } | 547 } |
| 548 virtual bool runModalConfirmDialog(WebKit::WebFrame* frame, const WebKit::We
bString& message) | 548 virtual bool runModalConfirmDialog(WebKit::WebFrame* frame, const WebKit::We
bString& message) |
| 549 { | 549 { |
| 550 WebTestProxyBase::runModalConfirmDialog(frame, message); | 550 WebTestProxyBase::runModalConfirmDialog(frame, message); |
| 551 return Base::runModalConfirmDialog(frame, message); | 551 return Base::runModalConfirmDialog(frame, message); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 574 } | 574 } |
| 575 virtual WebKit::WebColorChooser* createColorChooser(WebKit::WebColorChooserC
lient* client, const WebKit::WebColor& color) | 575 virtual WebKit::WebColorChooser* createColorChooser(WebKit::WebColorChooserC
lient* client, const WebKit::WebColor& color) |
| 576 { | 576 { |
| 577 return WebTestProxyBase::createColorChooser(client, color); | 577 return WebTestProxyBase::createColorChooser(client, color); |
| 578 } | 578 } |
| 579 }; | 579 }; |
| 580 | 580 |
| 581 } | 581 } |
| 582 | 582 |
| 583 #endif // WebTestProxy_h | 583 #endif // WebTestProxy_h |
| OLD | NEW |