Update DisplayHandler.OnConsoleMessage, add new param 'level'

cztomczak · cztomczak · commit f5dc3a54196e · 2018-05-24T18:57:09.000+02:00
diff --git a/api/DisplayHandler.md b/api/DisplayHandler.md
@@ -75,10 +75,14 @@ Called when the browser receives a status message.
 | Parameter | Type |
 | --- | --- |
 | browser | [Browser](Browser.md) |
+| level | int |
 | message | string |
 | source | string |
 | line | int |
 | __Return__ | bool |
 
 Called to display a console message. Return true to stop the message from
 being output to the console.
+
+|level| can be one of the same values as in ApplicationSettings.[log_severity](ApplicationSettings.md#log_severity).
+
diff --git a/api/WindowInfo.md b/api/WindowInfo.md
@@ -15,7 +15,6 @@ Table of contents:
   * [SetAsChild](#setaschild)
   * [SetAsPopup](#setaspopup)
   * [SetAsOffscreen](#setasoffscreen)
-  * [SetTransparentPainting](#settransparentpainting)
 
 ## Methods
 
diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
@@ -37,6 +37,7 @@ Table of contents:
 * [v56+ MacOS 10.9+ required to run](#v56-macos-109-required-to-run)
 * [v57.1+ High DPI support on Windows](#v571-high-dpi-support-on-windows)
 * [v66.0+ Linux patch that fixed HTTPS cache problems on pages with certificate errors was disabled](#v660-linux-patch-that-fixed-https-cache-problems-on-pages-with-certificate-errors-was-disabled)
+* [v66.0+ DisplayHandler.OnConsoleMessage new param 'level'](#v660-displayhandleronconsolemessage-new-param-level)
 
 
 
@@ -299,6 +300,13 @@ then you should change it to an empty string now.
 
 ## v66.0+ Linux patch that fixed HTTPS cache problems on pages with certificate errors was disabled
 
-See Issue [#125](../../../issues/125) for more details.
+That patch allowed for HTTPS caching to work when using self-signed
+certificates (or any invalid certificate). This doesn't work anymore. See
+Issue [#125](../../../issues/125) for more details.
+
+
+## v66.0+ DisplayHandler.OnConsoleMessage new param 'level'
 
+The DisplayHandler.[OnConsoleMessage](../api/DisplayHandler.md#onconsolemessage)
+callback has a new param `level`.
 
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
@@ -3,9 +3,9 @@ Changes in v59..v66
 BREAKAGE (needs updating Migration Guide doc)
 --------
 
-cef_display_handler.h
-- OnConsoleMessage: new param 'level'
-- update migration guide
++ cef_display_handler.h
+- + OnConsoleMessage: new param 'level'
+- + update migration guide
 
 cef_life_span_handler.h
 - OnBeforePopup: created on UI thread instead of IO thread
diff --git a/src/cefpython.pyx b/src/cefpython.pyx
@@ -245,6 +245,7 @@ from cef_types cimport (
     CefKeyEvent, CefMouseEvent, CefScreenInfo,
     PathKey, PK_DIR_EXE, PK_DIR_MODULE,
     int32, uint32, int64, uint64,
+    cef_log_severity_t,
 )
 
 # noinspection PyUnresolvedReferences
diff --git a/src/client_handler/display_handler.cpp b/src/client_handler/display_handler.cpp
@@ -39,10 +39,12 @@ void DisplayHandler::OnStatusMessage(CefRefPtr<CefBrowser> browser,
 
 
 bool DisplayHandler::OnConsoleMessage(CefRefPtr<CefBrowser> browser,
-                                     const CefString& message,
-                                     const CefString& source,
-                                     int line)
+                                      cef_log_severity_t level,
+                                      const CefString& message,
+                                      const CefString& source,
+                                      int line)
 {
     REQUIRE_UI_THREAD();
-    return DisplayHandler_OnConsoleMessage(browser, message, source, line);
+    return DisplayHandler_OnConsoleMessage(browser, level, message, source,
+                                           line);
 }
diff --git a/src/client_handler/display_handler.h b/src/client_handler/display_handler.h
@@ -28,6 +28,7 @@ class DisplayHandler : public CefDisplayHandler
                          const CefString& value) override;
 
     bool OnConsoleMessage(CefRefPtr<CefBrowser> browser,
+                          cef_log_severity_t level,
                           const CefString& message,
                           const CefString& source,
                           int line) override;
diff --git a/src/handlers/display_handler.pyx b/src/handlers/display_handler.pyx
@@ -85,6 +85,7 @@ cdef public void DisplayHandler_OnStatusMessage(
 
 cdef public cpp_bool DisplayHandler_OnConsoleMessage(
         CefRefPtr[CefBrowser] cefBrowser,
+        cef_log_severity_t level,
         const CefString& cefMessage,
         const CefString& cefSource,
         int line
@@ -100,8 +101,9 @@ cdef public cpp_bool DisplayHandler_OnConsoleMessage(
         pySource = CefToPyString(cefSource)
         callback = pyBrowser.GetClientCallback("OnConsoleMessage")
         if callback:
-            returnValue = callback(browser=pyBrowser, message=pyMessage,
-                                   source=pySource, line=line)
+            returnValue = callback(browser=pyBrowser, level=level,
+                                   message=pyMessage, source=pySource,
+                                   line=line)
             return bool(returnValue)
         return False
     except:

Original file line number	Diff line number	Diff line change
`@@ -245,6 +245,7 @@ from cef_types cimport (`
`245`	`245`	`CefKeyEvent, CefMouseEvent, CefScreenInfo,`
`246`	`246`	`PathKey, PK_DIR_EXE, PK_DIR_MODULE,`
`247`	`247`	`int32, uint32, int64, uint64,`
	`248`	`+ cef_log_severity_t,`
`248`	`249`	`)`
`249`	`250`
`250`	`251`	`# noinspection PyUnresolvedReferences`