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

Commit 02d5181

Browse files
committed
[[ CEF ]] Update to a more recent version of 2704
The available builds for CEF 2704 us tcmalloc until around 6th June 2016. We cannot use linux builds which use tcmalloc, so this updates to the earliest version of CEF for which builds are available which do not use it.
1 parent 72dee21 commit 02d5181

9 files changed

Lines changed: 61 additions & 31 deletions

File tree

libcef/include/capi/cef_browser_capi.h

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -448,10 +448,13 @@ typedef struct _cef_browser_host_t {
448448
int clearSelection);
449449

450450
///
451-
// Open developer tools in its own window. If |inspect_element_at| is non-
452-
// NULL the element at the specified (x,y) location will be inspected. The
453-
// |windowInfo| parameter will be ignored if this browser is wrapped in a
454-
// cef_browser_view_t.
451+
// Open developer tools (DevTools) in its own browser. The DevTools browser
452+
// will remain associated with this browser. If the DevTools browser is
453+
// already open then it will be focused, in which case the |windowInfo|,
454+
// |client| and |settings| parameters will be ignored. If |inspect_element_at|
455+
// is non-NULL then the element at the specified (x,y) location will be
456+
// inspected. The |windowInfo| parameter will be ignored if this browser is
457+
// wrapped in a cef_browser_view_t.
455458
///
456459
void (CEF_CALLBACK *show_dev_tools)(struct _cef_browser_host_t* self,
457460
const struct _cef_window_info_t* windowInfo,
@@ -460,11 +463,16 @@ typedef struct _cef_browser_host_t {
460463
const cef_point_t* inspect_element_at);
461464

462465
///
463-
// Explicitly close the developer tools window if one exists for this browser
464-
// instance.
466+
// Explicitly close the associated DevTools browser, if any.
465467
///
466468
void (CEF_CALLBACK *close_dev_tools)(struct _cef_browser_host_t* self);
467469

470+
///
471+
// Returns true (1) if this browser currently has an associated DevTools
472+
// browser. Must be called on the browser process UI thread.
473+
///
474+
int (CEF_CALLBACK *has_dev_tools)(struct _cef_browser_host_t* self);
475+
468476
///
469477
// Retrieve a snapshot of current navigation entries as values sent to the
470478
// specified visitor. If |current_only| is true (1) only the current

libcef/include/capi/cef_request_context_capi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ CEF_EXPORT cef_request_context_t* cef_request_context_create_context(
279279
// Creates a new context object that shares storage with |other| and uses an
280280
// optional |handler|.
281281
///
282-
CEF_EXPORT cef_request_context_t* create_context_shared(
282+
CEF_EXPORT cef_request_context_t* cef_create_context_shared(
283283
cef_request_context_t* other,
284284
struct _cef_request_context_handler_t* handler);
285285

libcef/include/cef_browser.h

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -490,24 +490,34 @@ class CefBrowserHost : public virtual CefBase {
490490
virtual void StopFinding(bool clearSelection) =0;
491491

492492
///
493-
// Open developer tools in its own window. If |inspect_element_at| is non-
494-
// empty the element at the specified (x,y) location will be inspected. The
495-
// |windowInfo| parameter will be ignored if this browser is wrapped in a
496-
// CefBrowserView.
497-
///
498-
/*--cef(optional_param=inspect_element_at)--*/
493+
// Open developer tools (DevTools) in its own browser. The DevTools browser
494+
// will remain associated with this browser. If the DevTools browser is
495+
// already open then it will be focused, in which case the |windowInfo|,
496+
// |client| and |settings| parameters will be ignored. If |inspect_element_at|
497+
// is non-empty then the element at the specified (x,y) location will be
498+
// inspected. The |windowInfo| parameter will be ignored if this browser is
499+
// wrapped in a CefBrowserView.
500+
///
501+
/*--cef(optional_param=windowInfo,optional_param=client,
502+
optional_param=settings,optional_param=inspect_element_at)--*/
499503
virtual void ShowDevTools(const CefWindowInfo& windowInfo,
500504
CefRefPtr<CefClient> client,
501505
const CefBrowserSettings& settings,
502506
const CefPoint& inspect_element_at) =0;
503507

504508
///
505-
// Explicitly close the developer tools window if one exists for this browser
506-
// instance.
509+
// Explicitly close the associated DevTools browser, if any.
507510
///
508511
/*--cef()--*/
509512
virtual void CloseDevTools() =0;
510513

514+
///
515+
// Returns true if this browser currently has an associated DevTools browser.
516+
// Must be called on the browser process UI thread.
517+
///
518+
/*--cef()--*/
519+
virtual bool HasDevTools() =0;
520+
511521
///
512522
// Retrieve a snapshot of current navigation entries as values sent to the
513523
// specified visitor. If |current_only| is true only the current navigation

libcef/include/cef_request_context.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class CefRequestContext : public virtual CefBase {
104104
// Creates a new context object that shares storage with |other| and uses an
105105
// optional |handler|.
106106
///
107-
/*--cef(capi_name=create_context_shared,optional_param=handler)--*/
107+
/*--cef(capi_name=cef_create_context_shared,optional_param=handler)--*/
108108
static CefRefPtr<CefRequestContext> CreateContext(
109109
CefRefPtr<CefRequestContext> other,
110110
CefRefPtr<CefRequestContextHandler> handler);

libcef/include/cef_version.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@
3535
#ifndef CEF_INCLUDE_CEF_VERSION_H_
3636
#define CEF_INCLUDE_CEF_VERSION_H_
3737

38-
#define CEF_VERSION "3.2704.1414.g185cd6c"
38+
#define CEF_VERSION "3.2704.1434.gec3e9ed"
3939
#define CEF_VERSION_MAJOR 3
40-
#define CEF_COMMIT_NUMBER 1414
41-
#define CEF_COMMIT_HASH "185cd6c507a018593d310742fa5c7fa3adc53cb4"
40+
#define CEF_COMMIT_NUMBER 1434
41+
#define CEF_COMMIT_HASH "ec3e9ed7fecc0d9f37a96951ba1bb26fd4f64dc7"
4242
#define COPYRIGHT_YEAR 2016
4343

4444
#define CHROME_VERSION_MAJOR 51
4545
#define CHROME_VERSION_MINOR 0
4646
#define CHROME_VERSION_BUILD 2704
47-
#define CHROME_VERSION_PATCH 47
47+
#define CHROME_VERSION_PATCH 103
4848

4949
#define DO_MAKE_STRING(p) #p
5050
#define MAKE_STRING(p) DO_MAKE_STRING(p)
@@ -63,13 +63,13 @@ extern "C" {
6363
// universal hash value will change if any platform is affected whereas the
6464
// platform hash values will change only if that particular platform is
6565
// affected.
66-
#define CEF_API_HASH_UNIVERSAL "0b16f480992a3e268258b39d728782f2349edab2"
66+
#define CEF_API_HASH_UNIVERSAL "a4358963bc66adefedbf3008a83007e89afffab9"
6767
#if defined(OS_WIN)
68-
#define CEF_API_HASH_PLATFORM "8e32000be3c4a4057057f32973e413b3c9517a9c"
68+
#define CEF_API_HASH_PLATFORM "770131916655f914b4659d82ef08993bf9cfdc22"
6969
#elif defined(OS_MACOSX)
70-
#define CEF_API_HASH_PLATFORM "698ca8f4b36d446333755ba6431ba0ab42a814cb"
70+
#define CEF_API_HASH_PLATFORM "95517cba92239cc69c4267a649c6dad0781f245c"
7171
#elif defined(OS_LINUX)
72-
#define CEF_API_HASH_PLATFORM "9d132433b77eaf33fc9f0fc9059a6eae3d386e63"
72+
#define CEF_API_HASH_PLATFORM "5963da3614d469320c9cc726ce7d838280132c26"
7373
#endif
7474

7575
// Returns CEF version information for the libcef library. The |entry|

libcef/libcef.stubs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ cef ./CEF/libcef ./CEF/libcef ./CEF/libcef
1515
cef_command_line_get_global: () -> (pointer)
1616
cef_cookie_manager_create_manager: (pointer,integer,pointer) -> (pointer)
1717
cef_cookie_manager_get_global_manager: (pointer) -> (pointer)
18+
cef_create_context_shared: (pointer,pointer) -> (pointer)
1819
cef_create_url: (pointer,pointer) -> (integer)
1920
cef_currently_on: (integer) -> (integer)
2021
cef_dictionary_value_create: () -> (pointer)
@@ -35,6 +36,7 @@ cef ./CEF/libcef ./CEF/libcef ./CEF/libcef
3536
cef_get_min_log_level: () -> (integer)
3637
cef_get_path: (integer,pointer) -> (integer)
3738
cef_get_vlog_level: (pointer,intsize) -> (integer)
39+
? cef_get_xdisplay: () -> (pointer)
3840
cef_image_create: () -> (pointer)
3941
cef_initialize: (pointer,pointer,pointer,pointer) -> (integer)
4042
cef_is_web_plugin_unstable: (pointer,pointer) -> ()
@@ -166,7 +168,6 @@ cef ./CEF/libcef ./CEF/libcef ./CEF/libcef
166168
cef_write_json: (pointer,integer) -> (pointer)
167169
cef_xml_reader_create: (pointer,integer,pointer) -> (pointer)
168170
cef_zip_reader_create: (pointer) -> (pointer)
169-
create_context_shared: (pointer,pointer) -> (pointer)
170171
# cef_get_current_platform_thread_handle: () -> (cef_platform_thread_handle_t)
171172
# cef_get_current_platform_thread_id: () -> (cef_platform_thread_id_t)
172173
# ( CEF_EXPORT __declspec(dllexport) #elif USING_CEF_SHARED #define CEF_EXPORT __declspec(dllimport) #else #define CEF_EXPORT #endif #define CEF_CALLBACK __stdcall #elif defined(COMPILER_GCC) #define CEF_EXPORT __attribute__ ((visibility("default"))) #define CEF_CALLBACK #endif // COMPILER_GCC #endif // CEF_INCLUDE_INTERNAL_CEF_EXPORT_H_

libcef/libcef_dll/ctocpp/browser_host_ctocpp.cc

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -375,11 +375,7 @@ void CefBrowserHostCToCpp::ShowDevTools(const CefWindowInfo& windowInfo,
375375

376376
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
377377

378-
// Verify param: client; type: refptr_diff
379-
DCHECK(client.get());
380-
if (!client.get())
381-
return;
382-
// Unverified params: inspect_element_at
378+
// Unverified params: windowInfo, client, settings, inspect_element_at
383379

384380
// Execute
385381
_struct->show_dev_tools(_struct,
@@ -400,6 +396,20 @@ void CefBrowserHostCToCpp::CloseDevTools() {
400396
_struct->close_dev_tools(_struct);
401397
}
402398

399+
bool CefBrowserHostCToCpp::HasDevTools() {
400+
cef_browser_host_t* _struct = GetStruct();
401+
if (CEF_MEMBER_MISSING(_struct, has_dev_tools))
402+
return false;
403+
404+
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
405+
406+
// Execute
407+
int _retval = _struct->has_dev_tools(_struct);
408+
409+
// Return type: bool
410+
return _retval?true:false;
411+
}
412+
403413
void CefBrowserHostCToCpp::GetNavigationEntries(
404414
CefRefPtr<CefNavigationEntryVisitor> visitor, bool current_only) {
405415
cef_browser_host_t* _struct = GetStruct();

libcef/libcef_dll/ctocpp/browser_host_ctocpp.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ class CefBrowserHostCToCpp
6363
CefRefPtr<CefClient> client, const CefBrowserSettings& settings,
6464
const CefPoint& inspect_element_at) OVERRIDE;
6565
void CloseDevTools() OVERRIDE;
66+
bool HasDevTools() OVERRIDE;
6667
void GetNavigationEntries(CefRefPtr<CefNavigationEntryVisitor> visitor,
6768
bool current_only) OVERRIDE;
6869
void SetMouseCursorChangeDisabled(bool disabled) OVERRIDE;

libcef/libcef_dll/ctocpp/request_context_ctocpp.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ CefRefPtr<CefRequestContext> CefRequestContext::CreateContext(
6161
// Unverified params: handler
6262

6363
// Execute
64-
cef_request_context_t* _retval = create_context_shared(
64+
cef_request_context_t* _retval = cef_create_context_shared(
6565
CefRequestContextCToCpp::Unwrap(other),
6666
CefRequestContextHandlerCppToC::Wrap(handler));
6767

0 commit comments

Comments
 (0)