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 1554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1565 if (webview() && webview()->mainFrame()) | 1565 if (webview() && webview()->mainFrame()) |
1566 active_url = GURL(webview()->mainFrame()->document().url()); | 1566 active_url = GURL(webview()->mainFrame()->document().url()); |
1567 RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create( | 1567 RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create( |
1568 routing_id_, plugin, active_url); | 1568 routing_id_, plugin, active_url); |
1569 widget->show(WebKit::WebNavigationPolicyIgnore); | 1569 widget->show(WebKit::WebNavigationPolicyIgnore); |
1570 return widget; | 1570 return widget; |
1571 } | 1571 } |
1572 | 1572 |
1573 WebStorageNamespace* RenderViewImpl::createSessionStorageNamespace( | 1573 WebStorageNamespace* RenderViewImpl::createSessionStorageNamespace( |
1574 unsigned quota) { | 1574 unsigned quota) { |
1575 #ifdef ENABLE_NEW_DOM_STORAGE_BACKEND | |
1576 CHECK(session_storage_namespace_id_ != | 1575 CHECK(session_storage_namespace_id_ != |
1577 dom_storage::kInvalidSessionStorageNamespaceId); | 1576 dom_storage::kInvalidSessionStorageNamespaceId); |
1578 return new RendererWebStorageNamespaceImpl(session_storage_namespace_id_); | 1577 return new RendererWebStorageNamespaceImpl(session_storage_namespace_id_); |
1579 #else | |
1580 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) | |
1581 return WebStorageNamespace::createSessionStorageNamespace(quota); | |
1582 CHECK(session_storage_namespace_id_ != | |
1583 dom_storage::kInvalidSessionStorageNamespaceId); | |
1584 return new RendererWebStorageNamespaceImpl(session_storage_namespace_id_); | |
1585 #endif | |
1586 } | 1578 } |
1587 | 1579 |
1588 WebGraphicsContext3D* RenderViewImpl::createGraphicsContext3D( | 1580 WebGraphicsContext3D* RenderViewImpl::createGraphicsContext3D( |
1589 const WebGraphicsContext3D::Attributes& attributes) { | 1581 const WebGraphicsContext3D::Attributes& attributes) { |
1590 if (!webview()) | 1582 if (!webview()) |
1591 return NULL; | 1583 return NULL; |
1592 // The WebGraphicsContext3DInProcessImpl code path is used for | 1584 // The WebGraphicsContext3DInProcessImpl code path is used for |
1593 // layout tests (though not through this code) as well as for | 1585 // layout tests (though not through this code) as well as for |
1594 // debugging and bringing up new ports. | 1586 // debugging and bringing up new ports. |
1595 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessWebGL)) { | 1587 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessWebGL)) { |
(...skipping 3662 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5258 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5250 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
5259 return !!RenderThreadImpl::current()->compositor_thread(); | 5251 return !!RenderThreadImpl::current()->compositor_thread(); |
5260 } | 5252 } |
5261 | 5253 |
5262 void RenderViewImpl::OnJavaBridgeInit() { | 5254 void RenderViewImpl::OnJavaBridgeInit() { |
5263 DCHECK(!java_bridge_dispatcher_.get()); | 5255 DCHECK(!java_bridge_dispatcher_.get()); |
5264 #if defined(ENABLE_JAVA_BRIDGE) | 5256 #if defined(ENABLE_JAVA_BRIDGE) |
5265 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); | 5257 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); |
5266 #endif | 5258 #endif |
5267 } | 5259 } |
OLD | NEW |