Update to CEF version 108.4.13+ga98cd4c+chromium-108.0.5359.125

Implements adaptations to new _cef_pdf_print_settings_t (CEF issue #3377)

Author: S1artie

CMakeLists.txt

@@ -130,7 +130,7 @@ set_property(GLOBAL PROPERTY OS_FOLDERS ON)
 
 # Specify the CEF distribution version.
 if(NOT DEFINED CEF_VERSION)
-  set(CEF_VERSION "107.1.9+g1f0a21a+chromium-107.0.5304.110")
+  set(CEF_VERSION "108.4.13+ga98cd4c+chromium-108.0.5359.125")
 endif()
 
 # Determine the platform.

java/org/cef/misc/CefPdfPrintSettings.java

@@ -15,97 +15,116 @@ public enum MarginType {
         // No margins
         NONE,
 
-        // Minimum margins.
-        MINIMUM,
-
         // Custom margins using the values from CefPdfPrintSettings
         CUSTOM
     }
 
     /**
-     * Set to true to print headers and footers or false to not print
-     * headers and footers.
+     * Set to true for landscape mode or false for portrait mode.
      */
-    public boolean header_footer_enabled;
+    public boolean landscape;
 
     /**
-     * Page title to display in the header. Only used if header_footer_enabled
-     * is set to true.
+     * Set to true to print background graphics or false to not print
+     * background graphics.
      */
-    public String header_footer_title;
+    public boolean print_background;
 
     /**
-     * URL to display in the footer. Only used if header_footer_enabled is set
-     * to true.
+     * The percentage to scale the PDF by before printing (e.g. .5 is 50%).
+     * If this value is less than or equal to zero the default value of 1.0
+     * will be used.
      */
-    public String header_footer_url;
+    public double scale;
 
     /**
-     * Set to true for landscape mode or false for portrait mode.
+     * Output paper size in inches. If either of these values is less than or
+     * equal to zero then the default paper size (letter, 8.5 x 11 inches) will
+     * be used.
      */
-    public boolean landscape;
+    public double paper_width;
+    public double paper_height;
 
     /**
-     * Set to true to print background graphics or false to not print
-     * background graphics.
+     * Set to true to prefer page size as defined by css. Defaults to false
+     * in which case the content will be scaled to fit the paper size.
+     */
+    public boolean prefer_css_page_size;
+
+    /**
+     * Margin type.
      */
-    public boolean backgrounds_enabled;
+    public MarginType margin_type;
 
     /**
-     * Output page size in microns (1 millimeter = 1000 microns). If either of these
-     * values is less than or equal to zero then the default paper size will be
-     * used as returned by the print_handler.  A4 is 210 x 297 mm which would
-     * be 210000 x 297000 microns.  US Letter is 215.9 x 279.4 mm which would
-     * be 215900 x 279400 microns.
+     * Margins in inches. Only used if margin_type is set to CUSTOM.
      */
-    public int page_width;
-    public int page_height;
+    public double margin_top;
+    public double margin_right;
+    public double margin_bottom;
+    public double margin_left;
 
     /**
-     * Set to true to print the selection only or false to print all.
+     * Paper ranges to print, one based, e.g., '1-5, 8, 11-13'. Pages are printed
+     * in the document order, not in the order specified, and no more than once.
+     * Defaults to empty string, which implies the entire document is printed.
+     * The page numbers are quietly capped to actual page count of the document,
+     * and ranges beyond the end of the document are ignored. If this results in
+     * no pages to print, an error is reported. It is an error to specify a range
+     * with start greater than end.
      */
-    public boolean selection_only;
+    public String page_ranges;
 
     /**
-     * The percentage to scale the PDF by before printing (e.g. 50 is 50%).
-     * If this value is less than or equal to zero the default value of 100
-     * will be used.
+     * Set to true to print headers and footers or false to not print
+     * headers and footers. Modify header_template and/or footer_template to
+     * customize the display.
      */
-    public int scale_factor;
+    public boolean display_header_footer;
 
     /**
-     * Margins in points. Only used if |margin_type| is set to
-     * PDF_PRINT_MARGIN_CUSTOM.
+     * HTML template for the print header. Only displayed if
+     * |display_header_footer| is true (1). Should be valid HTML markup with
+     * the following classes used to inject printing values into them:
+     *
+     * - date: formatted print date
+     * - title: document title
+     * - url: document location
+     * - pageNumber: current page number
+     * - totalPages: total pages in the document
+     *
+     * For example, "<span class=title></span>" would generate a span containing
+     * the title.
      */
-    public int margin_top;
-    public int margin_right;
-    public int margin_bottom;
-    public int margin_left;
+    public String header_template;
 
     /**
-     * Margin type.
+     * HTML template for the print footer. Only displayed if
+     * |display_header_footer| is true (1). Uses the same format as
+     * |header_template|.
      */
-    public MarginType margin_type;
+    public String footer_template;
 
     public CefPdfPrintSettings() {}
 
     @Override
     public CefPdfPrintSettings clone() {
         CefPdfPrintSettings tmp = new CefPdfPrintSettings();
-        tmp.header_footer_enabled = this.header_footer_enabled;
-        tmp.header_footer_title = this.header_footer_title;
-        tmp.header_footer_url = this.header_footer_url;
         tmp.landscape = this.landscape;
-        tmp.backgrounds_enabled = this.backgrounds_enabled;
-        tmp.page_width = this.page_width;
-        tmp.page_height = this.page_height;
-        tmp.selection_only = this.selection_only;
-        tmp.scale_factor = this.scale_factor;
+        tmp.print_background = this.print_background;
+        tmp.scale = this.scale;
+        tmp.paper_width = this.paper_width;
+        tmp.paper_height = this.paper_height;
+        tmp.prefer_css_page_size = this.prefer_css_page_size;
+        tmp.margin_type = this.margin_type;
         tmp.margin_top = this.margin_top;
-        tmp.margin_right = this.margin_right;
         tmp.margin_bottom = this.margin_bottom;
+        tmp.margin_right = this.margin_right;
         tmp.margin_left = this.margin_left;
-        tmp.margin_type = this.margin_type;
+        tmp.page_ranges = this.page_ranges;
+        tmp.display_header_footer = this.display_header_footer;
+        tmp.header_template = this.header_template;
+        tmp.footer_template = this.footer_template;
         return tmp;
     }
 }

java/tests/detailed/ui/MenuBar.java

@@ -157,10 +157,10 @@ public void actionPerformed(ActionEvent e) {
                 File selectedFile = fc.getSelectedFile();
                 if (selectedFile != null) {
                     CefPdfPrintSettings pdfSettings = new CefPdfPrintSettings();
-                    pdfSettings.header_footer_enabled = true;
-                    // A4 page size
-                    pdfSettings.page_width = 210000;
-                    pdfSettings.page_height = 297000;
+                    pdfSettings.display_header_footer = true;
+                    // letter page size
+                    pdfSettings.paper_width = 8.5;
+                    pdfSettings.paper_height = 11;
                     browser.printToPDF(
                             selectedFile.getAbsolutePath(), pdfSettings, new CefPdfPrintCallback() {
                                 @Override

native/CefBrowser_N.cpp

@@ -1078,33 +1078,18 @@ CefPdfPrintSettings GetJNIPdfPrintSettings(JNIEnv* env, jobject obj) {
   if (!cls)
     return settings;
 
-  GetJNIFieldBoolean(env, cls, obj, "header_footer_enabled",
-                     &settings.header_footer_enabled);
-
-  if (GetJNIFieldString(env, cls, obj, "header_footer_title", &tmp) &&
-      !tmp.empty()) {
-    CefString(&settings.header_footer_title) = tmp;
-    tmp.clear();
-  }
-
-  if (GetJNIFieldString(env, cls, obj, "header_footer_url", &tmp) &&
-      !tmp.empty()) {
-    CefString(&settings.header_footer_url) = tmp;
-    tmp.clear();
-  }
-
   GetJNIFieldBoolean(env, cls, obj, "landscape", &settings.landscape);
 
-  GetJNIFieldBoolean(env, cls, obj, "backgrounds_enabled",
-                     &settings.backgrounds_enabled);
+  GetJNIFieldBoolean(env, cls, obj, "print_background",
+                     &settings.print_background);
 
-  GetJNIFieldInt(env, cls, obj, "page_width", &settings.page_width);
+  GetJNIFieldDouble(env, cls, obj, "scale", &settings.scale);
 
-  GetJNIFieldInt(env, cls, obj, "page_height", &settings.page_height);
+  GetJNIFieldDouble(env, cls, obj, "paper_width", &settings.paper_width);
+  GetJNIFieldDouble(env, cls, obj, "paper_height", &settings.paper_height);
 
-  GetJNIFieldBoolean(env, cls, obj, "selection_only", &settings.selection_only);
-
-  GetJNIFieldInt(env, cls, obj, "scale_factor", &settings.scale_factor);
+  GetJNIFieldBoolean(env, cls, obj, "prefer_css_page_size",
+                     &settings.prefer_css_page_size);
 
   jobject obj_margin_type = nullptr;
   if (GetJNIFieldObject(env, cls, obj, "margin_type", &obj_margin_type,
@@ -1118,21 +1103,37 @@ CefPdfPrintSettings GetJNIPdfPrintSettings(JNIEnv* env, jobject obj) {
                               "org/cef/misc/CefPdfPrintSettings$MarginType",
                               "NONE")) {
       settings.margin_type = PDF_PRINT_MARGIN_NONE;
-    } else if (IsJNIEnumValue(env, margin_type,
-                              "org/cef/misc/CefPdfPrintSettings$MarginType",
-                              "MINIMUM")) {
-      settings.margin_type = PDF_PRINT_MARGIN_MINIMUM;
     } else if (IsJNIEnumValue(env, margin_type,
                               "org/cef/misc/CefPdfPrintSettings$MarginType",
                               "CUSTOM")) {
       settings.margin_type = PDF_PRINT_MARGIN_CUSTOM;
     }
   }
 
-  GetJNIFieldInt(env, cls, obj, "margin_top", &settings.margin_top);
-  GetJNIFieldInt(env, cls, obj, "margin_bottom", &settings.margin_bottom);
-  GetJNIFieldInt(env, cls, obj, "margin_right", &settings.margin_right);
-  GetJNIFieldInt(env, cls, obj, "margin_left", &settings.margin_left);
+  GetJNIFieldDouble(env, cls, obj, "margin_top", &settings.margin_top);
+  GetJNIFieldDouble(env, cls, obj, "margin_bottom", &settings.margin_bottom);
+  GetJNIFieldDouble(env, cls, obj, "margin_right", &settings.margin_right);
+  GetJNIFieldDouble(env, cls, obj, "margin_left", &settings.margin_left);
+
+  if (GetJNIFieldString(env, cls, obj, "page_ranges", &tmp) && !tmp.empty()) {
+    CefString(&settings.page_ranges) = tmp;
+    tmp.clear();
+  }
+
+  GetJNIFieldBoolean(env, cls, obj, "display_header_footer",
+                     &settings.display_header_footer);
+
+  if (GetJNIFieldString(env, cls, obj, "header_template", &tmp) &&
+      !tmp.empty()) {
+    CefString(&settings.header_template) = tmp;
+    tmp.clear();
+  }
+
+  if (GetJNIFieldString(env, cls, obj, "footer_template", &tmp) &&
+      !tmp.empty()) {
+    CefString(&settings.footer_template) = tmp;
+    tmp.clear();
+  }
 
   return settings;
 }

native/resource_handler.cpp

@@ -44,7 +44,7 @@ void ResourceHandler::GetResponseHeaders(CefRefPtr<CefResponse> response,
 
   ScopedJNIResponse jresponse(env, response);
   jresponse.SetTemporary();
-  ScopedJNIIntRef jresponseLength(env, response_length);
+  ScopedJNIIntRef jresponseLength(env, (int)response_length);
   ScopedJNIStringRef jredirectUrl(env, redirectUrl);
 
   JNI_CALL_VOID_METHOD(env, handle_, "getResponseHeaders",