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