Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / tools / render_pdfs_main.cpp

diff --git a/src/third_party/skia/tools/render_pdfs_main.cpp b/src/third_party/skia/tools/render_pdfs_main.cpp
index a1bd62d..dd5f642 100644 (file)
--- a/src/third_party/skia/tools/render_pdfs_main.cpp
+++ b/src/third_party/skia/tools/render_pdfs_main.cpp
@@ -166,9 +166,8 @@ static bool pdf_to_stream(SkPicture* picture,
                           SkPicture::EncodeBitmap encoder) {
     SkAutoTUnref<SkDocument> pdfDocument(
             SkDocument::CreatePDF(output, NULL, encoder));
-    SkCanvas* canvas = pdfDocument->beginPage(
-            SkIntToScalar(picture->width()),
-            SkIntToScalar(picture->height()));
+    SkCanvas* canvas = pdfDocument->beginPage(picture->cullRect().width(), 
+                                              picture->cullRect().height());
     canvas->drawPicture(picture);
     canvas->flush();
     return pdfDocument->close();
@@ -255,8 +254,10 @@ int tool_main_core(int argc, char** argv) {
             ++failures;
             continue;
         }
-        SkDebugf("[%-4i %6i] %-*s", picture->width(), picture->height(),
-                 maximumPathLength, basename.c_str());
+        SkDebugf("[%f,%f,%f,%f] %-*s", 
+            picture->cullRect().fLeft, picture->cullRect().fTop,
+            picture->cullRect().fRight, picture->cullRect().fBottom,
+            maximumPathLength, basename.c_str());
 
         SkAutoTDelete<SkWStream> stream(open_stream(outputDir, files[i]));
         if (!stream.get()) {
@@ -268,9 +269,9 @@ int tool_main_core(int argc, char** argv) {
             ++failures;
         }
 
-        int max_rss_kb = sk_tools::getMaxResidentSetSizeKB();
-        if (max_rss_kb >= 0) {
-            SkDebugf(" %4dM peak rss", max_rss_kb / 1024);
+        int max_rss_mb = sk_tools::getMaxResidentSetSizeMB();
+        if (max_rss_mb >= 0) {
+            SkDebugf(" %4dM peak rss", max_rss_mb);
         }
 
         SkDebugf("\n");