Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / printing / image.cc

diff --git a/src/printing/image.cc b/src/printing/image.cc
index b9c0010..5c832ad 100644 (file)
--- a/src/printing/image.cc
+++ b/src/printing/image.cc
@@ -6,12 +6,12 @@
 
 #include <algorithm>
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/md5.h"
-#include "base/safe_numerics.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
 #include "printing/metafile.h"
-#include "printing/metafile_impl.h"
+#include "printing/pdf_metafile_skia.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/codec/png_codec.h"
 
@@ -70,10 +70,10 @@ bool Image::SaveToPng(const base::FilePath& filepath) const {
                                        &compressed);
   DCHECK(success && compressed.size());
   if (success) {
-    int write_bytes = file_util::WriteFile(
+    int write_bytes = base::WriteFile(
         filepath,
         reinterpret_cast<char*>(&*compressed.begin()),
-        base::checked_numeric_cast<int>(compressed.size()));
+        base::checked_cast<int>(compressed.size()));
     success = (write_bytes == static_cast<int>(compressed.size()));
     DCHECK(success);
   }
@@ -150,9 +150,9 @@ bool Image::LoadPng(const std::string& compressed) {
 
 bool Image::LoadMetafile(const std::string& data) {
   DCHECK(!data.empty());
-  NativeMetafile metafile;
+  PdfMetafileSkia metafile;
   if (!metafile.InitFromData(data.data(),
-                             base::checked_numeric_cast<uint32>(data.size())))
+                             base::checked_cast<uint32>(data.size())))
     return false;
   return LoadMetafile(metafile);
 }