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

Unified Diff: content/browser/browser_plugin/test_browser_plugin_guest.h

Issue 11094080: Browser Plugin: More robust recovery from guest crash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: content/browser/browser_plugin/test_browser_plugin_guest.h
diff --git a/content/browser/browser_plugin/test_browser_plugin_guest.h b/content/browser/browser_plugin/test_browser_plugin_guest.h
index fbc7a4f95d95feb7c1504b0c576b1894db4e2286..747c65c0ba33cbcc7efd682969ba63f2f3f4c091 100644
--- a/content/browser/browser_plugin/test_browser_plugin_guest.h
+++ b/content/browser/browser_plugin/test_browser_plugin_guest.h
@@ -38,6 +38,10 @@ class TestBrowserPluginGuest : public BrowserPluginGuest {
// Overridden methods from BrowserPluginGuest to intercept in test objects.
virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE;
+ virtual void HandleInputEvent(RenderViewHost* render_view_host,
+ const gfx::Rect& guest_rect,
+ const WebKit::WebInputEvent& event,
+ IPC::Message* reply_message) OVERRIDE;
virtual void SetFocus(bool focused) OVERRIDE;
virtual bool ViewTakeFocus(bool reverse) OVERRIDE;
virtual void Reload() OVERRIDE;
@@ -68,6 +72,9 @@ class TestBrowserPluginGuest : public BrowserPluginGuest {
void WaitForReload();
// Waits until a stop request is observed.
void WaitForStop();
+ // Waits until input is observed.
+ void WaitForInput();
+
private:
// Overridden methods from BrowserPluginGuest to intercept in test objects.
@@ -82,6 +89,7 @@ class TestBrowserPluginGuest : public BrowserPluginGuest {
bool stop_observed_;
bool reload_observed_;
bool set_damage_buffer_observed_;
+ bool input_observed_;
// For WaitForDamageBufferWithSize().
bool waiting_for_damage_buffer_with_size_;
@@ -96,6 +104,7 @@ class TestBrowserPluginGuest : public BrowserPluginGuest {
scoped_refptr<MessageLoopRunner> reload_message_loop_runner_;
scoped_refptr<MessageLoopRunner> stop_message_loop_runner_;
scoped_refptr<MessageLoopRunner> damage_buffer_message_loop_runner_;
+ scoped_refptr<MessageLoopRunner> input_message_loop_runner_;
DISALLOW_COPY_AND_ASSIGN(TestBrowserPluginGuest);
};

Powered by Google App Engine
This is Rietveld 408576698