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 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 3037 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3048 DCHECK(!frame_ || frame_ == frame); | 3048 DCHECK(!frame_ || frame_ == frame); |
3049 GetContentClient()->renderer()->DidCreateScriptContext( | 3049 GetContentClient()->renderer()->DidCreateScriptContext( |
3050 frame, context, extension_group, world_id); | 3050 frame, context, extension_group, world_id); |
3051 } | 3051 } |
3052 | 3052 |
3053 void RenderFrameImpl::willReleaseScriptContext(blink::WebLocalFrame* frame, | 3053 void RenderFrameImpl::willReleaseScriptContext(blink::WebLocalFrame* frame, |
3054 v8::Handle<v8::Context> context, | 3054 v8::Handle<v8::Context> context, |
3055 int world_id) { | 3055 int world_id) { |
3056 DCHECK(!frame_ || frame_ == frame); | 3056 DCHECK(!frame_ || frame_ == frame); |
3057 | 3057 |
| 3058 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(), |
| 3059 WillReleaseScriptContext(frame, context, world_id)); |
3058 FOR_EACH_OBSERVER(RenderFrameObserver, | 3060 FOR_EACH_OBSERVER(RenderFrameObserver, |
3059 observers_, | 3061 observers_, |
3060 WillReleaseScriptContext(context, world_id)); | 3062 WillReleaseScriptContext(context, world_id)); |
3061 } | 3063 } |
3062 | 3064 |
3063 void RenderFrameImpl::didFirstVisuallyNonEmptyLayout( | 3065 void RenderFrameImpl::didFirstVisuallyNonEmptyLayout( |
3064 blink::WebLocalFrame* frame) { | 3066 blink::WebLocalFrame* frame) { |
3065 DCHECK(!frame_ || frame_ == frame); | 3067 DCHECK(!frame_ || frame_ == frame); |
3066 if (frame->parent()) | 3068 if (frame->parent()) |
3067 return; | 3069 return; |
(...skipping 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4149 | 4151 |
4150 #if defined(ENABLE_BROWSER_CDMS) | 4152 #if defined(ENABLE_BROWSER_CDMS) |
4151 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4153 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
4152 if (!cdm_manager_) | 4154 if (!cdm_manager_) |
4153 cdm_manager_ = new RendererCdmManager(this); | 4155 cdm_manager_ = new RendererCdmManager(this); |
4154 return cdm_manager_; | 4156 return cdm_manager_; |
4155 } | 4157 } |
4156 #endif // defined(ENABLE_BROWSER_CDMS) | 4158 #endif // defined(ENABLE_BROWSER_CDMS) |
4157 | 4159 |
4158 } // namespace content | 4160 } // namespace content |
OLD | NEW |