Index: content/renderer/gpu/mailbox_output_surface.cc |
diff --git a/content/renderer/gpu/mailbox_output_surface.cc b/content/renderer/gpu/mailbox_output_surface.cc |
index cf18fbf8d8e90b4212af8308100a6c0cc9c241fc..0f60e2d2d2d6b76ced90c43fbbe3026d45928272 100644 |
--- a/content/renderer/gpu/mailbox_output_surface.cc |
+++ b/content/renderer/gpu/mailbox_output_surface.cc |
@@ -14,7 +14,7 @@ |
using cc::CompositorFrame; |
using cc::GLFrameData; |
-using cc::Mailbox; |
+using gpu::Mailbox; |
using WebKit::WebGraphicsContext3D; |
namespace content { |
@@ -110,7 +110,7 @@ void MailboxOutputSurface::SendFrameToParentCompositor( |
DCHECK(!size_.IsEmpty()); |
DCHECK(size_ == current_backing_.size); |
- DCHECK(!current_backing_.mailbox.isZero()); |
+ DCHECK(!current_backing_.mailbox.IsZero()); |
context3d_->framebufferTexture2D( |
GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0); |
@@ -127,7 +127,7 @@ void MailboxOutputSurface::SendFrameToParentCompositor( |
} |
void MailboxOutputSurface::OnSwapAck(const cc::CompositorFrameAck& ack) { |
- if (!ack.gl_frame_data->mailbox.isZero()) { |
+ if (!ack.gl_frame_data->mailbox.IsZero()) { |
DCHECK(!ack.gl_frame_data->size.IsEmpty()); |
uint32 texture_id = context3d_->createTexture(); |
TransferableFrame texture( |