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/pepper/pepper_plugin_delegate_impl.h" | 5 #include "content/renderer/pepper/pepper_plugin_delegate_impl.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 #include <map> | 8 #include <map> |
9 #include <queue> | 9 #include <queue> |
10 | 10 |
(...skipping 1507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1518 } | 1518 } |
1519 #else | 1519 #else |
1520 return 0; | 1520 return 0; |
1521 #endif | 1521 #endif |
1522 } | 1522 } |
1523 | 1523 |
1524 ContentGLContext* | 1524 ContentGLContext* |
1525 PepperPluginDelegateImpl::GetParentContextForPlatformContext3D() { | 1525 PepperPluginDelegateImpl::GetParentContextForPlatformContext3D() { |
1526 WebGraphicsContext3DCommandBufferImpl* context = | 1526 WebGraphicsContext3DCommandBufferImpl* context = |
1527 static_cast<WebGraphicsContext3DCommandBufferImpl*>( | 1527 static_cast<WebGraphicsContext3DCommandBufferImpl*>( |
1528 render_view_->webview()->graphicsContext3D()); | 1528 render_view_->webview()->sharedGraphicsContext3D()); |
1529 if (!context) | 1529 if (!context) |
1530 return NULL; | 1530 return NULL; |
1531 if (!context->makeContextCurrent() || context->isContextLost()) | 1531 if (!context->makeContextCurrent() || context->isContextLost()) |
1532 return NULL; | 1532 return NULL; |
1533 | 1533 |
1534 ContentGLContext* parent_context = context->context(); | 1534 ContentGLContext* parent_context = context->context(); |
1535 if (!parent_context) | 1535 if (!parent_context) |
1536 return NULL; | 1536 return NULL; |
1537 return parent_context; | 1537 return parent_context; |
1538 } | 1538 } |
(...skipping 17 matching lines...) Expand all Loading... |
1556 render_view_->mouse_lock_dispatcher()->OnLockTargetDestroyed(target); | 1556 render_view_->mouse_lock_dispatcher()->OnLockTargetDestroyed(target); |
1557 delete target; | 1557 delete target; |
1558 mouse_lock_instances_.erase(it); | 1558 mouse_lock_instances_.erase(it); |
1559 } | 1559 } |
1560 } | 1560 } |
1561 | 1561 |
1562 webkit_glue::ClipboardClient* | 1562 webkit_glue::ClipboardClient* |
1563 PepperPluginDelegateImpl::CreateClipboardClient() const { | 1563 PepperPluginDelegateImpl::CreateClipboardClient() const { |
1564 return new RendererClipboardClient; | 1564 return new RendererClipboardClient; |
1565 } | 1565 } |
OLD | NEW |