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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 #include "third_party/WebKit/public/platform/WebURLResponse.h" | 113 #include "third_party/WebKit/public/platform/WebURLResponse.h" |
114 #include "third_party/WebKit/public/platform/WebVector.h" | 114 #include "third_party/WebKit/public/platform/WebVector.h" |
115 #include "third_party/WebKit/public/web/WebColorSuggestion.h" | 115 #include "third_party/WebKit/public/web/WebColorSuggestion.h" |
116 #include "third_party/WebKit/public/web/WebDocument.h" | 116 #include "third_party/WebKit/public/web/WebDocument.h" |
117 #include "third_party/WebKit/public/web/WebGlyphCache.h" | 117 #include "third_party/WebKit/public/web/WebGlyphCache.h" |
118 #include "third_party/WebKit/public/web/WebLocalFrame.h" | 118 #include "third_party/WebKit/public/web/WebLocalFrame.h" |
119 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" | 119 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" |
120 #include "third_party/WebKit/public/web/WebNavigationPolicy.h" | 120 #include "third_party/WebKit/public/web/WebNavigationPolicy.h" |
121 #include "third_party/WebKit/public/web/WebPlugin.h" | 121 #include "third_party/WebKit/public/web/WebPlugin.h" |
122 #include "third_party/WebKit/public/web/WebPluginParams.h" | 122 #include "third_party/WebKit/public/web/WebPluginParams.h" |
| 123 #include "third_party/WebKit/public/web/WebPluginPlaceholder.h" |
123 #include "third_party/WebKit/public/web/WebRange.h" | 124 #include "third_party/WebKit/public/web/WebRange.h" |
124 #include "third_party/WebKit/public/web/WebScriptSource.h" | 125 #include "third_party/WebKit/public/web/WebScriptSource.h" |
125 #include "third_party/WebKit/public/web/WebSearchableFormData.h" | 126 #include "third_party/WebKit/public/web/WebSearchableFormData.h" |
126 #include "third_party/WebKit/public/web/WebSecurityOrigin.h" | 127 #include "third_party/WebKit/public/web/WebSecurityOrigin.h" |
127 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" | 128 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" |
128 #include "third_party/WebKit/public/web/WebSurroundingText.h" | 129 #include "third_party/WebKit/public/web/WebSurroundingText.h" |
129 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" | 130 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" |
130 #include "third_party/WebKit/public/web/WebView.h" | 131 #include "third_party/WebKit/public/web/WebView.h" |
131 | 132 |
132 #if defined(ENABLE_PLUGINS) | 133 #if defined(ENABLE_PLUGINS) |
(...skipping 1466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1599 mojo::js::Support::kModuleName, | 1600 mojo::js::Support::kModuleName, |
1600 mojo::js::Support::GetModule(isolate)); | 1601 mojo::js::Support::GetModule(isolate)); |
1601 registry->AddBuiltinModule( | 1602 registry->AddBuiltinModule( |
1602 isolate, | 1603 isolate, |
1603 ServiceRegistryJsWrapper::kModuleName, | 1604 ServiceRegistryJsWrapper::kModuleName, |
1604 ServiceRegistryJsWrapper::Create(isolate, &service_registry_).ToV8()); | 1605 ServiceRegistryJsWrapper::Create(isolate, &service_registry_).ToV8()); |
1605 } | 1606 } |
1606 | 1607 |
1607 // blink::WebFrameClient implementation ---------------------------------------- | 1608 // blink::WebFrameClient implementation ---------------------------------------- |
1608 | 1609 |
| 1610 blink::WebPluginPlaceholder* RenderFrameImpl::createPluginPlaceholder( |
| 1611 blink::WebLocalFrame* frame, |
| 1612 const blink::WebPluginParams& params) { |
| 1613 DCHECK_EQ(frame_, frame); |
| 1614 return GetContentClient() |
| 1615 ->renderer() |
| 1616 ->CreatePluginPlaceholder(this, frame, params) |
| 1617 .release(); |
| 1618 } |
| 1619 |
1609 blink::WebPlugin* RenderFrameImpl::createPlugin( | 1620 blink::WebPlugin* RenderFrameImpl::createPlugin( |
1610 blink::WebLocalFrame* frame, | 1621 blink::WebLocalFrame* frame, |
1611 const blink::WebPluginParams& params) { | 1622 const blink::WebPluginParams& params) { |
1612 DCHECK_EQ(frame_, frame); | 1623 DCHECK_EQ(frame_, frame); |
1613 blink::WebPlugin* plugin = NULL; | 1624 blink::WebPlugin* plugin = NULL; |
1614 if (GetContentClient()->renderer()->OverrideCreatePlugin( | 1625 if (GetContentClient()->renderer()->OverrideCreatePlugin( |
1615 this, frame, params, &plugin)) { | 1626 this, frame, params, &plugin)) { |
1616 return plugin; | 1627 return plugin; |
1617 } | 1628 } |
1618 | 1629 |
(...skipping 2496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4115 | 4126 |
4116 #if defined(ENABLE_BROWSER_CDMS) | 4127 #if defined(ENABLE_BROWSER_CDMS) |
4117 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4128 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
4118 if (!cdm_manager_) | 4129 if (!cdm_manager_) |
4119 cdm_manager_ = new RendererCdmManager(this); | 4130 cdm_manager_ = new RendererCdmManager(this); |
4120 return cdm_manager_; | 4131 return cdm_manager_; |
4121 } | 4132 } |
4122 #endif // defined(ENABLE_BROWSER_CDMS) | 4133 #endif // defined(ENABLE_BROWSER_CDMS) |
4123 | 4134 |
4124 } // namespace content | 4135 } // namespace content |
OLD | NEW |