Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / common / gpu / media / v4l2_video_device.cc

diff --git a/src/content/common/gpu/media/v4l2_video_device.cc b/src/content/common/gpu/media/v4l2_video_device.cc
index 0a094ba..58b935a 100644 (file)
--- a/src/content/common/gpu/media/v4l2_video_device.cc
+++ b/src/content/common/gpu/media/v4l2_video_device.cc
@@ -18,13 +18,13 @@ scoped_ptr<V4L2Device> V4L2Device::Create(Type type) {
 
   scoped_ptr<ExynosV4L2Device> exynos_device(new ExynosV4L2Device(type));
   if (exynos_device->Initialize())
-    return exynos_device.PassAs<V4L2Device>();
+    return exynos_device.Pass();
 
   scoped_ptr<TegraV4L2Device> tegra_device(new TegraV4L2Device(type));
   if (tegra_device->Initialize())
-    return tegra_device.PassAs<V4L2Device>();
+    return tegra_device.Pass();
 
-  DLOG(ERROR) << "Failed to create V4L2Device";
+  LOG(ERROR) << "Failed to create V4L2Device";
   return scoped_ptr<V4L2Device>();
 }
 
@@ -113,7 +113,7 @@ gfx::Size V4L2Device::CodedSizeFromV4L2Format(struct v4l2_format format) {
            << ", horiz_bpp=" << horiz_bpp;
   if (sizeimage == 0 || bytesperline == 0 || horiz_bpp == 0 ||
       (bytesperline * 8) % horiz_bpp != 0) {
-    DLOG(ERROR) << "Invalid format provided";
+    LOG(ERROR) << "Invalid format provided";
     return coded_size;
   }