| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 namespace WebKit { | 54 namespace WebKit { |
| 55 class WebAXObject; | 55 class WebAXObject; |
| 56 class WebAudioDevice; | 56 class WebAudioDevice; |
| 57 class WebCachedURLRequest; | 57 class WebCachedURLRequest; |
| 58 class WebColorChooser; | 58 class WebColorChooser; |
| 59 class WebColorChooserClient; | 59 class WebColorChooserClient; |
| 60 class WebDataSource; | 60 class WebDataSource; |
| 61 class WebDeviceOrientationClient; | 61 class WebDeviceOrientationClient; |
| 62 class WebDeviceOrientationClientMock; | 62 class WebDeviceOrientationClientMock; |
| 63 class WebDragData; | 63 class WebDragData; |
| 64 class WebFileChooserCompletion; |
| 64 class WebFrame; | 65 class WebFrame; |
| 65 class WebGeolocationClient; | 66 class WebGeolocationClient; |
| 66 class WebGeolocationClientMock; | 67 class WebGeolocationClientMock; |
| 67 class WebImage; | 68 class WebImage; |
| 68 class WebMIDIAccessor; | 69 class WebMIDIAccessor; |
| 69 class WebMIDIAccessorClient; | 70 class WebMIDIAccessorClient; |
| 70 class WebMIDIClient; | 71 class WebMIDIClient; |
| 71 class WebMIDIClientMock; | 72 class WebMIDIClientMock; |
| 72 class WebNode; | 73 class WebNode; |
| 73 class WebNotificationPresenter; | 74 class WebNotificationPresenter; |
| 74 class WebPlugin; | 75 class WebPlugin; |
| 75 class WebRange; | 76 class WebRange; |
| 76 class WebSerializedScriptValue; | 77 class WebSerializedScriptValue; |
| 77 class WebSpeechInputController; | 78 class WebSpeechInputController; |
| 78 class WebSpeechInputListener; | 79 class WebSpeechInputListener; |
| 79 class WebSpeechRecognizer; | 80 class WebSpeechRecognizer; |
| 80 class WebSpellCheckClient; | 81 class WebSpellCheckClient; |
| 81 class WebString; | 82 class WebString; |
| 82 class WebURL; | 83 class WebURL; |
| 83 class WebURLResponse; | 84 class WebURLResponse; |
| 84 class WebUserMediaClient; | 85 class WebUserMediaClient; |
| 85 class WebValidationMessageClient; | 86 class WebValidationMessageClient; |
| 86 class WebView; | 87 class WebView; |
| 87 class WebWidget; | 88 class WebWidget; |
| 88 struct WebConsoleMessage; | 89 struct WebConsoleMessage; |
| 89 struct WebContextMenuData; | 90 struct WebContextMenuData; |
| 91 struct WebFileChooserParams; |
| 90 struct WebPluginParams; | 92 struct WebPluginParams; |
| 91 struct WebPoint; | 93 struct WebPoint; |
| 92 struct WebSize; | 94 struct WebSize; |
| 93 struct WebWindowFeatures; | 95 struct WebWindowFeatures; |
| 94 typedef unsigned WebColor; | 96 typedef unsigned WebColor; |
| 95 } | 97 } |
| 96 | 98 |
| 97 class SkCanvas; | 99 class SkCanvas; |
| 98 | 100 |
| 99 namespace WebTestRunner { | 101 namespace WebTestRunner { |
| (...skipping 12 matching lines...) Expand all Loading... |
| 112 public: | 114 public: |
| 113 void setInterfaces(WebTestInterfaces*); | 115 void setInterfaces(WebTestInterfaces*); |
| 114 void setDelegate(WebTestDelegate*); | 116 void setDelegate(WebTestDelegate*); |
| 115 void setWidget(WebKit::WebWidget*); | 117 void setWidget(WebKit::WebWidget*); |
| 116 | 118 |
| 117 void reset(); | 119 void reset(); |
| 118 | 120 |
| 119 WebKit::WebSpellCheckClient *spellCheckClient() const; | 121 WebKit::WebSpellCheckClient *spellCheckClient() const; |
| 120 WebKit::WebValidationMessageClient* validationMessageClient(); | 122 WebKit::WebValidationMessageClient* validationMessageClient(); |
| 121 WebKit::WebColorChooser* createColorChooser(WebKit::WebColorChooserClient*,
const WebKit::WebColor&); | 123 WebKit::WebColorChooser* createColorChooser(WebKit::WebColorChooserClient*,
const WebKit::WebColor&); |
| 124 bool runFileChooser(const WebKit::WebFileChooserParams&, WebKit::WebFileChoo
serCompletion*); |
| 122 | 125 |
| 123 std::string captureTree(bool debugRenderTree); | 126 std::string captureTree(bool debugRenderTree); |
| 124 SkCanvas* capturePixels(); | 127 SkCanvas* capturePixels(); |
| 125 | 128 |
| 126 void setLogConsoleOutput(bool enabled); | 129 void setLogConsoleOutput(bool enabled); |
| 127 | 130 |
| 128 // FIXME: Make this private again. | 131 // FIXME: Make this private again. |
| 129 void scheduleComposite(); | 132 void scheduleComposite(); |
| 130 | 133 |
| 131 void didOpenChooser(); | 134 void didOpenChooser(); |
| (...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 580 virtual bool willCheckAndDispatchMessageEvent(WebKit::WebFrame* sourceFrame,
WebKit::WebFrame* targetFrame, WebKit::WebSecurityOrigin target, WebKit::WebDOM
MessageEvent event) | 583 virtual bool willCheckAndDispatchMessageEvent(WebKit::WebFrame* sourceFrame,
WebKit::WebFrame* targetFrame, WebKit::WebSecurityOrigin target, WebKit::WebDOM
MessageEvent event) |
| 581 { | 584 { |
| 582 if (WebTestProxyBase::willCheckAndDispatchMessageEvent(sourceFrame, targ
etFrame, target, event)) | 585 if (WebTestProxyBase::willCheckAndDispatchMessageEvent(sourceFrame, targ
etFrame, target, event)) |
| 583 return true; | 586 return true; |
| 584 return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame,
target, event); | 587 return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame,
target, event); |
| 585 } | 588 } |
| 586 virtual WebKit::WebColorChooser* createColorChooser(WebKit::WebColorChooserC
lient* client, const WebKit::WebColor& color) | 589 virtual WebKit::WebColorChooser* createColorChooser(WebKit::WebColorChooserC
lient* client, const WebKit::WebColor& color) |
| 587 { | 590 { |
| 588 return WebTestProxyBase::createColorChooser(client, color); | 591 return WebTestProxyBase::createColorChooser(client, color); |
| 589 } | 592 } |
| 593 virtual bool runFileChooser(const WebKit::WebFileChooserParams& params, WebK
it::WebFileChooserCompletion* completion) |
| 594 { |
| 595 return WebTestProxyBase::runFileChooser(params, completion); |
| 596 } |
| 590 }; | 597 }; |
| 591 | 598 |
| 592 } | 599 } |
| 593 | 600 |
| 594 #endif // WebTestProxy_h | 601 #endif // WebTestProxy_h |
| OLD | NEW |