OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 1688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1699 new ExternalPopupMenu(this, popup_menu_info, popup_menu_client)); | 1699 new ExternalPopupMenu(this, popup_menu_info, popup_menu_client)); |
1700 return external_popup_menu_.get(); | 1700 return external_popup_menu_.get(); |
1701 } | 1701 } |
1702 | 1702 |
1703 RenderWidgetFullscreenPepper* RenderViewImpl::CreatePepperFullscreenContainer( | 1703 RenderWidgetFullscreenPepper* RenderViewImpl::CreatePepperFullscreenContainer( |
1704 webkit::ppapi::PluginInstance* plugin) { | 1704 webkit::ppapi::PluginInstance* plugin) { |
1705 GURL active_url; | 1705 GURL active_url; |
1706 if (webview() && webview()->mainFrame()) | 1706 if (webview() && webview()->mainFrame()) |
1707 active_url = GURL(webview()->mainFrame()->document().url()); | 1707 active_url = GURL(webview()->mainFrame()->document().url()); |
1708 RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create( | 1708 RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create( |
1709 routing_id_, plugin, active_url); | 1709 routing_id_, plugin, active_url, screen_info_); |
Nico
2012/07/21 16:55:15
As far as I can tell, this doesn't handle DPI chan
sail
2012/07/25 18:16:02
From what I can tell RenderWidget should get an up
| |
1710 widget->show(WebKit::WebNavigationPolicyIgnore); | 1710 widget->show(WebKit::WebNavigationPolicyIgnore); |
1711 return widget; | 1711 return widget; |
1712 } | 1712 } |
1713 | 1713 |
1714 WebStorageNamespace* RenderViewImpl::createSessionStorageNamespace( | 1714 WebStorageNamespace* RenderViewImpl::createSessionStorageNamespace( |
1715 unsigned quota) { | 1715 unsigned quota) { |
1716 CHECK(session_storage_namespace_id_ != | 1716 CHECK(session_storage_namespace_id_ != |
1717 dom_storage::kInvalidSessionStorageNamespaceId); | 1717 dom_storage::kInvalidSessionStorageNamespaceId); |
1718 return new WebStorageNamespaceImpl(session_storage_namespace_id_); | 1718 return new WebStorageNamespaceImpl(session_storage_namespace_id_); |
1719 } | 1719 } |
(...skipping 3960 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5680 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5680 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
5681 return !!RenderThreadImpl::current()->compositor_thread(); | 5681 return !!RenderThreadImpl::current()->compositor_thread(); |
5682 } | 5682 } |
5683 | 5683 |
5684 void RenderViewImpl::OnJavaBridgeInit() { | 5684 void RenderViewImpl::OnJavaBridgeInit() { |
5685 DCHECK(!java_bridge_dispatcher_); | 5685 DCHECK(!java_bridge_dispatcher_); |
5686 #if defined(ENABLE_JAVA_BRIDGE) | 5686 #if defined(ENABLE_JAVA_BRIDGE) |
5687 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); | 5687 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); |
5688 #endif | 5688 #endif |
5689 } | 5689 } |
OLD | NEW |