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

Unified Diff: cc/layers/video_layer_impl.cc

Issue 110683002: Split the hole punching logic from GOOGLE_TV ifdef to VIDEO_HOLE (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years 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 | « build/common.gypi ('k') | cc/resources/video_resource_updater.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/video_layer_impl.cc
diff --git a/cc/layers/video_layer_impl.cc b/cc/layers/video_layer_impl.cc
index b48b20f27422520046b6fd0f96e3927085715bdc..314fed624ca803a9efec5de142a3788b3dbbc1df 100644
--- a/cc/layers/video_layer_impl.cc
+++ b/cc/layers/video_layer_impl.cc
@@ -18,9 +18,9 @@
#include "cc/trees/proxy.h"
#include "media/base/video_frame.h"
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
#include "cc/quads/solid_color_draw_quad.h"
-#endif
+#endif // defined(VIDEO_HOLE)
namespace cc {
@@ -245,7 +245,7 @@ void VideoLayerImpl::AppendQuads(QuadSink* quad_sink,
append_quads_data);
break;
}
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
// This block and other blocks wrapped around #if defined(GOOGLE_TV) is not
// maintained by the general compositor team. Please contact the following
// people instead:
@@ -266,7 +266,7 @@ void VideoLayerImpl::AppendQuads(QuadSink* quad_sink,
append_quads_data);
break;
}
-#endif
+#endif // defined(VIDEO_HOLE)
case VideoFrameExternalResources::NONE:
NOTIMPLEMENTED();
break;
« no previous file with comments | « build/common.gypi ('k') | cc/resources/video_resource_updater.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698