Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2739)

Unified Diff: cc/texture_uploader_unittest.cc

Issue 12211110: Implement WebKit::WebUnitTestSupport::createLayerTreeViewForTesting() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add enum, fix NON_EXPORTED_BASE Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/texture_copier_unittest.cc ('k') | webkit/compositor_bindings/compositor_bindings.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/texture_uploader_unittest.cc
diff --git a/cc/texture_uploader_unittest.cc b/cc/texture_uploader_unittest.cc
index a975c16f2945aecd3d32059c9475b2e10072a1a3..4e95628e363bd03cac9bfe96376694609341640c 100644
--- a/cc/texture_uploader_unittest.cc
+++ b/cc/texture_uploader_unittest.cc
@@ -5,7 +5,7 @@
#include "cc/texture_uploader.h"
#include "cc/prioritized_resource.h"
-#include "cc/test/fake_web_graphics_context_3d.h"
+#include "cc/test/test_web_graphics_context_3d.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/khronos/GLES2/gl2.h"
@@ -21,9 +21,9 @@ unsigned int RoundUp(unsigned int n, unsigned int mul)
return (((n - 1) / mul) * mul) + mul;
}
-class FakeWebGraphicsContext3DTextureUpload : public FakeWebGraphicsContext3D {
+class TestWebGraphicsContext3DTextureUpload : public TestWebGraphicsContext3D {
public:
- FakeWebGraphicsContext3DTextureUpload()
+ TestWebGraphicsContext3DTextureUpload()
: m_resultAvailable(0)
, m_unpackAlignment(4)
{
@@ -151,7 +151,7 @@ void uploadTexture(TextureUploader* uploader, WGC3Denum format, const gfx::Size&
TEST(TextureUploaderTest, NumBlockingUploads)
{
- scoped_ptr<FakeWebGraphicsContext3DTextureUpload> fakeContext(new FakeWebGraphicsContext3DTextureUpload);
+ scoped_ptr<TestWebGraphicsContext3DTextureUpload> fakeContext(new TestWebGraphicsContext3DTextureUpload);
scoped_ptr<TextureUploader> uploader = TextureUploader::create(fakeContext.get(), false, false);
fakeContext->setResultAvailable(0);
@@ -172,7 +172,7 @@ TEST(TextureUploaderTest, NumBlockingUploads)
TEST(TextureUploaderTest, MarkPendingUploadsAsNonBlocking)
{
- scoped_ptr<FakeWebGraphicsContext3DTextureUpload> fakeContext(new FakeWebGraphicsContext3DTextureUpload);
+ scoped_ptr<TestWebGraphicsContext3DTextureUpload> fakeContext(new TestWebGraphicsContext3DTextureUpload);
scoped_ptr<TextureUploader> uploader = TextureUploader::create(fakeContext.get(), false, false);
fakeContext->setResultAvailable(0);
@@ -195,7 +195,7 @@ TEST(TextureUploaderTest, MarkPendingUploadsAsNonBlocking)
TEST(TextureUploaderTest, UploadContentsTest)
{
- scoped_ptr<FakeWebGraphicsContext3DTextureUpload> fakeContext(new FakeWebGraphicsContext3DTextureUpload);
+ scoped_ptr<TestWebGraphicsContext3DTextureUpload> fakeContext(new TestWebGraphicsContext3DTextureUpload);
scoped_ptr<TextureUploader> uploader = TextureUploader::create(fakeContext.get(), false, false);
uint8 buffer[256 * 256 * 4];
« no previous file with comments | « cc/texture_copier_unittest.cc ('k') | webkit/compositor_bindings/compositor_bindings.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698