Update to Chrome 55.0.2883.21 and CEF 3.2883.1506.ga6c42a7 (#263), and

others.

This is CEF Python 55.1 beta release with Chrome 55 from beta channel.

Add support for Python 3.6 (#121).

Update to Cython 0.25.1 (#110).

Build cefpython .so modules using clean Python installations as in pyenv
to avoid invalid symbols being embedded in the .so module (#266).

Update CEF include/.
Update patches/.

Update compile.py. Run unit tests first and don't run gtk3 example
temporarily until #261 is fixed. Check if Cython version installed
is the same as specified in tools/requirements.txt.

Update examples - print filename when logging messages.

Author: cztomczak

api/RequestHandler.md

@@ -9,9 +9,10 @@ For an example of how to implement handler see [cefpython](cefpython.md).CreateB
 
 The `RequestHandler` tests can be found in the wxpython.py script.
 
-Not yet ported to CEF Python:
+The following callbacks are available in upstream CEF, but were not yet
+exposed:
 * OnOpenURLFromTab
-
+* OnSelectClientCertificate
 
 
 Table of contents:

docs/Build-instructions.md

@@ -32,7 +32,7 @@ Table of contents:
 
 ## Build CEF Python on Linux
 
-Complete steps for building CEF Python 54 using prebuilt
+Complete steps for building CEF Python 55 using prebuilt
 binaries from GitHub releases:
 
 1) Tested and works fine on Ubuntu 14.04 64-bit (cmake 2.8.12 and g++ 4.8.4)
@@ -48,15 +48,15 @@ binaries from GitHub releases:
 
 5) Download 64-bit Linux binaries and libraries from
    [GH releases](https://github.com/cztomczak/cefpython/releases)
-   tagged 'v54-upstream'.
+   tagged 'v55-upstream'.
 
 6) Extract it in the cefpython/build/ directory and rename the extracted
    directory to "cef_linux64".
 
 8) Build cefpython and run examples:
 ```
 cd cefpython/src/linux/
-python compile.py 54.0
+python compile.py 55.0
 ```
 
 ## Requirements
@@ -167,7 +167,7 @@ mkdir build/ && cd build
 python ../tools/automate.py --build-cef --ninja-jobs 6
 mv cef*_*_linux64/ cef_linux64/
 cd ../../../src/linux/
-python compile.py 54.0
+python compile.py 55.0
 ```
 
 __MISSING PACKAGES (Linux)__: After the chromium sources are downloaded,
@@ -248,13 +248,7 @@ git diff --no-prefix --relative > issue251.patch
 Apply a patch in current directory:
 ```
 cd chromium/src/cef/
-git apply issue251.patch
-```
-
-In case of a "No such file or directory" error and when paths seem
-to be correct, try the -p0 or -p1 flag:
-```
-git apply -p0 issue251.patch
+git apply -v -p0 issue251.patch
 ```
 
 To create a patch from last two commits (no --relative flag available

examples/gtk2.py

@@ -35,24 +35,24 @@ def main():
 
 
 def check_versions():
-    print("CEF Python {ver}".format(ver=cef.__version__))
-    print("Python {ver}".format(ver=sys.version[:6]))
-    print("GTK {ver}".format(ver='.'.join(map(str, list(gtk.gtk_version)))))
+    print("[gkt2.py] CEF Python {ver}".format(ver=cef.__version__))
+    print("[gkt2.py] Python {ver}".format(ver=sys.version[:6]))
+    print("[gkt2.py] GTK {ver}".format(ver='.'.join(map(str, list(gtk.gtk_version)))))
     assert cef.__version__ >= "54.0", "CEF Python v54+ required to run this"
     pygtk.require('2.0')
 
 
 def configure_message_loop():
     global g_message_loop
     if "--message-loop-timer" in sys.argv:
-        print("Message loop mode: TIMER")
+        print("[gkt2.py] Message loop mode: TIMER")
         g_message_loop = MESSAGE_LOOP_TIMER
         sys.argv.remove("--message-loop-timer")
     else:
-        print("Message loop mode: BEST")
+        print("[gkt2.py] Message loop mode: BEST")
         g_message_loop = MESSAGE_LOOP_BEST
     if len(sys.argv) > 1:
-        print("ERROR: unknown argument passed")
+        print("[gkt2.py] ERROR: unknown argument passed")
         sys.exit(1)
 
 

examples/gtk3.py

@@ -9,9 +9,9 @@
 
 
 def main():
-    print("CEF Python {ver}".format(ver=cef.__version__))
-    print("Python {ver}".format(ver=sys.version[:6]))
-    print("GTK {major}.{minor}".format(
+    print("[gkt3.py] CEF Python {ver}".format(ver=cef.__version__))
+    print("[gkt3.py] Python {ver}".format(ver=sys.version[:6]))
+    print("[gkt3.py] GTK {major}.{minor}".format(
             major=Gtk.get_major_version(),
             minor=Gtk.get_minor_version()))
     assert cef.__version__ >= "53.1", "CEF Python v53.1+ required to run this"

examples/hello_world.py

@@ -6,8 +6,8 @@
 
 
 def main():
-    print("CEF Python {ver}".format(ver=cef.__version__))
-    print("Python {ver}".format(ver=sys.version[:6]))
+    print("[hello_world.py] CEF Python {ver}".format(ver=cef.__version__))
+    print("[hello_world.py] Python {ver}".format(ver=sys.version[:6]))
     assert cef.__version__ >= "53.1", "CEF Python v53.1+ required to run this"
     sys.excepthook = cef.ExceptHook  # To shutdown all CEF processes on error
     cef.Initialize()

examples/tkinter_.py

@@ -12,15 +12,18 @@
     import Tkinter as tk
 import sys
 import os
-import logging
+import logging as _logging
 
 # Globals
-logger = logging.getLogger()
+logger = _logging.getLogger("tkinter_.py")
 
 
 def main():
-    logger.setLevel(logging.INFO)
-    logger.addHandler(logging.StreamHandler())
+    logger.setLevel(_logging.INFO)
+    stream_handler = _logging.StreamHandler()
+    formatter = _logging.Formatter("[%(filename)s] %(message)s")
+    stream_handler.setFormatter(formatter)
+    logger.addHandler(stream_handler)
     logger.info("CEF Python {ver}".format(ver=cef.__version__))
     logger.info("Python {ver}".format(ver=sys.version[:6]))
     logger.info("Tk {ver}".format(ver=tk.TkVersion))

patches/issue125.patch

@@ -1,8 +1,8 @@
 diff --git http_cache_transaction.cc http_cache_transaction.cc
-index 489e4960..2c4d719 100644
+index 370862d..e63aecf 100644
 --- http_cache_transaction.cc
 +++ http_cache_transaction.cc
-@@ -2535,7 +2535,8 @@ int HttpCache::Transaction::WriteResponseInfoToEntry(bool truncated) {
+@@ -2548,7 +2548,8 @@ int HttpCache::Transaction::WriteResponseInfoToEntry(bool truncated) {
    // blocking page is shown.  An alternative would be to reverse-map the cert
    // status to a net error and replay the net error.
    if ((response_.headers->HasHeaderValue("cache-control", "no-store")) ||
@@ -11,4 +11,4 @@ index 489e4960..2c4d719 100644
 +       IsCertStatusError(response_.ssl_info.cert_status))) {
      DoneWritingToEntry(false);
      if (net_log_.IsCapturing())
-       net_log_.EndEvent(NetLog::TYPE_HTTP_CACHE_WRITE_INFO);
+       net_log_.EndEvent(NetLogEventType::HTTP_CACHE_WRITE_INFO);

patches/issue231.patch

@@ -83,10 +83,10 @@ index 6a75930..ad620d7 100644
 +  return PathService::Override(pref_key, file_path);
 +}
 diff --git libcef_dll/libcef_dll.cc libcef_dll/libcef_dll.cc
-index 208333c..fcadb7e 100644
+index 496c9b0..f2dc4d8 100644
 --- libcef_dll/libcef_dll.cc
 +++ libcef_dll/libcef_dll.cc
-@@ -747,6 +747,23 @@ CEF_EXPORT int cef_get_path(cef_path_key_t key, cef_string_t* path) {
+@@ -752,6 +752,23 @@ CEF_EXPORT int cef_get_path(cef_path_key_t key, cef_string_t* path) {
    return _retval;
  }
 
@@ -111,10 +111,10 @@ index 208333c..fcadb7e 100644
    // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
 
 diff --git libcef_dll/wrapper/libcef_dll_wrapper.cc libcef_dll/wrapper/libcef_dll_wrapper.cc
-index 248a285..3f0c226 100644
+index 3a5d30f..7431698 100644
 --- libcef_dll/wrapper/libcef_dll_wrapper.cc
 +++ libcef_dll/wrapper/libcef_dll_wrapper.cc
-@@ -691,6 +691,23 @@ CEF_GLOBAL bool CefGetPath(PathKey key, CefString& path) {
+@@ -696,6 +696,23 @@ CEF_GLOBAL bool CefGetPath(PathKey key, CefString& path) {
    return _retval?true:false;
  }
 

patches/issue251.patch

@@ -71,7 +71,7 @@ index 8f8094b..8b4602b 100644
 
  #endif  // CEF_INCLUDE_CEF_DRAG_DATA_H_
 diff --git libcef/browser/osr/web_contents_view_osr.cc libcef/browser/osr/web_contents_view_osr.cc
-index 52f1a87..e967865 100644
+index c39a29c..8b3c30a 100644
 --- libcef/browser/osr/web_contents_view_osr.cc
 +++ libcef/browser/osr/web_contents_view_osr.cc
 @@ -6,6 +6,7 @@
@@ -82,7 +82,7 @@ index 52f1a87..e967865 100644
  #include "libcef/browser/osr/render_widget_host_view_osr.h"
  #include "libcef/common/drag_data_impl.h"
 
-@@ -227,7 +228,9 @@ void CefWebContentsViewOSR::StartDragging(
+@@ -230,7 +231,9 @@ void CefWebContentsViewOSR::StartDragging(
    if (browser.get())
      handler = browser->GetClient()->GetRenderHandler();
    if (handler.get()) {

src/include/cef_navigation_entry.h

@@ -39,8 +39,7 @@
 #pragma once
 
 #include "include/cef_base.h"
-
-class CefSSLStatus;
+#include "include/cef_ssl_status.h"
 
 ///
 // Class used to represent an entry in navigation history.

src/include/cef_render_handler.h

@@ -38,10 +38,11 @@
 #define CEF_INCLUDE_CEF_RENDER_HANDLER_H_
 #pragma once
 
+#include <vector>
+
 #include "include/cef_base.h"
 #include "include/cef_browser.h"
 #include "include/cef_drag_data.h"
-#include <vector>
 
 ///
 // Implement this interface to handle events when window rendering is disabled.

src/include/cef_request_handler.h

@@ -38,6 +38,8 @@
 #define CEF_INCLUDE_CEF_REQUEST_HANDLER_H_
 #pragma once
 
+#include <vector>
+
 #include "include/cef_auth_callback.h"
 #include "include/cef_base.h"
 #include "include/cef_browser.h"
@@ -47,7 +49,7 @@
 #include "include/cef_response_filter.h"
 #include "include/cef_request.h"
 #include "include/cef_ssl_info.h"
-
+#include "include/cef_x509_certificate.h"
 
 ///
 // Callback interface used for asynchronous continuation of url requests.
@@ -70,6 +72,21 @@ class CefRequestCallback : public virtual CefBase {
 };
 
 
+///
+// Callback interface used to select a client certificate for authentication.
+///
+/*--cef(source=library)--*/
+class CefSelectClientCertificateCallback : public virtual CefBase {
+ public:
+  ///
+  // Chooses the specified certificate for client certificate authentication.
+  // NULL value means that no client certificate should be used.
+  ///
+  /*--cef(optional_param=cert)--*/
+  virtual void Select(CefRefPtr<CefX509Certificate> cert) =0;
+};
+
+
 ///
 // Implement this interface to handle events related to browser requests. The
 // methods of this class will be called on the thread indicated.
@@ -81,6 +98,7 @@ class CefRequestHandler : public virtual CefBase {
   typedef cef_termination_status_t TerminationStatus;
   typedef cef_urlrequest_status_t URLRequestStatus;
   typedef cef_window_open_disposition_t WindowOpenDisposition;
+  typedef std::vector<CefRefPtr<CefX509Certificate> > X509CertificateList;
 
   ///
   // Called on the UI thread before browser navigation. Return true to cancel
@@ -282,6 +300,29 @@ class CefRequestHandler : public virtual CefBase {
     return false;
   }
 
+  ///
+  // Called on the UI thread when a client certificate is being requested for
+  // authentication. Return false to use the default behavior and automatically
+  // select the first certificate available. Return true and call
+  // CefSelectClientCertificateCallback::Select either in this method or at a
+  // later time to select a certificate. Do not call Select or call it with NULL
+  // to continue without using any certificate. |isProxy| indicates whether the
+  // host is an HTTPS proxy or the origin server. |host| and |port| contains the
+  // hostname and port of the SSL server. |certificates| is the list of
+  // certificates to choose from; this list has already been pruned by Chromium
+  // so that it only contains certificates from issuers that the server trusts.
+  ///
+  /*--cef()--*/
+  virtual bool OnSelectClientCertificate(
+      CefRefPtr<CefBrowser> browser,
+      bool isProxy,
+      const CefString& host,
+      int port,
+      const X509CertificateList& certificates,
+      CefRefPtr<CefSelectClientCertificateCallback> callback) {
+    return false;
+  }
+
   ///
   // Called on the browser process UI thread when a plugin has crashed.
   // |plugin_path| is the path of the plugin that crashed.

src/include/cef_ssl_status.h

@@ -40,8 +40,7 @@
 
 #include "include/cef_base.h"
 #include "include/cef_values.h"
-
-class CefX509Certificate;
+#include "include/cef_x509_certificate.h"
 
 ///
 // Class representing the SSL information for a navigation entry.