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

Unified Diff: cc/gl_renderer_pixeltest.cc

Issue 12041062: Have a common implementation of cc::OutputSurface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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/cc_tests.gyp ('k') | cc/output_surface.h » ('j') | cc/output_surface.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/gl_renderer_pixeltest.cc
diff --git a/cc/gl_renderer_pixeltest.cc b/cc/gl_renderer_pixeltest.cc
index 3507d774f3cacfca3a6aa379f720deaa0d0096d9..7a0627cbda1846b75cd4ad6f70a9383caa93cbca 100644
--- a/cc/gl_renderer_pixeltest.cc
+++ b/cc/gl_renderer_pixeltest.cc
@@ -11,11 +11,11 @@
#include "cc/prioritized_resource_manager.h"
#include "cc/resource_provider.h"
#include "cc/test/paths.h"
-#include "cc/test/pixel_test_output_surface.h"
#include "cc/test/pixel_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/codec/png_codec.h"
#include "ui/gl/gl_implementation.h"
+#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
namespace cc {
namespace {
@@ -53,7 +53,12 @@ class GLRendererPixelTest : public testing::Test {
virtual void SetUp() {
gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL);
- output_surface_ = PixelTestOutputSurface::create();
+ scoped_ptr<webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl> context3d(
+ new webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl);
+ context3d->Initialize(WebKit::WebGraphicsContext3D::Attributes(), NULL);
+ output_surface_.reset(new OutputSurface(
+ context3d.PassAs<WebKit::WebGraphicsContext3D>()));
+ CHECK(context3d.get() == NULL);
danakj 2013/01/24 02:03:06 You don't need this unless you're trying to verify
resource_provider_ = ResourceProvider::create(output_surface_.get());
renderer_ = GLRenderer::create(&fake_client_,
output_surface_.get(),
« no previous file with comments | « cc/cc_tests.gyp ('k') | cc/output_surface.h » ('j') | cc/output_surface.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698