summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-14 18:51:24 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-14 18:51:24 +0000
commit97b4f5ec10574a789722a03ba0ad415b62b8422b (patch)
tree8b1058f16b0bdb69c552dc678cf94e147760ffeb
parent9bc1541dca1fcd60e28d49a2850e8a85564225f8 (diff)
downloadchromium_src-97b4f5ec10574a789722a03ba0ad415b62b8422b.zip
chromium_src-97b4f5ec10574a789722a03ba0ad415b62b8422b.tar.gz
chromium_src-97b4f5ec10574a789722a03ba0ad415b62b8422b.tar.bz2
Remove WebString refs from cc/, they are all dead code
These are all dead code - production code never calls any functions that would deal with a WebString. BUG=181120 Review URL: https://codereview.chromium.org/134383004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244777 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--cc/cc.gyp1
-rw-r--r--cc/cc_tests.gyp1
-rw-r--r--cc/output/gl_renderer_unittest.cc18
-rw-r--r--cc/test/fake_web_graphics_context_3d.cc23
-rw-r--r--cc/test/fake_web_graphics_context_3d.h5
-rw-r--r--cc/test/test_web_graphics_context_3d.cc4
-rw-r--r--cc/test/test_web_graphics_context_3d.h1
-rw-r--r--cc/trees/layer_tree_host_impl_unittest.cc1
-rw-r--r--ui/compositor/compositor.gyp1
9 files changed, 1 insertions, 54 deletions
diff --git a/cc/cc.gyp b/cc/cc.gyp
index 8ef6bde..c9196db 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -16,7 +16,6 @@
'<(DEPTH)/gpu/gpu.gyp:gpu',
'<(DEPTH)/media/media.gyp:media',
'<(DEPTH)/skia/skia.gyp:skia',
- '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal',
'<(DEPTH)/ui/events/events.gyp:events_base',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index 89c2c6d..309604c 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -335,7 +335,6 @@
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../third_party/WebKit/public/blink.gyp:blink_minimal',
'../third_party/mesa/mesa.gyp:osmesa',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index 1f05ff9..d9caad8 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -40,7 +40,6 @@ using testing::InSequence;
using testing::Mock;
using testing::Return;
using testing::StrictMock;
-using blink::WebString;
namespace cc {
@@ -471,35 +470,18 @@ class ForbidSynchronousCallContext : public TestWebGraphicsContext3D {
#endif
}
- virtual WebString getString(GLenum name) OVERRIDE {
- ADD_FAILURE() << name;
- return WebString();
- }
-
- virtual WebString getProgramInfoLog(GLuint program) OVERRIDE {
- ADD_FAILURE();
- return WebString();
- }
virtual void getRenderbufferParameteriv(GLenum target,
GLenum pname,
GLint* value) OVERRIDE {
ADD_FAILURE();
}
- virtual WebString getShaderInfoLog(GLuint shader) OVERRIDE {
- ADD_FAILURE();
- return WebString();
- }
virtual void getShaderPrecisionFormat(GLenum shadertype,
GLenum precisiontype,
GLint* range,
GLint* precision) OVERRIDE {
ADD_FAILURE();
}
- virtual WebString getShaderSource(GLuint shader) OVERRIDE {
- ADD_FAILURE();
- return WebString();
- }
virtual void getTexParameterfv(GLenum target,
GLenum pname,
GLfloat* value) OVERRIDE {
diff --git a/cc/test/fake_web_graphics_context_3d.cc b/cc/test/fake_web_graphics_context_3d.cc
index 02baf46..6029fd4 100644
--- a/cc/test/fake_web_graphics_context_3d.cc
+++ b/cc/test/fake_web_graphics_context_3d.cc
@@ -52,10 +52,6 @@ void* FakeWebGraphicsContext3D::mapTexSubImage2DCHROMIUM(
return 0;
}
-blink::WebString FakeWebGraphicsContext3D::getRequestableExtensionsCHROMIUM() {
- return blink::WebString();
-}
-
GLenum FakeWebGraphicsContext3D::checkFramebufferStatus(
GLenum target) {
return GL_FRAMEBUFFER_COMPLETE;
@@ -102,11 +98,6 @@ void FakeWebGraphicsContext3D::getProgramiv(
*value = 1;
}
-blink::WebString FakeWebGraphicsContext3D::getProgramInfoLog(
- GLuint program) {
- return blink::WebString();
-}
-
void FakeWebGraphicsContext3D::getShaderiv(
GLuint shader,
GLenum pname,
@@ -115,11 +106,6 @@ void FakeWebGraphicsContext3D::getShaderiv(
*value = 1;
}
-blink::WebString FakeWebGraphicsContext3D::getShaderInfoLog(
- GLuint shader) {
- return blink::WebString();
-}
-
void FakeWebGraphicsContext3D::getShaderPrecisionFormat(
GLenum shadertype,
GLenum precisiontype,
@@ -163,15 +149,6 @@ void FakeWebGraphicsContext3D::getShaderPrecisionFormat(
}
}
-blink::WebString FakeWebGraphicsContext3D::getShaderSource(
- GLuint shader) {
- return blink::WebString();
-}
-
-blink::WebString FakeWebGraphicsContext3D::getString(GLenum name) {
- return blink::WebString();
-}
-
GLint FakeWebGraphicsContext3D::getUniformLocation(
GLuint program,
const GLchar* name) {
diff --git a/cc/test/fake_web_graphics_context_3d.h b/cc/test/fake_web_graphics_context_3d.h
index 286476c..0a8f101 100644
--- a/cc/test/fake_web_graphics_context_3d.h
+++ b/cc/test/fake_web_graphics_context_3d.h
@@ -59,7 +59,6 @@ class FakeWebGraphicsContext3D {
GLsizei num_attachments,
const GLenum* attachments) {}
- virtual blink::WebString getRequestableExtensionsCHROMIUM();
virtual void requestExtensionCHROMIUM(const char*) {}
virtual void blitFramebufferCHROMIUM(
@@ -256,7 +255,6 @@ class FakeWebGraphicsContext3D {
GLenum pname,
GLint* value);
- virtual blink::WebString getProgramInfoLog(GLuint program);
virtual void getRenderbufferParameteriv(
GLenum target,
GLenum pname,
@@ -267,14 +265,11 @@ class FakeWebGraphicsContext3D {
GLenum pname,
GLint* value);
- virtual blink::WebString getShaderInfoLog(GLuint shader);
virtual void getShaderPrecisionFormat(
GLenum shadertype,
GLenum precisiontype,
GLint* range,
GLint* precision);
- virtual blink::WebString getShaderSource(GLuint shader);
- virtual blink::WebString getString(GLenum name);
virtual void getTexParameterfv(
GLenum target,
GLenum pname,
diff --git a/cc/test/test_web_graphics_context_3d.cc b/cc/test/test_web_graphics_context_3d.cc
index bfb8bc4..2b17cdd 100644
--- a/cc/test/test_web_graphics_context_3d.cc
+++ b/cc/test/test_web_graphics_context_3d.cc
@@ -111,10 +111,6 @@ GLenum TestWebGraphicsContext3D::checkFramebufferStatus(
return GL_FRAMEBUFFER_COMPLETE;
}
-blink::WebString TestWebGraphicsContext3D::getString(GLenum name) {
- return blink::WebString();
-}
-
GLint TestWebGraphicsContext3D::getUniformLocation(
GLuint program,
const GLchar* name) {
diff --git a/cc/test/test_web_graphics_context_3d.h b/cc/test/test_web_graphics_context_3d.h
index d8bab3d2..81a43b5 100644
--- a/cc/test/test_web_graphics_context_3d.h
+++ b/cc/test/test_web_graphics_context_3d.h
@@ -75,7 +75,6 @@ class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D {
virtual GLenum checkFramebufferStatus(GLenum target) OVERRIDE;
- virtual blink::WebString getString(GLenum name) OVERRIDE;
virtual GLint getUniformLocation(
GLuint program,
const GLchar* name) OVERRIDE;
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index a9a2720..f8207b5 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -3546,7 +3546,6 @@ class MockContext : public TestWebGraphicsContext3D {
GLsizei count,
GLenum type,
GLintptr offset));
- MOCK_METHOD0(getRequestableExtensionsCHROMIUM, blink::WebString());
MOCK_METHOD1(enable, void(GLenum cap));
MOCK_METHOD1(disable, void(GLenum cap));
MOCK_METHOD4(scissor, void(GLint x,
diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp
index 93e4dc3..8f06d09 100644
--- a/ui/compositor/compositor.gyp
+++ b/ui/compositor/compositor.gyp
@@ -78,6 +78,7 @@
'<(DEPTH)/cc/cc.gyp:cc',
'<(DEPTH)/cc/cc_tests.gyp:cc_test_support',
'<(DEPTH)/skia/skia.gyp:skia',
+ '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
'<(DEPTH)/ui/gl/gl.gyp:gl',