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