summaryrefslogtreecommitdiffstats
path: root/cc/output/gl_renderer_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'cc/output/gl_renderer_unittest.cc')
-rw-r--r--cc/output/gl_renderer_unittest.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index f165e15..b7f5c80 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -1842,15 +1842,15 @@ class GLRendererTestSyncPoint : public GLRendererPixelTest {
TEST_F(GLRendererTestSyncPoint, SignalSyncPointOnLostContext) {
int sync_point_callback_count = 0;
int other_callback_count = 0;
- blink::WebGraphicsContext3D* context3d =
- output_surface_->context_provider()->Context3d();
+ gpu::gles2::GLES2Interface* gl =
+ output_surface_->context_provider()->ContextGL();
gpu::ContextSupport* context_support =
output_surface_->context_provider()->ContextSupport();
- uint32 sync_point = context3d->insertSyncPoint();
+ uint32 sync_point = gl->InsertSyncPointCHROMIUM();
- context3d->loseContextCHROMIUM(GL_GUILTY_CONTEXT_RESET_ARB,
- GL_INNOCENT_CONTEXT_RESET_ARB);
+ gl->LoseContextCHROMIUM(GL_GUILTY_CONTEXT_RESET_ARB,
+ GL_INNOCENT_CONTEXT_RESET_ARB);
context_support->SignalSyncPoint(
sync_point, base::Bind(&SyncPointCallback, &sync_point_callback_count));
@@ -1858,7 +1858,7 @@ TEST_F(GLRendererTestSyncPoint, SignalSyncPointOnLostContext) {
EXPECT_EQ(0, other_callback_count);
// Make the sync point happen.
- context3d->finish();
+ gl->Finish();
// Post a task after the sync point.
base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(&OtherCallback, &other_callback_count));
@@ -1874,12 +1874,12 @@ TEST_F(GLRendererTestSyncPoint, SignalSyncPoint) {
int sync_point_callback_count = 0;
int other_callback_count = 0;
- blink::WebGraphicsContext3D* context3d =
- output_surface_->context_provider()->Context3d();
+ gpu::gles2::GLES2Interface* gl =
+ output_surface_->context_provider()->ContextGL();
gpu::ContextSupport* context_support =
output_surface_->context_provider()->ContextSupport();
- uint32 sync_point = context3d->insertSyncPoint();
+ uint32 sync_point = gl->InsertSyncPointCHROMIUM();
context_support->SignalSyncPoint(
sync_point, base::Bind(&SyncPointCallback, &sync_point_callback_count));
@@ -1887,7 +1887,7 @@ TEST_F(GLRendererTestSyncPoint, SignalSyncPoint) {
EXPECT_EQ(0, other_callback_count);
// Make the sync point happen.
- context3d->finish();
+ gl->Finish();
// Post a task after the sync point.
base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(&OtherCallback, &other_callback_count));