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

Unified Diff: content/shell/webkit_test_runner_host.h

Issue 11245004: [content shell] link against the TestRunner library (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch for landing Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/webkit_test_runner.js ('k') | content/shell/webkit_test_runner_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/webkit_test_runner_host.h
diff --git a/content/shell/webkit_test_runner_host.h b/content/shell/webkit_test_runner_host.h
index d5022e26feefb87a6217fedfeb742ad8129fa817..8616be6b9364cb9ac562c3518432e2be0a2a5a68 100644
--- a/content/shell/webkit_test_runner_host.h
+++ b/content/shell/webkit_test_runner_host.h
@@ -42,6 +42,7 @@ class WebKitTestResultPrinter {
void PrintImageFooter();
void AddMessage(const std::string& message);
+ void AddMessageRaw(const std::string& message);
void AddErrorMessage(const std::string& message);
private:
@@ -108,6 +109,7 @@ class WebKitTestController : public base::NonThreadSafe,
// WebContentsObserver implementation.
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
virtual void PluginCrashed(const FilePath& plugin_path) OVERRIDE;
+ virtual void RenderViewReady() OVERRIDE;
virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE;
virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE;
@@ -121,6 +123,7 @@ class WebKitTestController : public base::NonThreadSafe,
void OnDidFinishLoad();
void OnImageDump(const std::string& actual_pixel_hash, const SkBitmap& image);
void OnTextDump(const std::string& dump);
+ void OnPrintMessage(const std::string& message);
scoped_ptr<WebKitTestResultPrinter> printer_;
@@ -137,6 +140,8 @@ class WebKitTestController : public base::NonThreadSafe,
bool should_stay_on_page_after_handling_before_unload_;
bool wait_until_done_;
+ bool did_set_as_main_window_;
+
base::CancelableClosure watchdog_;
DISALLOW_COPY_AND_ASSIGN(WebKitTestController);
« no previous file with comments | « content/shell/webkit_test_runner.js ('k') | content/shell/webkit_test_runner_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698