Merge branch '146-linux' into 146-macos

Author: linesight

.gitignore

@@ -4,6 +4,9 @@ dist/
 cefpython3/*.pyd
 cefpython3/*.dll
 cefpython3/*.exe
+cefpython3/*.so
+cefpython3/*.so.*
+cefpython3/subprocess
 cefpython3/*.pak
 cefpython3/*.dat
 cefpython3/*.bin

README.md

@@ -53,11 +53,11 @@ You can also download packages for offline installation available on the [GitHub
 
 Below is a table with supported platforms, python versions and architectures.
 
-OS | Py2 | Py3 | 32bit | 64bit | Requirements
---- | --- | --- | --- | --- | ---
-Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 / 3.9 | Yes | Yes | Windows 7+ (Note that Python 3.9 supports Windows 8.1+)
-Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 8+, Ubuntu 14.04+,<br> Fedora 24+, openSUSE 13.3+
-Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+
+OS | Python | 32bit | 64bit | Requirements
+--- | --- | --- | --- | ---
+Windows | 3.10 / 3.11 / 3.12 / 3.13 / 3.14 | No | Yes | Windows 10+
+Linux | 3.10 / 3.11 / 3.12 / 3.13 / 3.14 | No | Yes | Ubuntu 20.04+, Debian 11+
+Mac | 3.10 / 3.11 / 3.12 / 3.13 / 3.14 | No | Yes | macOS 10.15+
 
 
 ## Examples

api/Browser.md

@@ -36,16 +36,13 @@ Table of contents:
   * [GetClientCallback](#getclientcallback)
   * [GetClientCallbacksDict](#getclientcallbacksdict)
   * [GetFocusedFrame](#getfocusedframe)
-  * [GetFrame](#getframe)
   * [GetFrameByIdentifier](#getframebyidentifier)
-  * [GetFrames](#getframes)
-  * [GetFrameCount](#getframecount)
-  * [GetFrameIdentifiers](#getframeidentifiers)
+  * [GetFrameByName](#getframebyname)
   * [GetFrameNames](#getframenames)
+  * [GetFrames](#getframes)
   * [GetImage](#getimage)
   * [GetJavascriptBindings](#getjavascriptbindings)
   * [GetMainFrame](#getmainframe)
-  * [GetNSTextInputContext](#getnstextinputcontext)
   * [GetOpenerWindowHandle](#getopenerwindowhandle)
   * [GetOuterWindowHandle](#getouterwindowhandle)
   * [GetSetting](#getsetting)
@@ -56,13 +53,10 @@ Table of contents:
   * [GetZoomLevel](#getzoomlevel)
   * [GoBack](#goback)
   * [GoForward](#goforward)
-  * [HandleKeyEventAfterTextInputClient](#handlekeyeventaftertextinputclient)
-  * [HandleKeyEventBeforeTextInputClient](#handlekeyeventbeforetextinputclient)
   * [HasDevTools](#hasdevtools)
   * [HasDocument](#hasdocument)
   * [Invalidate](#invalidate)
   * [IsFullscreen](#isfullscreen)
-  * [IsLoading](#isloading)
   * [IsPopup](#ispopup)
   * [IsWindowRenderingDisabled](#iswindowrenderingdisabled)
   * [LoadUrl](#loadurl)
@@ -107,6 +101,12 @@ Methods available in upstream CEF which were not yet exposed in CEF Python
 * ImeCommitText
 * ImeFinishComposingText
 * ImeCancelComposition
+* GetFrameCount
+* GetFrameIdentifiers
+* GetNSTextInputContext (Mac, OSR)
+* HandleKeyEventAfterTextInputClient (Mac, OSR)
+* HandleKeyEventBeforeTextInputClient (Mac, OSR)
+* IsLoading
 
 There are some edge cases when after the OnBeforeClose event browser objects
 are no more globally referenced thus a new instance is created that
@@ -169,7 +169,7 @@ information.
 
 | | |
 | --- | --- |
-| __Return__ | bool |
+| __Return__ | void |
 
 Explicitly close the associated DevTools browser, if any.
 
@@ -319,24 +319,17 @@ Calling javascript from native code synchronously is not possible in CEF 3. It i
 
 | Parameter | Type |
 | --- | --- |
-| searchId | int |
 | searchText | string |
 | forward | bool |
 | matchCase | bool |
 | findNext | bool |
 | __Return__ | void |
 
-Description from upstream CEF:
-
-> Search for |searchText|. |identifier| must be a unique ID and these IDs
-> must strictly increase so that newer requests always have greater IDs than
-> older requests. If |identifier| is zero or less than the previous ID value
-> then it will be automatically assigned a new valid ID. |forward| indicates
-> whether to search forward or backward within the page. |matchCase|
-> indicates whether the search should be case-sensitive. |findNext| indicates
-> whether this is the first request or a follow-up. The CefFindHandler
-> instance, if any, returned via CefClient::GetFindHandler will be called to
-> report find results.
+Search for |searchText|. |forward| indicates whether to search forward or
+backward within the page. |matchCase| indicates whether the search should be
+case-sensitive. |findNext| indicates whether this is the first request or a
+follow-up. The CefFindHandler instance, if any, returned via
+CefClient::GetFindHandler will be called to report find results.
 
 ### GetClientCallback
 
@@ -366,64 +359,46 @@ Get client callbacks as a dictionary.
 Returns the focused [Frame](Frame.md) for the browser window.
 
 
-### GetFrame
+### GetFrameByIdentifier
 
 | Parameter | Type |
 | --- | --- |
-| name | string |
+| identifier | string |
 | __Return__ | Frame |
 
-Returns the [Frame](Frame.md) with the specified name, or NULL if not found.
+Returns the [Frame](Frame.md) with the specified identifier, or None if not found.
 
 
-### GetFrameByIdentifier
+### GetFrameByName
 
 | Parameter | Type |
 | --- | --- |
-| identifier | long |
+| name | string |
 | __Return__ | Frame |
 
-Available only in CEF 3. Returns the [Frame](Frame.md) with the specified identifier, or None if not found.
-
-
-### GetFrames
-
-| | |
-| --- | --- |
-| __Return__ | list |
-
-Get all frames. This is an internal CEF Python implementation that uses GetFrameNames() and GetFrame() methods to list through all frames. The main frame is not included in that list.
+Returns the [Frame](Frame.md) with the specified name, or None if not found.
+This method should only be called on the UI thread.
 
 
-### GetFrameCount
+### GetFrameNames
 
 | | |
 | --- | --- |
-| __Return__ | int |
-
-Available only in CEF 3. Not yet implemented.
+| __Return__ | string[] |
 
-Returns the number of frames that currently exist.
+Returns the names of all existing frames. This list does not include the main frame.
+This method should only be called on the UI thread.
 
 
-### GetFrameIdentifiers
+### GetFrames
 
 | | |
 | --- | --- |
-| __Return__ | void |
-
-Available only in CEF 3. Not yet implemented.
-
-Returns the identifiers of all existing frames.
-
-
-### GetFrameNames
+| __Return__ | list |
 
-| | |
-| --- | --- |
-| __Return__ | string[] |
-
-Returns the names of all existing frames. This list does not include the main frame.
+Get all frames. This is a CEF Python helper that calls GetFrameNames() and
+GetFrameByName() to return a list of [Frame](Frame.md) objects. The main frame
+is not included in that list.
 
 
 ### GetImage
@@ -467,18 +442,6 @@ Returns the [JavascriptBindings](JavascriptBindings.md) object that was passed t
 Returns the main (top-level) [Frame](Frame.md) for the browser window.
 
 
-### GetNSTextInputContext
-
-| | |
-| --- | --- |
-| __Return__ | TextInputContext |
-
-Not yet ported. Available only in CEF 3.
-
-Get the NSTextInputContext implementation for enabling IME on Mac when
-window rendering is disabled.
-
-
 ### GetOpenerWindowHandle
 
 | | |
@@ -573,30 +536,6 @@ Navigate backwards.
 Navigate forwards.
 
 
-### HandleKeyEventAfterTextInputClient
-
-| Parameter | Type |
-| --- | --- |
-| keyEvent | eventHandle |
-| __Return__ | void |
-
-Available only in CEF 3. Not yet implemented.
-
-Performs any additional actions after NSTextInputClient handles the event.
-
-
-### HandleKeyEventBeforeTextInputClient
-
-| | |
-| --- | --- |
-| __Return__ | void |
-
-Available only in CEF 3. Not yet implemented.
-
-Handles a keyDown event prior to passing it through the NSTextInputClient
-machinery.
-
-
 ### HasDevTools
 
 | | |
@@ -636,24 +575,11 @@ Description from upstream CEF:
 
 ### IsFullscreen
 
-| | |
-| --- | --- |
-| __Return__ | void |
-
-Whether in fullscreen mode, see ToggleFullscreen().
-
-This function is Windows-only.
-
-
-### IsLoading
-
 | | |
 | --- | --- |
 | __Return__ | bool |
 
-Available only in CEF 3. Not yet implemented.
-
-Returns true if the browser is currently loading.
+Whether in fullscreen mode, see ToggleFullscreen(). Windows-only.
 
 
 ### IsPopup
@@ -686,9 +612,8 @@ Load url in the main frame.
 If the url is a local path it needs to start with the `file://` prefix.
 If the url contains special characters it may need proper handling.
 Starting with v66.1+ it is required for the app code to encode the url
-properly. You can use the `pathlib.PurePath.as_uri` in Python 3
-or `urllib.pathname2url` in Python 2 (`urllib.request.pathname2url`
-in Python 3) depending on your case.
+properly. You can use `pathlib.PurePath.as_uri` or
+`urllib.request.pathname2url` depending on your case.
 
 
 ### Navigate
@@ -781,7 +706,7 @@ this method will replace it with the specified |word|.
 | --- | --- |
 | enabled | bool |
 | min_size | list[width, height] |
-| max_size | list[width, heifght] |
+| max_size | list[width, height] |
 | __Return__ | void |
 
 Description from upstream CEF:

api/Cookie.md

@@ -31,6 +31,10 @@ Table of contents:
   * [GetHasExpires](#gethasexpires)
   * [SetExpires](#setexpires)
   * [GetExpires](#getexpires)
+  * [SetSameSite](#setsamesite)
+  * [GetSameSite](#getsamesite)
+  * [SetPriority](#setpriority)
+  * [GetPriority](#getpriority)
 
 
 ## Methods
@@ -56,6 +60,8 @@ The cookie may have the following keys:
 - lastAccess (datetime.datetime)  
 - hasExpires (bool)  
 - expires (datetime.datetime)  
+- sameSite (int)  
+- priority (int)  
 
 
 ### Get
@@ -261,3 +267,48 @@ Set the cookie expiration date. You should also call SetHasExpires().
 | __Return__ | datetime.datetime |
 
 Get the expires property.
+
+
+### SetSameSite
+
+| Parameter | Type |
+| --- | --- |
+| sameSite | int |
+| __Return__ | void |
+
+Set the cookie SameSite attribute. Use the `CEF_COOKIE_SAME_SITE_*` constants:
+- `CEF_COOKIE_SAME_SITE_UNSPECIFIED` (0)
+- `CEF_COOKIE_SAME_SITE_NO_RESTRICTION` (1)
+- `CEF_COOKIE_SAME_SITE_LAX_MODE` (2)
+- `CEF_COOKIE_SAME_SITE_STRICT_MODE` (3)
+
+
+### GetSameSite
+
+| | |
+| --- | --- |
+| __Return__ | int |
+
+Get the cookie SameSite attribute. See SetSameSite() for possible values.
+
+
+### SetPriority
+
+| Parameter | Type |
+| --- | --- |
+| priority | int |
+| __Return__ | void |
+
+Set the cookie priority. Use the `CEF_COOKIE_PRIORITY_*` constants:
+- `CEF_COOKIE_PRIORITY_LOW` (-1)
+- `CEF_COOKIE_PRIORITY_MEDIUM` (0)
+- `CEF_COOKIE_PRIORITY_HIGH` (1)
+
+
+### GetPriority
+
+| | |
+| --- | --- |
+| __Return__ | int |
+
+Get the cookie priority. See SetPriority() for possible values.