提交 91be74cc 编写于 作者: yanghye's avatar yanghye

修复 CEFChromium_CreateClientHandler 错误

上级 1c84a79f
......@@ -80,7 +80,8 @@ type IChromiumProc interface {
//SendProcessMessage(targetProcess CefProcessId, processMessage *ICefProcessMessage)
CefClient() *ICefClient
SendProcessMessageForJSONBytes(name string, targetProcess CefProcessId, message argument.IList)
CreateClientHandler(client *ICefClient, alsOSR bool) bool
CreateClientHandler(alsOSR bool) bool
CreateClientHandlerAndResult(alsOSR bool) (*ICefClient, bool)
SetFocus(value bool)
SendExternalBeginFrame()
SendKeyEvent(event *TCefKeyEvent)
......@@ -603,11 +604,24 @@ func (m *TCEFChromium) ExecuteDevToolsMethod(messageId int32, method string, dic
_CEFChromium_ExecuteDevToolsMethod(m.Instance(), messageId, method, dictionaryValue)
}
func (m *TCEFChromium) CreateClientHandler(client *ICefClient, alsOSR bool) bool {
func (m *TCEFChromium) CreateClientHandler(alsOSR bool) bool {
if !m.IsValid() {
return false
}
return api.GoBool(_CEFChromium_CreateClientHandler(m.Instance(), client.Instance(), api.PascalBool(alsOSR)))
var result uintptr
return api.GoBool(_CEFChromium_CreateClientHandler(m.Instance(), uintptr(unsafe.Pointer(&result)), api.PascalBool(false), api.PascalBool(alsOSR)))
}
func (m *TCEFChromium) CreateClientHandlerAndResult(alsOSR bool) (*ICefClient, bool) {
if !m.IsValid() {
return nil, false
}
var result uintptr
ok := api.GoBool(_CEFChromium_CreateClientHandler(m.Instance(), uintptr(unsafe.Pointer(&result)), api.PascalBool(true), api.PascalBool(alsOSR)))
if result != 0 {
return &ICefClient{instance: unsafe.Pointer(result), ct: CtOther}, ok
}
return nil, false
}
func (m *TCEFChromium) SetFocus(value bool) {
......@@ -1755,8 +1769,8 @@ func _CEFChromium_ExecuteDevToolsMethod(instance uintptr, messageId int32, metho
}
// TCEFChromium _CEFChromium_CreateClientHandler
func _CEFChromium_CreateClientHandler(instance, client, alsOSR uintptr) uintptr {
r1, _, _ := imports.Proc(def.CEFChromium_CreateClientHandler).Call(instance, client, alsOSR)
func _CEFChromium_CreateClientHandler(instance, client, result, alsOSR uintptr) uintptr {
r1, _, _ := imports.Proc(def.CEFChromium_CreateClientHandler).Call(instance, client, result, alsOSR)
return r1
}
......
......@@ -65,10 +65,15 @@ func (m *ICefClient) Free() {
}
}
// IsSelfEvent
// 当前client对象是自己事件代理
func (m *ICefClient) IsSelfEvent() bool {
return m.ct == consts.CtSelfOwn
}
// IsOtherEvent
// 当前client对象是其他对象事件代理
// 例如chromium events
func (m *ICefClient) IsOtherEvent() bool {
return m.ct == consts.CtOther
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册