Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I051052a70a6e764202a90d77fc1a0f73688d3704

1 files changed, 15 insertions, 13 deletions

diff --git a/src/core/printing/print_view_manager_qt.cpp b/src/core/printing/print_view_manager_qt.cpp
index 2bf11990a..b6a2b42ec 100644
--- a/src/core/printing/print_view_manager_qt.cpp
+++ b/src/core/printing/print_view_manager_qt.cpp
@@ -151,21 +151,12 @@ static base::DictionaryValue *createPrintSettingsFromQPageLayout(const QPageLayo
                                                                  bool useCustomMargins)
 {
     base::DictionaryValue *printSettings = createPrintSettings();
-
-    //Set page size attributes, chromium expects these in micrometers
-    QRectF pageSizeInMillimeter = pageLayout.pageSize().rect(QPageSize::Millimeter);
-    if (!useCustomMargins) {
-        // QPrinter will extend this size with its margins
-        QMarginsF margins = pageLayout.margins(QPageLayout::Millimeter);
-        pageSizeInMillimeter = pageSizeInMillimeter.marginsRemoved(margins);
-    }
-    std::unique_ptr<base::DictionaryValue> sizeDict(new base::DictionaryValue);
-    sizeDict->SetInteger(printing::kSettingMediaSizeWidthMicrons, pageSizeInMillimeter.width() * kMicronsToMillimeter);
-    sizeDict->SetInteger(printing::kSettingMediaSizeHeightMicrons, pageSizeInMillimeter.height() * kMicronsToMillimeter);
-    printSettings->Set(printing::kSettingMediaSize, std::move(sizeDict));
+    QRectF pageSizeInMillimeter;
 
     if (useCustomMargins) {
         // Apply page margins when printing to PDF
+        pageSizeInMillimeter = pageLayout.pageSize().rect(QPageSize::Millimeter);
+
         QMargins pageMarginsInPoints = pageLayout.marginsPoints();
         std::unique_ptr<base::DictionaryValue> marginsDict(new base::DictionaryValue);
         marginsDict->SetInteger(printing::kSettingMarginTop, pageMarginsInPoints.top());
@@ -175,12 +166,23 @@ static base::DictionaryValue *createPrintSettingsFromQPageLayout(const QPageLayo
 
         printSettings->Set(printing::kSettingMarginsCustom, std::move(marginsDict));
         printSettings->SetInteger(printing::kSettingMarginsType, printing::CUSTOM_MARGINS);
+
+        // pageSizeInMillimeter is in portrait orientation. Transpose it if necessary.
+        printSettings->SetBoolean(printing::kSettingLandscape, pageLayout.orientation() == QPageLayout::Landscape);
     } else {
         // QPrinter will handle margins
+        pageSizeInMillimeter = pageLayout.paintRect(QPageLayout::Millimeter);
         printSettings->SetInteger(printing::kSettingMarginsType, printing::NO_MARGINS);
+
+        // pageSizeInMillimeter already contains the orientation.
+        printSettings->SetBoolean(printing::kSettingLandscape, false);
     }
 
-    printSettings->SetBoolean(printing::kSettingLandscape, pageLayout.orientation() == QPageLayout::Landscape);
+    //Set page size attributes, chromium expects these in micrometers
+    std::unique_ptr<base::DictionaryValue> sizeDict(new base::DictionaryValue);
+    sizeDict->SetInteger(printing::kSettingMediaSizeWidthMicrons, pageSizeInMillimeter.width() * kMicronsToMillimeter);
+    sizeDict->SetInteger(printing::kSettingMediaSizeHeightMicrons, pageSizeInMillimeter.height() * kMicronsToMillimeter);
+    printSettings->Set(printing::kSettingMediaSize, std::move(sizeDict));
 
     return printSettings;
 }