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

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

Issue 1131803003: Remove testRunner.displayAsync() and displayAsyncThen() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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>
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 void CapturePixelsAsync( 116 void CapturePixelsAsync(
117 const base::Callback<void(const SkBitmap&)>& callback); 117 const base::Callback<void(const SkBitmap&)>& callback);
118 118
119 void SetLogConsoleOutput(bool enabled); 119 void SetLogConsoleOutput(bool enabled);
120 120
121 void DidOpenChooser(); 121 void DidOpenChooser();
122 void DidCloseChooser(); 122 void DidCloseChooser();
123 bool IsChooserShown(); 123 bool IsChooserShown();
124 124
125 void LayoutAndPaintAsyncThen(const base::Closure& callback); 125 void LayoutAndPaintAsyncThen(const base::Closure& callback);
126 void DisplayAsyncThen(const base::Closure& callback);
127 126
128 void GetScreenOrientationForTesting(blink::WebScreenInfo&); 127 void GetScreenOrientationForTesting(blink::WebScreenInfo&);
129 MockScreenOrientationClient* GetScreenOrientationClientMock(); 128 MockScreenOrientationClient* GetScreenOrientationClientMock();
130 MockWebSpeechRecognizer* GetSpeechRecognizerMock(); 129 MockWebSpeechRecognizer* GetSpeechRecognizerMock();
131 MockCredentialManagerClient* GetCredentialManagerClientMock(); 130 MockCredentialManagerClient* GetCredentialManagerClientMock();
132 131
133 WebTaskList* mutable_task_list() { return &task_list_; } 132 WebTaskList* mutable_task_list() { return &task_list_; }
134 133
135 blink::WebView* GetWebView() const; 134 blink::WebView* GetWebView() const;
136 135
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 LoadFinished, 237 LoadFinished,
239 MainResourceLoadFailed, 238 MainResourceLoadFailed,
240 ResourceLoadCompleted 239 ResourceLoadCompleted
241 }; 240 };
242 void CheckDone(blink::WebLocalFrame* frame, CheckDoneReason reason); 241 void CheckDone(blink::WebLocalFrame* frame, CheckDoneReason reason);
243 void AnimateNow(); 242 void AnimateNow();
244 void DrawSelectionRect(SkCanvas* canvas); 243 void DrawSelectionRect(SkCanvas* canvas);
245 void DidCapturePixelsAsync( 244 void DidCapturePixelsAsync(
246 const base::Callback<void(const SkBitmap&)>& callback, 245 const base::Callback<void(const SkBitmap&)>& callback,
247 const SkBitmap& bitmap); 246 const SkBitmap& bitmap);
248 void DidDisplayAsync(const base::Closure& callback, const SkBitmap& bitmap);
249 247
250 blink::WebWidget* web_widget() const { return web_widget_; } 248 blink::WebWidget* web_widget() const { return web_widget_; }
251 249
252 TestInterfaces* test_interfaces_; 250 TestInterfaces* test_interfaces_;
253 WebTestDelegate* delegate_; 251 WebTestDelegate* delegate_;
254 blink::WebWidget* web_widget_; 252 blink::WebWidget* web_widget_;
255 253
256 WebTaskList task_list_; 254 WebTaskList task_list_;
257 255
258 blink::WebImage drag_image_; 256 blink::WebImage drag_image_;
(...skipping 135 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