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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 #include "public/platform/WebRect.h" | 45 #include "public/platform/WebRect.h" |
46 #include "public/platform/WebURLError.h" | 46 #include "public/platform/WebURLError.h" |
47 #include "public/platform/WebURLRequest.h" | 47 #include "public/platform/WebURLRequest.h" |
48 #include <map> | 48 #include <map> |
49 #include <memory> | 49 #include <memory> |
50 #include <string> | 50 #include <string> |
51 | 51 |
52 namespace WebKit { | 52 namespace WebKit { |
53 class WebAccessibilityObject; | 53 class WebAccessibilityObject; |
54 class WebCachedURLRequest; | 54 class WebCachedURLRequest; |
| 55 class WebColorChooser; |
| 56 class WebColorChooserClient; |
55 class WebDataSource; | 57 class WebDataSource; |
56 class WebDeviceOrientationClient; | 58 class WebDeviceOrientationClient; |
57 class WebDeviceOrientationClientMock; | 59 class WebDeviceOrientationClientMock; |
58 class WebDragData; | 60 class WebDragData; |
59 class WebFrame; | 61 class WebFrame; |
60 class WebGeolocationClient; | 62 class WebGeolocationClient; |
61 class WebGeolocationClientMock; | 63 class WebGeolocationClientMock; |
62 class WebImage; | 64 class WebImage; |
63 class WebMediaPlayer; | 65 class WebMediaPlayer; |
64 class WebMediaPlayerClient; | 66 class WebMediaPlayerClient; |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 class WebUserMediaClientMock; | 100 class WebUserMediaClientMock; |
99 | 101 |
100 class WEBTESTRUNNER_EXPORT WebTestProxyBase { | 102 class WEBTESTRUNNER_EXPORT WebTestProxyBase { |
101 public: | 103 public: |
102 void setInterfaces(WebTestInterfaces*); | 104 void setInterfaces(WebTestInterfaces*); |
103 void setDelegate(WebTestDelegate*); | 105 void setDelegate(WebTestDelegate*); |
104 | 106 |
105 void reset(); | 107 void reset(); |
106 | 108 |
107 WebKit::WebSpellCheckClient *spellCheckClient() const; | 109 WebKit::WebSpellCheckClient *spellCheckClient() const; |
| 110 WebKit::WebColorChooser* createColorChooser(WebKit::WebColorChooserClient*); |
108 | 111 |
109 std::string captureTree(bool debugRenderTree); | 112 std::string captureTree(bool debugRenderTree); |
110 SkCanvas* capturePixels(); | 113 SkCanvas* capturePixels(); |
111 | 114 |
112 void setLogConsoleOutput(bool enabled); | 115 void setLogConsoleOutput(bool enabled); |
113 | 116 |
114 // FIXME: Make this private again. | 117 // FIXME: Make this private again. |
115 void scheduleComposite(); | 118 void scheduleComposite(); |
116 | 119 |
| 120 void didOpenChooser(); |
| 121 void didCloseChooser(); |
| 122 bool isChooserShown(); |
| 123 |
117 #if WEBTESTRUNNER_IMPLEMENTATION | 124 #if WEBTESTRUNNER_IMPLEMENTATION |
118 void display(); | 125 void display(); |
119 void displayInvalidatedRegion(); | 126 void displayInvalidatedRegion(); |
120 void discardBackingStore(); | 127 void discardBackingStore(); |
121 | 128 |
122 WebKit::WebDeviceOrientationClientMock* deviceOrientationClientMock(); | 129 WebKit::WebDeviceOrientationClientMock* deviceOrientationClientMock(); |
123 WebKit::WebGeolocationClientMock* geolocationClientMock(); | 130 WebKit::WebGeolocationClientMock* geolocationClientMock(); |
124 MockWebSpeechInputController* speechInputControllerMock(); | 131 MockWebSpeechInputController* speechInputControllerMock(); |
125 MockWebSpeechRecognizer* speechRecognizerMock(); | 132 MockWebSpeechRecognizer* speechRecognizerMock(); |
126 #endif | 133 #endif |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
216 std::auto_ptr<WebUserMediaClientMock> m_userMediaClient; | 223 std::auto_ptr<WebUserMediaClientMock> m_userMediaClient; |
217 | 224 |
218 // Painting. | 225 // Painting. |
219 std::auto_ptr<SkCanvas> m_canvas; | 226 std::auto_ptr<SkCanvas> m_canvas; |
220 WebKit::WebRect m_paintRect; | 227 WebKit::WebRect m_paintRect; |
221 bool m_isPainting; | 228 bool m_isPainting; |
222 std::map<unsigned, std::string> m_resourceIdentifierMap; | 229 std::map<unsigned, std::string> m_resourceIdentifierMap; |
223 std::map<unsigned, WebKit::WebURLRequest> m_requestMap; | 230 std::map<unsigned, WebKit::WebURLRequest> m_requestMap; |
224 | 231 |
225 bool m_logConsoleOutput; | 232 bool m_logConsoleOutput; |
| 233 int m_chooserCount; |
226 | 234 |
227 std::auto_ptr<WebKit::WebGeolocationClientMock> m_geolocationClient; | 235 std::auto_ptr<WebKit::WebGeolocationClientMock> m_geolocationClient; |
228 std::auto_ptr<WebKit::WebDeviceOrientationClientMock> m_deviceOrientationCli
ent; | 236 std::auto_ptr<WebKit::WebDeviceOrientationClientMock> m_deviceOrientationCli
ent; |
229 std::auto_ptr<MockWebSpeechRecognizer> m_speechRecognizer; | 237 std::auto_ptr<MockWebSpeechRecognizer> m_speechRecognizer; |
230 std::auto_ptr<MockWebSpeechInputController> m_speechInputController; | 238 std::auto_ptr<MockWebSpeechInputController> m_speechInputController; |
231 | 239 |
232 private: | 240 private: |
233 WebTestProxyBase(WebTestProxyBase&); | 241 WebTestProxyBase(WebTestProxyBase&); |
234 WebTestProxyBase& operator=(const WebTestProxyBase&); | 242 WebTestProxyBase& operator=(const WebTestProxyBase&); |
235 }; | 243 }; |
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
595 { | 603 { |
596 if (WebTestProxyBase::willCheckAndDispatchMessageEvent(sourceFrame, targ
etFrame, target, event)) | 604 if (WebTestProxyBase::willCheckAndDispatchMessageEvent(sourceFrame, targ
etFrame, target, event)) |
597 return true; | 605 return true; |
598 return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame,
target, event); | 606 return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame,
target, event); |
599 } | 607 } |
600 }; | 608 }; |
601 | 609 |
602 } | 610 } |
603 | 611 |
604 #endif // WebTestProxy_h | 612 #endif // WebTestProxy_h |
OLD | NEW |