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 1725 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1736 // The WebGraphicsContext3DInProcessImpl code path is used for | 1736 // The WebGraphicsContext3DInProcessImpl code path is used for |
1737 // layout tests (though not through this code) as well as for | 1737 // layout tests (though not through this code) as well as for |
1738 // debugging and bringing up new ports. | 1738 // debugging and bringing up new ports. |
1739 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessWebGL)) { | 1739 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessWebGL)) { |
1740 return webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView( | 1740 return webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView( |
1741 attributes, true); | 1741 attributes, true); |
1742 } else { | 1742 } else { |
1743 GURL url; | 1743 GURL url; |
1744 if (webview()->mainFrame()) | 1744 if (webview()->mainFrame()) |
1745 url = GURL(webview()->mainFrame()->document().url()); | 1745 url = GURL(webview()->mainFrame()->document().url()); |
| 1746 else |
| 1747 url = GURL("RenderViewImpl::createGraphicsContext3D"); |
1746 | 1748 |
1747 scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context( | 1749 scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context( |
1748 new WebGraphicsContext3DCommandBufferImpl( | 1750 new WebGraphicsContext3DCommandBufferImpl( |
1749 surface_id(), | 1751 surface_id(), |
1750 url, | 1752 url, |
1751 RenderThreadImpl::current(), | 1753 RenderThreadImpl::current(), |
1752 AsWeakPtr())); | 1754 AsWeakPtr())); |
1753 | 1755 |
1754 if (!context->Initialize( | 1756 if (!context->Initialize( |
1755 attributes, | 1757 attributes, |
(...skipping 3920 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5676 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5678 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
5677 return !!RenderThreadImpl::current()->compositor_thread(); | 5679 return !!RenderThreadImpl::current()->compositor_thread(); |
5678 } | 5680 } |
5679 | 5681 |
5680 void RenderViewImpl::OnJavaBridgeInit() { | 5682 void RenderViewImpl::OnJavaBridgeInit() { |
5681 DCHECK(!java_bridge_dispatcher_); | 5683 DCHECK(!java_bridge_dispatcher_); |
5682 #if defined(ENABLE_JAVA_BRIDGE) | 5684 #if defined(ENABLE_JAVA_BRIDGE) |
5683 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); | 5685 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); |
5684 #endif | 5686 #endif |
5685 } | 5687 } |
OLD | NEW |