diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-08-01 16:19:34 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-09-14 08:15:39 +0000 |
| commit | f1e2b2d80366b43ba638290bca55272b000b3ce1 (patch) | |
| tree | 9b3d4708f0cd80a1c73aeacdbf3b5640c7fa80ab /src/core/print_view_manager_qt.cpp | |
| parent | baaab31631dcff6075418c95f0220e8fb207dd50 (diff) | |
Adaptations to Chromium 53
Change-Id: I15053486edfd42ee607250b4f14fb6eaa325c959
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/print_view_manager_qt.cpp')
| -rw-r--r-- | src/core/print_view_manager_qt.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/print_view_manager_qt.cpp b/src/core/print_view_manager_qt.cpp index 117c2e40f..8f52cc24a 100644 --- a/src/core/print_view_manager_qt.cpp +++ b/src/core/print_view_manager_qt.cpp @@ -47,6 +47,7 @@ #include <QtGui/qpagesize.h> #include "base/values.h" +#include "base/memory/ref_counted_memory.h" #include "chrome/browser/printing/print_job_manager.h" #include "chrome/browser/printing/printer_query.h" #include "components/printing/common/print_messages.h" @@ -94,7 +95,7 @@ static void SavePdfFile(scoped_refptr<base::RefCountedBytes> data, DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); DCHECK_GT(data->size(), 0U); - printing::PdfMetafileSkia metafile; + printing::PdfMetafileSkia metafile(printing::PDF_SKIA_DOCUMENT_TYPE); metafile.InitFromData(static_cast<const void*>(data->front()), data->size()); base::File file(path, @@ -146,7 +147,7 @@ static void applyQPageLayoutSettingsToDictionary(const QPageLayout &pageLayout, // Apply page margins QMargins pageMarginsInPoints = pageLayout.marginsPoints(); - scoped_ptr<base::DictionaryValue> marginsDict(new base::DictionaryValue); + std::unique_ptr<base::DictionaryValue> marginsDict(new base::DictionaryValue); marginsDict->SetInteger(printing::kSettingMarginTop, pageMarginsInPoints.top()); marginsDict->SetInteger(printing::kSettingMarginBottom, pageMarginsInPoints.bottom()); marginsDict->SetInteger(printing::kSettingMarginLeft, pageMarginsInPoints.left()); |