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

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

Issue 684143002: Invalidate the previous frame when the window object is cleared. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use didCreateNewDocument notification Created 6 years, 1 month 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 | « content/renderer/render_frame_impl.h ('k') | extensions/renderer/script_injection_manager.cc » ('j') | 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 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 2339 matching lines...) Expand 10 before | Expand all | Expand 10 after
2350 // navigation without valid HistoryItem state, WebCore will think it is a 2350 // navigation without valid HistoryItem state, WebCore will think it is a
2351 // new navigation. 2351 // new navigation.
2352 navigation_state->set_request_committed(true); 2352 navigation_state->set_request_committed(true);
2353 2353
2354 SendDidCommitProvisionalLoad(frame); 2354 SendDidCommitProvisionalLoad(frame);
2355 2355
2356 // Check whether we have new encoding name. 2356 // Check whether we have new encoding name.
2357 UpdateEncoding(frame, frame->view()->pageEncoding().utf8()); 2357 UpdateEncoding(frame, frame->view()->pageEncoding().utf8());
2358 } 2358 }
2359 2359
2360 void RenderFrameImpl::didCreateNewDocument(blink::WebLocalFrame* frame) {
2361 DCHECK(!frame_ || frame_ == frame);
dcheng 2014/11/11 16:50:16 This assert should be more aggressive. We should n
robwu 2014/11/11 21:43:59 This DCHECK does not test whether the passed-in po
2362
2363 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(),
2364 DidCreateNewDocument(frame));
2365 }
2366
2360 void RenderFrameImpl::didClearWindowObject(blink::WebLocalFrame* frame) { 2367 void RenderFrameImpl::didClearWindowObject(blink::WebLocalFrame* frame) {
2361 DCHECK(!frame_ || frame_ == frame); 2368 DCHECK(!frame_ || frame_ == frame);
2362 // TODO(nasko): Move implementation here. Needed state: 2369 // TODO(nasko): Move implementation here. Needed state:
2363 // * enabled_bindings_ 2370 // * enabled_bindings_
2364 // * dom_automation_controller_ 2371 // * dom_automation_controller_
2365 // * stats_collection_controller_ 2372 // * stats_collection_controller_
2366 2373
2367 render_view_->didClearWindowObject(frame); 2374 render_view_->didClearWindowObject(frame);
2368 2375
2369 if (render_view_->GetEnabledBindings() & BINDINGS_POLICY_DOM_AUTOMATION) 2376 if (render_view_->GetEnabledBindings() & BINDINGS_POLICY_DOM_AUTOMATION)
(...skipping 1779 matching lines...) Expand 10 before | Expand all | Expand 10 after
4149 4156
4150 #if defined(ENABLE_BROWSER_CDMS) 4157 #if defined(ENABLE_BROWSER_CDMS)
4151 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4158 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4152 if (!cdm_manager_) 4159 if (!cdm_manager_)
4153 cdm_manager_ = new RendererCdmManager(this); 4160 cdm_manager_ = new RendererCdmManager(this);
4154 return cdm_manager_; 4161 return cdm_manager_;
4155 } 4162 }
4156 #endif // defined(ENABLE_BROWSER_CDMS) 4163 #endif // defined(ENABLE_BROWSER_CDMS)
4157 4164
4158 } // namespace content 4165 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | extensions/renderer/script_injection_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698