Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / cc / resources / video_resource_updater.h

diff --git a/src/cc/resources/video_resource_updater.h b/src/cc/resources/video_resource_updater.h
index e3476d4..eaaa8c1 100644 (file)
--- a/src/cc/resources/video_resource_updater.h
+++ b/src/cc/resources/video_resource_updater.h
@@ -37,11 +37,11 @@ class CC_EXPORT VideoFrameExternalResources {
     STREAM_TEXTURE_RESOURCE,
     IO_SURFACE,
 
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
     // TODO(danakj): Implement this with a solid color layer instead of a video
     // frame and video layer.
     HOLE,
-#endif
+#endif  // defined(VIDEO_HOLE)
 
     // TODO(danakj): Remove this and abstract TextureMailbox into
     // "ExternalResource" that can hold a hardware or software backing.
@@ -80,7 +80,7 @@ class CC_EXPORT VideoResourceUpdater
     gpu::Mailbox mailbox;
 
     PlaneResource(unsigned resource_id,
-                  gfx::Size resource_size,
+                  const gfx::Size& resource_size,
                   ResourceFormat resource_format,
                   gpu::Mailbox mailbox)
         : resource_id(resource_id),
@@ -104,7 +104,7 @@ class CC_EXPORT VideoResourceUpdater
   };
   static void RecycleResource(base::WeakPtr<VideoResourceUpdater> updater,
                               RecycleResourceData data,
-                              unsigned sync_point,
+                              uint32 sync_point,
                               bool lost_resource);
 
   ContextProvider* context_provider_;