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

Unified Diff: content/renderer/gpu/mailbox_output_surface.cc

Issue 12378053: Move Mailbox from cc to gpu, and its traits to gpu/ipc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ios hate 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 | « content/renderer/gpu/mailbox_output_surface.h ('k') | gpu/command_buffer/common/mailbox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4e0a8634dd544b6b4373b85a34c6e9d557731613..8d713c82fd7920c854b828a982255318ccfdce9f 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 {
@@ -113,7 +113,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);
@@ -132,7 +132,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(
« no previous file with comments | « content/renderer/gpu/mailbox_output_surface.h ('k') | gpu/command_buffer/common/mailbox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698