mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
- Update to Chromium revision 133430.
- Move custom scheme registration to CefApp::OnRegisterCustomSchemes(). This is required by the introduction of ContentClient::AddAdditionalSchemes() and fixes a race condition when registering standard schemes in different processes. - Execute V8 functions using V8Proxy. This is required for inspector instrumentation to work correctly and fixes an assertion in WebCore related to V8RecursionScope. - Enable verbose V8 TryCatch logging. - Mac: Expose UnderlayOpenGLHostingWindow interface that should be used for all CEF windows. - Add CefSettings.remote_debugging_port option. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@602 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@ -15,6 +15,7 @@
|
||||
#include "libcef_dll/cpptoc/render_process_handler_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h"
|
||||
#include "libcef_dll/ctocpp/command_line_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/scheme_registrar_ctocpp.h"
|
||||
|
||||
|
||||
// MEMBER FUNCTIONS - Body may be edited by hand.
|
||||
@ -39,6 +40,23 @@ void CEF_CALLBACK app_on_before_command_line_processing(struct _cef_app_t* self,
|
||||
CefCommandLineCToCpp::Wrap(command_line));
|
||||
}
|
||||
|
||||
void CEF_CALLBACK app_on_register_custom_schemes(struct _cef_app_t* self,
|
||||
struct _cef_scheme_registrar_t* registrar) {
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
DCHECK(self);
|
||||
if (!self)
|
||||
return;
|
||||
// Verify param: registrar; type: refptr_diff
|
||||
DCHECK(registrar);
|
||||
if (!registrar)
|
||||
return;
|
||||
|
||||
// Execute
|
||||
CefAppCppToC::Get(self)->OnRegisterCustomSchemes(
|
||||
CefSchemeRegistrarCToCpp::Wrap(registrar));
|
||||
}
|
||||
|
||||
struct _cef_render_process_handler_t* CEF_CALLBACK app_get_render_process_handler(
|
||||
struct _cef_app_t* self) {
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
@ -94,6 +112,7 @@ CefAppCppToC::CefAppCppToC(CefApp* cls)
|
||||
: CefCppToC<CefAppCppToC, CefApp, cef_app_t>(cls) {
|
||||
struct_.struct_.on_before_command_line_processing =
|
||||
app_on_before_command_line_processing;
|
||||
struct_.struct_.on_register_custom_schemes = app_on_register_custom_schemes;
|
||||
struct_.struct_.get_render_process_handler = app_get_render_process_handler;
|
||||
struct_.struct_.get_resource_bundle_handler = app_get_resource_bundle_handler;
|
||||
struct_.struct_.get_proxy_handler = app_get_proxy_handler;
|
||||
|
@ -212,24 +212,24 @@ void CEF_CALLBACK frame_load_string(struct _cef_frame_t* self,
|
||||
}
|
||||
|
||||
void CEF_CALLBACK frame_execute_java_script(struct _cef_frame_t* self,
|
||||
const cef_string_t* jsCode, const cef_string_t* scriptUrl,
|
||||
int startLine) {
|
||||
const cef_string_t* code, const cef_string_t* script_url,
|
||||
int start_line) {
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
DCHECK(self);
|
||||
if (!self)
|
||||
return;
|
||||
// Verify param: jsCode; type: string_byref_const
|
||||
DCHECK(jsCode);
|
||||
if (!jsCode)
|
||||
// Verify param: code; type: string_byref_const
|
||||
DCHECK(code);
|
||||
if (!code)
|
||||
return;
|
||||
// Unverified params: scriptUrl
|
||||
// Unverified params: script_url
|
||||
|
||||
// Execute
|
||||
CefFrameCppToC::Get(self)->ExecuteJavaScript(
|
||||
CefString(jsCode),
|
||||
CefString(scriptUrl),
|
||||
startLine);
|
||||
CefString(code),
|
||||
CefString(script_url),
|
||||
start_line);
|
||||
}
|
||||
|
||||
int CEF_CALLBACK frame_is_main(struct _cef_frame_t* self) {
|
||||
|
55
libcef_dll/cpptoc/scheme_registrar_cpptoc.cc
Normal file
55
libcef_dll/cpptoc/scheme_registrar_cpptoc.cc
Normal file
@ -0,0 +1,55 @@
|
||||
// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
|
||||
// reserved. Use of this source code is governed by a BSD-style license that
|
||||
// can be found in the LICENSE file.
|
||||
//
|
||||
// ---------------------------------------------------------------------------
|
||||
//
|
||||
// This file was generated by the CEF translator tool. If making changes by
|
||||
// hand only do so within the body of existing method and function
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
|
||||
#include "libcef_dll/cpptoc/scheme_registrar_cpptoc.h"
|
||||
|
||||
|
||||
// MEMBER FUNCTIONS - Body may be edited by hand.
|
||||
|
||||
int CEF_CALLBACK scheme_registrar_add_custom_scheme(
|
||||
struct _cef_scheme_registrar_t* self, const cef_string_t* scheme_name,
|
||||
int is_standard, int is_local, int is_display_isolated) {
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
DCHECK(self);
|
||||
if (!self)
|
||||
return 0;
|
||||
// Verify param: scheme_name; type: string_byref_const
|
||||
DCHECK(scheme_name);
|
||||
if (!scheme_name)
|
||||
return 0;
|
||||
|
||||
// Execute
|
||||
bool _retval = CefSchemeRegistrarCppToC::Get(self)->AddCustomScheme(
|
||||
CefString(scheme_name),
|
||||
is_standard?true:false,
|
||||
is_local?true:false,
|
||||
is_display_isolated?true:false);
|
||||
|
||||
// Return type: bool
|
||||
return _retval;
|
||||
}
|
||||
|
||||
|
||||
// CONSTRUCTOR - Do not edit by hand.
|
||||
|
||||
CefSchemeRegistrarCppToC::CefSchemeRegistrarCppToC(CefSchemeRegistrar* cls)
|
||||
: CefCppToC<CefSchemeRegistrarCppToC, CefSchemeRegistrar,
|
||||
cef_scheme_registrar_t>(cls) {
|
||||
struct_.struct_.add_custom_scheme = scheme_registrar_add_custom_scheme;
|
||||
}
|
||||
|
||||
#ifndef NDEBUG
|
||||
template<> long CefCppToC<CefSchemeRegistrarCppToC, CefSchemeRegistrar,
|
||||
cef_scheme_registrar_t>::DebugObjCt = 0;
|
||||
#endif
|
||||
|
37
libcef_dll/cpptoc/scheme_registrar_cpptoc.h
Normal file
37
libcef_dll/cpptoc/scheme_registrar_cpptoc.h
Normal file
@ -0,0 +1,37 @@
|
||||
// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
|
||||
// reserved. Use of this source code is governed by a BSD-style license that
|
||||
// can be found in the LICENSE file.
|
||||
//
|
||||
// ---------------------------------------------------------------------------
|
||||
//
|
||||
// This file was generated by the CEF translator tool. If making changes by
|
||||
// hand only do so within the body of existing method and function
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
|
||||
#ifndef CEF_LIBCEF_DLL_CPPTOC_SCHEME_REGISTRAR_CPPTOC_H_
|
||||
#define CEF_LIBCEF_DLL_CPPTOC_SCHEME_REGISTRAR_CPPTOC_H_
|
||||
#pragma once
|
||||
|
||||
#ifndef BUILDING_CEF_SHARED
|
||||
#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
|
||||
#else // BUILDING_CEF_SHARED
|
||||
|
||||
#include "include/cef_scheme.h"
|
||||
#include "include/capi/cef_scheme_capi.h"
|
||||
#include "libcef_dll/cpptoc/cpptoc.h"
|
||||
|
||||
// Wrap a C++ class with a C structure.
|
||||
// This class may be instantiated and accessed DLL-side only.
|
||||
class CefSchemeRegistrarCppToC
|
||||
: public CefCppToC<CefSchemeRegistrarCppToC, CefSchemeRegistrar,
|
||||
cef_scheme_registrar_t> {
|
||||
public:
|
||||
explicit CefSchemeRegistrarCppToC(CefSchemeRegistrar* cls);
|
||||
virtual ~CefSchemeRegistrarCppToC() {}
|
||||
};
|
||||
|
||||
#endif // BUILDING_CEF_SHARED
|
||||
#endif // CEF_LIBCEF_DLL_CPPTOC_SCHEME_REGISTRAR_CPPTOC_H_
|
||||
|
Reference in New Issue
Block a user