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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 857213003: Refactor sudden termination (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Charlie's comments Created 5 years, 10 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 #endif 684 #endif
685 #if defined(VIDEO_HOLE) 685 #if defined(VIDEO_HOLE)
686 contains_media_player_(false), 686 contains_media_player_(false),
687 #endif 687 #endif
688 geolocation_dispatcher_(NULL), 688 geolocation_dispatcher_(NULL),
689 push_messaging_dispatcher_(NULL), 689 push_messaging_dispatcher_(NULL),
690 screen_orientation_dispatcher_(NULL), 690 screen_orientation_dispatcher_(NULL),
691 manifest_manager_(NULL), 691 manifest_manager_(NULL),
692 accessibility_mode_(AccessibilityModeOff), 692 accessibility_mode_(AccessibilityModeOff),
693 renderer_accessibility_(NULL), 693 renderer_accessibility_(NULL),
694 beforeunload_handlers_present_(false),
695 unload_handlers_present_(false),
694 weak_factory_(this) { 696 weak_factory_(this) {
695 std::pair<RoutingIDFrameMap::iterator, bool> result = 697 std::pair<RoutingIDFrameMap::iterator, bool> result =
696 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this)); 698 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this));
697 CHECK(result.second) << "Inserting a duplicate item."; 699 CHECK(result.second) << "Inserting a duplicate item.";
698 700
699 RenderThread::Get()->AddRoute(routing_id_, this); 701 RenderThread::Get()->AddRoute(routing_id_, this);
700 702
701 render_view_->RegisterRenderFrame(this); 703 render_view_->RegisterRenderFrame(this);
702 704
703 // Everything below subclasses RenderFrameObserver and is automatically 705 // Everything below subclasses RenderFrameObserver and is automatically
(...skipping 2855 matching lines...) Expand 10 before | Expand all | Expand 10 after
3559 bool RenderFrameImpl::enterFullscreen() { 3561 bool RenderFrameImpl::enterFullscreen() {
3560 Send(new FrameHostMsg_ToggleFullscreen(routing_id_, true)); 3562 Send(new FrameHostMsg_ToggleFullscreen(routing_id_, true));
3561 return true; 3563 return true;
3562 } 3564 }
3563 3565
3564 bool RenderFrameImpl::exitFullscreen() { 3566 bool RenderFrameImpl::exitFullscreen() {
3565 Send(new FrameHostMsg_ToggleFullscreen(routing_id_, false)); 3567 Send(new FrameHostMsg_ToggleFullscreen(routing_id_, false));
3566 return true; 3568 return true;
3567 } 3569 }
3568 3570
3571 void RenderFrameImpl::suddenTerminationDisablerChanged(
3572 bool present,
3573 blink::WebFrameClient::SuddenTerminationDisablerType type) {
3574 switch (type) {
3575 case blink::WebFrameClient::BeforeUnloadHandler:
3576 beforeunload_handlers_present_ = present;
Charlie Reis 2015/01/29 23:20:42 We don't need these members anymore, do we? We're
clamy 2015/02/02 16:16:27 Done.
3577 Send(new FrameHostMsg_BeforeUnloadHandlersPresent(
3578 routing_id_, beforeunload_handlers_present_));
3579 break;
3580 case blink::WebFrameClient::UnloadHandler:
3581 unload_handlers_present_ = present;
3582 Send(new FrameHostMsg_UnloadHandlersPresent(
3583 routing_id_, unload_handlers_present_));
3584 break;
3585 default:
3586 NOTREACHED();
3587 }
3588 }
3589
3569 void RenderFrameImpl::DidPlay(blink::WebMediaPlayer* player) { 3590 void RenderFrameImpl::DidPlay(blink::WebMediaPlayer* player) {
3570 Send(new FrameHostMsg_MediaPlayingNotification( 3591 Send(new FrameHostMsg_MediaPlayingNotification(
3571 routing_id_, reinterpret_cast<int64>(player), player->hasVideo(), 3592 routing_id_, reinterpret_cast<int64>(player), player->hasVideo(),
3572 player->hasAudio(), player->isRemote())); 3593 player->hasAudio(), player->isRemote()));
3573 } 3594 }
3574 3595
3575 void RenderFrameImpl::DidPause(blink::WebMediaPlayer* player) { 3596 void RenderFrameImpl::DidPause(blink::WebMediaPlayer* player) {
3576 Send(new FrameHostMsg_MediaPausedNotification( 3597 Send(new FrameHostMsg_MediaPausedNotification(
3577 routing_id_, reinterpret_cast<int64>(player))); 3598 routing_id_, reinterpret_cast<int64>(player)));
3578 } 3599 }
(...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after
4440 4461
4441 #if defined(ENABLE_BROWSER_CDMS) 4462 #if defined(ENABLE_BROWSER_CDMS)
4442 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4463 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4443 if (!cdm_manager_) 4464 if (!cdm_manager_)
4444 cdm_manager_ = new RendererCdmManager(this); 4465 cdm_manager_ = new RendererCdmManager(this);
4445 return cdm_manager_; 4466 return cdm_manager_;
4446 } 4467 }
4447 #endif // defined(ENABLE_BROWSER_CDMS) 4468 #endif // defined(ENABLE_BROWSER_CDMS)
4448 4469
4449 } // namespace content 4470 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698