Skip to content

Commit cd9613f

Browse files
committed
Update to Chromium v57 on Mac (cztomczak#341).
Print user agent and cefpython version in tutorial.py example. Print various version info in main_test.py.
1 parent b89b93f commit cd9613f

File tree

4 files changed

+22
-13
lines changed

4 files changed

+22
-13
lines changed

examples/tutorial.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
window.onload = function(){
4343
js_print("Javascript", "window.onload", "Called");
4444
js_print("Javascript", "python_property", python_property);
45+
js_print("Javascript", "navigator.userAgent", navigator.userAgent);
46+
js_print("Javascript", "cefpython_version", cefpython_version.version);
4547
html_to_data_uri("test", js_callback_1);
4648
external.test_multiple_callbacks(js_callback_2);
4749
};
@@ -113,6 +115,7 @@ def set_javascript_bindings(browser):
113115
bindings = cef.JavascriptBindings(
114116
bindToFrames=False, bindToPopups=False)
115117
bindings.SetProperty("python_property", "This property was set in Python")
118+
bindings.SetProperty("cefpython_version", cef.GetVersion())
116119
bindings.SetFunction("html_to_data_uri", html_to_data_uri)
117120
bindings.SetObject("external", external)
118121
browser.SetJavascriptBindings(bindings)

src/compile_time_constants.pxi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# This file was generated by setup.py
2-
DEF UNAME_SYSNAME = "Linux"
3-
DEF PY_MAJOR_VERSION = 2
2+
DEF UNAME_SYSNAME = "Darwin"
3+
DEF PY_MAJOR_VERSION = 3

src/version/cef_version_mac.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@
3535
#ifndef CEF_INCLUDE_CEF_VERSION_H_
3636
#define CEF_INCLUDE_CEF_VERSION_H_
3737

38-
#define CEF_VERSION "3.2924.1575.g97389a9"
38+
#define CEF_VERSION "3.2987.1601.gf035232"
3939
#define CEF_VERSION_MAJOR 3
40-
#define CEF_COMMIT_NUMBER 1575
41-
#define CEF_COMMIT_HASH "97389a92ee2309ded830338d6afd61ba109d31d8"
40+
#define CEF_COMMIT_NUMBER 1601
41+
#define CEF_COMMIT_HASH "f035232c082f837d2b85bd7821a93a54fc742775"
4242
#define COPYRIGHT_YEAR 2017
4343

44-
#define CHROME_VERSION_MAJOR 56
44+
#define CHROME_VERSION_MAJOR 57
4545
#define CHROME_VERSION_MINOR 0
46-
#define CHROME_VERSION_BUILD 2924
47-
#define CHROME_VERSION_PATCH 76
46+
#define CHROME_VERSION_BUILD 2987
47+
#define CHROME_VERSION_PATCH 133
4848

4949
#define DO_MAKE_STRING(p) #p
5050
#define MAKE_STRING(p) DO_MAKE_STRING(p)
@@ -63,13 +63,13 @@ extern "C" {
6363
// universal hash value will change if any platform is affected whereas the
6464
// platform hash values will change only if that particular platform is
6565
// affected.
66-
#define CEF_API_HASH_UNIVERSAL "66de193ba22e1d92a99bb29d60f3107709aeefda"
66+
#define CEF_API_HASH_UNIVERSAL "b0a24e3e202f3d8b72f2fbc1ebc5864f96ec16ae"
6767
#if defined(OS_WIN)
68-
#define CEF_API_HASH_PLATFORM "8055740cd08db66cefe838a826dc90806fadfb33"
68+
#define CEF_API_HASH_PLATFORM "1c6a27f840ac87c8c971350c907edbe2c5fa0387"
6969
#elif defined(OS_MACOSX)
70-
#define CEF_API_HASH_PLATFORM "12d8ab423df369b68d37c3667123a1812bc0d345"
70+
#define CEF_API_HASH_PLATFORM "1567db600ee83cc2a59bb8c17ca416d11a7c9b8a"
7171
#elif defined(OS_LINUX)
72-
#define CEF_API_HASH_PLATFORM "86ab23c0d7dafbdff7f66764cf8dac5ec1712af4"
72+
#define CEF_API_HASH_PLATFORM "1f9f9e15bf7cf13de2557ddd411dfc9f694503b0"
7373
#endif
7474

7575
// Returns CEF version information for the libcef library. The |entry|

unittests/main_test.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import sys
1515

1616
# To show the window for an extended period of time increase this number.
17-
MESSAGE_LOOP_RANGE = 100 # each iteration is 0.01 sec
17+
MESSAGE_LOOP_RANGE = 200 # each iteration is 0.01 sec
1818

1919
g_datauri_data = """
2020
<!DOCTYPE html>
@@ -36,6 +36,11 @@
3636
window.onload = function(){
3737
print("window.onload() ok");
3838
39+
version = cefpython_version
40+
print("CEF Python: <b>"+version.version+"</b>");
41+
print("Chrome: <b>"+version.chrome_version+"</b>");
42+
print("CEF: <b>"+version.cef_version+"</b>");
43+
3944
// Test binding property: test_property1
4045
if (test_property1 == "Test binding property to the 'window' object") {
4146
print("test_property_1 ok");
@@ -140,6 +145,7 @@ def test_main(self):
140145
bindings.SetFunction("test_function", external.test_function)
141146
bindings.SetProperty("test_property1", external.test_property1)
142147
bindings.SetProperty("test_property2", external.test_property2)
148+
bindings.SetProperty("cefpython_version", cef.GetVersion())
143149
bindings.SetObject("external", external)
144150
browser.SetJavascriptBindings(bindings)
145151
subtest_message("browser.SetJavascriptBindings() ok")

0 commit comments

Comments
 (0)