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

Side by Side Diff: content/shell/browser/layout_test/blink_test_controller.h

Issue 1750063002: Replicate static layout test configuration to all renderers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@no-test-finished-in-secondary-frames-please
Patch Set: Rebasing... Created 4 years, 9 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
« no previous file with comments | « no previous file | content/shell/browser/layout_test/blink_test_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ 5 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_
6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ 6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <ostream> 9 #include <ostream>
10 #include <string> 10 #include <string>
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 private: 180 private:
181 enum TestPhase { 181 enum TestPhase {
182 BETWEEN_TESTS, 182 BETWEEN_TESTS,
183 DURING_TEST, 183 DURING_TEST,
184 CLEAN_UP 184 CLEAN_UP
185 }; 185 };
186 186
187 static BlinkTestController* instance_; 187 static BlinkTestController* instance_;
188 188
189 void DiscardMainWindow(); 189 void DiscardMainWindow();
190 void SendTestConfiguration(); 190 void HandleNewRenderFrameHost(
191 RenderFrameHost* frame_representing_target_process);
191 192
192 // Message handlers. 193 // Message handlers.
193 void OnAudioDump(const std::vector<unsigned char>& audio_dump); 194 void OnAudioDump(const std::vector<unsigned char>& audio_dump);
194 void OnImageDump(const std::string& actual_pixel_hash, const SkBitmap& image); 195 void OnImageDump(const std::string& actual_pixel_hash, const SkBitmap& image);
195 void OnTextDump(const std::string& dump); 196 void OnTextDump(const std::string& dump);
196 void OnInitiateLayoutDump( 197 void OnInitiateLayoutDump(
197 const test_runner::LayoutDumpFlags& layout_dump_flags); 198 const test_runner::LayoutDumpFlags& layout_dump_flags);
198 void OnLayoutDumpResponse(RenderFrameHost* sender, const std::string& dump); 199 void OnLayoutDumpResponse(RenderFrameHost* sender, const std::string& dump);
199 void OnPrintMessage(const std::string& message); 200 void OnPrintMessage(const std::string& message);
200 void OnOverridePreferences(const WebPreferences& prefs); 201 void OnOverridePreferences(const WebPreferences& prefs);
(...skipping 17 matching lines...) Expand all
218 scoped_ptr<BlinkTestResultPrinter> printer_; 219 scoped_ptr<BlinkTestResultPrinter> printer_;
219 220
220 base::FilePath current_working_directory_; 221 base::FilePath current_working_directory_;
221 base::FilePath temp_path_; 222 base::FilePath temp_path_;
222 223
223 Shell* main_window_; 224 Shell* main_window_;
224 225
225 // The PID of the render process of the render view host of main_window_. 226 // The PID of the render process of the render view host of main_window_.
226 int current_pid_; 227 int current_pid_;
227 228
228 // True if we should set the test configuration to the next RenderViewHost 229 // Tracks if (during the current test) we have already sent test configuration
229 // created. 230 // to a renderer process.
230 bool send_configuration_to_next_host_; 231 bool need_to_send_test_configuration_to_renderer_;
jochen (gone - plz use gerrit) 2016/03/08 16:28:58 the name is a bit confusing, because in fact you'l
Łukasz Anforowicz 2016/03/08 18:12:46 Done. I talked with alexmos@ and he helped me pic
231 232
232 // What phase of running an individual test we are currently in. 233 // What phase of running an individual test we are currently in.
233 TestPhase test_phase_; 234 TestPhase test_phase_;
234 235
235 // True if the currently running test is a compositing test. 236 // True if the currently running test is a compositing test.
236 bool is_compositing_test_; 237 bool is_compositing_test_;
237 238
238 // Per test config. 239 // Per test config.
239 bool enable_pixel_dumping_; 240 bool enable_pixel_dumping_;
240 std::string expected_pixel_hash_; 241 std::string expected_pixel_hash_;
(...skipping 28 matching lines...) Expand all
269 // waiting on the UI thread while layout tests are being ran. 270 // waiting on the UI thread while layout tests are being ran.
270 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; 271 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_;
271 #endif 272 #endif
272 273
273 DISALLOW_COPY_AND_ASSIGN(BlinkTestController); 274 DISALLOW_COPY_AND_ASSIGN(BlinkTestController);
274 }; 275 };
275 276
276 } // namespace content 277 } // namespace content
277 278
278 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ 279 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | content/shell/browser/layout_test/blink_test_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698