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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
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_BROWSER_BROWSER_PLUGIN_TEST_BROWSER_PLUGIN_GUEST_H_ 5 #ifndef CONTENT_BROWSER_BROWSER_PLUGIN_TEST_BROWSER_PLUGIN_GUEST_H_
6 #define CONTENT_BROWSER_BROWSER_PLUGIN_TEST_BROWSER_PLUGIN_GUEST_H_ 6 #define CONTENT_BROWSER_BROWSER_PLUGIN_TEST_BROWSER_PLUGIN_GUEST_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/process_util.h" 9 #include "base/process_util.h"
10 #include "content/browser/browser_plugin/browser_plugin_guest.h" 10 #include "content/browser/browser_plugin/browser_plugin_guest.h"
(...skipping 20 matching lines...) Expand all
31 31
32 WebContentsImpl* web_contents() const; 32 WebContentsImpl* web_contents() const;
33 33
34 // NotificationObserver method override. 34 // NotificationObserver method override.
35 virtual void Observe(int type, 35 virtual void Observe(int type,
36 const NotificationSource& source, 36 const NotificationSource& source,
37 const NotificationDetails& details) OVERRIDE; 37 const NotificationDetails& details) OVERRIDE;
38 38
39 // Overridden methods from BrowserPluginGuest to intercept in test objects. 39 // Overridden methods from BrowserPluginGuest to intercept in test objects.
40 virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE; 40 virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE;
41 virtual void HandleInputEvent(RenderViewHost* render_view_host,
42 const gfx::Rect& guest_rect,
43 const WebKit::WebInputEvent& event,
44 IPC::Message* reply_message) OVERRIDE;
41 virtual void SetFocus(bool focused) OVERRIDE; 45 virtual void SetFocus(bool focused) OVERRIDE;
42 virtual bool ViewTakeFocus(bool reverse) OVERRIDE; 46 virtual bool ViewTakeFocus(bool reverse) OVERRIDE;
43 virtual void Reload() OVERRIDE; 47 virtual void Reload() OVERRIDE;
44 virtual void Stop() OVERRIDE; 48 virtual void Stop() OVERRIDE;
45 virtual void SetDamageBuffer(TransportDIB* damage_buffer, 49 virtual void SetDamageBuffer(TransportDIB* damage_buffer,
46 #if defined(OS_WIN) 50 #if defined(OS_WIN)
47 int damage_buffer_size, 51 int damage_buffer_size,
48 #endif 52 #endif
49 const gfx::Size& damage_view_size, 53 const gfx::Size& damage_view_size,
50 float scale_factor) OVERRIDE; 54 float scale_factor) OVERRIDE;
(...skipping 10 matching lines...) Expand all
61 // Waits for focus to move out of this guest. 65 // Waits for focus to move out of this guest.
62 void WaitForAdvanceFocus(); 66 void WaitForAdvanceFocus();
63 // Waits until the guest is hidden. 67 // Waits until the guest is hidden.
64 void WaitUntilHidden(); 68 void WaitUntilHidden();
65 // Waits until guest crashes. 69 // Waits until guest crashes.
66 void WaitForCrashed(); 70 void WaitForCrashed();
67 // Waits until a reload request is observed. 71 // Waits until a reload request is observed.
68 void WaitForReload(); 72 void WaitForReload();
69 // Waits until a stop request is observed. 73 // Waits until a stop request is observed.
70 void WaitForStop(); 74 void WaitForStop();
75 // Waits until input is observed.
76 void WaitForInput();
77
71 78
72 private: 79 private:
73 // Overridden methods from BrowserPluginGuest to intercept in test objects. 80 // Overridden methods from BrowserPluginGuest to intercept in test objects.
74 virtual void SendMessageToEmbedder(IPC::Message* msg) OVERRIDE; 81 virtual void SendMessageToEmbedder(IPC::Message* msg) OVERRIDE;
75 82
76 int update_rect_count_; 83 int update_rect_count_;
77 int damage_buffer_call_count_; 84 int damage_buffer_call_count_;
78 bool crash_observed_; 85 bool crash_observed_;
79 bool focus_observed_; 86 bool focus_observed_;
80 bool advance_focus_observed_; 87 bool advance_focus_observed_;
81 bool was_hidden_observed_; 88 bool was_hidden_observed_;
82 bool stop_observed_; 89 bool stop_observed_;
83 bool reload_observed_; 90 bool reload_observed_;
84 bool set_damage_buffer_observed_; 91 bool set_damage_buffer_observed_;
92 bool input_observed_;
85 93
86 // For WaitForDamageBufferWithSize(). 94 // For WaitForDamageBufferWithSize().
87 bool waiting_for_damage_buffer_with_size_; 95 bool waiting_for_damage_buffer_with_size_;
88 gfx::Size expected_damage_buffer_size_; 96 gfx::Size expected_damage_buffer_size_;
89 gfx::Size last_damage_buffer_size_; 97 gfx::Size last_damage_buffer_size_;
90 98
91 scoped_refptr<MessageLoopRunner> send_message_loop_runner_; 99 scoped_refptr<MessageLoopRunner> send_message_loop_runner_;
92 scoped_refptr<MessageLoopRunner> crash_message_loop_runner_; 100 scoped_refptr<MessageLoopRunner> crash_message_loop_runner_;
93 scoped_refptr<MessageLoopRunner> focus_message_loop_runner_; 101 scoped_refptr<MessageLoopRunner> focus_message_loop_runner_;
94 scoped_refptr<MessageLoopRunner> advance_focus_message_loop_runner_; 102 scoped_refptr<MessageLoopRunner> advance_focus_message_loop_runner_;
95 scoped_refptr<MessageLoopRunner> was_hidden_message_loop_runner_; 103 scoped_refptr<MessageLoopRunner> was_hidden_message_loop_runner_;
96 scoped_refptr<MessageLoopRunner> reload_message_loop_runner_; 104 scoped_refptr<MessageLoopRunner> reload_message_loop_runner_;
97 scoped_refptr<MessageLoopRunner> stop_message_loop_runner_; 105 scoped_refptr<MessageLoopRunner> stop_message_loop_runner_;
98 scoped_refptr<MessageLoopRunner> damage_buffer_message_loop_runner_; 106 scoped_refptr<MessageLoopRunner> damage_buffer_message_loop_runner_;
107 scoped_refptr<MessageLoopRunner> input_message_loop_runner_;
99 108
100 DISALLOW_COPY_AND_ASSIGN(TestBrowserPluginGuest); 109 DISALLOW_COPY_AND_ASSIGN(TestBrowserPluginGuest);
101 }; 110 };
102 111
103 } // namespace content 112 } // namespace content
104 113
105 #endif // CONTENT_BROWSER_BROWSER_PLUGIN_TEST_BROWSER_PLUGIN_GUEST_H_ 114 #endif // CONTENT_BROWSER_BROWSER_PLUGIN_TEST_BROWSER_PLUGIN_GUEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698