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

Side by Side Diff: content/shell/webkit_test_runner.h

Issue 11416177: [content shell] change how the main render view is picked for layout tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch for landing Created 8 years 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 | Annotate | Revision Log
« no previous file with comments | « content/shell/shell_render_process_observer.cc ('k') | content/shell/webkit_test_runner.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_WEBKIT_TEST_RUNNER_H_ 5 #ifndef CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_
6 #define CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ 6 #define CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_
7 7
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/public/renderer/render_view_observer.h" 10 #include "content/public/renderer/render_view_observer.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 const std::string& utf8_path); 60 const std::string& utf8_path);
61 61
62 void Display(); 62 void Display();
63 63
64 void set_proxy(WebTestRunner::WebTestProxyBase* proxy) { proxy_ = proxy; } 64 void set_proxy(WebTestRunner::WebTestProxyBase* proxy) { proxy_ = proxy; }
65 65
66 private: 66 private:
67 // Message handlers. 67 // Message handlers.
68 void OnCaptureTextDump(bool as_text, bool printing, bool recursive); 68 void OnCaptureTextDump(bool as_text, bool printing, bool recursive);
69 void OnCaptureImageDump(const std::string& expected_pixel_hash); 69 void OnCaptureImageDump(const std::string& expected_pixel_hash);
70 void OnSetIsMainWindow();
71 void OnSetCurrentWorkingDirectory(const FilePath& current_working_directory); 70 void OnSetCurrentWorkingDirectory(const FilePath& current_working_directory);
72 71
73 SkCanvas* GetCanvas(); 72 SkCanvas* GetCanvas();
74 void PaintRect(const WebKit::WebRect& rect); 73 void PaintRect(const WebKit::WebRect& rect);
75 void PaintInvalidatedRegion(); 74 void PaintInvalidatedRegion();
76 void DisplayRepaintMask(); 75 void DisplayRepaintMask();
77 76
78 scoped_ptr<SkCanvas> canvas_; 77 scoped_ptr<SkCanvas> canvas_;
79 scoped_ptr<WebKit::WebContextMenuData> last_context_menu_data_; 78 scoped_ptr<WebKit::WebContextMenuData> last_context_menu_data_;
80 bool is_main_window_;
81 FilePath current_working_directory_; 79 FilePath current_working_directory_;
82 80
83 WebTestRunner::WebTestProxyBase* proxy_; 81 WebTestRunner::WebTestProxyBase* proxy_;
84 82
85 83
86 DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner); 84 DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner);
87 }; 85 };
88 86
89 } // namespace content 87 } // namespace content
90 88
91 #endif // CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ 89 #endif // CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_
OLDNEW
« no previous file with comments | « content/shell/shell_render_process_observer.cc ('k') | content/shell/webkit_test_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698