| 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 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 531 { | 531 { |
| 532 return m_validationMessageClient.get(); | 532 return m_validationMessageClient.get(); |
| 533 } | 533 } |
| 534 | 534 |
| 535 WebColorChooser* WebTestProxyBase::createColorChooser(WebColorChooserClient* cli
ent, const WebKit::WebColor& color) | 535 WebColorChooser* WebTestProxyBase::createColorChooser(WebColorChooserClient* cli
ent, const WebKit::WebColor& color) |
| 536 { | 536 { |
| 537 // This instance is deleted by WebCore::ColorInputType | 537 // This instance is deleted by WebCore::ColorInputType |
| 538 return new MockColorChooser(client, m_delegate, this); | 538 return new MockColorChooser(client, m_delegate, this); |
| 539 } | 539 } |
| 540 | 540 |
| 541 bool WebTestProxyBase::runFileChooser(const WebKit::WebFileChooserParams&, WebKi
t::WebFileChooserCompletion*) |
| 542 { |
| 543 m_delegate->printMessage("Mock: Opening a file chooser.\n"); |
| 544 // FIXME: Add ability to set file names to a file upload control. |
| 545 return false; |
| 546 } |
| 547 |
| 541 string WebTestProxyBase::captureTree(bool debugRenderTree) | 548 string WebTestProxyBase::captureTree(bool debugRenderTree) |
| 542 { | 549 { |
| 543 WebScriptController::flushConsoleMessages(); | 550 WebScriptController::flushConsoleMessages(); |
| 544 | 551 |
| 545 bool shouldDumpAsText = m_testInterfaces->testRunner()->shouldDumpAsText(); | 552 bool shouldDumpAsText = m_testInterfaces->testRunner()->shouldDumpAsText(); |
| 546 bool shouldDumpAsPrinted = m_testInterfaces->testRunner()->isPrinting(); | 553 bool shouldDumpAsPrinted = m_testInterfaces->testRunner()->isPrinting(); |
| 547 WebFrame* frame = webView()->mainFrame(); | 554 WebFrame* frame = webView()->mainFrame(); |
| 548 string dataUtf8; | 555 string dataUtf8; |
| 549 if (shouldDumpAsText) { | 556 if (shouldDumpAsText) { |
| 550 bool recursive = m_testInterfaces->testRunner()->shouldDumpChildFramesAs
Text(); | 557 bool recursive = m_testInterfaces->testRunner()->shouldDumpChildFramesAs
Text(); |
| (...skipping 948 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1499 | 1506 |
| 1500 void WebTestProxyBase::resetInputMethod() | 1507 void WebTestProxyBase::resetInputMethod() |
| 1501 { | 1508 { |
| 1502 // If a composition text exists, then we need to let the browser process | 1509 // If a composition text exists, then we need to let the browser process |
| 1503 // to cancel the input method's ongoing composition session. | 1510 // to cancel the input method's ongoing composition session. |
| 1504 if (m_webWidget) | 1511 if (m_webWidget) |
| 1505 m_webWidget->confirmComposition(); | 1512 m_webWidget->confirmComposition(); |
| 1506 } | 1513 } |
| 1507 | 1514 |
| 1508 } | 1515 } |
| OLD | NEW |