Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Side by Side Diff: content/shell/renderer/test_runner/web_test_proxy.h

Issue 925743002: Revert of Add test_runner hook to dump drag image. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "content/shell/renderer/test_runner/web_task.h" 15 #include "content/shell/renderer/test_runner/web_task.h"
16 #include "third_party/WebKit/public/platform/WebImage.h"
17 #include "third_party/WebKit/public/platform/WebRect.h" 16 #include "third_party/WebKit/public/platform/WebRect.h"
18 #include "third_party/WebKit/public/platform/WebScreenInfo.h" 17 #include "third_party/WebKit/public/platform/WebScreenInfo.h"
19 #include "third_party/WebKit/public/platform/WebURLError.h" 18 #include "third_party/WebKit/public/platform/WebURLError.h"
20 #include "third_party/WebKit/public/platform/WebURLRequest.h" 19 #include "third_party/WebKit/public/platform/WebURLRequest.h"
21 #include "third_party/WebKit/public/web/WebAXEnums.h" 20 #include "third_party/WebKit/public/web/WebAXEnums.h"
22 #include "third_party/WebKit/public/web/WebDOMMessageEvent.h" 21 #include "third_party/WebKit/public/web/WebDOMMessageEvent.h"
23 #include "third_party/WebKit/public/web/WebDataSource.h" 22 #include "third_party/WebKit/public/web/WebDataSource.h"
24 #include "third_party/WebKit/public/web/WebDragOperation.h" 23 #include "third_party/WebKit/public/web/WebDragOperation.h"
25 #include "third_party/WebKit/public/web/WebFrame.h" 24 #include "third_party/WebKit/public/web/WebFrame.h"
26 #include "third_party/WebKit/public/web/WebFrameClient.h" 25 #include "third_party/WebKit/public/web/WebFrameClient.h"
(...skipping 11 matching lines...) Expand all
38 namespace blink { 37 namespace blink {
39 class WebAXObject; 38 class WebAXObject;
40 class WebAudioDevice; 39 class WebAudioDevice;
41 class WebCachedURLRequest; 40 class WebCachedURLRequest;
42 class WebColorChooser; 41 class WebColorChooser;
43 class WebColorChooserClient; 42 class WebColorChooserClient;
44 class WebDataSource; 43 class WebDataSource;
45 class WebDragData; 44 class WebDragData;
46 class WebFileChooserCompletion; 45 class WebFileChooserCompletion;
47 class WebFrame; 46 class WebFrame;
47 class WebImage;
48 class WebLocalFrame; 48 class WebLocalFrame;
49 class WebMIDIAccessor; 49 class WebMIDIAccessor;
50 class WebMIDIAccessorClient; 50 class WebMIDIAccessorClient;
51 class WebMIDIClient; 51 class WebMIDIClient;
52 class WebMIDIClientMock; 52 class WebMIDIClientMock;
53 class WebNode; 53 class WebNode;
54 class WebPlugin; 54 class WebPlugin;
55 class WebRange; 55 class WebRange;
56 class WebSerializedScriptValue; 56 class WebSerializedScriptValue;
57 class WebSpeechRecognizer; 57 class WebSpeechRecognizer;
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 void DidDisplayAsync(const base::Closure& callback, const SkBitmap& bitmap); 247 void DidDisplayAsync(const base::Closure& callback, const SkBitmap& bitmap);
248 248
249 blink::WebWidget* web_widget() const { return web_widget_; } 249 blink::WebWidget* web_widget() const { return web_widget_; }
250 250
251 TestInterfaces* test_interfaces_; 251 TestInterfaces* test_interfaces_;
252 WebTestDelegate* delegate_; 252 WebTestDelegate* delegate_;
253 blink::WebWidget* web_widget_; 253 blink::WebWidget* web_widget_;
254 254
255 WebTaskList task_list_; 255 WebTaskList task_list_;
256 256
257 blink::WebImage drag_image_;
258
259 scoped_ptr<SpellCheckClient> spellcheck_; 257 scoped_ptr<SpellCheckClient> spellcheck_;
260 scoped_ptr<MockWebUserMediaClient> user_media_client_; 258 scoped_ptr<MockWebUserMediaClient> user_media_client_;
261 259
262 bool animate_scheduled_; 260 bool animate_scheduled_;
263 std::map<unsigned, std::string> resource_identifier_map_; 261 std::map<unsigned, std::string> resource_identifier_map_;
264 262
265 bool log_console_output_; 263 bool log_console_output_;
266 int chooser_count_; 264 int chooser_count_;
267 265
268 scoped_ptr<MockCredentialManagerClient> credential_manager_client_; 266 scoped_ptr<MockCredentialManagerClient> credential_manager_client_;
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 392
395 private: 393 private:
396 virtual ~WebTestProxy() {} 394 virtual ~WebTestProxy() {}
397 395
398 DISALLOW_COPY_AND_ASSIGN(WebTestProxy); 396 DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
399 }; 397 };
400 398
401 } // namespace content 399 } // namespace content
402 400
403 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_ 401 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
OLDNEW
« no previous file with comments | « content/shell/renderer/test_runner/test_runner.cc ('k') | content/shell/renderer/test_runner/web_test_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698