pulsar-edit/pulsar
1
1
Fork 0
mirror of https://github.com/pulsar-edit/pulsar.git synced 2025-01-02 11:52:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update CEF to CEF3 trunk

Browse Source
This commit is contained in:
Corey Johnson 2012-09-18 15:01:09 -07:00
parent b8c2786f85
commit 286ff465d0
27 changed files with 1596 additions and 1111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cef/cef_paths.gypi
View File

@ -216,6 +216,10 @@
'cef/libcef_dll/cpptoc/v8exception_cpptoc.h',
'cef/libcef_dll/ctocpp/v8handler_ctocpp.cc',
'cef/libcef_dll/ctocpp/v8handler_ctocpp.h',
'cef/libcef_dll/cpptoc/v8stack_frame_cpptoc.cc',
'cef/libcef_dll/cpptoc/v8stack_frame_cpptoc.h',
'cef/libcef_dll/cpptoc/v8stack_trace_cpptoc.cc',
'cef/libcef_dll/cpptoc/v8stack_trace_cpptoc.h',
'cef/libcef_dll/cpptoc/v8value_cpptoc.cc',
'cef/libcef_dll/cpptoc/v8value_cpptoc.h',
'cef/libcef_dll/cpptoc/web_plugin_info_cpptoc.cc',
@ -346,6 +350,10 @@
'cef/libcef_dll/ctocpp/v8exception_ctocpp.h',
'cef/libcef_dll/cpptoc/v8handler_cpptoc.cc',
'cef/libcef_dll/cpptoc/v8handler_cpptoc.h',
'cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc',
'cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.h',
'cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc',
'cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.h',
'cef/libcef_dll/ctocpp/v8value_ctocpp.cc',
'cef/libcef_dll/ctocpp/v8value_ctocpp.h',
'cef/libcef_dll/ctocpp/web_plugin_info_ctocpp.cc',

5
cef/cef_paths2.gypi
View File

@ -88,7 +88,7 @@
'tests/cefclient/client_app.h',
'tests/cefclient/client_app_delegates.cpp',
'tests/cefclient/client_handler.cpp',
'tests/cefclient/atom_cef_client.h',
'tests/cefclient/client_handler.h',
'tests/cefclient/client_renderer.cpp',
'tests/cefclient/client_renderer.h',
'tests/cefclient/client_switches.cpp',
@ -130,7 +130,7 @@
'tests/cefclient/client_app.h',
'tests/cefclient/client_app_delegates.cpp',
'tests/cefclient/client_handler.cpp',
'tests/cefclient/atom_cef_client.h',
'tests/cefclient/client_handler.h',
'tests/cefclient/client_handler_mac.mm',
'tests/cefclient/client_renderer.cpp',
'tests/cefclient/client_renderer.h',
@ -166,6 +166,7 @@
],
'cefclient_bundle_resources_linux': [
'tests/cefclient/res/binding.html',
'tests/cefclient/res/dialogs.html',
'tests/cefclient/res/domaccess.html',
'tests/cefclient/res/localstorage.html',
'tests/cefclient/res/logo.png',

BIN
cef/frameworks/ffmpegsumo.so
View File

Binary file not shown.

BIN
cef/frameworks/libcef.dylib
View File

Binary file not shown.

9
cef/include/capi/cef_browser_capi.h
View File

@ -114,7 +114,9 @@ typedef struct _cef_browser_t {
///
int (CEF_CALLBACK *is_popup)(struct _cef_browser_t* self);
///
// Returns true (1) if a document has been loaded in the browser.
///
int (CEF_CALLBACK *has_document)(struct _cef_browser_t* self);
///
@ -238,12 +240,15 @@ typedef struct _cef_browser_host_t {
struct _cef_browser_host_t* self, int http_scheme);
///
// Get the zoom level. This function can only be called on the UI thread.
// Get the current zoom level. The default zoom level is 0.0. This function
// can only be called on the UI thread.
///
double (CEF_CALLBACK *get_zoom_level)(struct _cef_browser_host_t* self);
///
// Change the zoom level to the specified value.
// Change the zoom level to the specified value. Specify 0.0 to reset the zoom
// level. If called on the UI thread the change will be applied immediately.
// Otherwise, the change will be applied asynchronously on the UI thread.
///
void (CEF_CALLBACK *set_zoom_level)(struct _cef_browser_host_t* self,
double zoomLevel);

7
cef/include/capi/cef_command_line_capi.h
View File

@ -100,6 +100,13 @@ typedef struct _cef_command_line_t {
///
void (CEF_CALLBACK *reset)(struct _cef_command_line_t* self);
///
// Retrieve the original command line string as a vector of strings. The argv
// array: { program, [(--|-|/)switch[=value]]*, [--], [argument]* }
///
void (CEF_CALLBACK *get_argv)(struct _cef_command_line_t* self,
cef_string_list_t argv);
///
// Constructs and returns the represented command line string. Use this
// function cautiously because quoting behavior is unclear.

3
cef/include/capi/cef_display_handler_capi.h
View File

@ -91,8 +91,7 @@ typedef struct _cef_display_handler_t {
// status message type.
///
void (CEF_CALLBACK *on_status_message)(struct _cef_display_handler_t* self,
struct _cef_browser_t* browser, const cef_string_t* value,
enum cef_handler_statustype_t type);
struct _cef_browser_t* browser, const cef_string_t* value);
///
// Called to display a console message. Return true (1) to stop the message

86
cef/include/capi/cef_v8_capi.h
View File

@ -700,6 +700,92 @@ CEF_EXPORT cef_v8value_t* cef_v8value_create_function(const cef_string_t* name,
cef_v8handler_t* handler);
///
// Structure representing a V8 stack trace. The functions of this structure may
// only be called on the render process main thread.
///
typedef struct _cef_v8stack_trace_t {
///
// Base structure.
///
cef_base_t base;
///
// Returns the number of stack frames.
///
int (CEF_CALLBACK *get_frame_count)(struct _cef_v8stack_trace_t* self);
///
// Returns the stack frame at the specified 0-based index.
///
struct _cef_v8stack_frame_t* (CEF_CALLBACK *get_frame)(
struct _cef_v8stack_trace_t* self, int index);
} cef_v8stack_trace_t;
///
// Returns the stack trace for the currently active context. |frame_limit| is
// the maximum number of frames that will be captured.
///
CEF_EXPORT cef_v8stack_trace_t* cef_v8stack_trace_get_current(int frame_limit);
///
// Structure representing a V8 stack frame. The functions of this structure may
// only be called on the render process main thread.
///
typedef struct _cef_v8stack_frame_t {
///
// Base structure.
///
cef_base_t base;
///
// Returns the name of the resource script that contains the function.
///
// The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t (CEF_CALLBACK *get_script_name)(
struct _cef_v8stack_frame_t* self);
///
// Returns the name of the resource script that contains the function or the
// sourceURL value if the script name is undefined and its source ends with a
// "//@ sourceURL=..." string.
///
// The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t (CEF_CALLBACK *get_script_name_or_source_url)(
struct _cef_v8stack_frame_t* self);
///
// Returns the name of the function.
///
// The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t (CEF_CALLBACK *get_function_name)(
struct _cef_v8stack_frame_t* self);
///
// Returns the 1-based line number for the function call or 0 if unknown.
///
int (CEF_CALLBACK *get_line_number)(struct _cef_v8stack_frame_t* self);
///
// Returns the 1-based column offset on the line for the function call or 0 if
// unknown.
///
int (CEF_CALLBACK *get_column)(struct _cef_v8stack_frame_t* self);
///
// Returns true (1) if the function was compiled using eval().
///
int (CEF_CALLBACK *is_eval)(struct _cef_v8stack_frame_t* self);
///
// Returns true (1) if the function was called as a constructor via "new".
///
int (CEF_CALLBACK *is_constructor)(struct _cef_v8stack_frame_t* self);
} cef_v8stack_frame_t;
#ifdef __cplusplus
}
#endif

8
cef/include/cef_browser.h
View File

@ -273,13 +273,17 @@ class CefBrowserHost : public virtual CefBase {
virtual CefString GetDevToolsURL(bool http_scheme) =0;
///
// Get the zoom level. This method can only be called on the UI thread.
// Get the current zoom level. The default zoom level is 0.0. This method can
// only be called on the UI thread.
///
/*--cef()--*/
virtual double GetZoomLevel() =0;
///
// Change the zoom level to the specified value.
// Change the zoom level to the specified value. Specify 0.0 to reset the
// zoom level. If called on the UI thread the change will be applied
// immediately. Otherwise, the change will be applied asynchronously on the
// UI thread.
///
/*--cef()--*/
virtual void SetZoomLevel(double zoomLevel) =0;

7
cef/include/cef_command_line.h
View File

@ -113,6 +113,13 @@ class CefCommandLine : public virtual CefBase {
/*--cef()--*/
virtual void Reset() =0;
///
// Retrieve the original command line string as a vector of strings.
// The argv array: { program, [(--|-|/)switch[=value]]*, [--], [argument]* }
///
/*--cef()--*/
virtual void GetArgv(std::vector<CefString>& argv) =0;
///
// Constructs and returns the represented command line string. Use this method
// cautiously because quoting behavior is unclear.

5
cef/include/cef_display_handler.h
View File

@ -49,8 +49,6 @@
/*--cef(source=client)--*/
class CefDisplayHandler : public virtual CefBase {
public:
typedef cef_handler_statustype_t StatusType;
///
// Called when the loading state has changed.
///
@ -92,8 +90,7 @@ class CefDisplayHandler : public virtual CefBase {
///
/*--cef(optional_param=value)--*/
virtual void OnStatusMessage(CefRefPtr<CefBrowser> browser,
const CefString& value,
StatusType type) {}
const CefString& value) {}
///
// Called to display a console message. Return true to stop the message from

1843
cef/include/cef_pack_resources.h
View File

File diff suppressed because it is too large Load Diff

266
cef/include/cef_pack_strings.h
View File

@ -39,142 +39,150 @@
// ---------------------------------------------------------------------------
// From cef_strings.h:
#define IDS_MENU_BACK 26500
#define IDS_MENU_FORWARD 26501
#define IDS_MENU_RELOAD 26502
#define IDS_MENU_RELOAD_NOCACHE 26503
#define IDS_MENU_STOPLOAD 26504
#define IDS_MENU_UNDO 26505
#define IDS_MENU_REDO 26506
#define IDS_MENU_CUT 26507
#define IDS_MENU_COPY 26508
#define IDS_MENU_PASTE 26509
#define IDS_MENU_DELETE 26510
#define IDS_MENU_SELECT_ALL 26511
#define IDS_MENU_FIND 26512
#define IDS_MENU_PRINT 26513
#define IDS_MENU_VIEW_SOURCE 26514
#define IDS_MENU_BACK 28000
#define IDS_MENU_FORWARD 28001
#define IDS_MENU_RELOAD 28002
#define IDS_MENU_RELOAD_NOCACHE 28003
#define IDS_MENU_STOPLOAD 28004
#define IDS_MENU_UNDO 28005
#define IDS_MENU_REDO 28006
#define IDS_MENU_CUT 28007
#define IDS_MENU_COPY 28008
#define IDS_MENU_PASTE 28009
#define IDS_MENU_DELETE 28010
#define IDS_MENU_SELECT_ALL 28011
#define IDS_MENU_FIND 28012
#define IDS_MENU_PRINT 28013
#define IDS_MENU_VIEW_SOURCE 28014
// ---------------------------------------------------------------------------
// From ui_strings.h:
#define IDS_APP_MENU_EMPTY_SUBMENU 9500
#define IDS_APP_UNTITLED_SHORTCUT_FILE_NAME 9501
#define IDS_APP_SAVEAS_ALL_FILES 9502
#define IDS_APP_SAVEAS_EXTENSION_FORMAT 9503
#define IDS_APP_ACCACTION_PRESS 9504
#define IDS_APP_ACCNAME_CLOSE 9505
#define IDS_APP_ACCNAME_MINIMIZE 9506
#define IDS_APP_ACCNAME_MAXIMIZE 9507
#define IDS_APP_ACCNAME_RESTORE 9508
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLHERE 9509
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLLEFTEDGE 9510
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLRIGHTEDGE 9511
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLHOME 9512
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLEND 9513
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEUP 9514
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEDOWN 9515
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLLEFT 9516
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLRIGHT 9517
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLUP 9518
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLDOWN 9519
#define IDS_APP_UNDO 9520
#define IDS_APP_CUT 9521
#define IDS_APP_COPY 9522
#define IDS_APP_PASTE 9523
#define IDS_APP_DELETE 9524
#define IDS_APP_SELECT_ALL 9525
#define IDS_APP_OK 9526
#define IDS_APP_CANCEL 9527
#define IDS_APP_CLOSE 9528
#define IDS_APP_ESC_KEY 9529
#define IDS_APP_TAB_KEY 9530
#define IDS_APP_INSERT_KEY 9531
#define IDS_APP_HOME_KEY 9532
#define IDS_APP_DELETE_KEY 9533
#define IDS_APP_END_KEY 9534
#define IDS_APP_PAGEUP_KEY 9535
#define IDS_APP_PAGEDOWN_KEY 9536
#define IDS_APP_LEFT_ARROW_KEY 9537
#define IDS_APP_RIGHT_ARROW_KEY 9538
#define IDS_APP_RIGHT_UP_KEY 9539
#define IDS_APP_RIGHT_DOWN_KEY 9540
#define IDS_APP_ENTER_KEY 9541
#define IDS_APP_F1_KEY 9542
#define IDS_APP_F11_KEY 9543
#define IDS_APP_BACKSPACE_KEY 9544
#define IDS_APP_CONTROL_MODIFIER 9545
#define IDS_APP_ALT_MODIFIER 9546
#define IDS_APP_SHIFT_MODIFIER 9547
#define IDS_APP_BYTES 9548
#define IDS_APP_KIBIBYTES 9549
#define IDS_APP_MEBIBYTES 9550
#define IDS_APP_GIBIBYTES 9551
#define IDS_APP_TEBIBYTES 9552
#define IDS_APP_PEBIBYTES 9553
#define IDS_APP_BYTES_PER_SECOND 9554
#define IDS_APP_KIBIBYTES_PER_SECOND 9555
#define IDS_APP_MEBIBYTES_PER_SECOND 9556
#define IDS_APP_GIBIBYTES_PER_SECOND 9557
#define IDS_APP_TEBIBYTES_PER_SECOND 9558
#define IDS_APP_PEBIBYTES_PER_SECOND 9559
#define IDS_APP_MENU_EMPTY_SUBMENU 11000
#define IDS_APP_UNTITLED_SHORTCUT_FILE_NAME 11001
#define IDS_APP_SAVEAS_ALL_FILES 11002
#define IDS_APP_SAVEAS_EXTENSION_FORMAT 11003
#define IDS_SELECT_FOLDER_BUTTON_TITLE 11004
#define IDS_SELECT_FOLDER_DIALOG_TITLE 11005
#define IDS_SAVE_AS_DIALOG_TITLE 11006
#define IDS_OPEN_FILE_DIALOG_TITLE 11007
#define IDS_OPEN_FILES_DIALOG_TITLE 11008
#define IDS_SAVEAS_ALL_FILES 11009
#define IDS_APP_ACCACTION_PRESS 11010
#define IDS_APP_ACCNAME_CLOSE 11011
#define IDS_APP_ACCNAME_MINIMIZE 11012
#define IDS_APP_ACCNAME_MAXIMIZE 11013
#define IDS_APP_ACCNAME_RESTORE 11014
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLHERE 11015
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLLEFTEDGE 11016
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLRIGHTEDGE 11017
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLHOME 11018
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLEND 11019
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEUP 11020
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEDOWN 11021
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLLEFT 11022
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLRIGHT 11023
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLUP 11024
#define IDS_APP_SCROLLBAR_CXMENU_SCROLLDOWN 11025
#define IDS_APP_UNDO 11026
#define IDS_APP_CUT 11027
#define IDS_APP_COPY 11028
#define IDS_APP_PASTE 11029
#define IDS_APP_DELETE 11030
#define IDS_APP_SELECT_ALL 11031
#define IDS_APP_OK 11032
#define IDS_APP_CANCEL 11033
#define IDS_APP_CLOSE 11034
#define IDS_APP_ESC_KEY 11035
#define IDS_APP_TAB_KEY 11036
#define IDS_APP_INSERT_KEY 11037
#define IDS_APP_HOME_KEY 11038
#define IDS_APP_DELETE_KEY 11039
#define IDS_APP_END_KEY 11040
#define IDS_APP_PAGEUP_KEY 11041
#define IDS_APP_PAGEDOWN_KEY 11042
#define IDS_APP_LEFT_ARROW_KEY 11043
#define IDS_APP_RIGHT_ARROW_KEY 11044
#define IDS_APP_RIGHT_UP_KEY 11045
#define IDS_APP_RIGHT_DOWN_KEY 11046
#define IDS_APP_ENTER_KEY 11047
#define IDS_APP_F1_KEY 11048
#define IDS_APP_F11_KEY 11049
#define IDS_APP_BACKSPACE_KEY 11050
#define IDS_APP_CONTROL_MODIFIER 11051
#define IDS_APP_ALT_MODIFIER 11052
#define IDS_APP_SHIFT_MODIFIER 11053
#define IDS_APP_COMMAND_MODIFIER 11054
#define IDS_APP_BYTES 11055
#define IDS_APP_KIBIBYTES 11056
#define IDS_APP_MEBIBYTES 11057
#define IDS_APP_GIBIBYTES 11058
#define IDS_APP_TEBIBYTES 11059
#define IDS_APP_PEBIBYTES 11060
#define IDS_APP_BYTES_PER_SECOND 11061
#define IDS_APP_KIBIBYTES_PER_SECOND 11062
#define IDS_APP_MEBIBYTES_PER_SECOND 11063
#define IDS_APP_GIBIBYTES_PER_SECOND 11064
#define IDS_APP_TEBIBYTES_PER_SECOND 11065
#define IDS_APP_PEBIBYTES_PER_SECOND 11066
// ---------------------------------------------------------------------------
// From webkit_strings.h:
#define IDS_DETAILS_WITHOUT_SUMMARY_LABEL 16500
#define IDS_SEARCHABLE_INDEX_INTRO 16501
#define IDS_FORM_CALENDAR_CLEAR 16502
#define IDS_FORM_CALENDAR_TODAY 16503
#define IDS_FORM_DATE_FORMAT_DAY_IN_MONTH 16504
#define IDS_FORM_DATE_FORMAT_MONTH 16505
#define IDS_FORM_DATE_FORMAT_YEAR 16506
#define IDS_FORM_SUBMIT_LABEL 16507
#define IDS_FORM_INPUT_ALT 16508
#define IDS_FORM_RESET_LABEL 16509
#define IDS_FORM_FILE_BUTTON_LABEL 16510
#define IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL 16511
#define IDS_FORM_FILE_NO_FILE_LABEL 16512
#define IDS_FORM_FILE_NO_FILE_DRAG_LABEL 16513
#define IDS_FORM_FILE_MULTIPLE_UPLOAD 16514
#define IDS_RECENT_SEARCHES_NONE 16515
#define IDS_RECENT_SEARCHES 16516
#define IDS_RECENT_SEARCHES_CLEAR 16517
#define IDS_IMAGE_TITLE_FOR_FILENAME 16518
#define IDS_AX_ROLE_WEB_AREA 16519
#define IDS_AX_ROLE_LINK 16520
#define IDS_AX_ROLE_LIST_MARKER 16521
#define IDS_AX_ROLE_IMAGE_MAP 16522
#define IDS_AX_ROLE_HEADING 16523
#define IDS_AX_ROLE_FOOTER 16524
#define IDS_AX_BUTTON_ACTION_VERB 16525
#define IDS_AX_RADIO_BUTTON_ACTION_VERB 16526
#define IDS_AX_TEXT_FIELD_ACTION_VERB 16527
#define IDS_AX_CHECKED_CHECK_BOX_ACTION_VERB 16528
#define IDS_AX_UNCHECKED_CHECK_BOX_ACTION_VERB 16529
#define IDS_AX_LINK_ACTION_VERB 16530
#define IDS_KEYGEN_HIGH_GRADE_KEY 16531
#define IDS_KEYGEN_MED_GRADE_KEY 16532
#define IDS_FORM_VALIDATION_VALUE_MISSING_MULTIPLE_FILE 16533
#define IDS_FORM_VALIDATION_TYPE_MISMATCH 16534
#define IDS_FORM_VALIDATION_TYPE_MISMATCH_MULTIPLE_EMAIL 16535
#define IDS_FORM_VALIDATION_RANGE_UNDERFLOW 16536
#define IDS_FORM_VALIDATION_RANGE_OVERFLOW 16537
#define IDS_FORM_VALIDATION_STEP_MISMATCH 16538
#define IDS_FORM_VALIDATION_VALUE_MISSING 16539
#define IDS_FORM_VALIDATION_VALUE_MISSING_CHECKBOX 16540
#define IDS_FORM_VALIDATION_VALUE_MISSING_FILE 16541
#define IDS_FORM_VALIDATION_VALUE_MISSING_RADIO 16542
#define IDS_FORM_VALIDATION_VALUE_MISSING_SELECT 16543
#define IDS_FORM_VALIDATION_TYPE_MISMATCH_EMAIL 16544
#define IDS_FORM_VALIDATION_TYPE_MISMATCH_URL 16545
#define IDS_FORM_VALIDATION_PATTERN_MISMATCH 16546
#define IDS_FORM_VALIDATION_TOO_LONG 16547
#define IDS_PDF_NEED_PASSWORD 16548
#define IDS_PDF_PAGE_LOADING 16549
#define IDS_PDF_LOADING_PROGRESS 16550
#define IDS_PDF_PAGE_LOAD_FAILED 16551
#define IDS_PDF_PROGRESS_LOADING 16552
#define IDS_PLUGIN_INITIALIZATION_ERROR 16553
#define IDS_DETAILS_WITHOUT_SUMMARY_LABEL 18000
#define IDS_SEARCHABLE_INDEX_INTRO 18001
#define IDS_FORM_CALENDAR_CLEAR 18002
#define IDS_FORM_CALENDAR_TODAY 18003
#define IDS_FORM_DATE_FORMAT_DAY_IN_MONTH 18004
#define IDS_FORM_DATE_FORMAT_MONTH 18005
#define IDS_FORM_DATE_FORMAT_YEAR 18006
#define IDS_FORM_SUBMIT_LABEL 18007
#define IDS_FORM_INPUT_ALT 18008
#define IDS_FORM_RESET_LABEL 18009
#define IDS_FORM_FILE_BUTTON_LABEL 18010
#define IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL 18011
#define IDS_FORM_FILE_NO_FILE_LABEL 18012
#define IDS_FORM_FILE_NO_FILE_DRAG_LABEL 18013
#define IDS_FORM_FILE_MULTIPLE_UPLOAD 18014
#define IDS_FORM_OTHER_COLOR_LABEL 18015
#define IDS_RECENT_SEARCHES_NONE 18016
#define IDS_RECENT_SEARCHES 18017
#define IDS_RECENT_SEARCHES_CLEAR 18018
#define IDS_IMAGE_TITLE_FOR_FILENAME 18019
#define IDS_AX_ROLE_WEB_AREA 18020
#define IDS_AX_ROLE_LINK 18021
#define IDS_AX_ROLE_LIST_MARKER 18022
#define IDS_AX_ROLE_IMAGE_MAP 18023
#define IDS_AX_ROLE_HEADING 18024
#define IDS_AX_ROLE_FOOTER 18025
#define IDS_AX_BUTTON_ACTION_VERB 18026
#define IDS_AX_RADIO_BUTTON_ACTION_VERB 18027
#define IDS_AX_TEXT_FIELD_ACTION_VERB 18028
#define IDS_AX_CHECKED_CHECK_BOX_ACTION_VERB 18029
#define IDS_AX_UNCHECKED_CHECK_BOX_ACTION_VERB 18030
#define IDS_AX_LINK_ACTION_VERB 18031
#define IDS_KEYGEN_HIGH_GRADE_KEY 18032
#define IDS_KEYGEN_MED_GRADE_KEY 18033
#define IDS_FORM_VALIDATION_VALUE_MISSING_MULTIPLE_FILE 18034
#define IDS_FORM_VALIDATION_TYPE_MISMATCH 18035
#define IDS_FORM_VALIDATION_TYPE_MISMATCH_MULTIPLE_EMAIL 18036
#define IDS_FORM_VALIDATION_RANGE_UNDERFLOW 18037
#define IDS_FORM_VALIDATION_RANGE_OVERFLOW 18038
#define IDS_FORM_VALIDATION_STEP_MISMATCH 18039
#define IDS_FORM_VALIDATION_VALUE_MISSING 18040
#define IDS_FORM_VALIDATION_VALUE_MISSING_CHECKBOX 18041
#define IDS_FORM_VALIDATION_VALUE_MISSING_FILE 18042
#define IDS_FORM_VALIDATION_VALUE_MISSING_RADIO 18043
#define IDS_FORM_VALIDATION_VALUE_MISSING_SELECT 18044
#define IDS_FORM_VALIDATION_TYPE_MISMATCH_EMAIL 18045
#define IDS_FORM_VALIDATION_TYPE_MISMATCH_URL 18046
#define IDS_FORM_VALIDATION_PATTERN_MISMATCH 18047
#define IDS_FORM_VALIDATION_TOO_LONG 18048
#define IDS_PDF_NEED_PASSWORD 18049
#define IDS_PDF_PAGE_LOADING 18050
#define IDS_PDF_LOADING_PROGRESS 18051
#define IDS_PDF_PAGE_LOAD_FAILED 18052
#define IDS_PDF_PROGRESS_LOADING 18053
#define IDS_PLUGIN_INITIALIZATION_ERROR 18054
#endif // CEF_INCLUDE_CEF_PACK_STRINGS_H_

81
cef/include/cef_v8.h
View File

@ -46,6 +46,7 @@
class CefV8Exception;
class CefV8Handler;
class CefV8StackFrame;
class CefV8Value;
@ -739,4 +740,84 @@ class CefV8Value : public virtual CefBase {
const CefV8ValueList& arguments) =0;
};
///
// Class representing a V8 stack trace. The methods of this class may only be
// called on the render process main thread.
///
/*--cef(source=library)--*/
class CefV8StackTrace : public virtual CefBase {
public:
///
// Returns the stack trace for the currently active context. |frame_limit| is
// the maximum number of frames that will be captured.
///
/*--cef()--*/
static CefRefPtr<CefV8StackTrace> GetCurrent(int frame_limit);
///
// Returns the number of stack frames.
///
/*--cef()--*/
virtual int GetFrameCount() =0;
///
// Returns the stack frame at the specified 0-based index.
///
/*--cef()--*/
virtual CefRefPtr<CefV8StackFrame> GetFrame(int index) =0;
};
///
// Class representing a V8 stack frame. The methods of this class may only be
// called on the render process main thread.
///
/*--cef(source=library)--*/
class CefV8StackFrame : public virtual CefBase {
public:
///
// Returns the name of the resource script that contains the function.
///
/*--cef()--*/
virtual CefString GetScriptName() =0;
///
// Returns the name of the resource script that contains the function or the
// sourceURL value if the script name is undefined and its source ends with
// a "//@ sourceURL=..." string.
///
/*--cef()--*/
virtual CefString GetScriptNameOrSourceURL() =0;
///
// Returns the name of the function.
///
/*--cef()--*/
virtual CefString GetFunctionName() =0;
///
// Returns the 1-based line number for the function call or 0 if unknown.
///
/*--cef()--*/
virtual int GetLineNumber() =0;
///
// Returns the 1-based column offset on the line for the function call or 0 if
// unknown.
///
/*--cef()--*/
virtual int GetColumn() =0;
///
// Returns true if the function was compiled using eval().
///
/*--cef()--*/
virtual bool IsEval() =0;
///
// Returns true if the function was called as a constructor via "new".
///
/*--cef()--*/
virtual bool IsConstructor() =0;
};
#endif // CEF_INCLUDE_CEF_V8_H_

8
cef/include/cef_version.h
View File

@ -35,13 +35,13 @@
#ifndef CEF_INCLUDE_CEF_VERSION_H_
#define CEF_INCLUDE_CEF_VERSION_H_
#define CEF_REVISION 735
#define CEF_REVISION 785
#define COPYRIGHT_YEAR 2012
#define CHROME_VERSION_MAJOR 21
#define CHROME_VERSION_MAJOR 23
#define CHROME_VERSION_MINOR 0
#define CHROME_VERSION_BUILD 1180
#define CHROME_VERSION_PATCH 18
#define CHROME_VERSION_BUILD 1248
#define CHROME_VERSION_PATCH 0
#define DO_MAKE_STRING(p) #p
#define MAKE_STRING(p) DO_MAKE_STRING(p)

12
cef/include/internal/cef_string_wrappers.h
View File

@ -314,7 +314,8 @@ class CefStringBase {
}
CefStringBase(const char* src) // NOLINT(runtime/explicit)
: string_(NULL), owner_(false) {
FromString(std::string(src));
if (src)
FromString(std::string(src));
}
///
@ -328,7 +329,8 @@ class CefStringBase {
}
CefStringBase(const wchar_t* src) // NOLINT(runtime/explicit)
: string_(NULL), owner_(false) {
FromWString(std::wstring(src));
if (src)
FromWString(std::wstring(src));
}
#if (defined(BUILDING_CEF_SHARED) && defined(WCHAR_T_IS_UTF32))
@ -343,7 +345,8 @@ class CefStringBase {
}
CefStringBase(const char16* src) // NOLINT(runtime/explicit)
: string_(NULL), owner_(false) {
FromString16(string16(src));
if (src)
FromString16(string16(src));
}
#endif // BUILDING_CEF_SHARED && WCHAR_T_IS_UTF32
@ -355,7 +358,8 @@ class CefStringBase {
///
CefStringBase(const char_type* src, size_t src_len, bool copy)
: string_(NULL), owner_(false) {
FromString(src, src_len, copy);
if (src && src_len > 0)
FromString(src, src_len, copy);
}
///

27
cef/include/internal/cef_types.h
View File

@ -222,18 +222,18 @@ typedef struct _cef_settings_t {
bool auto_detect_proxy_settings_enabled;
///
// The fully qualified path for the cef.pak file. If this value is empty
// the cef.pak file must be located in the module directory. This value is
// ignored on Mac OS X where pack files are always loaded from the app bundle
// resource directory.
// The fully qualified path for the resources directory. If this value is
// empty the cef.pak and/or devtools_resources.pak files must be located in
// the module directory on Windows/Linux or the app bundle Resources directory
// on Mac OS X.
///
cef_string_t pack_file_path;
cef_string_t resources_dir_path;
///
// The fully qualified path for the locales directory. If this value is empty
// the locales directory must be located in the module directory. This value
// is ignored on Mac OS X where pack files are always loaded from the app
// bundle resource directory.
// bundle Resources directory.
///
cef_string_t locales_dir_path;
@ -1199,15 +1199,6 @@ enum cef_xml_node_type_t {
XML_NODE_COMMENT,
};
///
// Status message types.
///
enum cef_handler_statustype_t {
STATUSTYPE_TEXT = 0,
STATUSTYPE_MOUSEOVER_URL,
STATUSTYPE_KEYBOARD_FOCUS_URL,
};
///
// Popup window features.
///
@ -1237,9 +1228,9 @@ typedef struct _cef_popup_features_t {
// Proxy types.
///
enum cef_proxy_type_t {
PROXY_TYPE_DIRECT = 0,
PROXY_TYPE_NAMED,
PROXY_TYPE_PAC_STRING,
CEF_PROXY_TYPE_DIRECT = 0,
CEF_PROXY_TYPE_NAMED,
CEF_PROXY_TYPE_PAC_STRING,
};
///

18
cef/include/internal/cef_types_wrappers.h
View File

@ -264,7 +264,7 @@ struct CefSettingsTraits {
cef_string_clear(&s->locale);
cef_string_clear(&s->log_file);
cef_string_clear(&s->javascript_flags);
cef_string_clear(&s->pack_file_path);
cef_string_clear(&s->resources_dir_path);
cef_string_clear(&s->locales_dir_path);
}
@ -294,8 +294,8 @@ struct CefSettingsTraits {
target->auto_detect_proxy_settings_enabled =
src->auto_detect_proxy_settings_enabled;
cef_string_set(src->pack_file_path.str, src->pack_file_path.length,
&target->pack_file_path, copy);
cef_string_set(src->resources_dir_path.str, src->resources_dir_path.length,
&target->resources_dir_path, copy);
cef_string_set(src->locales_dir_path.str, src->locales_dir_path.length,
&target->locales_dir_path, copy);
target->pack_loading_disabled = src->pack_loading_disabled;
@ -556,7 +556,7 @@ class CefProxyInfo : public CefStructBase<CefProxyInfoTraits> {
// Use a direction connection instead of a proxy.
///
void UseDirect() {
proxyType = PROXY_TYPE_DIRECT;
proxyType = CEF_PROXY_TYPE_DIRECT;
}
///
@ -569,7 +569,7 @@ class CefProxyInfo : public CefStructBase<CefProxyInfoTraits> {
// "foo1:80;foo2:80".
///
void UseNamedProxy(const CefString& proxy_uri_list) {
proxyType = PROXY_TYPE_NAMED;
proxyType = CEF_PROXY_TYPE_NAMED;
(CefString(&proxyList)) = proxy_uri_list;
}
@ -578,13 +578,13 @@ class CefProxyInfo : public CefStructBase<CefProxyInfoTraits> {
// example, "PROXY foobar:99; SOCKS fml:2; DIRECT".
///
void UsePacString(const CefString& pac_string) {
proxyType = PROXY_TYPE_PAC_STRING;
proxyType = CEF_PROXY_TYPE_PAC_STRING;
(CefString(&proxyList)) = pac_string;
}
bool IsDirect() const { return proxyType == PROXY_TYPE_DIRECT; }
bool IsNamedProxy() const { return proxyType == PROXY_TYPE_NAMED; }
bool IsPacString() const { return proxyType == PROXY_TYPE_PAC_STRING; }
bool IsDirect() const { return proxyType == CEF_PROXY_TYPE_DIRECT; }
bool IsNamedProxy() const { return proxyType == CEF_PROXY_TYPE_NAMED; }
bool IsPacString() const { return proxyType == CEF_PROXY_TYPE_PAC_STRING; }
CefString ProxyList() const { return CefString(&proxyList); }
};

5
cef/libcef_dll/cpptoc/display_handler_cpptoc.cc
View File

@ -113,7 +113,7 @@ int CEF_CALLBACK display_handler_on_tooltip(struct _cef_display_handler_t* self,
void CEF_CALLBACK display_handler_on_status_message(
struct _cef_display_handler_t* self, cef_browser_t* browser,
const cef_string_t* value, enum cef_handler_statustype_t type) {
const cef_string_t* value) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
@ -128,8 +128,7 @@ void CEF_CALLBACK display_handler_on_status_message(
// Execute
CefDisplayHandlerCppToC::Get(self)->OnStatusMessage(
CefBrowserCToCpp::Wrap(browser),
CefString(value),
type);
CefString(value));
}
int CEF_CALLBACK display_handler_on_console_message(

24
cef/libcef_dll/ctocpp/command_line_ctocpp.cc
View File

@ -136,6 +136,30 @@ void CefCommandLineCToCpp::Reset() {
struct_->reset(struct_);
}
void CefCommandLineCToCpp::GetArgv(std::vector<CefString>& argv) {
if (CEF_MEMBER_MISSING(struct_, get_argv))
return;
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Translate param: argv; type: string_vec_byref
cef_string_list_t argvList = cef_string_list_alloc();
DCHECK(argvList);
if (argvList)
transfer_string_list_contents(argv, argvList);
// Execute
struct_->get_argv(struct_,
argvList);
// Restore param:argv; type: string_vec_byref
if (argvList) {
argv.clear();
transfer_string_list_contents(argvList, argv);
cef_string_list_free(argvList);
}
}
CefString CefCommandLineCToCpp::GetCommandLineString() {
if (CEF_MEMBER_MISSING(struct_, get_command_line_string))
return CefString();

2
cef/libcef_dll/ctocpp/command_line_ctocpp.h
View File

@ -18,6 +18,7 @@
#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
#else // USING_CEF_SHARED
#include <vector>
#include "include/cef_command_line.h"
#include "include/capi/cef_command_line_capi.h"
#include "libcef_dll/ctocpp/ctocpp.h"
@ -40,6 +41,7 @@ class CefCommandLineCToCpp
virtual void InitFromArgv(int argc, const char* const* argv) OVERRIDE;
virtual void InitFromString(const CefString& command_line) OVERRIDE;
virtual void Reset() OVERRIDE;
virtual void GetArgv(std::vector<CefString>& argv) OVERRIDE;
virtual CefString GetCommandLineString() OVERRIDE;
virtual CefString GetProgram() OVERRIDE;
virtual void SetProgram(const CefString& program) OVERRIDE;

121
cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc Normal file
View File

@ -0,0 +1,121 @@
// 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/ctocpp/v8stack_frame_ctocpp.h"
// VIRTUAL METHODS - Body may be edited by hand.
CefString CefV8StackFrameCToCpp::GetScriptName() {
if (CEF_MEMBER_MISSING(struct_, get_script_name))
return CefString();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
cef_string_userfree_t _retval = struct_->get_script_name(struct_);
// Return type: string
CefString _retvalStr;
_retvalStr.AttachToUserFree(_retval);
return _retvalStr;
}
CefString CefV8StackFrameCToCpp::GetScriptNameOrSourceURL() {
if (CEF_MEMBER_MISSING(struct_, get_script_name_or_source_url))
return CefString();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
cef_string_userfree_t _retval = struct_->get_script_name_or_source_url(
struct_);
// Return type: string
CefString _retvalStr;
_retvalStr.AttachToUserFree(_retval);
return _retvalStr;
}
CefString CefV8StackFrameCToCpp::GetFunctionName() {
if (CEF_MEMBER_MISSING(struct_, get_function_name))
return CefString();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
cef_string_userfree_t _retval = struct_->get_function_name(struct_);
// Return type: string
CefString _retvalStr;
_retvalStr.AttachToUserFree(_retval);
return _retvalStr;
}
int CefV8StackFrameCToCpp::GetLineNumber() {
if (CEF_MEMBER_MISSING(struct_, get_line_number))
return 0;
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
int _retval = struct_->get_line_number(struct_);
// Return type: simple
return _retval;
}
int CefV8StackFrameCToCpp::GetColumn() {
if (CEF_MEMBER_MISSING(struct_, get_column))
return 0;
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
int _retval = struct_->get_column(struct_);
// Return type: simple
return _retval;
}
bool CefV8StackFrameCToCpp::IsEval() {
if (CEF_MEMBER_MISSING(struct_, is_eval))
return false;
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
int _retval = struct_->is_eval(struct_);
// Return type: bool
return _retval?true:false;
}
bool CefV8StackFrameCToCpp::IsConstructor() {
if (CEF_MEMBER_MISSING(struct_, is_constructor))
return false;
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
int _retval = struct_->is_constructor(struct_);
// Return type: bool
return _retval?true:false;
}
#ifndef NDEBUG
template<> long CefCToCpp<CefV8StackFrameCToCpp, CefV8StackFrame,
cef_v8stack_frame_t>::DebugObjCt = 0;
#endif

48
cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.h Normal file
View File

@ -0,0 +1,48 @@
// 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_CTOCPP_V8STACK_FRAME_CTOCPP_H_
#define CEF_LIBCEF_DLL_CTOCPP_V8STACK_FRAME_CTOCPP_H_
#pragma once
#ifndef USING_CEF_SHARED
#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
#else // USING_CEF_SHARED
#include "include/cef_v8.h"
#include "include/capi/cef_v8_capi.h"
#include "libcef_dll/ctocpp/ctocpp.h"
// Wrap a C structure with a C++ class.
// This class may be instantiated and accessed wrapper-side only.
class CefV8StackFrameCToCpp
: public CefCToCpp<CefV8StackFrameCToCpp, CefV8StackFrame,
cef_v8stack_frame_t> {
public:
explicit CefV8StackFrameCToCpp(cef_v8stack_frame_t* str)
: CefCToCpp<CefV8StackFrameCToCpp, CefV8StackFrame, cef_v8stack_frame_t>(
str) {}
virtual ~CefV8StackFrameCToCpp() {}
// CefV8StackFrame methods
virtual CefString GetScriptName() OVERRIDE;
virtual CefString GetScriptNameOrSourceURL() OVERRIDE;
virtual CefString GetFunctionName() OVERRIDE;
virtual int GetLineNumber() OVERRIDE;
virtual int GetColumn() OVERRIDE;
virtual bool IsEval() OVERRIDE;
virtual bool IsConstructor() OVERRIDE;
};
#endif // USING_CEF_SHARED
#endif // CEF_LIBCEF_DLL_CTOCPP_V8STACK_FRAME_CTOCPP_H_

65
cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc Normal file
View File

@ -0,0 +1,65 @@
// 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/ctocpp/v8stack_frame_ctocpp.h"
#include "libcef_dll/ctocpp/v8stack_trace_ctocpp.h"
// STATIC METHODS - Body may be edited by hand.
CefRefPtr<CefV8StackTrace> CefV8StackTrace::GetCurrent(int frame_limit) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
cef_v8stack_trace_t* _retval = cef_v8stack_trace_get_current(
frame_limit);
// Return type: refptr_same
return CefV8StackTraceCToCpp::Wrap(_retval);
}
// VIRTUAL METHODS - Body may be edited by hand.
int CefV8StackTraceCToCpp::GetFrameCount() {
if (CEF_MEMBER_MISSING(struct_, get_frame_count))
return 0;
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
int _retval = struct_->get_frame_count(struct_);
// Return type: simple
return _retval;
}
CefRefPtr<CefV8StackFrame> CefV8StackTraceCToCpp::GetFrame(int index) {
if (CEF_MEMBER_MISSING(struct_, get_frame))
return NULL;
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
cef_v8stack_frame_t* _retval = struct_->get_frame(struct_,
index);
// Return type: refptr_same
return CefV8StackFrameCToCpp::Wrap(_retval);
}
#ifndef NDEBUG
template<> long CefCToCpp<CefV8StackTraceCToCpp, CefV8StackTrace,
cef_v8stack_trace_t>::DebugObjCt = 0;
#endif

43
cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.h Normal file
View File

@ -0,0 +1,43 @@
// 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_CTOCPP_V8STACK_TRACE_CTOCPP_H_
#define CEF_LIBCEF_DLL_CTOCPP_V8STACK_TRACE_CTOCPP_H_
#pragma once
#ifndef USING_CEF_SHARED
#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
#else // USING_CEF_SHARED
#include "include/cef_v8.h"
#include "include/capi/cef_v8_capi.h"
#include "libcef_dll/ctocpp/ctocpp.h"
// Wrap a C structure with a C++ class.
// This class may be instantiated and accessed wrapper-side only.
class CefV8StackTraceCToCpp
: public CefCToCpp<CefV8StackTraceCToCpp, CefV8StackTrace,
cef_v8stack_trace_t> {
public:
explicit CefV8StackTraceCToCpp(cef_v8stack_trace_t* str)
: CefCToCpp<CefV8StackTraceCToCpp, CefV8StackTrace, cef_v8stack_trace_t>(
str) {}
virtual ~CefV8StackTraceCToCpp() {}
// CefV8StackTrace methods
virtual int GetFrameCount() OVERRIDE;
virtual CefRefPtr<CefV8StackFrame> GetFrame(int index) OVERRIDE;
};
#endif // USING_CEF_SHARED
#endif // CEF_LIBCEF_DLL_CTOCPP_V8STACK_TRACE_CTOCPP_H_

2
cef/libcef_dll/wrapper/cef_byte_read_handler.cc
View File

@ -13,7 +13,7 @@ CefByteReadHandler::CefByteReadHandler(const unsigned char* bytes, size_t size,
size_t CefByteReadHandler::Read(void* ptr, size_t size, size_t n) {
AutoLock lock_scope(this);
size_t s = (size_ - offset_) / size;
size_t s = static_cast<size_t>(size_ - offset_) / size;
size_t ret = std::min(n, s);
memcpy(ptr, bytes_ + offset_, ret * size);
offset_ += ret * size;

4
cef/libcef_dll/wrapper/libcef_dll_wrapper.cc
View File

@ -84,6 +84,8 @@
#include "libcef_dll/ctocpp/urlrequest_ctocpp.h"
#include "libcef_dll/ctocpp/v8context_ctocpp.h"
#include "libcef_dll/ctocpp/v8exception_ctocpp.h"
#include "libcef_dll/ctocpp/v8stack_frame_ctocpp.h"
#include "libcef_dll/ctocpp/v8stack_trace_ctocpp.h"
#include "libcef_dll/ctocpp/v8value_ctocpp.h"
#include "libcef_dll/ctocpp/web_plugin_info_ctocpp.h"
#include "libcef_dll/ctocpp/xml_reader_ctocpp.h"
@ -199,6 +201,8 @@ CEF_GLOBAL void CefShutdown() {
DCHECK_EQ(CefV8ContextCToCpp::DebugObjCt, 0);
DCHECK_EQ(CefV8ExceptionCToCpp::DebugObjCt, 0);
DCHECK_EQ(CefV8HandlerCppToC::DebugObjCt, 0);
DCHECK_EQ(CefV8StackFrameCToCpp::DebugObjCt, 0);
DCHECK_EQ(CefV8StackTraceCToCpp::DebugObjCt, 0);
DCHECK_EQ(CefV8ValueCToCpp::DebugObjCt, 0);
DCHECK_EQ(CefWebPluginInfoCToCpp::DebugObjCt, 0);
DCHECK_EQ(CefWebPluginInfoVisitorCppToC::DebugObjCt, 0);