| 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 1517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1528 WebGraphicsContext3D* RenderViewImpl::createGraphicsContext3D( | 1528 WebGraphicsContext3D* RenderViewImpl::createGraphicsContext3D( |
| 1529 const WebGraphicsContext3D::Attributes& attributes, | 1529 const WebGraphicsContext3D::Attributes& attributes, |
| 1530 bool direct) { | 1530 bool direct) { |
| 1531 if (!webview()) | 1531 if (!webview()) |
| 1532 return NULL; | 1532 return NULL; |
| 1533 // The WebGraphicsContext3DInProcessImpl code path is used for | 1533 // The WebGraphicsContext3DInProcessImpl code path is used for |
| 1534 // layout tests (though not through this code) as well as for | 1534 // layout tests (though not through this code) as well as for |
| 1535 // debugging and bringing up new ports. | 1535 // debugging and bringing up new ports. |
| 1536 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessWebGL)) { | 1536 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessWebGL)) { |
| 1537 return webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView( | 1537 return webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView( |
| 1538 attributes, webview(), direct); | 1538 attributes, direct); |
| 1539 } else { | 1539 } else { |
| 1540 int surface = direct ? surface_id() : 0; | 1540 int surface = direct ? surface_id() : 0; |
| 1541 | 1541 |
| 1542 GURL url; | 1542 GURL url; |
| 1543 if (webview()->mainFrame()) | 1543 if (webview()->mainFrame()) |
| 1544 url = GURL(webview()->mainFrame()->document().url()); | 1544 url = GURL(webview()->mainFrame()->document().url()); |
| 1545 | 1545 |
| 1546 base::WeakPtr<WebGraphicsContext3DSwapBuffersClient> swap_client; | 1546 base::WeakPtr<WebGraphicsContext3DSwapBuffersClient> swap_client; |
| 1547 if (direct) | 1547 if (direct) |
| 1548 swap_client = AsWeakPtr(); | 1548 swap_client = AsWeakPtr(); |
| (...skipping 3525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5074 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5074 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
| 5075 return !!RenderThreadImpl::current()->compositor_thread(); | 5075 return !!RenderThreadImpl::current()->compositor_thread(); |
| 5076 } | 5076 } |
| 5077 | 5077 |
| 5078 void RenderViewImpl::OnJavaBridgeInit() { | 5078 void RenderViewImpl::OnJavaBridgeInit() { |
| 5079 DCHECK(!java_bridge_dispatcher_.get()); | 5079 DCHECK(!java_bridge_dispatcher_.get()); |
| 5080 #if defined(ENABLE_JAVA_BRIDGE) | 5080 #if defined(ENABLE_JAVA_BRIDGE) |
| 5081 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); | 5081 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); |
| 5082 #endif | 5082 #endif |
| 5083 } | 5083 } |
| OLD | NEW |