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

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

Issue 305103003: Fix for 'Simple Adblock' extension crashes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: RenderProcessHost can be a mock in unittests Created 6 years, 6 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 #include "content/renderer/render_widget.h" 5 #include "content/renderer/render_widget.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 void RenderWidget::ResizeSynchronously(const gfx::Rect& new_position) { 697 void RenderWidget::ResizeSynchronously(const gfx::Rect& new_position) {
698 Resize(new_position.size(), new_position.size(), overdraw_bottom_height_, 698 Resize(new_position.size(), new_position.size(), overdraw_bottom_height_,
699 visible_viewport_size_, gfx::Rect(), is_fullscreen_, NO_RESIZE_ACK); 699 visible_viewport_size_, gfx::Rect(), is_fullscreen_, NO_RESIZE_ACK);
700 view_screen_rect_ = new_position; 700 view_screen_rect_ = new_position;
701 window_screen_rect_ = new_position; 701 window_screen_rect_ = new_position;
702 if (!did_show_) 702 if (!did_show_)
703 initial_pos_ = new_position; 703 initial_pos_ = new_position;
704 } 704 }
705 705
706 void RenderWidget::OnClose() { 706 void RenderWidget::OnClose() {
707 if (closing_) 707 if (closing_) {
708 RenderThread::Get()->Send(new ViewHostMsg_Close_ACK(routing_id_));
708 return; 709 return;
710 }
709 closing_ = true; 711 closing_ = true;
710 712
711 // Browser correspondence is no longer needed at this point. 713 // Browser correspondence is no longer needed at this point.
712 if (routing_id_ != MSG_ROUTING_NONE) { 714 if (routing_id_ != MSG_ROUTING_NONE) {
713 if (RenderThreadImpl::current()) 715 if (RenderThreadImpl::current())
714 RenderThreadImpl::current()->WidgetDestroyed(); 716 RenderThreadImpl::current()->WidgetDestroyed();
715 RenderThread::Get()->RemoveRoute(routing_id_); 717 RenderThread::Get()->RemoveRoute(routing_id_);
716 SetHidden(false); 718 SetHidden(false);
717 } 719 }
718 720
(...skipping 1409 matching lines...) Expand 10 before | Expand all | Expand 10 after
2128 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { 2130 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) {
2129 video_hole_frames_.AddObserver(frame); 2131 video_hole_frames_.AddObserver(frame);
2130 } 2132 }
2131 2133
2132 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { 2134 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) {
2133 video_hole_frames_.RemoveObserver(frame); 2135 video_hole_frames_.RemoveObserver(frame);
2134 } 2136 }
2135 #endif // defined(VIDEO_HOLE) 2137 #endif // defined(VIDEO_HOLE)
2136 2138
2137 } // namespace content 2139 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698