提交 cc72e8ca 编写于 作者: R Richard Wilkes

Update to CEF 76.1.13+gf19c584+chromium-76.0.3809.132 and Go 1.13

上级 218131e3
...@@ -133,9 +133,9 @@ func gocef_resource_handler_get_response_headers(self *C.cef_resource_handler_t, ...@@ -133,9 +133,9 @@ func gocef_resource_handler_get_response_headers(self *C.cef_resource_handler_t,
// Skip (skip) // Skip (skip)
// Skip response data when requested by a Range header. Skip over and discard // Skip response data when requested by a Range header. Skip over and discard
// |bytes_to_skip| bytes of response data. If data is available immediately // |bytes_to_skip| bytes of response data. If data is available immediately
// set |bytes_skipped| to the number of of bytes skipped and return true (1). // set |bytes_skipped| to the number of bytes skipped and return true (1). To
// To read the data at a later time set |bytes_skipped| to 0, return true (1) // read the data at a later time set |bytes_skipped| to 0, return true (1) and
// and execute |callback| when the data is available. To indicate failure set // execute |callback| when the data is available. To indicate failure set
// |bytes_skipped| to < 0 (e.g. -2 for ERR_FAILED) and return false (0). This // |bytes_skipped| to < 0 (e.g. -2 for ERR_FAILED) and return false (0). This
// function will be called in sequence but not from a dedicated thread. // function will be called in sequence but not from a dedicated thread.
func (d *ResourceHandler) Skip(bytes_to_skip int64, bytes_skipped *int64, callback *ResourceSkipCallback) int32 { func (d *ResourceHandler) Skip(bytes_to_skip int64, bytes_skipped *int64, callback *ResourceSkipCallback) int32 {
......
...@@ -41,6 +41,11 @@ type Settings struct { ...@@ -41,6 +41,11 @@ type Settings struct {
// Framework.framework" in the top-level app bundle. Also configurable using // Framework.framework" in the top-level app bundle. Also configurable using
// the "framework-dir-path" command-line switch. // the "framework-dir-path" command-line switch.
FrameworkDirPath string FrameworkDirPath string
// MainBundlePath (main_bundle_path)
// The path to the main bundle on macOS. If this value is empty then it
// defaults to the top-level app bundle. Also configurable using
// the "main-bundle-path" command-line switch.
MainBundlePath string
// MultiThreadedMessageLoop (multi_threaded_message_loop) // MultiThreadedMessageLoop (multi_threaded_message_loop)
// Set to true (1) to have the browser process message loop run in a separate // Set to true (1) to have the browser process message loop run in a separate
// thread. If false (0) than the CefDoMessageLoopWork() function must be // thread. If false (0) than the CefDoMessageLoopWork() function must be
...@@ -70,7 +75,7 @@ type Settings struct { ...@@ -70,7 +75,7 @@ type Settings struct {
CommandLineArgsDisabled int32 CommandLineArgsDisabled int32
// CachePath (cache_path) // CachePath (cache_path)
// The location where data for the global browser cache will be stored on // The location where data for the global browser cache will be stored on
// disk. In non-empty this must be either equal to or a child directory of // disk. If non-empty this must be either equal to or a child directory of
// CefSettings.root_cache_path. If empty then browsers will be created in // CefSettings.root_cache_path. If empty then browsers will be created in
// "incognito mode" where in-memory caches are used for storage and no data is // "incognito mode" where in-memory caches are used for storage and no data is
// persisted to disk. HTML5 databases such as localStorage will only persist // persisted to disk. HTML5 databases such as localStorage will only persist
...@@ -252,6 +257,7 @@ func (d *Settings) toNative(native *C.cef_settings_t) *C.cef_settings_t { ...@@ -252,6 +257,7 @@ func (d *Settings) toNative(native *C.cef_settings_t) *C.cef_settings_t {
native.no_sandbox = C.int(d.NoSandbox) native.no_sandbox = C.int(d.NoSandbox)
setCEFStr(d.BrowserSubprocessPath, &native.browser_subprocess_path) setCEFStr(d.BrowserSubprocessPath, &native.browser_subprocess_path)
setCEFStr(d.FrameworkDirPath, &native.framework_dir_path) setCEFStr(d.FrameworkDirPath, &native.framework_dir_path)
setCEFStr(d.MainBundlePath, &native.main_bundle_path)
native.multi_threaded_message_loop = C.int(d.MultiThreadedMessageLoop) native.multi_threaded_message_loop = C.int(d.MultiThreadedMessageLoop)
native.external_message_pump = C.int(d.ExternalMessagePump) native.external_message_pump = C.int(d.ExternalMessagePump)
native.windowless_rendering_enabled = C.int(d.WindowlessRenderingEnabled) native.windowless_rendering_enabled = C.int(d.WindowlessRenderingEnabled)
...@@ -294,6 +300,7 @@ func (n *C.cef_settings_t) intoGo(d *Settings) { ...@@ -294,6 +300,7 @@ func (n *C.cef_settings_t) intoGo(d *Settings) {
d.NoSandbox = int32(n.no_sandbox) d.NoSandbox = int32(n.no_sandbox)
d.BrowserSubprocessPath = cefstrToString(&n.browser_subprocess_path) d.BrowserSubprocessPath = cefstrToString(&n.browser_subprocess_path)
d.FrameworkDirPath = cefstrToString(&n.framework_dir_path) d.FrameworkDirPath = cefstrToString(&n.framework_dir_path)
d.MainBundlePath = cefstrToString(&n.main_bundle_path)
d.MultiThreadedMessageLoop = int32(n.multi_threaded_message_loop) d.MultiThreadedMessageLoop = int32(n.multi_threaded_message_loop)
d.ExternalMessagePump = int32(n.external_message_pump) d.ExternalMessagePump = int32(n.external_message_pump)
d.WindowlessRenderingEnabled = int32(n.windowless_rendering_enabled) d.WindowlessRenderingEnabled = int32(n.windowless_rendering_enabled)
......
此差异已折叠。
...@@ -318,12 +318,8 @@ func IsWebPluginUnstable(path string, callback *WebPluginUnstableCallback) { ...@@ -318,12 +318,8 @@ func IsWebPluginUnstable(path string, callback *WebPluginUnstableCallback) {
// LabelButtonCreate (cef_label_button_create from include/capi/views/cef_label_button_capi.h) // LabelButtonCreate (cef_label_button_create from include/capi/views/cef_label_button_capi.h)
// Create a new LabelButton. A |delegate| must be provided to handle the button // Create a new LabelButton. A |delegate| must be provided to handle the button
// click. |text| will be shown on the LabelButton and used as the default // click. |text| will be shown on the LabelButton and used as the default
// accessible name. If |with_frame| is true (1) the button will have a visible // accessible name.
// frame at all times, center alignment, additional padding and a default func LabelButtonCreate(delegate *ButtonDelegate, text string) *LabelButton {
// minimum size of 70x33 DIP. If |with_frame| is false (0) the button will only
// have a visible frame on hover/press, left alignment, less padding and no
// default minimum size.
func LabelButtonCreate(delegate *ButtonDelegate, text string, with_frame int32) *LabelButton {
var delegate_ *C.cef_button_delegate_t var delegate_ *C.cef_button_delegate_t
if delegate != nil { if delegate != nil {
delegate_ = delegate.toNative() delegate_ = delegate.toNative()
...@@ -333,7 +329,7 @@ func LabelButtonCreate(delegate *ButtonDelegate, text string, with_frame int32) ...@@ -333,7 +329,7 @@ func LabelButtonCreate(delegate *ButtonDelegate, text string, with_frame int32)
defer func() { defer func() {
C.cef_string_userfree_free(text_) C.cef_string_userfree_free(text_)
}() }()
return (*LabelButton)(C.cef_label_button_create(delegate_, (*C.cef_string_t)(text_), C.int(with_frame))) return (*LabelButton)(C.cef_label_button_create(delegate_, (*C.cef_string_t)(text_)))
} }
// ListValueCreate (cef_list_value_create from include/capi/cef_values_capi.h) // ListValueCreate (cef_list_value_create from include/capi/cef_values_capi.h)
...@@ -350,7 +346,7 @@ func ListValueCreate() *ListValue { ...@@ -350,7 +346,7 @@ func ListValueCreate() *ListValue {
// default minimum size of 70x33 DIP. If |with_frame| is false (0) the button // default minimum size of 70x33 DIP. If |with_frame| is false (0) the button
// will only have a visible frame on hover/press, left alignment, less padding // will only have a visible frame on hover/press, left alignment, less padding
// and no default minimum size. // and no default minimum size.
func MenuButtonCreate(delegate *MenuButtonDelegate, text string, with_frame int32) *MenuButton { func MenuButtonCreate(delegate *MenuButtonDelegate, text string) *MenuButton {
var delegate_ *C.cef_menu_button_delegate_t var delegate_ *C.cef_menu_button_delegate_t
if delegate != nil { if delegate != nil {
delegate_ = delegate.toNative() delegate_ = delegate.toNative()
...@@ -360,7 +356,7 @@ func MenuButtonCreate(delegate *MenuButtonDelegate, text string, with_frame int3 ...@@ -360,7 +356,7 @@ func MenuButtonCreate(delegate *MenuButtonDelegate, text string, with_frame int3
defer func() { defer func() {
C.cef_string_userfree_free(text_) C.cef_string_userfree_free(text_)
}() }()
return (*MenuButton)(C.cef_menu_button_create(delegate_, (*C.cef_string_t)(text_), C.int(with_frame))) return (*MenuButton)(C.cef_menu_button_create(delegate_, (*C.cef_string_t)(text_)))
} }
// MenuModelCreate (cef_menu_model_create from include/capi/cef_menu_model_capi.h) // MenuModelCreate (cef_menu_model_create from include/capi/cef_menu_model_capi.h)
......
...@@ -8,11 +8,18 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb ...@@ -8,11 +8,18 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/richardwilkes/toolbox v1.9.3 h1:G9muaw+Ck30Md2PPiEDiemMMmN2yMaB4G67ViZEW6mw= github.com/richardwilkes/toolbox v1.9.3 h1:G9muaw+Ck30Md2PPiEDiemMMmN2yMaB4G67ViZEW6mw=
github.com/richardwilkes/toolbox v1.9.3/go.mod h1:lmtR34kHPv+/xe9ctPnnEuBrBE2ViIcFNSzOCMbHKWo= github.com/richardwilkes/toolbox v1.9.3/go.mod h1:lmtR34kHPv+/xe9ctPnnEuBrBE2ViIcFNSzOCMbHKWo=
github.com/richardwilkes/toolbox v1.11.0 h1:VBF/o3tj5jSfX7oiC0vQFrFjOvaY81O6bAA/RatL97c=
github.com/richardwilkes/toolbox v1.11.0/go.mod h1:ZUs/21ySApPLS/ZIlNhCQ42nBOrSxlwP+9TUzizlq/c=
github.com/richardwilkes/toolbox v1.12.0 h1:dGxzOJ47zi7LegvkPoZCZJZDOKSzEUii/793SOrbnXI=
github.com/richardwilkes/toolbox v1.12.0/go.mod h1:1JkSR/OTdnDZmhE4RtQVMWOII+5yGnEP3g247IQu3PE=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0 h1:HyfiK1WMnHj5FXFXatD+Qs1A/xC2Run6RzeW1SyHxpc= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0 h1:HyfiK1WMnHj5FXFXatD+Qs1A/xC2Run6RzeW1SyHxpc=
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
......
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
"github.com/richardwilkes/toolbox/cmdline" "github.com/richardwilkes/toolbox/cmdline"
) )
const desiredCEFVersion = "75.1.4+g4210896+chromium-75.0.3770.100" const desiredCEFVersion = "76.1.13+gf19c584+chromium-76.0.3809.132"
func main() { func main() {
cmdline.CopyrightYears = "2018-2019" cmdline.CopyrightYears = "2018-2019"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册