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

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: DCHECK_EQ(frame_, frame) -> DCHECK again 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
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 2369 matching lines...) Expand 10 before | Expand all | Expand 10 after
2380 // navigation without valid HistoryItem state, WebCore will think it is a 2380 // navigation without valid HistoryItem state, WebCore will think it is a
2381 // new navigation. 2381 // new navigation.
2382 navigation_state->set_request_committed(true); 2382 navigation_state->set_request_committed(true);
2383 2383
2384 SendDidCommitProvisionalLoad(frame); 2384 SendDidCommitProvisionalLoad(frame);
2385 2385
2386 // Check whether we have new encoding name. 2386 // Check whether we have new encoding name.
2387 UpdateEncoding(frame, frame->view()->pageEncoding().utf8()); 2387 UpdateEncoding(frame, frame->view()->pageEncoding().utf8());
2388 } 2388 }
2389 2389
2390 void RenderFrameImpl::didCreateNewDocument(blink::WebLocalFrame* frame) {
2391 DCHECK(!frame_ || frame_ == frame);
2392
2393 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(),
2394 DidCreateNewDocument(frame));
2395 }
2396
2390 void RenderFrameImpl::didClearWindowObject(blink::WebLocalFrame* frame) { 2397 void RenderFrameImpl::didClearWindowObject(blink::WebLocalFrame* frame) {
2391 DCHECK(!frame_ || frame_ == frame); 2398 DCHECK(!frame_ || frame_ == frame);
2392 // TODO(nasko): Move implementation here. Needed state: 2399 // TODO(nasko): Move implementation here. Needed state:
2393 // * enabled_bindings_ 2400 // * enabled_bindings_
2394 // * dom_automation_controller_ 2401 // * dom_automation_controller_
2395 // * stats_collection_controller_ 2402 // * stats_collection_controller_
2396 2403
2397 render_view_->didClearWindowObject(frame); 2404 render_view_->didClearWindowObject(frame);
2398 2405
2399 if (render_view_->GetEnabledBindings() & BINDINGS_POLICY_DOM_AUTOMATION) 2406 if (render_view_->GetEnabledBindings() & BINDINGS_POLICY_DOM_AUTOMATION)
(...skipping 1794 matching lines...) Expand 10 before | Expand all | Expand 10 after
4194 4201
4195 #if defined(ENABLE_BROWSER_CDMS) 4202 #if defined(ENABLE_BROWSER_CDMS)
4196 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4203 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4197 if (!cdm_manager_) 4204 if (!cdm_manager_)
4198 cdm_manager_ = new RendererCdmManager(this); 4205 cdm_manager_ = new RendererCdmManager(this);
4199 return cdm_manager_; 4206 return cdm_manager_;
4200 } 4207 }
4201 #endif // defined(ENABLE_BROWSER_CDMS) 4208 #endif // defined(ENABLE_BROWSER_CDMS)
4202 4209
4203 } // namespace content 4210 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698