summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-16 23:55:38 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-16 23:55:38 +0000
commitfe43d3ed9877c852403829705b980672ff9e7e18 (patch)
tree689e62360a1900c3f138ca477902fe86bb279c30
parent00d0c6da740979be2a7e06bf1ec71be25697f305 (diff)
downloadchromium_src-fe43d3ed9877c852403829705b980672ff9e7e18.zip
chromium_src-fe43d3ed9877c852403829705b980672ff9e7e18.tar.gz
chromium_src-fe43d3ed9877c852403829705b980672ff9e7e18.tar.bz2
Remove now-unused sharedOffscreenGraphicsContext3D() methods.
The sharedOffscreenGraphicsContext3D() and sharedOffscreenGrContext() methods are no longer used, as they were replaced by createSharedOffscreenGraphicsContext3DProvider() so they can be removed now. R=jamesr BUG=236572 Review URL: https://chromiumcodereview.appspot.com/14708011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200658 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/renderer/renderer_webkitplatformsupport_impl.cc32
-rw-r--r--content/renderer/renderer_webkitplatformsupport_impl.h2
-rw-r--r--webkit/support/test_webkit_platform_support.cc16
-rw-r--r--webkit/support/test_webkit_platform_support.h2
4 files changed, 6 insertions, 46 deletions
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 12dfa0a..019bdde 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -883,8 +883,8 @@ RendererWebKitPlatformSupportImpl::createOffscreenGraphicsContext3D(
//------------------------------------------------------------------------------
-WebKit::WebGraphicsContext3D* RendererWebKitPlatformSupportImpl::
- sharedOffscreenGraphicsContext3D() {
+WebKit::WebGraphicsContext3DProvider* RendererWebKitPlatformSupportImpl::
+ createSharedOffscreenGraphicsContext3DProvider() {
if (!shared_offscreen_context_ ||
shared_offscreen_context_->DestroyedOnMainThread()) {
shared_offscreen_context_ =
@@ -892,35 +892,15 @@ WebKit::WebGraphicsContext3D* RendererWebKitPlatformSupportImpl::
}
if (!shared_offscreen_context_)
return NULL;
- return shared_offscreen_context_->Context3d();
+ return new webkit::gpu::WebGraphicsContext3DProviderImpl(
+ shared_offscreen_context_);
}
+//------------------------------------------------------------------------------
+
WebKit::WebCompositorSupport*
RendererWebKitPlatformSupportImpl::compositorSupport() {
return &compositor_support_;
}
-//------------------------------------------------------------------------------
-
-GrContext* RendererWebKitPlatformSupportImpl::sharedOffscreenGrContext() {
- if (!shared_offscreen_context_)
- return NULL;
- return shared_offscreen_context_->GrContext();
-}
-
-//------------------------------------------------------------------------------
-
-WebKit::WebGraphicsContext3DProvider* RendererWebKitPlatformSupportImpl::
- createSharedOffscreenGraphicsContext3DProvider() {
- if (!shared_offscreen_context_ ||
- shared_offscreen_context_->DestroyedOnMainThread()) {
- shared_offscreen_context_ =
- RenderThreadImpl::current()->OffscreenContextProviderForMainThread();
- }
- if (!shared_offscreen_context_)
- return NULL;
- return new webkit::gpu::WebGraphicsContext3DProviderImpl(
- shared_offscreen_context_);
-}
-
} // namespace content
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.h b/content/renderer/renderer_webkitplatformsupport_impl.h
index 14fddb9..2bf5948 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.h
+++ b/content/renderer/renderer_webkitplatformsupport_impl.h
@@ -116,8 +116,6 @@ class CONTENT_EXPORT RendererWebKitPlatformSupportImpl
size_t* private_bytes, size_t* shared_bytes);
virtual WebKit::WebGraphicsContext3D* createOffscreenGraphicsContext3D(
const WebKit::WebGraphicsContext3D::Attributes& attributes);
- virtual WebKit::WebGraphicsContext3D* sharedOffscreenGraphicsContext3D();
- virtual GrContext* sharedOffscreenGrContext();
virtual WebKit::WebGraphicsContext3DProvider*
createSharedOffscreenGraphicsContext3DProvider();
virtual WebKit::WebCompositorSupport* compositorSupport();
diff --git a/webkit/support/test_webkit_platform_support.cc b/webkit/support/test_webkit_platform_support.cc
index 84e4cd5..05e3e72 100644
--- a/webkit/support/test_webkit_platform_support.cc
+++ b/webkit/support/test_webkit_platform_support.cc
@@ -375,22 +375,6 @@ TestWebKitPlatformSupport::createOffscreenGraphicsContext3D(
attributes);
}
-WebKit::WebGraphicsContext3D*
-TestWebKitPlatformSupport::sharedOffscreenGraphicsContext3D() {
- main_thread_contexts_ =
- webkit::gpu::TestContextProviderFactory::GetInstance()->
- OffscreenContextProviderForMainThread();
- if (!main_thread_contexts_)
- return NULL;
- return main_thread_contexts_->Context3d();
-}
-
-GrContext* TestWebKitPlatformSupport::sharedOffscreenGrContext() {
- if (!main_thread_contexts_)
- return NULL;
- return main_thread_contexts_->GrContext();
-}
-
WebKit::WebGraphicsContext3DProvider* TestWebKitPlatformSupport::
createSharedOffscreenGraphicsContext3DProvider() {
main_thread_contexts_ =
diff --git a/webkit/support/test_webkit_platform_support.h b/webkit/support/test_webkit_platform_support.h
index d06833c..65c62bc 100644
--- a/webkit/support/test_webkit_platform_support.h
+++ b/webkit/support/test_webkit_platform_support.h
@@ -90,8 +90,6 @@ class TestWebKitPlatformSupport :
virtual WebKit::WebGraphicsContext3D* createOffscreenGraphicsContext3D(
const WebKit::WebGraphicsContext3D::Attributes&);
- virtual WebKit::WebGraphicsContext3D* sharedOffscreenGraphicsContext3D();
- virtual GrContext* sharedOffscreenGrContext();
virtual WebKit::WebGraphicsContext3DProvider*
createSharedOffscreenGraphicsContext3DProvider();
virtual bool canAccelerate2dCanvas();