Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 19f1366

Browse files
Merge pull request #133 from livecode/updatecef_3729
[[ CEF ]] Update to 74.1.16+ge20b240+chromium-74.0.3729.131
2 parents 8605495 + 4af0deb commit 19f1366

File tree

447 files changed

+16428
-12269
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

447 files changed

+16428
-12269
lines changed

libcef/Makefile

Lines changed: 0 additions & 8 deletions
This file was deleted.

libcef/Makefile.libcef

Lines changed: 0 additions & 22 deletions
This file was deleted.

libcef/Makefile.libcefwrapper

Lines changed: 0 additions & 223 deletions
This file was deleted.

libcef/UPDATE.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Steps for updating CEF
2+
3+
- Go to http://opensource.spotify.com/cefbuilds/index.html
4+
- Download the latest standard distribution for Windows or Linux and extract
5+
- Delete `thirdparty/libcef/include` and `thirdparty/libcef/libcef_dll`
6+
- Copy `include` and `libcef_dll` from the CEF build to `thirdparty/libcef`
7+
- CD to `thirdparty/libcef`
8+
- Execute `python gen_libcef_paths.py libcef_dll > libcef.gypi`
9+
- Execute `python gen_libcef_stubs.py include > libcef.stubs`
10+
- Stderr will list unknown parameter or return types so edit `gen_libcef_stubs.py`
11+
to add them and run again
12+
- Copy binaries and resources from the CEF build to the prebuilt folders checking
13+
for any new file names to update in the gyp files and prebuilt builder. Note copy
14+
the binaries from the Release folder even to the debug prebuilt folders.
15+
- Reconfigure and build
16+
- Fix any API changes and make sure things work
17+
- Update `prebuilt/versions/cef` and `prebuilt/versions/cef_buildrevision`
18+
- Push up a patch to livecode and thirdparty
19+
- Kick off prebuilts

libcef/gen_libcef_paths.py

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#!/usr/bin/env python
2+
3+
import os
4+
import sys
5+
import posixpath
6+
7+
def log(pMsg):
8+
sys.stderr.write(pMsg + "\n")
9+
sys.stderr.flush()
10+
11+
def gen_paths_file(pPaths):
12+
tFileList = []
13+
14+
for tPath in pPaths:
15+
for tRoot, tFolders, tFiles in os.walk(tPath):
16+
if os.path.basename(tRoot) != "test":
17+
tFileNames = filter(lambda(s) : s.endswith(".h") or s.endswith(".cc"), tFiles)
18+
19+
tRoot = tRoot.replace(os.path.sep, "/")
20+
21+
for tFile in tFileNames:
22+
tFileList.append("\t\t\t'" + posixpath.join(tRoot, tFile) + "',")
23+
24+
tFileList.sort()
25+
26+
print "{\n"
27+
print "\t'variables': {\n"
28+
print "\t\t'libcef_dll_sources': [\n"
29+
30+
print "\n".join(tFileList)
31+
32+
print "\t\t]\n\t}\n}\n"
33+
34+
35+
#get include folder from the command line
36+
tPaths = ["."]
37+
if len(sys.argv) > 1:
38+
tPaths = sys.argv[1:]
39+
40+
gen_paths_file(tPaths)

libcef/gen_libcef_stubs.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77

88
_s_type_table = {
99
"int":"integer",
10+
"int16":"integer",
11+
"uint16":"integer",
12+
"cef_platform_thread_id_t":"integer",
13+
"cef_platform_thread_handle_t":"integer",
1014
"int32":"integer",
1115
"uint32":"integer",
1216
"int64":"integer64",
@@ -17,6 +21,9 @@
1721
"time_t":"integer64",
1822
"cef_json_parser_options_t":"integer",
1923
"cef_json_writer_options_t":"integer",
24+
"cef_thread_priority_t":"integer",
25+
"cef_message_loop_type_t":"integer",
26+
"cef_com_init_mode_t":"integer",
2027
"cef_path_key_t":"integer",
2128
"cef_string_list_t":"pointer",
2229
"cef_string_map_t":"pointer",
@@ -73,7 +80,9 @@ def conv_to_stub(pSig):
7380
tStubParams = []
7481

7582
tStubTypesKnown, tStubReturnType = cef_type_to_stub_type(tReturnType)
76-
83+
if not tStubTypesKnown:
84+
log("unknown type: " + tStubReturnType)
85+
7786
if len(tParams) > 0:
7887
tSplit = tParams.split(",")
7988

@@ -122,7 +131,7 @@ def gen_stubs_file(pPaths):
122131

123132
tSignatureList.sort()
124133

125-
print "cef ./CEF/libcef ./CEF/libcef ./CEF/libcef"
134+
print "cef ./Externals/CEF/libcef ./Externals/CEF/libcef ./Externals/CEF/libcef"
126135
print "\n".join(tSignatureList)
127136

128137
#get include folder from the command line

libcef/include/base/cef_basictypes.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,16 @@ typedef int int32;
6464
typedef unsigned int uint32;
6565
#endif
6666

67+
#ifndef _INT16
68+
#define _INT16
69+
typedef short int16;
70+
#endif
71+
72+
#ifndef _UINT16
73+
#define _UINT16
74+
typedef unsigned short uint16;
75+
#endif
76+
6777
// UTF-16 character type.
6878
// This should be kept synchronized with base/strings/string16.h
6979
#ifndef char16

libcef/include/base/cef_build.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,16 @@
162162
#define ALLOW_UNUSED_LOCAL(x) false ? (void)x : (void)0
163163
#endif
164164

165+
// Sanitizers annotations.
166+
#if defined(__has_attribute)
167+
#if __has_attribute(no_sanitize)
168+
#define NO_SANITIZE(what) __attribute__((no_sanitize(what)))
169+
#endif
170+
#endif
171+
#if !defined(NO_SANITIZE)
172+
#define NO_SANITIZE(what)
173+
#endif
174+
165175
#endif // !USING_CHROMIUM_INCLUDES
166176

167177
// Annotate a virtual method indicating it must be overriding a virtual method

0 commit comments

Comments
 (0)