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 14 matching lines...) Expand all Loading... |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "WebTestProxy.h" | 32 #include "WebTestProxy.h" |
33 | 33 |
34 #include "AccessibilityControllerChromium.h" | 34 #include "AccessibilityControllerChromium.h" |
| 35 #include "ColorChooser.h" |
35 #include "EventSender.h" | 36 #include "EventSender.h" |
36 #include "MockWebSpeechInputController.h" | 37 #include "MockWebSpeechInputController.h" |
37 #include "MockWebSpeechRecognizer.h" | 38 #include "MockWebSpeechRecognizer.h" |
38 #include "SpellCheckClient.h" | 39 #include "SpellCheckClient.h" |
39 #include "TestCommon.h" | 40 #include "TestCommon.h" |
40 #include "TestInterfaces.h" | 41 #include "TestInterfaces.h" |
41 #include "TestPlugin.h" | 42 #include "TestPlugin.h" |
42 #include "TestRunner.h" | 43 #include "TestRunner.h" |
43 #include "WebAccessibilityNotification.h" | 44 #include "WebAccessibilityNotification.h" |
44 #include "WebAccessibilityObject.h" | 45 #include "WebAccessibilityObject.h" |
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
479 if (m_speechInputController.get()) | 480 if (m_speechInputController.get()) |
480 m_speechInputController->clearResults(); | 481 m_speechInputController->clearResults(); |
481 #endif | 482 #endif |
482 } | 483 } |
483 | 484 |
484 WebSpellCheckClient* WebTestProxyBase::spellCheckClient() const | 485 WebSpellCheckClient* WebTestProxyBase::spellCheckClient() const |
485 { | 486 { |
486 return m_spellcheck.get(); | 487 return m_spellcheck.get(); |
487 } | 488 } |
488 | 489 |
| 490 WebColorChooser* WebTestProxyBase::createColorChooser(WebColorChooserClient* cli
ent) const |
| 491 { |
| 492 // This instance is deleted by WebCore::ColorInputType |
| 493 return new ColorChooser(client, m_delegate); |
| 494 } |
| 495 |
489 string WebTestProxyBase::captureTree(bool debugRenderTree) | 496 string WebTestProxyBase::captureTree(bool debugRenderTree) |
490 { | 497 { |
491 WebScriptController::flushConsoleMessages(); | 498 WebScriptController::flushConsoleMessages(); |
492 | 499 |
493 bool shouldDumpAsText = m_testInterfaces->testRunner()->shouldDumpAsText(); | 500 bool shouldDumpAsText = m_testInterfaces->testRunner()->shouldDumpAsText(); |
494 bool shouldDumpAsPrinted = m_testInterfaces->testRunner()->isPrinting(); | 501 bool shouldDumpAsPrinted = m_testInterfaces->testRunner()->isPrinting(); |
495 WebFrame* frame = m_testInterfaces->webView()->mainFrame(); | 502 WebFrame* frame = m_testInterfaces->webView()->mainFrame(); |
496 string dataUtf8; | 503 string dataUtf8; |
497 if (shouldDumpAsText) { | 504 if (shouldDumpAsText) { |
498 bool recursive = m_testInterfaces->testRunner()->shouldDumpChildFramesAs
Text(); | 505 bool recursive = m_testInterfaces->testRunner()->shouldDumpChildFramesAs
Text(); |
(...skipping 968 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1467 { | 1474 { |
1468 if (m_testInterfaces->testRunner()->shouldInterceptPostMessage()) { | 1475 if (m_testInterfaces->testRunner()->shouldInterceptPostMessage()) { |
1469 m_delegate->printMessage("intercepted postMessage\n"); | 1476 m_delegate->printMessage("intercepted postMessage\n"); |
1470 return true; | 1477 return true; |
1471 } | 1478 } |
1472 | 1479 |
1473 return false; | 1480 return false; |
1474 } | 1481 } |
1475 | 1482 |
1476 } | 1483 } |
OLD | NEW |