OLD | NEW |
---|---|
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 3762 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3773 // navigation without valid HistoryItem state, WebCore will think it is a | 3773 // navigation without valid HistoryItem state, WebCore will think it is a |
3774 // new navigation. | 3774 // new navigation. |
3775 navigation_state->set_request_committed(true); | 3775 navigation_state->set_request_committed(true); |
3776 | 3776 |
3777 SendDidCommitProvisionalLoad(frame, commit_type); | 3777 SendDidCommitProvisionalLoad(frame, commit_type); |
3778 | 3778 |
3779 // Check whether we have new encoding name. | 3779 // Check whether we have new encoding name. |
3780 UpdateEncoding(frame, frame->view()->pageEncoding().utf8()); | 3780 UpdateEncoding(frame, frame->view()->pageEncoding().utf8()); |
3781 } | 3781 } |
3782 | 3782 |
3783 void RenderFrameImpl::didCreateNewDocument(blink::WebLocalFrame* frame) { | 3783 void RenderFrameImpl::didCreateNewDocument() { |
3784 DCHECK(!frame_ || frame_ == frame); | |
jochen (gone - plz use gerrit)
2017/03/30 11:44:22
maybe keep DCHECK(frame_) for a while?
jochen (gone - plz use gerrit)
2017/03/30 11:49:58
on second thought, please first verify a while wit
| |
3785 | |
3786 for (auto& observer : observers_) | 3784 for (auto& observer : observers_) |
3787 observer.DidCreateNewDocument(); | 3785 observer.DidCreateNewDocument(); |
3788 for (auto& observer : render_view_->observers()) | 3786 for (auto& observer : render_view_->observers()) |
3789 observer.DidCreateNewDocument(frame); | 3787 observer.DidCreateNewDocument(frame_); |
3790 } | 3788 } |
3791 | 3789 |
3792 void RenderFrameImpl::didClearWindowObject(blink::WebLocalFrame* frame) { | 3790 void RenderFrameImpl::didClearWindowObject(blink::WebLocalFrame* frame) { |
3793 DCHECK_EQ(frame_, frame); | 3791 DCHECK_EQ(frame_, frame); |
3794 | 3792 |
3795 if (enabled_bindings_ & BINDINGS_POLICY_WEB_UI) | 3793 if (enabled_bindings_ & BINDINGS_POLICY_WEB_UI) |
3796 WebUIExtension::Install(frame); | 3794 WebUIExtension::Install(frame); |
3797 | 3795 |
3798 if (enabled_bindings_ & BINDINGS_POLICY_DOM_AUTOMATION) | 3796 if (enabled_bindings_ & BINDINGS_POLICY_DOM_AUTOMATION) |
3799 DomAutomationController::Install(this, frame); | 3797 DomAutomationController::Install(this, frame); |
(...skipping 3169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
6969 policy(info.defaultPolicy), | 6967 policy(info.defaultPolicy), |
6970 replaces_current_history_item(info.replacesCurrentHistoryItem), | 6968 replaces_current_history_item(info.replacesCurrentHistoryItem), |
6971 history_navigation_in_new_child_frame( | 6969 history_navigation_in_new_child_frame( |
6972 info.isHistoryNavigationInNewChildFrame), | 6970 info.isHistoryNavigationInNewChildFrame), |
6973 client_redirect(info.isClientRedirect), | 6971 client_redirect(info.isClientRedirect), |
6974 cache_disabled(info.isCacheDisabled), | 6972 cache_disabled(info.isCacheDisabled), |
6975 form(info.form), | 6973 form(info.form), |
6976 source_location(info.sourceLocation) {} | 6974 source_location(info.sourceLocation) {} |
6977 | 6975 |
6978 } // namespace content | 6976 } // namespace content |
OLD | NEW |