Commit 413b3969 authored by jamesr@chromium.org's avatar jamesr@chromium.org

Stop using WGC3D entry point for rateLimitOffscreen

This entry point is only used by the compositor bindings which should use
gpu::gles2::GLES2Interface to talk to the command buffer.

BUG=181120

Review URL: https://codereview.chromium.org/134343003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244334 0039d316-1c4b-4281-b951-d872f2087c98
parent c040a9ad
...@@ -542,9 +542,6 @@ void WebGraphicsContext3DCommandBufferImpl::copyTextureToParentTextureCHROMIUM( ...@@ -542,9 +542,6 @@ void WebGraphicsContext3DCommandBufferImpl::copyTextureToParentTextureCHROMIUM(
NOTIMPLEMENTED(); NOTIMPLEMENTED();
} }
DELEGATE_TO_GL(rateLimitOffscreenContextCHROMIUM,
RateLimitOffscreenContextCHROMIUM)
blink::WebString WebGraphicsContext3DCommandBufferImpl:: blink::WebString WebGraphicsContext3DCommandBufferImpl::
getRequestableExtensionsCHROMIUM() { getRequestableExtensionsCHROMIUM() {
return blink::WebString::fromUTF8( return blink::WebString::fromUTF8(
......
...@@ -500,8 +500,6 @@ class WebGraphicsContext3DCommandBufferImpl ...@@ -500,8 +500,6 @@ class WebGraphicsContext3DCommandBufferImpl
virtual void copyTextureToParentTextureCHROMIUM( virtual void copyTextureToParentTextureCHROMIUM(
WebGLId texture, WebGLId parentTexture); WebGLId texture, WebGLId parentTexture);
virtual void rateLimitOffscreenContextCHROMIUM();
virtual blink::WebString getRequestableExtensionsCHROMIUM(); virtual blink::WebString getRequestableExtensionsCHROMIUM();
virtual void requestExtensionCHROMIUM(const char*); virtual void requestExtensionCHROMIUM(const char*);
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
#include "content/renderer/input/input_handler_manager.h" #include "content/renderer/input/input_handler_manager.h"
#include "content/renderer/render_thread_impl.h" #include "content/renderer/render_thread_impl.h"
#include "gpu/command_buffer/client/gles2_interface.h"
#include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/WebKit/public/platform/WebSize.h"
#include "third_party/WebKit/public/web/WebWidget.h" #include "third_party/WebKit/public/web/WebWidget.h"
#include "ui/gl/gl_switches.h" #include "ui/gl/gl_switches.h"
...@@ -639,7 +640,7 @@ void RenderWidgetCompositor::DidAbortSwapBuffers() { ...@@ -639,7 +640,7 @@ void RenderWidgetCompositor::DidAbortSwapBuffers() {
void RenderWidgetCompositor::RateLimitSharedMainThreadContext() { void RenderWidgetCompositor::RateLimitSharedMainThreadContext() {
cc::ContextProvider* provider = cc::ContextProvider* provider =
RenderThreadImpl::current()->SharedMainThreadContextProvider().get(); RenderThreadImpl::current()->SharedMainThreadContextProvider().get();
provider->Context3d()->rateLimitOffscreenContextCHROMIUM(); provider->ContextGL()->RateLimitOffscreenContextCHROMIUM();
} }
} // namespace content } // namespace content
...@@ -402,13 +402,6 @@ void WebGraphicsContext3DInProcessCommandBufferImpl:: ...@@ -402,13 +402,6 @@ void WebGraphicsContext3DInProcessCommandBufferImpl::
NOTIMPLEMENTED(); NOTIMPLEMENTED();
} }
void WebGraphicsContext3DInProcessCommandBufferImpl::
rateLimitOffscreenContextCHROMIUM() {
// TODO(gmam): See if we can comment this in.
// ClearContext();
gl_->RateLimitOffscreenContextCHROMIUM();
}
blink::WebString WebGraphicsContext3DInProcessCommandBufferImpl:: blink::WebString WebGraphicsContext3DInProcessCommandBufferImpl::
getRequestableExtensionsCHROMIUM() { getRequestableExtensionsCHROMIUM() {
// TODO(gmam): See if we can comment this in. // TODO(gmam): See if we can comment this in.
......
...@@ -448,8 +448,6 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl ...@@ -448,8 +448,6 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl
virtual void copyTextureToParentTextureCHROMIUM( virtual void copyTextureToParentTextureCHROMIUM(
WebGLId texture, WebGLId parentTexture); WebGLId texture, WebGLId parentTexture);
virtual void rateLimitOffscreenContextCHROMIUM();
virtual blink::WebString getRequestableExtensionsCHROMIUM(); virtual blink::WebString getRequestableExtensionsCHROMIUM();
virtual void requestExtensionCHROMIUM(const char*); virtual void requestExtensionCHROMIUM(const char*);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment