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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.h

Issue 1014623002: Revert "Refactor sudden termination" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + fixed compilation error Created 5 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
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_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 const std::vector<GURL>& links, 239 const std::vector<GURL>& links,
240 const std::vector<base::FilePath>& local_paths, 240 const std::vector<base::FilePath>& local_paths,
241 const base::FilePath& local_directory_name); 241 const base::FilePath& local_directory_name);
242 242
243 // Notifies the RenderViewHost that its load state changed. 243 // Notifies the RenderViewHost that its load state changed.
244 void LoadStateChanged(const GURL& url, 244 void LoadStateChanged(const GURL& url,
245 const net::LoadStateWithParam& load_state, 245 const net::LoadStateWithParam& load_state,
246 uint64 upload_position, 246 uint64 upload_position,
247 uint64 upload_size); 247 uint64 upload_size);
248 248
249 bool SuddenTerminationAllowed() const;
250 void set_sudden_termination_allowed(bool enabled) {
251 sudden_termination_allowed_ = enabled;
252 }
253
249 // RenderWidgetHost public overrides. 254 // RenderWidgetHost public overrides.
250 void Init() override; 255 void Init() override;
251 void Shutdown() override; 256 void Shutdown() override;
252 void WasHidden() override; 257 void WasHidden() override;
253 void WasShown(const ui::LatencyInfo& latency_info) override; 258 void WasShown(const ui::LatencyInfo& latency_info) override;
254 bool IsRenderView() const override; 259 bool IsRenderView() const override;
255 bool OnMessageReceived(const IPC::Message& msg) override; 260 bool OnMessageReceived(const IPC::Message& msg) override;
256 void GotFocus() override; 261 void GotFocus() override;
257 void LostCapture() override; 262 void LostCapture() override;
258 void LostMouseLock() override; 263 void LostMouseLock() override;
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 bool is_swapped_out_; 425 bool is_swapped_out_;
421 426
422 // Routing ID for the main frame's RenderFrameHost. 427 // Routing ID for the main frame's RenderFrameHost.
423 int main_frame_routing_id_; 428 int main_frame_routing_id_;
424 429
425 // Set to true when waiting for a ViewHostMsg_ClosePageACK. 430 // Set to true when waiting for a ViewHostMsg_ClosePageACK.
426 // TODO(creis): Move to RenderFrameHost and RenderWidgetHost. 431 // TODO(creis): Move to RenderFrameHost and RenderWidgetHost.
427 // See http://crbug.com/418265. 432 // See http://crbug.com/418265.
428 bool is_waiting_for_close_ack_; 433 bool is_waiting_for_close_ack_;
429 434
435 // True if the render view can be shut down suddenly.
436 bool sudden_termination_allowed_;
437
430 // The termination status of the last render view that terminated. 438 // The termination status of the last render view that terminated.
431 base::TerminationStatus render_view_termination_status_; 439 base::TerminationStatus render_view_termination_status_;
432 440
433 // Set to true if we requested the on screen keyboard to be displayed. 441 // Set to true if we requested the on screen keyboard to be displayed.
434 bool virtual_keyboard_requested_; 442 bool virtual_keyboard_requested_;
435 443
436 // True if the current focused element is editable. 444 // True if the current focused element is editable.
437 bool is_focused_element_editable_; 445 bool is_focused_element_editable_;
438 446
439 // This is updated every time UpdateWebkitPreferences is called. That method 447 // This is updated every time UpdateWebkitPreferences is called. That method
440 // is in turn called when any of the settings change that the WebPreferences 448 // is in turn called when any of the settings change that the WebPreferences
441 // values depend on. 449 // values depend on.
442 scoped_ptr<WebPreferences> web_preferences_; 450 scoped_ptr<WebPreferences> web_preferences_;
443 451
444 bool updating_web_preferences_; 452 bool updating_web_preferences_;
445 453
446 base::WeakPtrFactory<RenderViewHostImpl> weak_factory_; 454 base::WeakPtrFactory<RenderViewHostImpl> weak_factory_;
447 455
448 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); 456 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl);
449 }; 457 };
450 458
451 #if defined(COMPILER_MSVC) 459 #if defined(COMPILER_MSVC)
452 #pragma warning(pop) 460 #pragma warning(pop)
453 #endif 461 #endif
454 462
455 } // namespace content 463 } // namespace content
456 464
457 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 465 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/browser/renderer_host/render_view_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698