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

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

Issue 2276053002: Fix use-after-free in the renderer process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: adding ifdef Created 4 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2810 matching lines...) Expand 10 before | Expand all | Expand 10 after
2821 Send(new FrameHostMsg_DidChangeOpener(routing_id_, opener_routing_id)); 2821 Send(new FrameHostMsg_DidChangeOpener(routing_id_, opener_routing_id));
2822 } 2822 }
2823 2823
2824 void RenderFrameImpl::frameDetached(blink::WebLocalFrame* frame, 2824 void RenderFrameImpl::frameDetached(blink::WebLocalFrame* frame,
2825 DetachType type) { 2825 DetachType type) {
2826 // NOTE: This function is called on the frame that is being detached and not 2826 // NOTE: This function is called on the frame that is being detached and not
2827 // the parent frame. This is different from createChildFrame() which is 2827 // the parent frame. This is different from createChildFrame() which is
2828 // called on the parent frame. 2828 // called on the parent frame.
2829 DCHECK_EQ(frame_, frame); 2829 DCHECK_EQ(frame_, frame);
2830 2830
2831 #if defined(ENABLE_PLUGINS)
2832 if (focused_pepper_plugin_)
2833 GetRenderWidget()->set_focused_pepper_plugin(nullptr);
Charlie Reis 2016/08/24 20:38:44 Looks like there's a focused_pepper_plugin_ on bot
2834 #endif
2835
2831 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, FrameDetached()); 2836 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, FrameDetached());
2832 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(), 2837 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(),
2833 FrameDetached(frame)); 2838 FrameDetached(frame));
2834 2839
2835 // Send a state update before the frame is detached. 2840 // Send a state update before the frame is detached.
2836 if (SiteIsolationPolicy::UseSubframeNavigationEntries()) 2841 if (SiteIsolationPolicy::UseSubframeNavigationEntries())
2837 SendUpdateState(); 2842 SendUpdateState();
2838 2843
2839 // We only notify the browser process when the frame is being detached for 2844 // We only notify the browser process when the frame is being detached for
2840 // removal and it was initiated from the renderer process. 2845 // removal and it was initiated from the renderer process.
(...skipping 3513 matching lines...) Expand 10 before | Expand all | Expand 10 after
6354 // event target. Potentially a Pepper plugin will receive the event. 6359 // event target. Potentially a Pepper plugin will receive the event.
6355 // In order to tell whether a plugin gets the last mouse event and which it 6360 // In order to tell whether a plugin gets the last mouse event and which it
6356 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6361 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6357 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6362 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6358 // |pepper_last_mouse_event_target_|. 6363 // |pepper_last_mouse_event_target_|.
6359 pepper_last_mouse_event_target_ = nullptr; 6364 pepper_last_mouse_event_target_ = nullptr;
6360 #endif 6365 #endif
6361 } 6366 }
6362 6367
6363 } // namespace content 6368 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698