diff --git a/cef/Resources/am.lproj/locale.pak b/cef/Resources/am.lproj/locale.pak index 64d88a737..65189adb0 100644 Binary files a/cef/Resources/am.lproj/locale.pak and b/cef/Resources/am.lproj/locale.pak differ diff --git a/cef/Resources/ar.lproj/locale.pak b/cef/Resources/ar.lproj/locale.pak index 7c7dadcbe..fcbab5ebc 100644 Binary files a/cef/Resources/ar.lproj/locale.pak and b/cef/Resources/ar.lproj/locale.pak differ diff --git a/cef/Resources/bg.lproj/locale.pak b/cef/Resources/bg.lproj/locale.pak index ab6d0e6b0..6a462255a 100644 Binary files a/cef/Resources/bg.lproj/locale.pak and b/cef/Resources/bg.lproj/locale.pak differ diff --git a/cef/Resources/bn.lproj/locale.pak b/cef/Resources/bn.lproj/locale.pak index cea4fa839..895709a20 100644 Binary files a/cef/Resources/bn.lproj/locale.pak and b/cef/Resources/bn.lproj/locale.pak differ diff --git a/cef/Resources/ca.lproj/locale.pak b/cef/Resources/ca.lproj/locale.pak index 680e3b946..587b9e43e 100644 Binary files a/cef/Resources/ca.lproj/locale.pak and b/cef/Resources/ca.lproj/locale.pak differ diff --git a/cef/Resources/cef.pak b/cef/Resources/cef.pak index 3e99a98b5..f74178cd5 100644 Binary files a/cef/Resources/cef.pak and b/cef/Resources/cef.pak differ diff --git a/cef/Resources/cs.lproj/locale.pak b/cef/Resources/cs.lproj/locale.pak index c8de5bfb6..de45ea970 100644 Binary files a/cef/Resources/cs.lproj/locale.pak and b/cef/Resources/cs.lproj/locale.pak differ diff --git a/cef/Resources/da.lproj/locale.pak b/cef/Resources/da.lproj/locale.pak index 271b2c854..eff5594cc 100644 Binary files a/cef/Resources/da.lproj/locale.pak and b/cef/Resources/da.lproj/locale.pak differ diff --git a/cef/Resources/de.lproj/locale.pak b/cef/Resources/de.lproj/locale.pak index 836acc82c..58e3ecf6b 100644 Binary files a/cef/Resources/de.lproj/locale.pak and b/cef/Resources/de.lproj/locale.pak differ diff --git a/cef/Resources/devtools_resources.pak b/cef/Resources/devtools_resources.pak index eacab853a..4afa9320c 100644 Binary files a/cef/Resources/devtools_resources.pak and b/cef/Resources/devtools_resources.pak differ diff --git a/cef/Resources/el.lproj/locale.pak b/cef/Resources/el.lproj/locale.pak index 0bbaeeb29..90c7963fe 100644 Binary files a/cef/Resources/el.lproj/locale.pak and b/cef/Resources/el.lproj/locale.pak differ diff --git a/cef/Resources/en.lproj/locale.pak b/cef/Resources/en.lproj/locale.pak index bef874a76..0eeeefc13 100644 Binary files a/cef/Resources/en.lproj/locale.pak and b/cef/Resources/en.lproj/locale.pak differ diff --git a/cef/Resources/en_GB.lproj/locale.pak b/cef/Resources/en_GB.lproj/locale.pak index e8ad7cf61..90f29dc40 100644 Binary files a/cef/Resources/en_GB.lproj/locale.pak and b/cef/Resources/en_GB.lproj/locale.pak differ diff --git a/cef/Resources/es.lproj/locale.pak b/cef/Resources/es.lproj/locale.pak index 8d0ab7a2a..f835a1360 100644 Binary files a/cef/Resources/es.lproj/locale.pak and b/cef/Resources/es.lproj/locale.pak differ diff --git a/cef/Resources/es_419.lproj/locale.pak b/cef/Resources/es_419.lproj/locale.pak index 30498078c..bfbcdcac1 100644 Binary files a/cef/Resources/es_419.lproj/locale.pak and b/cef/Resources/es_419.lproj/locale.pak differ diff --git a/cef/Resources/et.lproj/locale.pak b/cef/Resources/et.lproj/locale.pak index 1038a6bc2..cefbf4dbc 100644 Binary files a/cef/Resources/et.lproj/locale.pak and b/cef/Resources/et.lproj/locale.pak differ diff --git a/cef/Resources/fa.lproj/locale.pak b/cef/Resources/fa.lproj/locale.pak index 4c23088ef..a4778379f 100644 Binary files a/cef/Resources/fa.lproj/locale.pak and b/cef/Resources/fa.lproj/locale.pak differ diff --git a/cef/Resources/fi.lproj/locale.pak b/cef/Resources/fi.lproj/locale.pak index f1305f0f2..305c8b4ff 100644 Binary files a/cef/Resources/fi.lproj/locale.pak and b/cef/Resources/fi.lproj/locale.pak differ diff --git a/cef/Resources/fil.lproj/locale.pak b/cef/Resources/fil.lproj/locale.pak index bee63ca17..0bdb2166a 100644 Binary files a/cef/Resources/fil.lproj/locale.pak and b/cef/Resources/fil.lproj/locale.pak differ diff --git a/cef/Resources/fr.lproj/locale.pak b/cef/Resources/fr.lproj/locale.pak index 0332894f0..a9211de68 100644 Binary files a/cef/Resources/fr.lproj/locale.pak and b/cef/Resources/fr.lproj/locale.pak differ diff --git a/cef/Resources/gu.lproj/locale.pak b/cef/Resources/gu.lproj/locale.pak index 6fb157209..6c3b22dc1 100644 Binary files a/cef/Resources/gu.lproj/locale.pak and b/cef/Resources/gu.lproj/locale.pak differ diff --git a/cef/Resources/he.lproj/locale.pak b/cef/Resources/he.lproj/locale.pak index 52ea44bc1..aae8411e3 100644 Binary files a/cef/Resources/he.lproj/locale.pak and b/cef/Resources/he.lproj/locale.pak differ diff --git a/cef/Resources/hi.lproj/locale.pak b/cef/Resources/hi.lproj/locale.pak index 24762e166..000033420 100644 Binary files a/cef/Resources/hi.lproj/locale.pak and b/cef/Resources/hi.lproj/locale.pak differ diff --git a/cef/Resources/hr.lproj/locale.pak b/cef/Resources/hr.lproj/locale.pak index 6b83baa08..b724a94ef 100644 Binary files a/cef/Resources/hr.lproj/locale.pak and b/cef/Resources/hr.lproj/locale.pak differ diff --git a/cef/Resources/hu.lproj/locale.pak b/cef/Resources/hu.lproj/locale.pak index 7f70c02dc..dd842fc21 100644 Binary files a/cef/Resources/hu.lproj/locale.pak and b/cef/Resources/hu.lproj/locale.pak differ diff --git a/cef/Resources/id.lproj/locale.pak b/cef/Resources/id.lproj/locale.pak index 4dab1e4b7..98826d0d1 100644 Binary files a/cef/Resources/id.lproj/locale.pak and b/cef/Resources/id.lproj/locale.pak differ diff --git a/cef/Resources/it.lproj/locale.pak b/cef/Resources/it.lproj/locale.pak index 1f0fb0804..663343821 100644 Binary files a/cef/Resources/it.lproj/locale.pak and b/cef/Resources/it.lproj/locale.pak differ diff --git a/cef/Resources/ja.lproj/locale.pak b/cef/Resources/ja.lproj/locale.pak index 5eaf4ac13..bc1f486fb 100644 Binary files a/cef/Resources/ja.lproj/locale.pak and b/cef/Resources/ja.lproj/locale.pak differ diff --git a/cef/Resources/kn.lproj/locale.pak b/cef/Resources/kn.lproj/locale.pak index 7558242f9..f25deb996 100644 Binary files a/cef/Resources/kn.lproj/locale.pak and b/cef/Resources/kn.lproj/locale.pak differ diff --git a/cef/Resources/ko.lproj/locale.pak b/cef/Resources/ko.lproj/locale.pak index 5bba4e89a..9600b505a 100644 Binary files a/cef/Resources/ko.lproj/locale.pak and b/cef/Resources/ko.lproj/locale.pak differ diff --git a/cef/Resources/lt.lproj/locale.pak b/cef/Resources/lt.lproj/locale.pak index e69c959dc..804667adc 100644 Binary files a/cef/Resources/lt.lproj/locale.pak and b/cef/Resources/lt.lproj/locale.pak differ diff --git a/cef/Resources/lv.lproj/locale.pak b/cef/Resources/lv.lproj/locale.pak index 242f7fca7..5027dd259 100644 Binary files a/cef/Resources/lv.lproj/locale.pak and b/cef/Resources/lv.lproj/locale.pak differ diff --git a/cef/Resources/ml.lproj/locale.pak b/cef/Resources/ml.lproj/locale.pak index 1ad1d3827..4ba5c4d40 100644 Binary files a/cef/Resources/ml.lproj/locale.pak and b/cef/Resources/ml.lproj/locale.pak differ diff --git a/cef/Resources/mr.lproj/locale.pak b/cef/Resources/mr.lproj/locale.pak index 2baa04f2f..35a709f9d 100644 Binary files a/cef/Resources/mr.lproj/locale.pak and b/cef/Resources/mr.lproj/locale.pak differ diff --git a/cef/Resources/ms.lproj/locale.pak b/cef/Resources/ms.lproj/locale.pak index 815faed74..6d1eb5d9c 100644 Binary files a/cef/Resources/ms.lproj/locale.pak and b/cef/Resources/ms.lproj/locale.pak differ diff --git a/cef/Resources/nb.lproj/locale.pak b/cef/Resources/nb.lproj/locale.pak index 3c5393181..500a994e1 100644 Binary files a/cef/Resources/nb.lproj/locale.pak and b/cef/Resources/nb.lproj/locale.pak differ diff --git a/cef/Resources/nl.lproj/locale.pak b/cef/Resources/nl.lproj/locale.pak index 111b53827..20aa175e2 100644 Binary files a/cef/Resources/nl.lproj/locale.pak and b/cef/Resources/nl.lproj/locale.pak differ diff --git a/cef/Resources/pl.lproj/locale.pak b/cef/Resources/pl.lproj/locale.pak index 2b67529ef..31af234a2 100644 Binary files a/cef/Resources/pl.lproj/locale.pak and b/cef/Resources/pl.lproj/locale.pak differ diff --git a/cef/Resources/pt_BR.lproj/locale.pak b/cef/Resources/pt_BR.lproj/locale.pak index 1753cb221..08adda03e 100644 Binary files a/cef/Resources/pt_BR.lproj/locale.pak and b/cef/Resources/pt_BR.lproj/locale.pak differ diff --git a/cef/Resources/pt_PT.lproj/locale.pak b/cef/Resources/pt_PT.lproj/locale.pak index c675b64c5..f1ec8f4e4 100644 Binary files a/cef/Resources/pt_PT.lproj/locale.pak and b/cef/Resources/pt_PT.lproj/locale.pak differ diff --git a/cef/Resources/ro.lproj/locale.pak b/cef/Resources/ro.lproj/locale.pak index 5803f4d99..7e8a7a973 100644 Binary files a/cef/Resources/ro.lproj/locale.pak and b/cef/Resources/ro.lproj/locale.pak differ diff --git a/cef/Resources/ru.lproj/locale.pak b/cef/Resources/ru.lproj/locale.pak index 0898db2be..03678ade9 100644 Binary files a/cef/Resources/ru.lproj/locale.pak and b/cef/Resources/ru.lproj/locale.pak differ diff --git a/cef/Resources/sk.lproj/locale.pak b/cef/Resources/sk.lproj/locale.pak index ecd4b58f1..7a0adfabe 100644 Binary files a/cef/Resources/sk.lproj/locale.pak and b/cef/Resources/sk.lproj/locale.pak differ diff --git a/cef/Resources/sl.lproj/locale.pak b/cef/Resources/sl.lproj/locale.pak index 65e48f409..a93192cfd 100644 Binary files a/cef/Resources/sl.lproj/locale.pak and b/cef/Resources/sl.lproj/locale.pak differ diff --git a/cef/Resources/sr.lproj/locale.pak b/cef/Resources/sr.lproj/locale.pak index 46031def3..9d17cb4f8 100644 Binary files a/cef/Resources/sr.lproj/locale.pak and b/cef/Resources/sr.lproj/locale.pak differ diff --git a/cef/Resources/sv.lproj/locale.pak b/cef/Resources/sv.lproj/locale.pak index 93978914c..82d18cf87 100644 Binary files a/cef/Resources/sv.lproj/locale.pak and b/cef/Resources/sv.lproj/locale.pak differ diff --git a/cef/Resources/sw.lproj/locale.pak b/cef/Resources/sw.lproj/locale.pak index 2851e2d4a..6f773aa10 100644 Binary files a/cef/Resources/sw.lproj/locale.pak and b/cef/Resources/sw.lproj/locale.pak differ diff --git a/cef/Resources/ta.lproj/locale.pak b/cef/Resources/ta.lproj/locale.pak index 7de840455..3a3aa4446 100644 Binary files a/cef/Resources/ta.lproj/locale.pak and b/cef/Resources/ta.lproj/locale.pak differ diff --git a/cef/Resources/te.lproj/locale.pak b/cef/Resources/te.lproj/locale.pak index bc6713b70..a225c5496 100644 Binary files a/cef/Resources/te.lproj/locale.pak and b/cef/Resources/te.lproj/locale.pak differ diff --git a/cef/Resources/th.lproj/locale.pak b/cef/Resources/th.lproj/locale.pak index 17807ac1b..d954eecb2 100644 Binary files a/cef/Resources/th.lproj/locale.pak and b/cef/Resources/th.lproj/locale.pak differ diff --git a/cef/Resources/tr.lproj/locale.pak b/cef/Resources/tr.lproj/locale.pak index 8b53ac274..fdbf850df 100644 Binary files a/cef/Resources/tr.lproj/locale.pak and b/cef/Resources/tr.lproj/locale.pak differ diff --git a/cef/Resources/uk.lproj/locale.pak b/cef/Resources/uk.lproj/locale.pak index a38a9aef0..0ef1824ba 100644 Binary files a/cef/Resources/uk.lproj/locale.pak and b/cef/Resources/uk.lproj/locale.pak differ diff --git a/cef/Resources/vi.lproj/locale.pak b/cef/Resources/vi.lproj/locale.pak index 25e6b7d81..3ac42090d 100644 Binary files a/cef/Resources/vi.lproj/locale.pak and b/cef/Resources/vi.lproj/locale.pak differ diff --git a/cef/Resources/zh_CN.lproj/locale.pak b/cef/Resources/zh_CN.lproj/locale.pak index d57ba6298..50ee386ae 100644 Binary files a/cef/Resources/zh_CN.lproj/locale.pak and b/cef/Resources/zh_CN.lproj/locale.pak differ diff --git a/cef/Resources/zh_TW.lproj/locale.pak b/cef/Resources/zh_TW.lproj/locale.pak index 71fea863d..0d00e83a2 100644 Binary files a/cef/Resources/zh_TW.lproj/locale.pak and b/cef/Resources/zh_TW.lproj/locale.pak differ diff --git a/cef/cef_paths.gypi b/cef/cef_paths.gypi index 03d045758..963603e8b 100644 --- a/cef/cef_paths.gypi +++ b/cef/cef_paths.gypi @@ -1,4 +1,4 @@ -# Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +# Copyright (c) 2013 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. # @@ -39,6 +39,7 @@ 'cef/include/cef_process_message.h', 'cef/include/cef_process_util.h', 'cef/include/cef_proxy_handler.h', + 'cef/include/cef_render_handler.h', 'cef/include/cef_render_process_handler.h', 'cef/include/cef_request.h', 'cef/include/cef_request_handler.h', @@ -86,6 +87,7 @@ 'cef/include/capi/cef_process_message_capi.h', 'cef/include/capi/cef_process_util_capi.h', 'cef/include/capi/cef_proxy_handler_capi.h', + 'cef/include/capi/cef_render_handler_capi.h', 'cef/include/capi/cef_render_process_handler_capi.h', 'cef/include/capi/cef_request_capi.h', 'cef/include/capi/cef_request_handler_capi.h', @@ -194,6 +196,8 @@ 'cef/libcef_dll/cpptoc/quota_callback_cpptoc.h', 'cef/libcef_dll/ctocpp/read_handler_ctocpp.cc', 'cef/libcef_dll/ctocpp/read_handler_ctocpp.h', + 'cef/libcef_dll/ctocpp/render_handler_ctocpp.cc', + 'cef/libcef_dll/ctocpp/render_handler_ctocpp.h', 'cef/libcef_dll/ctocpp/render_process_handler_ctocpp.cc', 'cef/libcef_dll/ctocpp/render_process_handler_ctocpp.h', 'cef/libcef_dll/cpptoc/request_cpptoc.cc', @@ -220,6 +224,8 @@ 'cef/libcef_dll/ctocpp/string_visitor_ctocpp.h', 'cef/libcef_dll/ctocpp/task_ctocpp.cc', 'cef/libcef_dll/ctocpp/task_ctocpp.h', + 'cef/libcef_dll/cpptoc/task_runner_cpptoc.cc', + 'cef/libcef_dll/cpptoc/task_runner_cpptoc.h', 'cef/libcef_dll/ctocpp/trace_client_ctocpp.cc', 'cef/libcef_dll/ctocpp/trace_client_ctocpp.h', 'cef/libcef_dll/cpptoc/urlrequest_cpptoc.cc', @@ -342,6 +348,8 @@ 'cef/libcef_dll/ctocpp/quota_callback_ctocpp.h', 'cef/libcef_dll/cpptoc/read_handler_cpptoc.cc', 'cef/libcef_dll/cpptoc/read_handler_cpptoc.h', + 'cef/libcef_dll/cpptoc/render_handler_cpptoc.cc', + 'cef/libcef_dll/cpptoc/render_handler_cpptoc.h', 'cef/libcef_dll/cpptoc/render_process_handler_cpptoc.cc', 'cef/libcef_dll/cpptoc/render_process_handler_cpptoc.h', 'cef/libcef_dll/ctocpp/request_ctocpp.cc', @@ -368,6 +376,8 @@ 'cef/libcef_dll/cpptoc/string_visitor_cpptoc.h', 'cef/libcef_dll/cpptoc/task_cpptoc.cc', 'cef/libcef_dll/cpptoc/task_cpptoc.h', + 'cef/libcef_dll/ctocpp/task_runner_ctocpp.cc', + 'cef/libcef_dll/ctocpp/task_runner_ctocpp.h', 'cef/libcef_dll/cpptoc/trace_client_cpptoc.cc', 'cef/libcef_dll/cpptoc/trace_client_cpptoc.h', 'cef/libcef_dll/ctocpp/urlrequest_ctocpp.cc', diff --git a/cef/cef_paths2.gypi b/cef/cef_paths2.gypi index 16fb32986..fadc4f101 100644 --- a/cef/cef_paths2.gypi +++ b/cef/cef_paths2.gypi @@ -98,11 +98,16 @@ 'tests/cefclient/dialog_test.h', 'tests/cefclient/dom_test.cpp', 'tests/cefclient/dom_test.h', + 'tests/cefclient/performance_test.cpp', + 'tests/cefclient/performance_test.h', + 'tests/cefclient/performance_test_setup.h', + 'tests/cefclient/performance_test_tests.cpp', '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', + 'tests/cefclient/res/performance.html', 'tests/cefclient/res/xmlhttprequest.html', 'tests/cefclient/resource_util.h', 'tests/cefclient/scheme_test.cpp', @@ -113,12 +118,17 @@ ], 'cefclient_sources_win': [ 'tests/cefclient/cefclient.rc', + 'tests/cefclient/cefclient_osr_widget_win.h', + 'tests/cefclient/cefclient_osr_widget_win.cpp', 'tests/cefclient/cefclient_win.cpp', 'tests/cefclient/client_handler_win.cpp', + 'tests/cefclient/osrenderer.h', + 'tests/cefclient/osrenderer.cpp', 'tests/cefclient/resource.h', 'tests/cefclient/res/cefclient.ico', 'tests/cefclient/res/logoball.png', 'tests/cefclient/res/small.ico', + 'tests/cefclient/res/transparency.html', 'tests/cefclient/resource_util_win.cpp', ], 'cefclient_sources_mac': [ @@ -143,6 +153,10 @@ 'tests/cefclient/dialog_test.h', 'tests/cefclient/dom_test.cpp', 'tests/cefclient/dom_test.h', + 'tests/cefclient/performance_test.cpp', + 'tests/cefclient/performance_test.h', + 'tests/cefclient/performance_test_setup.h', + 'tests/cefclient/performance_test_tests.cpp', 'tests/cefclient/process_helper_mac.cpp', 'tests/cefclient/resource_util.h', 'tests/cefclient/resource_util_mac.mm', @@ -162,6 +176,7 @@ 'tests/cefclient/res/domaccess.html', 'tests/cefclient/res/localstorage.html', 'tests/cefclient/res/logo.png', + 'tests/cefclient/res/performance.html', 'tests/cefclient/res/xmlhttprequest.html', ], 'cefclient_sources_linux': [ @@ -175,6 +190,7 @@ 'tests/cefclient/res/domaccess.html', 'tests/cefclient/res/localstorage.html', 'tests/cefclient/res/logo.png', + 'tests/cefclient/res/performance.html', 'tests/cefclient/res/xmlhttprequest.html', ], }, diff --git a/cef/frameworks/ffmpegsumo.so b/cef/frameworks/ffmpegsumo.so index 9a496f0d0..77a27dc6a 100755 Binary files a/cef/frameworks/ffmpegsumo.so and b/cef/frameworks/ffmpegsumo.so differ diff --git a/cef/frameworks/libcef.dylib b/cef/frameworks/libcef.dylib index 7bf869458..772bb935c 100755 Binary files a/cef/frameworks/libcef.dylib and b/cef/frameworks/libcef.dylib differ diff --git a/cef/include/capi/cef_app_capi.h b/cef/include/capi/cef_app_capi.h index e698171d0..77b641468 100644 --- a/cef/include/capi/cef_app_capi.h +++ b/cef/include/capi/cef_app_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_browser_capi.h b/cef/include/capi/cef_browser_capi.h index e721cbece..b10c64c89 100644 --- a/cef/include/capi/cef_browser_capi.h +++ b/cef/include/capi/cef_browser_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -109,6 +109,13 @@ typedef struct _cef_browser_t { /// int (CEF_CALLBACK *get_identifier)(struct _cef_browser_t* self); + /// + // Returns true (1) if this object is pointing to the same handle as |that| + // object. + /// + int (CEF_CALLBACK *is_same)(struct _cef_browser_t* self, + struct _cef_browser_t* that); + /// // Returns true (1) if the window is a popup window. /// @@ -290,6 +297,71 @@ typedef struct _cef_browser_host_t { enum cef_file_dialog_mode_t mode, const cef_string_t* title, const cef_string_t* default_file_name, cef_string_list_t accept_types, struct _cef_run_file_dialog_callback_t* callback); + + /// + // Returns true (1) if window rendering is disabled. + /// + int (CEF_CALLBACK *is_window_rendering_disabled)( + struct _cef_browser_host_t* self); + + /// + // Notify the browser that the widget has been resized. The browser will first + // call cef_render_handler_t::GetViewRect to get the new size and then call + // cef_render_handler_t::OnPaint asynchronously with the updated regions. This + // function is only used when window rendering is disabled. + /// + void (CEF_CALLBACK *was_resized)(struct _cef_browser_host_t* self); + + /// + // Invalidate the |dirtyRect| region of the view. The browser will call + // cef_render_handler_t::OnPaint asynchronously with the updated regions. This + // function is only used when window rendering is disabled. + /// + void (CEF_CALLBACK *invalidate)(struct _cef_browser_host_t* self, + const cef_rect_t* dirtyRect, enum cef_paint_element_type_t type); + + /// + // Send a key event to the browser. + /// + void (CEF_CALLBACK *send_key_event)(struct _cef_browser_host_t* self, + const struct _cef_key_event_t* event); + + /// + // Send a mouse click event to the browser. The |x| and |y| coordinates are + // relative to the upper-left corner of the view. + /// + void (CEF_CALLBACK *send_mouse_click_event)(struct _cef_browser_host_t* self, + const struct _cef_mouse_event_t* event, + enum cef_mouse_button_type_t type, int mouseUp, int clickCount); + + /// + // Send a mouse move event to the browser. The |x| and |y| coordinates are + // relative to the upper-left corner of the view. + /// + void (CEF_CALLBACK *send_mouse_move_event)(struct _cef_browser_host_t* self, + const struct _cef_mouse_event_t* event, int mouseLeave); + + /// + // Send a mouse wheel event to the browser. The |x| and |y| coordinates are + // relative to the upper-left corner of the view. The |deltaX| and |deltaY| + // values represent the movement delta in the X and Y directions respectively. + // In order to scroll inside select popups with window rendering disabled + // cef_render_handler_t::GetScreenPoint should be implemented properly. + /// + void (CEF_CALLBACK *send_mouse_wheel_event)(struct _cef_browser_host_t* self, + const struct _cef_mouse_event_t* event, int deltaX, int deltaY); + + /// + // Send a focus event to the browser. + /// + void (CEF_CALLBACK *send_focus_event)(struct _cef_browser_host_t* self, + int setFocus); + + /// + // Send a capture lost event to the browser. + /// + void (CEF_CALLBACK *send_capture_lost_event)( + struct _cef_browser_host_t* self); } cef_browser_host_t; diff --git a/cef/include/capi/cef_browser_process_handler_capi.h b/cef/include/capi/cef_browser_process_handler_capi.h index 3c631175b..b41d66ef1 100644 --- a/cef/include/capi/cef_browser_process_handler_capi.h +++ b/cef/include/capi/cef_browser_process_handler_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -72,12 +72,26 @@ typedef struct _cef_browser_process_handler_t { struct _cef_browser_process_handler_t* self); /// - // Called on the browser process IO thread before a child process is launched. - // Provides an opportunity to modify the child process command line. + // Called before a child process is launched. Will be called on the browser + // process UI thread when launching a render process and on the browser + // process IO thread when launching a GPU or plugin process. Provides an + // opportunity to modify the child process command line. Do not keep a + // reference to |command_line| outside of this function. /// void (CEF_CALLBACK *on_before_child_process_launch)( struct _cef_browser_process_handler_t* self, struct _cef_command_line_t* command_line); + + /// + // Called on the browser process IO thread after the main thread has been + // created for a new render process. Provides an opportunity to specify extra + // information that will be passed to + // cef_render_process_handler_t::on_render_thread_created() in the render + // process. Do not keep a reference to |extra_info| outside of this function. + /// + void (CEF_CALLBACK *on_render_process_thread_created)( + struct _cef_browser_process_handler_t* self, + struct _cef_list_value_t* extra_info); } cef_browser_process_handler_t; diff --git a/cef/include/capi/cef_callback_capi.h b/cef/include/capi/cef_callback_capi.h index 8f5cbeb62..a6731efd7 100644 --- a/cef/include/capi/cef_callback_capi.h +++ b/cef/include/capi/cef_callback_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_client_capi.h b/cef/include/capi/cef_client_capi.h index 87be6f7bf..cdb513d30 100644 --- a/cef/include/capi/cef_client_capi.h +++ b/cef/include/capi/cef_client_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -119,6 +119,12 @@ typedef struct _cef_client_t { struct _cef_load_handler_t* (CEF_CALLBACK *get_load_handler)( struct _cef_client_t* self); + /// + // Return the handler for off-screen rendering events. + /// + struct _cef_render_handler_t* (CEF_CALLBACK *get_render_handler)( + struct _cef_client_t* self); + /// // Return the handler for browser request events. /// diff --git a/cef/include/capi/cef_command_line_capi.h b/cef/include/capi/cef_command_line_capi.h index 70ce23352..0168c16c3 100644 --- a/cef/include/capi/cef_command_line_capi.h +++ b/cef/include/capi/cef_command_line_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_context_menu_handler_capi.h b/cef/include/capi/cef_context_menu_handler_capi.h index 02989d9c4..c9282393e 100644 --- a/cef/include/capi/cef_context_menu_handler_capi.h +++ b/cef/include/capi/cef_context_menu_handler_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_cookie_capi.h b/cef/include/capi/cef_cookie_capi.h index d5c6d9bb6..de795e921 100644 --- a/cef/include/capi/cef_cookie_capi.h +++ b/cef/include/capi/cef_cookie_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_dialog_handler_capi.h b/cef/include/capi/cef_dialog_handler_capi.h index ede997663..bd7a2656c 100644 --- a/cef/include/capi/cef_dialog_handler_capi.h +++ b/cef/include/capi/cef_dialog_handler_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_display_handler_capi.h b/cef/include/capi/cef_display_handler_capi.h index f2b68017a..9a329a8aa 100644 --- a/cef/include/capi/cef_display_handler_capi.h +++ b/cef/include/capi/cef_display_handler_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -80,7 +80,8 @@ typedef struct _cef_display_handler_t { // text that will be displayed in the tooltip. To handle the display of the // tooltip yourself return true (1). Otherwise, you can optionally modify // |text| and then return false (0) to allow the browser to display the - // tooltip. + // tooltip. When window rendering is disabled the application is responsible + // for drawing tooltips and the return value is ignored. /// int (CEF_CALLBACK *on_tooltip)(struct _cef_display_handler_t* self, struct _cef_browser_t* browser, cef_string_t* text); diff --git a/cef/include/capi/cef_dom_capi.h b/cef/include/capi/cef_dom_capi.h index 8b5b752ec..99f0055c1 100644 --- a/cef/include/capi/cef_dom_capi.h +++ b/cef/include/capi/cef_dom_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_download_handler_capi.h b/cef/include/capi/cef_download_handler_capi.h index ef0821c27..658136b74 100644 --- a/cef/include/capi/cef_download_handler_capi.h +++ b/cef/include/capi/cef_download_handler_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_download_item_capi.h b/cef/include/capi/cef_download_item_capi.h index c5ac8b5c5..5639eb53f 100644 --- a/cef/include/capi/cef_download_item_capi.h +++ b/cef/include/capi/cef_download_item_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -145,13 +145,6 @@ typedef struct _cef_download_item_t { // The resulting string must be freed by calling cef_string_userfree_free(). cef_string_userfree_t (CEF_CALLBACK *get_mime_type)( struct _cef_download_item_t* self); - - /// - // Returns the referrer character set. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_referrer_charset)( - struct _cef_download_item_t* self); } cef_download_item_t; diff --git a/cef/include/capi/cef_focus_handler_capi.h b/cef/include/capi/cef_focus_handler_capi.h index 04ee80d81..b0b2a34b6 100644 --- a/cef/include/capi/cef_focus_handler_capi.h +++ b/cef/include/capi/cef_focus_handler_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_frame_capi.h b/cef/include/capi/cef_frame_capi.h index 88f0ae20d..c13a98dfb 100644 --- a/cef/include/capi/cef_frame_capi.h +++ b/cef/include/capi/cef_frame_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_geolocation_capi.h b/cef/include/capi/cef_geolocation_capi.h index c74b0609a..c4ec6aa6a 100644 --- a/cef/include/capi/cef_geolocation_capi.h +++ b/cef/include/capi/cef_geolocation_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_geolocation_handler_capi.h b/cef/include/capi/cef_geolocation_handler_capi.h index 30eca09a6..8a646b5ac 100644 --- a/cef/include/capi/cef_geolocation_handler_capi.h +++ b/cef/include/capi/cef_geolocation_handler_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_jsdialog_handler_capi.h b/cef/include/capi/cef_jsdialog_handler_capi.h index a667b5a6b..4869f54ea 100644 --- a/cef/include/capi/cef_jsdialog_handler_capi.h +++ b/cef/include/capi/cef_jsdialog_handler_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_keyboard_handler_capi.h b/cef/include/capi/cef_keyboard_handler_capi.h index abff51461..e01c150bf 100644 --- a/cef/include/capi/cef_keyboard_handler_capi.h +++ b/cef/include/capi/cef_keyboard_handler_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_life_span_handler_capi.h b/cef/include/capi/cef_life_span_handler_capi.h index be5fe1290..0220e2667 100644 --- a/cef/include/capi/cef_life_span_handler_capi.h +++ b/cef/include/capi/cef_life_span_handler_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_load_handler_capi.h b/cef/include/capi/cef_load_handler_capi.h index e707a8dd2..5ec9060ba 100644 --- a/cef/include/capi/cef_load_handler_capi.h +++ b/cef/include/capi/cef_load_handler_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_menu_model_capi.h b/cef/include/capi/cef_menu_model_capi.h index 6a4179998..d0c7af323 100644 --- a/cef/include/capi/cef_menu_model_capi.h +++ b/cef/include/capi/cef_menu_model_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_origin_whitelist_capi.h b/cef/include/capi/cef_origin_whitelist_capi.h index 917ec861e..8dde4c1c5 100644 --- a/cef/include/capi/cef_origin_whitelist_capi.h +++ b/cef/include/capi/cef_origin_whitelist_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_path_util_capi.h b/cef/include/capi/cef_path_util_capi.h index 3df1a100a..847a283ae 100644 --- a/cef/include/capi/cef_path_util_capi.h +++ b/cef/include/capi/cef_path_util_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_process_message_capi.h b/cef/include/capi/cef_process_message_capi.h index 2b072dcf7..cc00a3c77 100644 --- a/cef/include/capi/cef_process_message_capi.h +++ b/cef/include/capi/cef_process_message_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_process_util_capi.h b/cef/include/capi/cef_process_util_capi.h index 53ccbb2c1..066a461e6 100644 --- a/cef/include/capi/cef_process_util_capi.h +++ b/cef/include/capi/cef_process_util_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_proxy_handler_capi.h b/cef/include/capi/cef_proxy_handler_capi.h index 2628002d6..1ed15c560 100644 --- a/cef/include/capi/cef_proxy_handler_capi.h +++ b/cef/include/capi/cef_proxy_handler_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_render_handler_capi.h b/cef/include/capi/cef_render_handler_capi.h new file mode 100644 index 000000000..da57b65ec --- /dev/null +++ b/cef/include/capi/cef_render_handler_capi.h @@ -0,0 +1,118 @@ +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the name Chromium Embedded +// Framework nor the names of its contributors may be used to endorse +// or promote products derived from this software without specific prior +// written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// --------------------------------------------------------------------------- +// +// This file was generated by the CEF translator tool and should not edited +// by hand. See the translator.README.txt file in the tools directory for +// more information. +// + +#ifndef CEF_INCLUDE_CAPI_CEF_RENDER_HANDLER_CAPI_H_ +#define CEF_INCLUDE_CAPI_CEF_RENDER_HANDLER_CAPI_H_ +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +#include "include/capi/cef_base_capi.h" + + +/// +// Implement this structure to handle events when window rendering is disabled. +// The functions of this structure will be called on the UI thread. +/// +typedef struct _cef_render_handler_t { + /// + // Base structure. + /// + cef_base_t base; + + /// + // Called to retrieve the root window rectangle in screen coordinates. Return + // true (1) if the rectangle was provided. + /// + int (CEF_CALLBACK *get_root_screen_rect)(struct _cef_render_handler_t* self, + struct _cef_browser_t* browser, cef_rect_t* rect); + + /// + // Called to retrieve the view rectangle which is relative to screen + // coordinates. Return true (1) if the rectangle was provided. + /// + int (CEF_CALLBACK *get_view_rect)(struct _cef_render_handler_t* self, + struct _cef_browser_t* browser, cef_rect_t* rect); + + /// + // Called to retrieve the translation from view coordinates to actual screen + // coordinates. Return true (1) if the screen coordinates were provided. + /// + int (CEF_CALLBACK *get_screen_point)(struct _cef_render_handler_t* self, + struct _cef_browser_t* browser, int viewX, int viewY, int* screenX, + int* screenY); + + /// + // Called when the browser wants to show or hide the popup widget. The popup + // should be shown if |show| is true (1) and hidden if |show| is false (0). + /// + void (CEF_CALLBACK *on_popup_show)(struct _cef_render_handler_t* self, + struct _cef_browser_t* browser, int show); + + /// + // Called when the browser wants to move or resize the popup widget. |rect| + // contains the new location and size. + /// + void (CEF_CALLBACK *on_popup_size)(struct _cef_render_handler_t* self, + struct _cef_browser_t* browser, const cef_rect_t* rect); + + /// + // Called when an element should be painted. |type| indicates whether the + // element is the view or the popup widget. |buffer| contains the pixel data + // for the whole image. |dirtyRects| contains the set of rectangles that need + // to be repainted. On Windows |buffer| will be |width|*|height|*4 bytes in + // size and represents a BGRA image with an upper-left origin. + /// + void (CEF_CALLBACK *on_paint)(struct _cef_render_handler_t* self, + struct _cef_browser_t* browser, enum cef_paint_element_type_t type, + size_t dirtyRectsCount, cef_rect_t const* dirtyRects, const void* buffer, + int width, int height); + + /// + // Called when the browser window's cursor has changed. + /// + void (CEF_CALLBACK *on_cursor_change)(struct _cef_render_handler_t* self, + struct _cef_browser_t* browser, cef_cursor_handle_t cursor); +} cef_render_handler_t; + + +#ifdef __cplusplus +} +#endif + +#endif // CEF_INCLUDE_CAPI_CEF_RENDER_HANDLER_CAPI_H_ diff --git a/cef/include/capi/cef_render_process_handler_capi.h b/cef/include/capi/cef_render_process_handler_capi.h index 6ff24d0b7..13949fe8a 100644 --- a/cef/include/capi/cef_render_process_handler_capi.h +++ b/cef/include/capi/cef_render_process_handler_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -47,7 +47,8 @@ extern "C" { /// // Structure used to implement render process callbacks. The functions of this -// structure will always be called on the render process main thread. +// structure will be called on the render process main thread (TID_RENDERER) +// unless otherwise indicated. /// typedef struct _cef_render_process_handler_t { /// @@ -56,10 +57,14 @@ typedef struct _cef_render_process_handler_t { cef_base_t base; /// - // Called after the render process main thread has been created. + // Called after the render process main thread has been created. |extra_info| + // is a read-only value originating from + // cef_browser_process_handler_t::on_render_process_thread_created(). Do not + // keep a reference to |extra_info| outside of this function. /// void (CEF_CALLBACK *on_render_thread_created)( - struct _cef_render_process_handler_t* self); + struct _cef_render_process_handler_t* self, + struct _cef_list_value_t* extra_info); /// // Called after WebKit has been initialized. @@ -68,7 +73,9 @@ typedef struct _cef_render_process_handler_t { struct _cef_render_process_handler_t* self); /// - // Called after a browser has been created. + // Called after a browser has been created. When browsing cross-origin a new + // browser will be created before the old browser with the same identifier is + // destroyed. /// void (CEF_CALLBACK *on_browser_created)( struct _cef_render_process_handler_t* self, @@ -81,10 +88,24 @@ typedef struct _cef_render_process_handler_t { struct _cef_render_process_handler_t* self, struct _cef_browser_t* browser); + /// + // Called before browser navigation. Return true (1) to cancel the navigation + // or false (0) to allow the navigation to proceed. The |request| object + // cannot be modified in this callback. + /// + int (CEF_CALLBACK *on_before_navigation)( + struct _cef_render_process_handler_t* self, + struct _cef_browser_t* browser, struct _cef_frame_t* frame, + struct _cef_request_t* request, + enum cef_navigation_type_t navigation_type, int is_redirect); + /// // Called immediately after the V8 context for a frame has been created. To // retrieve the JavaScript 'window' object use the - // cef_v8context_t::get_global() function. + // cef_v8context_t::get_global() function. V8 handles can only be accessed + // from the thread on which they are created. A task runner for posting tasks + // on the associated thread can be retrieved via the + // cef_v8context_t::get_task_runner() function. /// void (CEF_CALLBACK *on_context_created)( struct _cef_render_process_handler_t* self, @@ -100,6 +121,50 @@ typedef struct _cef_render_process_handler_t { struct _cef_browser_t* browser, struct _cef_frame_t* frame, struct _cef_v8context_t* context); + /// + // Called for global uncaught exceptions in a frame. Execution of this + // callback is disabled by default. To enable set + // CefSettings.uncaught_exception_stack_size > 0. + /// + void (CEF_CALLBACK *on_uncaught_exception)( + struct _cef_render_process_handler_t* self, + struct _cef_browser_t* browser, struct _cef_frame_t* frame, + struct _cef_v8context_t* context, struct _cef_v8exception_t* exception, + struct _cef_v8stack_trace_t* stackTrace); + + /// + // Called on the WebWorker thread immediately after the V8 context for a new + // WebWorker has been created. To retrieve the JavaScript 'self' object use + // the cef_v8context_t::get_global() function. V8 handles can only be accessed + // from the thread on which they are created. A task runner for posting tasks + // on the associated thread can be retrieved via the + // cef_v8context_t::get_task_runner() function. + /// + void (CEF_CALLBACK *on_worker_context_created)( + struct _cef_render_process_handler_t* self, int worker_id, + const cef_string_t* url, struct _cef_v8context_t* context); + + /// + // Called on the WebWorker thread immediately before the V8 context for a + // WebWorker is released. No references to the context should be kept after + // this function is called. Any tasks posted or pending on the WebWorker + // thread after this function is called may not be executed. + /// + void (CEF_CALLBACK *on_worker_context_released)( + struct _cef_render_process_handler_t* self, int worker_id, + const cef_string_t* url, struct _cef_v8context_t* context); + + /// + // Called on the WebWorker thread for global uncaught exceptions in a + // WebWorker. Execution of this callback is disabled by default. To enable set + // CefSettings.uncaught_exception_stack_size > 0. + /// + void (CEF_CALLBACK *on_worker_uncaught_exception)( + struct _cef_render_process_handler_t* self, int worker_id, + const cef_string_t* url, struct _cef_v8context_t* context, + struct _cef_v8exception_t* exception, + struct _cef_v8stack_trace_t* stackTrace); + /// // Called when a new node in the the browser gets focus. The |node| value may // be NULL if no specific node has gained focus. The node object passed to diff --git a/cef/include/capi/cef_request_capi.h b/cef/include/capi/cef_request_capi.h index a28d4754d..da895f362 100644 --- a/cef/include/capi/cef_request_capi.h +++ b/cef/include/capi/cef_request_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_request_handler_capi.h b/cef/include/capi/cef_request_handler_capi.h index 1a21cadf8..d2a9477d2 100644 --- a/cef/include/capi/cef_request_handler_capi.h +++ b/cef/include/capi/cef_request_handler_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -132,9 +132,8 @@ typedef struct _cef_request_handler_t { // Called on the IO thread when the browser needs credentials from the user. // |isProxy| indicates whether the host is a proxy server. |host| contains the // hostname and |port| contains the port number. Return true (1) to continue - // the request and call cef_auth_callback_t::Complete() when the - // authentication information is available. Return false (0) to cancel the - // request. + // the request and call cef_auth_callback_t::cont() when the authentication + // information is available. Return false (0) to cancel the request. /// int (CEF_CALLBACK *get_auth_credentials)(struct _cef_request_handler_t* self, struct _cef_browser_t* browser, struct _cef_frame_t* frame, int isProxy, @@ -145,9 +144,9 @@ typedef struct _cef_request_handler_t { // Called on the IO thread when JavaScript requests a specific storage quota // size via the webkitStorageInfo.requestQuota function. |origin_url| is the // origin of the page making the request. |new_size| is the requested quota - // size in bytes. Return true (1) and call cef_quota_callback_t::Complete() - // either in this function or at a later time to grant or deny the request. - // Return false (0) to cancel the request. + // size in bytes. Return true (1) and call cef_quota_callback_t::cont() either + // in this function or at a later time to grant or deny the request. Return + // false (0) to cancel the request. /// int (CEF_CALLBACK *on_quota_request)(struct _cef_request_handler_t* self, struct _cef_browser_t* browser, const cef_string_t* origin_url, diff --git a/cef/include/capi/cef_resource_bundle_handler_capi.h b/cef/include/capi/cef_resource_bundle_handler_capi.h index e81d7f947..62a90c04e 100644 --- a/cef/include/capi/cef_resource_bundle_handler_capi.h +++ b/cef/include/capi/cef_resource_bundle_handler_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_resource_handler_capi.h b/cef/include/capi/cef_resource_handler_capi.h index b55c41202..5f2d8384b 100644 --- a/cef/include/capi/cef_resource_handler_capi.h +++ b/cef/include/capi/cef_resource_handler_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_response_capi.h b/cef/include/capi/cef_response_capi.h index 5dd682ae4..f583b1343 100644 --- a/cef/include/capi/cef_response_capi.h +++ b/cef/include/capi/cef_response_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_scheme_capi.h b/cef/include/capi/cef_scheme_capi.h index 3e9622eb9..8eea0201c 100644 --- a/cef/include/capi/cef_scheme_capi.h +++ b/cef/include/capi/cef_scheme_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_stream_capi.h b/cef/include/capi/cef_stream_capi.h index f73fa39c3..e4b32b597 100644 --- a/cef/include/capi/cef_stream_capi.h +++ b/cef/include/capi/cef_stream_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_string_visitor_capi.h b/cef/include/capi/cef_string_visitor_capi.h index aa628faae..13407ccd8 100644 --- a/cef/include/capi/cef_string_visitor_capi.h +++ b/cef/include/capi/cef_string_visitor_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_task_capi.h b/cef/include/capi/cef_task_capi.h index 75b6ee3ed..e4deec516 100644 --- a/cef/include/capi/cef_task_capi.h +++ b/cef/include/capi/cef_task_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -46,33 +46,33 @@ extern "C" { /// -// CEF maintains multiple internal threads that are used for handling different -// types of tasks in different processes. See the cef_thread_id_t definitions in -// cef_types.h for more information. This function will return true (1) if -// called on the specified thread. It is an error to request a thread from the -// wrong process. +// Returns true (1) if called on the specified thread. Equivalent to using +// cef_task_runner_t::GetForThread(threadId)->belongs_to_current_thread(). /// CEF_EXPORT int cef_currently_on(cef_thread_id_t threadId); /// -// Post a task for execution on the specified thread. This function may be -// called on any thread. It is an error to request a thread from the wrong -// process. +// Post a task for execution on the specified thread. Equivalent to using +// cef_task_runner_t::GetForThread(threadId)->PostTask(task). /// CEF_EXPORT int cef_post_task(cef_thread_id_t threadId, struct _cef_task_t* task); /// -// Post a task for delayed execution on the specified thread. This function may -// be called on any thread. It is an error to request a thread from the wrong -// process. +// Post a task for delayed execution on the specified thread. Equivalent to +// using cef_task_runner_t::GetForThread(threadId)->PostDelayedTask(task, +// delay_ms). /// CEF_EXPORT int cef_post_delayed_task(cef_thread_id_t threadId, struct _cef_task_t* task, int64 delay_ms); /// -// Implement this structure for task execution. The functions of this structure -// may be called on any thread. +// Implement this structure for asynchronous task execution. If the task is +// posted successfully and if the associated message loop is still running then +// the execute() function will be called on the target thread. If the task fails +// to post then the task object may be destroyed on the source thread instead of +// the target thread. For this reason be cautious when performing work in the +// task object destructor. /// typedef struct _cef_task_t { /// @@ -81,13 +81,78 @@ typedef struct _cef_task_t { cef_base_t base; /// - // Method that will be executed. |threadId| is the thread executing the call. + // Method that will be executed on the target thread. /// - void (CEF_CALLBACK *execute)(struct _cef_task_t* self, - cef_thread_id_t threadId); + void (CEF_CALLBACK *execute)(struct _cef_task_t* self); } cef_task_t; +/// +// Structure that asynchronously executes tasks on the associated thread. It is +// safe to call the functions of this structure on any thread. +// +// CEF maintains multiple internal threads that are used for handling different +// types of tasks in different processes. The cef_thread_id_t definitions in +// cef_types.h list the common CEF threads. Task runners are also available for +// other CEF threads as appropriate (for example, V8 WebWorker threads). +/// +typedef struct _cef_task_runner_t { + /// + // Base structure. + /// + cef_base_t base; + + /// + // Returns true (1) if this object is pointing to the same task runner as + // |that| object. + /// + int (CEF_CALLBACK *is_same)(struct _cef_task_runner_t* self, + struct _cef_task_runner_t* that); + + /// + // Returns true (1) if this task runner belongs to the current thread. + /// + int (CEF_CALLBACK *belongs_to_current_thread)( + struct _cef_task_runner_t* self); + + /// + // Returns true (1) if this task runner is for the specified CEF thread. + /// + int (CEF_CALLBACK *belongs_to_thread)(struct _cef_task_runner_t* self, + cef_thread_id_t threadId); + + /// + // Post a task for execution on the thread associated with this task runner. + // Execution will occur asynchronously. + /// + int (CEF_CALLBACK *post_task)(struct _cef_task_runner_t* self, + struct _cef_task_t* task); + + /// + // Post a task for delayed execution on the thread associated with this task + // runner. Execution will occur asynchronously. Delayed tasks are not + // supported on V8 WebWorker threads and will be executed without the + // specified delay. + /// + int (CEF_CALLBACK *post_delayed_task)(struct _cef_task_runner_t* self, + struct _cef_task_t* task, int64 delay_ms); +} cef_task_runner_t; + + +/// +// Returns the task runner for the current thread. Only CEF threads will have +// task runners. An NULL reference will be returned if this function is called +// on an invalid thread. +/// +CEF_EXPORT cef_task_runner_t* cef_task_runner_get_for_current_thread(); + +/// +// Returns the task runner for the specified CEF thread. +/// +CEF_EXPORT cef_task_runner_t* cef_task_runner_get_for_thread( + cef_thread_id_t threadId); + + #ifdef __cplusplus } #endif diff --git a/cef/include/capi/cef_trace_capi.h b/cef/include/capi/cef_trace_capi.h index 2f1d0dac3..d3ba7868b 100644 --- a/cef/include/capi/cef_trace_capi.h +++ b/cef/include/capi/cef_trace_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_url_capi.h b/cef/include/capi/cef_url_capi.h index 757875b39..b0fdcd22b 100644 --- a/cef/include/capi/cef_url_capi.h +++ b/cef/include/capi/cef_url_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_urlrequest_capi.h b/cef/include/capi/cef_urlrequest_capi.h index 29e111e9b..23100feeb 100644 --- a/cef/include/capi/cef_urlrequest_capi.h +++ b/cef/include/capi/cef_urlrequest_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_v8_capi.h b/cef/include/capi/cef_v8_capi.h index 03dc58661..7ec761d6f 100644 --- a/cef/include/capi/cef_v8_capi.h +++ b/cef/include/capi/cef_v8_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -105,8 +105,11 @@ CEF_EXPORT int cef_register_extension(const cef_string_t* extension_name, const cef_string_t* javascript_code, struct _cef_v8handler_t* handler); /// -// Structure that encapsulates a V8 context handle. The functions of this -// structure may only be called on the render process main thread. +// Structure representing a V8 context handle. V8 handles can only be accessed +// from the thread on which they are created. Valid threads for creating a V8 +// handle include the render process main thread (TID_RENDERER) and WebWorker +// threads. A task runner for posting tasks on the associated thread can be +// retrieved via the cef_v8context_t::get_task_runner() function. /// typedef struct _cef_v8context_t { /// @@ -115,13 +118,30 @@ typedef struct _cef_v8context_t { cef_base_t base; /// - // Returns the browser for this context. + // Returns the task runner associated with this context. V8 handles can only + // be accessed from the thread on which they are created. This function can be + // called on any render process thread. + /// + struct _cef_task_runner_t* (CEF_CALLBACK *get_task_runner)( + struct _cef_v8context_t* self); + + /// + // Returns true (1) if the underlying handle is valid and it can be accessed + // on the current thread. Do not call any other functions if this function + // returns false (0). + /// + int (CEF_CALLBACK *is_valid)(struct _cef_v8context_t* self); + + /// + // Returns the browser for this context. This function will return an NULL + // reference for WebWorker contexts. /// struct _cef_browser_t* (CEF_CALLBACK *get_browser)( struct _cef_v8context_t* self); /// - // Returns the frame for this context. + // Returns the frame for this context. This function will return an NULL + // reference for WebWorker contexts. /// struct _cef_frame_t* (CEF_CALLBACK *get_frame)(struct _cef_v8context_t* self); @@ -184,8 +204,8 @@ CEF_EXPORT int cef_v8context_in_context(); /// // Structure that should be implemented to handle V8 function calls. The -// functions of this structure will always be called on the render process main -// thread. +// functions of this structure will be called on the thread associated with the +// V8 function. /// typedef struct _cef_v8handler_t { /// @@ -210,8 +230,8 @@ typedef struct _cef_v8handler_t { /// // Structure that should be implemented to handle V8 accessor calls. Accessor // identifiers are registered by calling cef_v8value_t::set_value_byaccessor(). -// The functions of this structure will always be called on the render process -// main thread. +// The functions of this structure will be called on the thread associated with +// the V8 accessor. /// typedef struct _cef_v8accessor_t { /// @@ -244,7 +264,8 @@ typedef struct _cef_v8accessor_t { /// -// Structure representing a V8 exception. +// Structure representing a V8 exception. The functions of this structure may be +// called on any render process thread. /// typedef struct _cef_v8exception_t { /// @@ -307,8 +328,11 @@ typedef struct _cef_v8exception_t { /// -// Structure representing a V8 value. The functions of this structure may only -// be called on the render process main thread. +// Structure representing a V8 value handle. V8 handles can only be accessed +// from the thread on which they are created. Valid threads for creating a V8 +// handle include the render process main thread (TID_RENDERER) and WebWorker +// threads. A task runner for posting tasks on the associated thread can be +// retrieved via the cef_v8context_t::get_task_runner() function. /// typedef struct _cef_v8value_t { /// @@ -316,6 +340,13 @@ typedef struct _cef_v8value_t { /// cef_base_t base; + /// + // Returns true (1) if the underlying handle is valid and it can be accessed + // on the current thread. Do not call any other functions if this function + // returns false (0). + /// + int (CEF_CALLBACK *is_valid)(struct _cef_v8value_t* self); + /// // True if the value type is undefined. /// @@ -701,8 +732,11 @@ CEF_EXPORT cef_v8value_t* cef_v8value_create_function(const cef_string_t* name, /// -// Structure representing a V8 stack trace. The functions of this structure may -// only be called on the render process main thread. +// Structure representing a V8 stack trace handle. V8 handles can only be +// accessed from the thread on which they are created. Valid threads for +// creating a V8 handle include the render process main thread (TID_RENDERER) +// and WebWorker threads. A task runner for posting tasks on the associated +// thread can be retrieved via the cef_v8context_t::get_task_runner() function. /// typedef struct _cef_v8stack_trace_t { /// @@ -710,6 +744,13 @@ typedef struct _cef_v8stack_trace_t { /// cef_base_t base; + /// + // Returns true (1) if the underlying handle is valid and it can be accessed + // on the current thread. Do not call any other functions if this function + // returns false (0). + /// + int (CEF_CALLBACK *is_valid)(struct _cef_v8stack_trace_t* self); + /// // Returns the number of stack frames. /// @@ -731,8 +772,11 @@ 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. +// Structure representing a V8 stack frame handle. V8 handles can only be +// accessed from the thread on which they are created. Valid threads for +// creating a V8 handle include the render process main thread (TID_RENDERER) +// and WebWorker threads. A task runner for posting tasks on the associated +// thread can be retrieved via the cef_v8context_t::get_task_runner() function. /// typedef struct _cef_v8stack_frame_t { /// @@ -740,6 +784,13 @@ typedef struct _cef_v8stack_frame_t { /// cef_base_t base; + /// + // Returns true (1) if the underlying handle is valid and it can be accessed + // on the current thread. Do not call any other functions if this function + // returns false (0). + /// + int (CEF_CALLBACK *is_valid)(struct _cef_v8stack_frame_t* self); + /// // Returns the name of the resource script that contains the function. /// diff --git a/cef/include/capi/cef_values_capi.h b/cef/include/capi/cef_values_capi.h index 712474a09..ed59fa4fc 100644 --- a/cef/include/capi/cef_values_capi.h +++ b/cef/include/capi/cef_values_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_web_plugin_capi.h b/cef/include/capi/cef_web_plugin_capi.h index 3fd07f1bd..13ac38b39 100644 --- a/cef/include/capi/cef_web_plugin_capi.h +++ b/cef/include/capi/cef_web_plugin_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_xml_reader_capi.h b/cef/include/capi/cef_xml_reader_capi.h index c8585a53e..952aa26e3 100644 --- a/cef/include/capi/cef_xml_reader_capi.h +++ b/cef/include/capi/cef_xml_reader_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/capi/cef_zip_reader_capi.h b/cef/include/capi/cef_zip_reader_capi.h index d7988afcb..36c5be0de 100644 --- a/cef/include/capi/cef_zip_reader_capi.h +++ b/cef/include/capi/cef_zip_reader_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/cef/include/cef_browser.h b/cef/include/cef_browser.h index 5090adc3e..c19e5f502 100644 --- a/cef/include/cef_browser.h +++ b/cef/include/cef_browser.h @@ -117,6 +117,13 @@ class CefBrowser : public virtual CefBase { /*--cef()--*/ virtual int GetIdentifier() =0; + /// + // Returns true if this object is pointing to the same handle as |that| + // object. + /// + /*--cef()--*/ + virtual bool IsSame(CefRefPtr that) =0; + /// // Returns true if the window is a popup window. /// @@ -211,6 +218,8 @@ class CefRunFileDialogCallback : public virtual CefBase { class CefBrowserHost : public virtual CefBase { public: typedef cef_file_dialog_mode_t FileDialogMode; + typedef cef_mouse_button_type_t MouseButtonType; + typedef cef_paint_element_type_t PaintElementType; /// // Create a new browser window using the window parameters specified by @@ -218,7 +227,7 @@ class CefBrowserHost : public virtual CefBase { // will be created on the UI thread. This method can be called on any browser // process thread and will not block. /// - /*--cef(optional_param=url)--*/ + /*--cef(optional_param=client,optional_param=url)--*/ static bool CreateBrowser(const CefWindowInfo& windowInfo, CefRefPtr client, const CefString& url, @@ -229,7 +238,7 @@ class CefBrowserHost : public virtual CefBase { // |windowInfo|. This method can only be called on the browser process UI // thread. /// - /*--cef(optional_param=url)--*/ + /*--cef(optional_param=client,optional_param=url)--*/ static CefRefPtr CreateBrowserSync( const CefWindowInfo& windowInfo, CefRefPtr client, @@ -241,7 +250,7 @@ class CefBrowserHost : public virtual CefBase { /// /*--cef()--*/ virtual CefRefPtr GetBrowser() =0; - + /// // Call this method before destroying a contained browser window. This method // performs any internal cleanup that may be needed before the browser window @@ -329,6 +338,75 @@ class CefBrowserHost : public virtual CefBase { const CefString& default_file_name, const std::vector& accept_types, CefRefPtr callback) =0; + + /// + // Returns true if window rendering is disabled. + /// + /*--cef()--*/ + virtual bool IsWindowRenderingDisabled() =0; + + /// + // Notify the browser that the widget has been resized. The browser will first + // call CefRenderHandler::GetViewRect to get the new size and then call + // CefRenderHandler::OnPaint asynchronously with the updated regions. This + // method is only used when window rendering is disabled. + /// + /*--cef()--*/ + virtual void WasResized() =0; + + /// + // Invalidate the |dirtyRect| region of the view. The browser will call + // CefRenderHandler::OnPaint asynchronously with the updated regions. This + // method is only used when window rendering is disabled. + /// + /*--cef()--*/ + virtual void Invalidate(const CefRect& dirtyRect, PaintElementType type) =0; + + /// + // Send a key event to the browser. + /// + /*--cef()--*/ + virtual void SendKeyEvent(const CefKeyEvent& event) =0; + + /// + // Send a mouse click event to the browser. The |x| and |y| coordinates are + // relative to the upper-left corner of the view. + /// + /*--cef()--*/ + virtual void SendMouseClickEvent(const CefMouseEvent& event, + MouseButtonType type, + bool mouseUp, int clickCount) =0; + + /// + // Send a mouse move event to the browser. The |x| and |y| coordinates are + // relative to the upper-left corner of the view. + /// + /*--cef()--*/ + virtual void SendMouseMoveEvent(const CefMouseEvent& event, + bool mouseLeave) =0; + + /// + // Send a mouse wheel event to the browser. The |x| and |y| coordinates are + // relative to the upper-left corner of the view. The |deltaX| and |deltaY| + // values represent the movement delta in the X and Y directions respectively. + // In order to scroll inside select popups with window rendering disabled + // CefRenderHandler::GetScreenPoint should be implemented properly. + /// + /*--cef()--*/ + virtual void SendMouseWheelEvent(const CefMouseEvent& event, + int deltaX, int deltaY) =0; + + /// + // Send a focus event to the browser. + /// + /*--cef()--*/ + virtual void SendFocusEvent(bool setFocus) =0; + + /// + // Send a capture lost event to the browser. + /// + /*--cef()--*/ + virtual void SendCaptureLostEvent() =0; }; #endif // CEF_INCLUDE_CEF_BROWSER_H_ diff --git a/cef/include/cef_browser_process_handler.h b/cef/include/cef_browser_process_handler.h index 02b792300..39e0dcbb1 100644 --- a/cef/include/cef_browser_process_handler.h +++ b/cef/include/cef_browser_process_handler.h @@ -41,6 +41,7 @@ #include "include/cef_base.h" #include "include/cef_command_line.h" #include "include/cef_proxy_handler.h" +#include "include/cef_values.h" /// // Class used to implement browser process callbacks. The methods of this class @@ -67,13 +68,26 @@ class CefBrowserProcessHandler : public virtual CefBase { virtual void OnContextInitialized() {} /// - // Called on the browser process IO thread before a child process is launched. - // Provides an opportunity to modify the child process command line. + // Called before a child process is launched. Will be called on the browser + // process UI thread when launching a render process and on the browser + // process IO thread when launching a GPU or plugin process. Provides an + // opportunity to modify the child process command line. Do not keep a + // reference to |command_line| outside of this method. /// /*--cef()--*/ virtual void OnBeforeChildProcessLaunch( - CefRefPtr command_line) { - } + CefRefPtr command_line) {} + + /// + // Called on the browser process IO thread after the main thread has been + // created for a new render process. Provides an opportunity to specify extra + // information that will be passed to + // CefRenderProcessHandler::OnRenderThreadCreated() in the render process. Do + // not keep a reference to |extra_info| outside of this method. + /// + /*--cef()--*/ + virtual void OnRenderProcessThreadCreated( + CefRefPtr extra_info) {} }; #endif // CEF_INCLUDE_CEF_BROWSER_PROCESS_HANDLER_H_ diff --git a/cef/include/cef_client.h b/cef/include/cef_client.h index b0a80d86e..dbba43927 100644 --- a/cef/include/cef_client.h +++ b/cef/include/cef_client.h @@ -50,6 +50,7 @@ #include "include/cef_life_span_handler.h" #include "include/cef_load_handler.h" #include "include/cef_process_message.h" +#include "include/cef_render_handler.h" #include "include/cef_request_handler.h" /// @@ -143,6 +144,14 @@ class CefClient : public virtual CefBase { return NULL; } + /// + // Return the handler for off-screen rendering events. + /// + /*--cef()--*/ + virtual CefRefPtr GetRenderHandler() { + return NULL; + } + /// // Return the handler for browser request events. /// diff --git a/cef/include/cef_display_handler.h b/cef/include/cef_display_handler.h index f54a650ea..7c19081c2 100644 --- a/cef/include/cef_display_handler.h +++ b/cef/include/cef_display_handler.h @@ -78,6 +78,8 @@ class CefDisplayHandler : public virtual CefBase { // text that will be displayed in the tooltip. To handle the display of the // tooltip yourself return true. Otherwise, you can optionally modify |text| // and then return false to allow the browser to display the tooltip. + // When window rendering is disabled the application is responsible for + // drawing tooltips and the return value is ignored. /// /*--cef(optional_param=text)--*/ virtual bool OnTooltip(CefRefPtr browser, diff --git a/cef/include/cef_download_item.h b/cef/include/cef_download_item.h index 01988bfd5..55f7fce06 100644 --- a/cef/include/cef_download_item.h +++ b/cef/include/cef_download_item.h @@ -143,12 +143,6 @@ class CefDownloadItem : public virtual CefBase { /// /*--cef()--*/ virtual CefString GetMimeType() =0; - - /// - // Returns the referrer character set. - /// - /*--cef()--*/ - virtual CefString GetReferrerCharset() =0; }; #endif // CEF_INCLUDE_CEF_DOWNLOAD_ITEM_H_ diff --git a/cef/include/cef_pack_resources.h b/cef/include/cef_pack_resources.h index f5fc9423e..abe055205 100644 --- a/cef/include/cef_pack_resources.h +++ b/cef/include/cef_pack_resources.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -79,9 +79,9 @@ #define DEVTOOLS_EXTENSION_API_JS 22013 #define AUDITSPANEL_CSS 22014 #define BREADCRUMBLIST_CSS 22015 -#define CODEMIRROR_CSS 22016 -#define CSSNAMEDFLOWS_CSS 22017 -#define CMDEVTOOLS_CSS 22018 +#define CMDEVTOOLS_CSS 22016 +#define CODEMIRROR_CSS 22017 +#define CSSNAMEDFLOWS_CSS 22018 #define DATAGRID_CSS 22019 #define ELEMENTSPANEL_CSS 22020 #define FILTEREDITEMSELECTIONDIALOG_CSS 22021 @@ -99,155 +99,156 @@ #define RESOURCESPANEL_CSS 22033 #define REVISIONHISTORY_CSS 22034 #define SCRIPTSPANEL_CSS 22035 -#define SPLITVIEW_CSS 22036 -#define TABBEDPANE_CSS 22037 -#define TEXTEDITOR_CSS 22038 -#define TEXTPROMPT_CSS 22039 -#define TIMELINEPANEL_CSS 22040 -#define WEBGLPROFILER_CSS 22041 -#define IMAGES_APPLICATIONCACHE_PNG 22042 -#define IMAGES_BACK_PNG 22043 -#define IMAGES_BREAKPOINTBORDER_PNG 22044 -#define IMAGES_BREAKPOINTCONDITIONALBORDER_PNG 22045 -#define IMAGES_BREAKPOINTCONDITIONALCOUNTERBORDER_PNG 22046 -#define IMAGES_BREAKPOINTCOUNTERBORDER_PNG 22047 -#define IMAGES_CHECKER_PNG 22048 -#define IMAGES_CLOSEBUTTONS_PNG 22049 -#define IMAGES_COOKIE_PNG 22050 -#define IMAGES_DATABASE_PNG 22051 -#define IMAGES_DATABASETABLE_PNG 22052 -#define IMAGES_DEBUGGERCONTINUE_PNG 22053 -#define IMAGES_DEBUGGERPAUSE_PNG 22054 -#define IMAGES_DEBUGGERSTEPINTO_PNG 22055 -#define IMAGES_DEBUGGERSTEPOUT_PNG 22056 -#define IMAGES_DEBUGGERSTEPOVER_PNG 22057 -#define IMAGES_DELETEICON_PNG 22058 -#define IMAGES_DISCLOSURETRIANGLESMALLDOWN_PNG 22059 -#define IMAGES_DISCLOSURETRIANGLESMALLDOWNBLACK_PNG 22060 -#define IMAGES_DISCLOSURETRIANGLESMALLDOWNWHITE_PNG 22061 -#define IMAGES_DISCLOSURETRIANGLESMALLRIGHT_PNG 22062 -#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTBLACK_PNG 22063 -#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTDOWN_PNG 22064 -#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTDOWNBLACK_PNG 22065 -#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTDOWNWHITE_PNG 22066 -#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTWHITE_PNG 22067 -#define IMAGES_DOMAIN_PNG 22068 -#define IMAGES_ERRORICON_PNG 22069 -#define IMAGES_ERRORMEDIUMICON_PNG 22070 -#define IMAGES_ERRORREDDOT_PNG 22071 -#define IMAGES_FILESYSTEM_PNG 22072 -#define IMAGES_FORWARD_PNG 22073 -#define IMAGES_FRAME_PNG 22074 -#define IMAGES_GLOSSYHEADER_PNG 22075 -#define IMAGES_GLOSSYHEADERPRESSED_PNG 22076 -#define IMAGES_GLOSSYHEADERSELECTED_PNG 22077 -#define IMAGES_GLOSSYHEADERSELECTEDPRESSED_PNG 22078 -#define IMAGES_GOARROW_PNG 22079 -#define IMAGES_GRAPHLABELCALLOUTLEFT_PNG 22080 -#define IMAGES_GRAPHLABELCALLOUTRIGHT_PNG 22081 -#define IMAGES_INDEXEDDB_PNG 22082 -#define IMAGES_INDEXEDDBINDEX_PNG 22083 -#define IMAGES_INDEXEDDBOBJECTSTORE_PNG 22084 -#define IMAGES_LOCALSTORAGE_PNG 22085 -#define IMAGES_NAMEDFLOWOVERFLOW_PNG 22086 -#define IMAGES_NAVIGATORSHOWHIDEBUTTON_PNG 22087 -#define IMAGES_PANEADDBUTTONS_PNG 22088 -#define IMAGES_PANEBOTTOMGROW_PNG 22089 -#define IMAGES_PANEBOTTOMGROWACTIVE_PNG 22090 -#define IMAGES_PANEELEMENTSTATEBUTTONS_PNG 22091 -#define IMAGES_PANEFILTERBUTTONS_PNG 22092 -#define IMAGES_PANEGROWHANDLELINE_PNG 22093 -#define IMAGES_PANEREFRESHBUTTONS_PNG 22094 -#define IMAGES_PANESETTINGSBUTTONS_PNG 22095 -#define IMAGES_POPOVERARROWS_PNG 22096 -#define IMAGES_POPOVERBACKGROUND_PNG 22097 -#define IMAGES_PROFILEGROUPICON_PNG 22098 -#define IMAGES_PROFILEICON_PNG 22099 -#define IMAGES_PROFILESMALLICON_PNG 22100 -#define IMAGES_PROFILESSILHOUETTE_PNG 22101 -#define IMAGES_PROGRAMCOUNTERBORDER_PNG 22102 -#define IMAGES_RADIODOT_PNG 22103 -#define IMAGES_REGIONEMPTY_PNG 22104 -#define IMAGES_REGIONFIT_PNG 22105 -#define IMAGES_REGIONOVERSET_PNG 22106 -#define IMAGES_RESOURCECSSICON_PNG 22107 -#define IMAGES_RESOURCEDOCUMENTICON_PNG 22108 -#define IMAGES_RESOURCEDOCUMENTICONSMALL_PNG 22109 -#define IMAGES_RESOURCEJSICON_PNG 22110 -#define IMAGES_RESOURCEPLAINICON_PNG 22111 -#define IMAGES_RESOURCEPLAINICONSMALL_PNG 22112 -#define IMAGES_RESOURCESSIZEGRAPHICON_PNG 22113 -#define IMAGES_RESOURCESTIMEGRAPHICON_PNG 22114 -#define IMAGES_SCRIPTSSILHOUETTE_PNG 22115 -#define IMAGES_SEARCHNEXT_PNG 22116 -#define IMAGES_SEARCHPREV_PNG 22117 -#define IMAGES_SEARCHSMALLBLUE_PNG 22118 -#define IMAGES_SEARCHSMALLBRIGHTBLUE_PNG 22119 -#define IMAGES_SEARCHSMALLGRAY_PNG 22120 -#define IMAGES_SEARCHSMALLWHITE_PNG 22121 -#define IMAGES_SEGMENT_PNG 22122 -#define IMAGES_SEGMENTEND_PNG 22123 -#define IMAGES_SEGMENTHOVER_PNG 22124 -#define IMAGES_SEGMENTHOVEREND_PNG 22125 -#define IMAGES_SEGMENTSELECTED_PNG 22126 -#define IMAGES_SEGMENTSELECTEDEND_PNG 22127 -#define IMAGES_SESSIONSTORAGE_PNG 22128 -#define IMAGES_SPINNER_GIF 22129 -#define IMAGES_SPINNERACTIVE_GIF 22130 -#define IMAGES_SPINNERACTIVESELECTED_GIF 22131 -#define IMAGES_SPINNERINACTIVE_GIF 22132 -#define IMAGES_SPINNERINACTIVESELECTED_GIF 22133 -#define IMAGES_SPLITVIEWDIMPLE_PNG 22134 -#define IMAGES_SPLITVIEWDIVIDERBACKGROUND_PNG 22135 -#define IMAGES_STATUSBARBUTTONGLYPHS_PNG 22136 -#define IMAGES_STATUSBARBUTTONGLYPHS2X_PNG 22137 -#define IMAGES_STATUSBARRESIZERHORIZONTAL_PNG 22138 -#define IMAGES_STATUSBARRESIZERVERTICAL_PNG 22139 -#define IMAGES_SUCCESSGREENDOT_PNG 22140 -#define IMAGES_THUMBACTIVEHORIZ_PNG 22141 -#define IMAGES_THUMBACTIVEVERT_PNG 22142 -#define IMAGES_THUMBHORIZ_PNG 22143 -#define IMAGES_THUMBHOVERHORIZ_PNG 22144 -#define IMAGES_THUMBHOVERVERT_PNG 22145 -#define IMAGES_THUMBVERT_PNG 22146 -#define IMAGES_TICKMARK_PNG 22147 -#define IMAGES_TIMELINEHOLLOWPILLBLUE_PNG 22148 -#define IMAGES_TIMELINEHOLLOWPILLGRAY_PNG 22149 -#define IMAGES_TIMELINEHOLLOWPILLGREEN_PNG 22150 -#define IMAGES_TIMELINEHOLLOWPILLORANGE_PNG 22151 -#define IMAGES_TIMELINEHOLLOWPILLPURPLE_PNG 22152 -#define IMAGES_TIMELINEHOLLOWPILLRED_PNG 22153 -#define IMAGES_TIMELINEHOLLOWPILLYELLOW_PNG 22154 -#define IMAGES_TIMELINEPILLBLUE_PNG 22155 -#define IMAGES_TIMELINEPILLGRAY_PNG 22156 -#define IMAGES_TIMELINEPILLGREEN_PNG 22157 -#define IMAGES_TIMELINEPILLORANGE_PNG 22158 -#define IMAGES_TIMELINEPILLPURPLE_PNG 22159 -#define IMAGES_TIMELINEPILLRED_PNG 22160 -#define IMAGES_TIMELINEPILLYELLOW_PNG 22161 -#define IMAGES_TOOLBARICONS_PNG 22162 -#define IMAGES_TOOLBARICONSSMALL_PNG 22163 -#define IMAGES_TOOLBARITEMSELECTED_PNG 22164 -#define IMAGES_TRACKHORIZ_PNG 22165 -#define IMAGES_TRACKVERT_PNG 22166 -#define IMAGES_TREEDOWNTRIANGLEBLACK_PNG 22167 -#define IMAGES_TREEDOWNTRIANGLEWHITE_PNG 22168 -#define IMAGES_TREERIGHTTRIANGLEBLACK_PNG 22169 -#define IMAGES_TREERIGHTTRIANGLEWHITE_PNG 22170 -#define IMAGES_TREEUPTRIANGLEBLACK_PNG 22171 -#define IMAGES_TREEUPTRIANGLEWHITE_PNG 22172 -#define IMAGES_USERINPUTICON_PNG 22173 -#define IMAGES_USERINPUTPREVIOUSICON_PNG 22174 -#define IMAGES_USERINPUTRESULTICON_PNG 22175 -#define IMAGES_WARNINGICON_PNG 22176 -#define IMAGES_WARNINGMEDIUMICON_PNG 22177 -#define IMAGES_WARNINGORANGEDOT_PNG 22178 -#define IMAGES_WARNINGSERRORS_PNG 22179 -#define IMAGES_SEGMENTCHROMIUM_PNG 22180 -#define IMAGES_SEGMENTHOVERCHROMIUM_PNG 22181 -#define IMAGES_SEGMENTHOVERENDCHROMIUM_PNG 22182 -#define IMAGES_SEGMENTSELECTEDCHROMIUM_PNG 22183 -#define IMAGES_SEGMENTSELECTEDENDCHROMIUM_PNG 22184 +#define SPECTRUM_CSS 22036 +#define SPLITVIEW_CSS 22037 +#define TABBEDPANE_CSS 22038 +#define TEXTEDITOR_CSS 22039 +#define TEXTPROMPT_CSS 22040 +#define TIMELINEPANEL_CSS 22041 +#define CANVASPROFILER_CSS 22042 +#define IMAGES_APPLICATIONCACHE_PNG 22043 +#define IMAGES_BACK_PNG 22044 +#define IMAGES_BREAKPOINTBORDER_PNG 22045 +#define IMAGES_BREAKPOINTCONDITIONALBORDER_PNG 22046 +#define IMAGES_BREAKPOINTCONDITIONALCOUNTERBORDER_PNG 22047 +#define IMAGES_BREAKPOINTCOUNTERBORDER_PNG 22048 +#define IMAGES_CHECKER_PNG 22049 +#define IMAGES_CLOSEBUTTONS_PNG 22050 +#define IMAGES_COOKIE_PNG 22051 +#define IMAGES_DATABASE_PNG 22052 +#define IMAGES_DATABASETABLE_PNG 22053 +#define IMAGES_DEBUGGERCONTINUE_PNG 22054 +#define IMAGES_DEBUGGERPAUSE_PNG 22055 +#define IMAGES_DEBUGGERSTEPINTO_PNG 22056 +#define IMAGES_DEBUGGERSTEPOUT_PNG 22057 +#define IMAGES_DEBUGGERSTEPOVER_PNG 22058 +#define IMAGES_DELETEICON_PNG 22059 +#define IMAGES_DISCLOSURETRIANGLESMALLDOWN_PNG 22060 +#define IMAGES_DISCLOSURETRIANGLESMALLDOWNBLACK_PNG 22061 +#define IMAGES_DISCLOSURETRIANGLESMALLDOWNWHITE_PNG 22062 +#define IMAGES_DISCLOSURETRIANGLESMALLRIGHT_PNG 22063 +#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTBLACK_PNG 22064 +#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTDOWN_PNG 22065 +#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTDOWNBLACK_PNG 22066 +#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTDOWNWHITE_PNG 22067 +#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTWHITE_PNG 22068 +#define IMAGES_DOMAIN_PNG 22069 +#define IMAGES_ERRORICON_PNG 22070 +#define IMAGES_ERRORMEDIUMICON_PNG 22071 +#define IMAGES_ERRORREDDOT_PNG 22072 +#define IMAGES_FILESYSTEM_PNG 22073 +#define IMAGES_FORWARD_PNG 22074 +#define IMAGES_FRAME_PNG 22075 +#define IMAGES_GLOSSYHEADER_PNG 22076 +#define IMAGES_GLOSSYHEADERPRESSED_PNG 22077 +#define IMAGES_GLOSSYHEADERSELECTED_PNG 22078 +#define IMAGES_GLOSSYHEADERSELECTEDPRESSED_PNG 22079 +#define IMAGES_GOARROW_PNG 22080 +#define IMAGES_GRAPHLABELCALLOUTLEFT_PNG 22081 +#define IMAGES_GRAPHLABELCALLOUTRIGHT_PNG 22082 +#define IMAGES_INDEXEDDB_PNG 22083 +#define IMAGES_INDEXEDDBINDEX_PNG 22084 +#define IMAGES_INDEXEDDBOBJECTSTORE_PNG 22085 +#define IMAGES_LOCALSTORAGE_PNG 22086 +#define IMAGES_NAMEDFLOWOVERFLOW_PNG 22087 +#define IMAGES_NAVIGATORSHOWHIDEBUTTON_PNG 22088 +#define IMAGES_PANEADDBUTTONS_PNG 22089 +#define IMAGES_PANEBOTTOMGROW_PNG 22090 +#define IMAGES_PANEBOTTOMGROWACTIVE_PNG 22091 +#define IMAGES_PANEELEMENTSTATEBUTTONS_PNG 22092 +#define IMAGES_PANEFILTERBUTTONS_PNG 22093 +#define IMAGES_PANEGROWHANDLELINE_PNG 22094 +#define IMAGES_PANEREFRESHBUTTONS_PNG 22095 +#define IMAGES_PANESETTINGSBUTTONS_PNG 22096 +#define IMAGES_POPOVERARROWS_PNG 22097 +#define IMAGES_POPOVERBACKGROUND_PNG 22098 +#define IMAGES_PROFILEGROUPICON_PNG 22099 +#define IMAGES_PROFILEICON_PNG 22100 +#define IMAGES_PROFILESMALLICON_PNG 22101 +#define IMAGES_PROFILESSILHOUETTE_PNG 22102 +#define IMAGES_PROGRAMCOUNTERBORDER_PNG 22103 +#define IMAGES_RADIODOT_PNG 22104 +#define IMAGES_REGIONEMPTY_PNG 22105 +#define IMAGES_REGIONFIT_PNG 22106 +#define IMAGES_REGIONOVERSET_PNG 22107 +#define IMAGES_RESOURCECSSICON_PNG 22108 +#define IMAGES_RESOURCEDOCUMENTICON_PNG 22109 +#define IMAGES_RESOURCEDOCUMENTICONSMALL_PNG 22110 +#define IMAGES_RESOURCEJSICON_PNG 22111 +#define IMAGES_RESOURCEPLAINICON_PNG 22112 +#define IMAGES_RESOURCEPLAINICONSMALL_PNG 22113 +#define IMAGES_RESOURCESSIZEGRAPHICON_PNG 22114 +#define IMAGES_RESOURCESTIMEGRAPHICON_PNG 22115 +#define IMAGES_SCRIPTSSILHOUETTE_PNG 22116 +#define IMAGES_SEARCHNEXT_PNG 22117 +#define IMAGES_SEARCHPREV_PNG 22118 +#define IMAGES_SEARCHSMALLBLUE_PNG 22119 +#define IMAGES_SEARCHSMALLBRIGHTBLUE_PNG 22120 +#define IMAGES_SEARCHSMALLGRAY_PNG 22121 +#define IMAGES_SEARCHSMALLWHITE_PNG 22122 +#define IMAGES_SEGMENT_PNG 22123 +#define IMAGES_SEGMENTEND_PNG 22124 +#define IMAGES_SEGMENTHOVER_PNG 22125 +#define IMAGES_SEGMENTHOVEREND_PNG 22126 +#define IMAGES_SEGMENTSELECTED_PNG 22127 +#define IMAGES_SEGMENTSELECTEDEND_PNG 22128 +#define IMAGES_SESSIONSTORAGE_PNG 22129 +#define IMAGES_SPINNER_GIF 22130 +#define IMAGES_SPINNERACTIVE_GIF 22131 +#define IMAGES_SPINNERACTIVESELECTED_GIF 22132 +#define IMAGES_SPINNERINACTIVE_GIF 22133 +#define IMAGES_SPINNERINACTIVESELECTED_GIF 22134 +#define IMAGES_SPLITVIEWDIMPLE_PNG 22135 +#define IMAGES_SPLITVIEWDIVIDERBACKGROUND_PNG 22136 +#define IMAGES_STATUSBARBUTTONGLYPHS_PNG 22137 +#define IMAGES_STATUSBARBUTTONGLYPHS2X_PNG 22138 +#define IMAGES_STATUSBARRESIZERHORIZONTAL_PNG 22139 +#define IMAGES_STATUSBARRESIZERVERTICAL_PNG 22140 +#define IMAGES_SUCCESSGREENDOT_PNG 22141 +#define IMAGES_THUMBACTIVEHORIZ_PNG 22142 +#define IMAGES_THUMBACTIVEVERT_PNG 22143 +#define IMAGES_THUMBHORIZ_PNG 22144 +#define IMAGES_THUMBHOVERHORIZ_PNG 22145 +#define IMAGES_THUMBHOVERVERT_PNG 22146 +#define IMAGES_THUMBVERT_PNG 22147 +#define IMAGES_TICKMARK_PNG 22148 +#define IMAGES_TIMELINEHOLLOWPILLBLUE_PNG 22149 +#define IMAGES_TIMELINEHOLLOWPILLGRAY_PNG 22150 +#define IMAGES_TIMELINEHOLLOWPILLGREEN_PNG 22151 +#define IMAGES_TIMELINEHOLLOWPILLORANGE_PNG 22152 +#define IMAGES_TIMELINEHOLLOWPILLPURPLE_PNG 22153 +#define IMAGES_TIMELINEHOLLOWPILLRED_PNG 22154 +#define IMAGES_TIMELINEHOLLOWPILLYELLOW_PNG 22155 +#define IMAGES_TIMELINEPILLBLUE_PNG 22156 +#define IMAGES_TIMELINEPILLGRAY_PNG 22157 +#define IMAGES_TIMELINEPILLGREEN_PNG 22158 +#define IMAGES_TIMELINEPILLORANGE_PNG 22159 +#define IMAGES_TIMELINEPILLPURPLE_PNG 22160 +#define IMAGES_TIMELINEPILLRED_PNG 22161 +#define IMAGES_TIMELINEPILLYELLOW_PNG 22162 +#define IMAGES_TOOLBARICONS_PNG 22163 +#define IMAGES_TOOLBARICONSSMALL_PNG 22164 +#define IMAGES_TOOLBARITEMSELECTED_PNG 22165 +#define IMAGES_TRACKHORIZ_PNG 22166 +#define IMAGES_TRACKVERT_PNG 22167 +#define IMAGES_TREEDOWNTRIANGLEBLACK_PNG 22168 +#define IMAGES_TREEDOWNTRIANGLEWHITE_PNG 22169 +#define IMAGES_TREERIGHTTRIANGLEBLACK_PNG 22170 +#define IMAGES_TREERIGHTTRIANGLEWHITE_PNG 22171 +#define IMAGES_TREEUPTRIANGLEBLACK_PNG 22172 +#define IMAGES_TREEUPTRIANGLEWHITE_PNG 22173 +#define IMAGES_USERINPUTICON_PNG 22174 +#define IMAGES_USERINPUTPREVIOUSICON_PNG 22175 +#define IMAGES_USERINPUTRESULTICON_PNG 22176 +#define IMAGES_WARNINGICON_PNG 22177 +#define IMAGES_WARNINGMEDIUMICON_PNG 22178 +#define IMAGES_WARNINGORANGEDOT_PNG 22179 +#define IMAGES_WARNINGSERRORS_PNG 22180 +#define IMAGES_SEGMENTCHROMIUM_PNG 22181 +#define IMAGES_SEGMENTHOVERCHROMIUM_PNG 22182 +#define IMAGES_SEGMENTHOVERENDCHROMIUM_PNG 22183 +#define IMAGES_SEGMENTSELECTEDCHROMIUM_PNG 22184 +#define IMAGES_SEGMENTSELECTEDENDCHROMIUM_PNG 22185 // --------------------------------------------------------------------------- // From net_resources.h: @@ -260,145 +261,190 @@ #define IDR_APP_TOP_CENTER 5500 #define IDR_APP_TOP_LEFT 5501 #define IDR_APP_TOP_RIGHT 5502 -#define IDR_BROWSER_ACTION_BADGE_CENTER 5503 -#define IDR_BROWSER_ACTION_BADGE_LEFT 5504 -#define IDR_BROWSER_ACTION_BADGE_RIGHT 5505 -#define IDR_BUBBLE_B 5506 -#define IDR_BUBBLE_BL 5507 -#define IDR_BUBBLE_BR 5508 -#define IDR_BUBBLE_B_ARROW 5509 -#define IDR_BUBBLE_L 5510 -#define IDR_BUBBLE_L_ARROW 5511 -#define IDR_BUBBLE_R 5512 -#define IDR_BUBBLE_R_ARROW 5513 -#define IDR_BUBBLE_SHADOW_B 5514 -#define IDR_BUBBLE_SHADOW_BL 5515 -#define IDR_BUBBLE_SHADOW_BR 5516 -#define IDR_BUBBLE_SHADOW_L 5517 -#define IDR_BUBBLE_SHADOW_R 5518 -#define IDR_BUBBLE_SHADOW_T 5519 -#define IDR_BUBBLE_SHADOW_TL 5520 -#define IDR_BUBBLE_SHADOW_TR 5521 -#define IDR_BUBBLE_T 5522 -#define IDR_BUBBLE_TL 5523 -#define IDR_BUBBLE_TR 5524 -#define IDR_BUBBLE_T_ARROW 5525 -#define IDR_CHECKBOX_DISABLED_INDETERMINATE 5526 -#define IDR_CHECKBOX_DISABLED_OFF 5527 -#define IDR_CHECKBOX_DISABLED_ON 5528 -#define IDR_CHECKBOX_INDETERMINATE 5529 -#define IDR_CHECKBOX_OFF 5530 -#define IDR_CHECKBOX_ON 5531 -#define IDR_CHECKMARK 5538 -#define IDR_CLOSE 5539 -#define IDR_CLOSE_BAR 5541 -#define IDR_CLOSE_BAR_H 5542 -#define IDR_CLOSE_BAR_MASK 5543 -#define IDR_CLOSE_BAR_P 5544 -#define IDR_CLOSE_H 5545 -#define IDR_CLOSE_P 5546 -#define IDR_CLOSE_SA 5549 -#define IDR_CLOSE_SA_H 5550 -#define IDR_CLOSE_SA_P 5551 -#define IDR_CONTENT_BOTTOM_CENTER 5552 -#define IDR_CONTENT_BOTTOM_LEFT_CORNER 5553 -#define IDR_CONTENT_BOTTOM_RIGHT_CORNER 5554 -#define IDR_CONTENT_LEFT_SIDE 5555 -#define IDR_CONTENT_RIGHT_SIDE 5556 -#define IDR_DEFAULT_FAVICON 5557 -#define IDR_DEFAULT_LARGE_FAVICON 5558 -#define IDR_FOLDER_CLOSED 5559 -#define IDR_FOLDER_CLOSED_RTL 5560 -#define IDR_FOLDER_OPEN 5561 -#define IDR_FOLDER_OPEN_RTL 5562 -#define IDR_FRAME 5563 -#define IDR_FRAME_APP_PANEL 5564 -#define IDR_FRAME_INACTIVE 5565 -#define IDR_MAXIMIZE 5566 -#define IDR_MAXIMIZE_H 5567 -#define IDR_MAXIMIZE_P 5568 -#define IDR_MENU_ARROW 5572 -#define IDR_MENU_CHECK 5573 -#define IDR_SLIDER_ACTIVE_LEFT 5574 -#define IDR_SLIDER_ACTIVE_RIGHT 5575 -#define IDR_SLIDER_ACTIVE_CENTER 5576 -#define IDR_SLIDER_DISABLED_LEFT 5577 -#define IDR_SLIDER_DISABLED_RIGHT 5578 -#define IDR_SLIDER_DISABLED_CENTER 5579 -#define IDR_SLIDER_PRESSED_LEFT 5580 -#define IDR_SLIDER_PRESSED_RIGHT 5581 -#define IDR_SLIDER_PRESSED_CENTER 5582 -#define IDR_SLIDER_ACTIVE_THUMB 5583 -#define IDR_SLIDER_DISABLED_THUMB 5584 -#define IDR_MENU_DROPARROW 5585 -#define IDR_MINIMIZE 5586 -#define IDR_MINIMIZE_H 5587 -#define IDR_MINIMIZE_P 5588 -#define IDR_OAK 5592 -#define IDR_PANEL_BOTTOM_LEFT_CORNER 5593 -#define IDR_PANEL_BOTTOM_RIGHT_CORNER 5594 -#define IDR_PROGRESS_BAR 5595 -#define IDR_PROGRESS_BORDER_LEFT 5596 -#define IDR_PROGRESS_BORDER_RIGHT 5597 -#define IDR_PROGRESS_VALUE 5598 -#define IDR_RADIO_DISABLED_OFF 5599 -#define IDR_RADIO_DISABLED_ON 5600 -#define IDR_RADIO_OFF 5601 -#define IDR_RADIO_ON 5602 -#define IDR_SCROLL_BASE_HORIZONTAL_CENTER_H 5611 -#define IDR_SCROLL_BASE_HORIZONTAL_LEFT_H 5612 -#define IDR_SCROLL_BASE_HORIZONTAL_RIGHT_H 5613 -#define IDR_SCROLL_BASE_VERTICAL_BOTTOM_H 5614 -#define IDR_SCROLL_BASE_VERTICAL_CENTER_H 5615 -#define IDR_SCROLL_BASE_VERTICAL_TOP_H 5616 -#define IDR_SCROLL_THUMB_HORIZONTAL_CENTER 5617 -#define IDR_SCROLL_THUMB_HORIZONTAL_CENTER_H 5618 -#define IDR_SCROLL_THUMB_HORIZONTAL_CENTER_P 5619 -#define IDR_SCROLL_THUMB_HORIZONTAL_LEFT 5620 -#define IDR_SCROLL_THUMB_HORIZONTAL_LEFT_H 5621 -#define IDR_SCROLL_THUMB_HORIZONTAL_LEFT_P 5622 -#define IDR_SCROLL_THUMB_HORIZONTAL_RIGHT 5623 -#define IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_H 5624 -#define IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_P 5625 -#define IDR_SCROLL_THUMB_VERTICAL_BOTTOM 5626 -#define IDR_SCROLL_THUMB_VERTICAL_BOTTOM_H 5627 -#define IDR_SCROLL_THUMB_VERTICAL_BOTTOM_P 5628 -#define IDR_SCROLL_THUMB_VERTICAL_CENTER 5629 -#define IDR_SCROLL_THUMB_VERTICAL_CENTER_H 5630 -#define IDR_SCROLL_THUMB_VERTICAL_CENTER_P 5631 -#define IDR_SCROLL_THUMB_VERTICAL_TOP 5632 -#define IDR_SCROLL_THUMB_VERTICAL_TOP_H 5633 -#define IDR_SCROLL_THUMB_VERTICAL_TOP_P 5634 -#define IDR_RESTORE 5635 -#define IDR_RESTORE_H 5636 -#define IDR_RESTORE_P 5637 -#define IDR_TEXTBUTTON_HOVER_BOTTOM 5641 -#define IDR_TEXTBUTTON_HOVER_BOTTOM_LEFT 5642 -#define IDR_TEXTBUTTON_HOVER_BOTTOM_RIGHT 5643 -#define IDR_TEXTBUTTON_HOVER_CENTER 5644 -#define IDR_TEXTBUTTON_HOVER_LEFT 5645 -#define IDR_TEXTBUTTON_HOVER_RIGHT 5646 -#define IDR_TEXTBUTTON_HOVER_TOP 5647 -#define IDR_TEXTBUTTON_HOVER_TOP_LEFT 5648 -#define IDR_TEXTBUTTON_HOVER_TOP_RIGHT 5649 -#define IDR_TEXTBUTTON_PRESSED_BOTTOM 5650 -#define IDR_TEXTBUTTON_PRESSED_BOTTOM_LEFT 5651 -#define IDR_TEXTBUTTON_PRESSED_BOTTOM_RIGHT 5652 -#define IDR_TEXTBUTTON_PRESSED_CENTER 5653 -#define IDR_TEXTBUTTON_PRESSED_LEFT 5654 -#define IDR_TEXTBUTTON_PRESSED_RIGHT 5655 -#define IDR_TEXTBUTTON_PRESSED_TOP 5656 -#define IDR_TEXTBUTTON_PRESSED_TOP_LEFT 5657 -#define IDR_TEXTBUTTON_PRESSED_TOP_RIGHT 5658 -#define IDR_THROBBER 5659 -#define IDR_WINDOW_BOTTOM_CENTER 5660 -#define IDR_WINDOW_BOTTOM_LEFT_CORNER 5661 -#define IDR_WINDOW_BOTTOM_RIGHT_CORNER 5662 -#define IDR_WINDOW_LEFT_SIDE 5663 -#define IDR_WINDOW_RIGHT_SIDE 5664 -#define IDR_WINDOW_TOP_CENTER 5665 -#define IDR_WINDOW_TOP_LEFT_CORNER 5666 -#define IDR_WINDOW_TOP_RIGHT_CORNER 5667 +#define IDR_AURA_SHADOW_ACTIVE_BOTTOM 5503 +#define IDR_AURA_SHADOW_ACTIVE_BOTTOM_LEFT 5504 +#define IDR_AURA_SHADOW_ACTIVE_BOTTOM_RIGHT 5505 +#define IDR_AURA_SHADOW_ACTIVE_LEFT 5506 +#define IDR_AURA_SHADOW_ACTIVE_RIGHT 5507 +#define IDR_AURA_SHADOW_ACTIVE_TOP 5508 +#define IDR_AURA_SHADOW_ACTIVE_TOP_LEFT 5509 +#define IDR_AURA_SHADOW_ACTIVE_TOP_RIGHT 5510 +#define IDR_AURA_SHADOW_INACTIVE_BOTTOM 5511 +#define IDR_AURA_SHADOW_INACTIVE_BOTTOM_LEFT 5512 +#define IDR_AURA_SHADOW_INACTIVE_BOTTOM_RIGHT 5513 +#define IDR_AURA_SHADOW_INACTIVE_LEFT 5514 +#define IDR_AURA_SHADOW_INACTIVE_RIGHT 5515 +#define IDR_AURA_SHADOW_INACTIVE_TOP 5516 +#define IDR_AURA_SHADOW_INACTIVE_TOP_LEFT 5517 +#define IDR_AURA_SHADOW_INACTIVE_TOP_RIGHT 5518 +#define IDR_BROWSER_ACTION_BADGE_CENTER 5519 +#define IDR_BROWSER_ACTION_BADGE_LEFT 5520 +#define IDR_BROWSER_ACTION_BADGE_RIGHT 5521 +#define IDR_BUBBLE_B 5522 +#define IDR_BUBBLE_BL 5523 +#define IDR_BUBBLE_BR 5524 +#define IDR_BUBBLE_B_ARROW 5525 +#define IDR_BUBBLE_L 5526 +#define IDR_BUBBLE_L_ARROW 5527 +#define IDR_BUBBLE_R 5528 +#define IDR_BUBBLE_R_ARROW 5529 +#define IDR_BUBBLE_SHADOW_B 5530 +#define IDR_BUBBLE_SHADOW_BL 5531 +#define IDR_BUBBLE_SHADOW_BR 5532 +#define IDR_BUBBLE_SHADOW_L 5533 +#define IDR_BUBBLE_SHADOW_R 5534 +#define IDR_BUBBLE_SHADOW_T 5535 +#define IDR_BUBBLE_SHADOW_TL 5536 +#define IDR_BUBBLE_SHADOW_TR 5537 +#define IDR_BUBBLE_T 5538 +#define IDR_BUBBLE_TL 5539 +#define IDR_BUBBLE_TR 5540 +#define IDR_BUBBLE_T_ARROW 5541 +#define IDR_CHECKBOX_DISABLED_INDETERMINATE 5542 +#define IDR_CHECKBOX_DISABLED_OFF 5543 +#define IDR_CHECKBOX_DISABLED_ON 5544 +#define IDR_CHECKBOX_INDETERMINATE 5545 +#define IDR_CHECKBOX_OFF 5546 +#define IDR_CHECKBOX_ON 5547 +#define IDR_CHECKMARK 5548 +#define IDR_CLOSE 5549 +#define IDR_CLOSE_BAR 5550 +#define IDR_CLOSE_BAR_H 5551 +#define IDR_CLOSE_BAR_MASK 5552 +#define IDR_CLOSE_BAR_P 5553 +#define IDR_CLOSE_H 5554 +#define IDR_CLOSE_P 5555 +#define IDR_CLOSE_SA 5556 +#define IDR_CLOSE_SA_H 5557 +#define IDR_CLOSE_SA_P 5558 +#define IDR_CONTENT_BOTTOM_CENTER 5559 +#define IDR_CONTENT_BOTTOM_LEFT_CORNER 5560 +#define IDR_CONTENT_BOTTOM_RIGHT_CORNER 5561 +#define IDR_CONTENT_LEFT_SIDE 5562 +#define IDR_CONTENT_RIGHT_SIDE 5563 +#define IDR_DEFAULT_FAVICON 5564 +#define IDR_DEFAULT_FAVICON_32 5565 +#define IDR_DEFAULT_FAVICON_64 5566 +#define IDR_FOLDER_CLOSED 5567 +#define IDR_FOLDER_CLOSED_RTL 5568 +#define IDR_FOLDER_OPEN 5569 +#define IDR_FOLDER_OPEN_RTL 5570 +#define IDR_FRAME 5571 +#define IDR_FRAME_APP_PANEL 5572 +#define IDR_FRAME_INACTIVE 5573 +#define IDR_MAXIMIZE 5574 +#define IDR_MAXIMIZE_H 5575 +#define IDR_MAXIMIZE_P 5576 +#define IDR_MENU_ARROW 5577 +#define IDR_MENU_CHECK 5578 +#define IDR_MENU_CHECK_CHECKED 5579 +#define IDR_MENU_RADIO_EMPTY 5580 +#define IDR_MENU_RADIO_SELECTED 5581 +#define IDR_SLIDER_ACTIVE_LEFT 5582 +#define IDR_SLIDER_ACTIVE_RIGHT 5583 +#define IDR_SLIDER_ACTIVE_CENTER 5584 +#define IDR_SLIDER_DISABLED_LEFT 5585 +#define IDR_SLIDER_DISABLED_RIGHT 5586 +#define IDR_SLIDER_DISABLED_CENTER 5587 +#define IDR_SLIDER_PRESSED_LEFT 5588 +#define IDR_SLIDER_PRESSED_RIGHT 5589 +#define IDR_SLIDER_PRESSED_CENTER 5590 +#define IDR_SLIDER_ACTIVE_THUMB 5591 +#define IDR_SLIDER_DISABLED_THUMB 5592 +#define IDR_MENU_DROPARROW 5593 +#define IDR_MINIMIZE 5594 +#define IDR_MINIMIZE_H 5595 +#define IDR_MINIMIZE_P 5596 +#define IDR_OAK 5597 +#define IDR_PANEL_BOTTOM_LEFT_CORNER 5598 +#define IDR_PANEL_BOTTOM_RIGHT_CORNER 5599 +#define IDR_PROGRESS_BAR 5600 +#define IDR_PROGRESS_BORDER_LEFT 5601 +#define IDR_PROGRESS_BORDER_RIGHT 5602 +#define IDR_PROGRESS_VALUE 5603 +#define IDR_RADIO_DISABLED_OFF 5604 +#define IDR_RADIO_DISABLED_ON 5605 +#define IDR_RADIO_OFF 5606 +#define IDR_RADIO_ON 5607 +#define IDR_SCROLL_BASE_HORIZONTAL_CENTER_H 5608 +#define IDR_SCROLL_BASE_HORIZONTAL_LEFT_H 5609 +#define IDR_SCROLL_BASE_HORIZONTAL_RIGHT_H 5610 +#define IDR_SCROLL_BASE_VERTICAL_BOTTOM_H 5611 +#define IDR_SCROLL_BASE_VERTICAL_CENTER_H 5612 +#define IDR_SCROLL_BASE_VERTICAL_TOP_H 5613 +#define IDR_SCROLL_THUMB_HORIZONTAL_CENTER 5614 +#define IDR_SCROLL_THUMB_HORIZONTAL_CENTER_H 5615 +#define IDR_SCROLL_THUMB_HORIZONTAL_CENTER_P 5616 +#define IDR_SCROLL_THUMB_HORIZONTAL_LEFT 5617 +#define IDR_SCROLL_THUMB_HORIZONTAL_LEFT_H 5618 +#define IDR_SCROLL_THUMB_HORIZONTAL_LEFT_P 5619 +#define IDR_SCROLL_THUMB_HORIZONTAL_RIGHT 5620 +#define IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_H 5621 +#define IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_P 5622 +#define IDR_SCROLL_THUMB_VERTICAL_BOTTOM 5623 +#define IDR_SCROLL_THUMB_VERTICAL_BOTTOM_H 5624 +#define IDR_SCROLL_THUMB_VERTICAL_BOTTOM_P 5625 +#define IDR_SCROLL_THUMB_VERTICAL_CENTER 5626 +#define IDR_SCROLL_THUMB_VERTICAL_CENTER_H 5627 +#define IDR_SCROLL_THUMB_VERTICAL_CENTER_P 5628 +#define IDR_SCROLL_THUMB_VERTICAL_TOP 5629 +#define IDR_SCROLL_THUMB_VERTICAL_TOP_H 5630 +#define IDR_SCROLL_THUMB_VERTICAL_TOP_P 5631 +#define IDR_RESTORE 5632 +#define IDR_RESTORE_H 5633 +#define IDR_RESTORE_P 5634 +#define IDR_TEXTBUTTON_HOVER_BOTTOM 5635 +#define IDR_TEXTBUTTON_HOVER_BOTTOM_LEFT 5636 +#define IDR_TEXTBUTTON_HOVER_BOTTOM_RIGHT 5637 +#define IDR_TEXTBUTTON_HOVER_CENTER 5638 +#define IDR_TEXTBUTTON_HOVER_LEFT 5639 +#define IDR_TEXTBUTTON_HOVER_RIGHT 5640 +#define IDR_TEXTBUTTON_HOVER_TOP 5641 +#define IDR_TEXTBUTTON_HOVER_TOP_LEFT 5642 +#define IDR_TEXTBUTTON_HOVER_TOP_RIGHT 5643 +#define IDR_TEXTBUTTON_PRESSED_BOTTOM 5644 +#define IDR_TEXTBUTTON_PRESSED_BOTTOM_LEFT 5645 +#define IDR_TEXTBUTTON_PRESSED_BOTTOM_RIGHT 5646 +#define IDR_TEXTBUTTON_PRESSED_CENTER 5647 +#define IDR_TEXTBUTTON_PRESSED_LEFT 5648 +#define IDR_TEXTBUTTON_PRESSED_RIGHT 5649 +#define IDR_TEXTBUTTON_PRESSED_TOP 5650 +#define IDR_TEXTBUTTON_PRESSED_TOP_LEFT 5651 +#define IDR_TEXTBUTTON_PRESSED_TOP_RIGHT 5652 +#define IDR_THROBBER 5653 +#define IDR_WINDOW_BOTTOM_CENTER 5654 +#define IDR_WINDOW_BOTTOM_LEFT_CORNER 5655 +#define IDR_WINDOW_BOTTOM_RIGHT_CORNER 5656 +#define IDR_WINDOW_LEFT_SIDE 5657 +#define IDR_WINDOW_RIGHT_SIDE 5658 +#define IDR_WINDOW_TOP_CENTER 5659 +#define IDR_WINDOW_TOP_LEFT_CORNER 5660 +#define IDR_WINDOW_TOP_RIGHT_CORNER 5661 +#define IDR_WINDOW_BUBBLE_SHADOW_BIG_BOTTOM 5662 +#define IDR_WINDOW_BUBBLE_SHADOW_BIG_BOTTOM_LEFT 5663 +#define IDR_WINDOW_BUBBLE_SHADOW_BIG_BOTTOM_RIGHT 5664 +#define IDR_WINDOW_BUBBLE_SHADOW_BIG_LEFT 5665 +#define IDR_WINDOW_BUBBLE_SHADOW_BIG_RIGHT 5666 +#define IDR_WINDOW_BUBBLE_SHADOW_BIG_TOP 5667 +#define IDR_WINDOW_BUBBLE_SHADOW_BIG_TOP_LEFT 5668 +#define IDR_WINDOW_BUBBLE_SHADOW_BIG_TOP_RIGHT 5669 +#define IDR_WINDOW_BUBBLE_SHADOW_SPIKE_BIG_BOTTOM 5670 +#define IDR_WINDOW_BUBBLE_SHADOW_SPIKE_BIG_LEFT 5671 +#define IDR_WINDOW_BUBBLE_SHADOW_SPIKE_BIG_RIGHT 5672 +#define IDR_WINDOW_BUBBLE_SHADOW_SPIKE_BIG_TOP 5673 +#define IDR_WINDOW_BUBBLE_SHADOW_SMALL_BOTTOM 5674 +#define IDR_WINDOW_BUBBLE_SHADOW_SMALL_BOTTOM_LEFT 5675 +#define IDR_WINDOW_BUBBLE_SHADOW_SMALL_BOTTOM_RIGHT 5676 +#define IDR_WINDOW_BUBBLE_SHADOW_SMALL_LEFT 5677 +#define IDR_WINDOW_BUBBLE_SHADOW_SMALL_RIGHT 5678 +#define IDR_WINDOW_BUBBLE_SHADOW_SMALL_TOP 5679 +#define IDR_WINDOW_BUBBLE_SHADOW_SMALL_TOP_LEFT 5680 +#define IDR_WINDOW_BUBBLE_SHADOW_SMALL_TOP_RIGHT 5681 +#define IDR_WINDOW_BUBBLE_SHADOW_SPIKE_SMALL_BOTTOM 5682 +#define IDR_WINDOW_BUBBLE_SHADOW_SPIKE_SMALL_LEFT 5683 +#define IDR_WINDOW_BUBBLE_SHADOW_SPIKE_SMALL_RIGHT 5684 +#define IDR_WINDOW_BUBBLE_SHADOW_SPIKE_SMALL_TOP 5685 +#define IDR_MESSAGE_CLOSE 5686 // --------------------------------------------------------------------------- // From webkit_chromium_resources.h: @@ -674,26 +720,6 @@ // --------------------------------------------------------------------------- // From webkit_resources.h: -#define IDC_ALIAS 4500 -#define IDC_CELL 4501 -#define IDC_COLRESIZE 4502 -#define IDC_COPYCUR 4503 -#define IDC_CURSOR_NONE 4504 -#define IDC_HAND_GRAB 4505 -#define IDC_HAND_GRABBING 4506 -#define IDC_PAN_EAST 4507 -#define IDC_PAN_MIDDLE 4508 -#define IDC_PAN_NORTH 4509 -#define IDC_PAN_NORTH_EAST 4510 -#define IDC_PAN_NORTH_WEST 4511 -#define IDC_PAN_SOUTH 4512 -#define IDC_PAN_SOUTH_EAST 4513 -#define IDC_PAN_SOUTH_WEST 4514 -#define IDC_PAN_WEST 4515 -#define IDC_ROWRESIZE 4516 -#define IDC_VERTICALTEXT 4517 -#define IDC_ZOOMIN 4518 -#define IDC_ZOOMOUT 4519 #define IDR_BROKENIMAGE 4700 #define IDR_INPUT_SPEECH 4701 #define IDR_INPUT_SPEECH_RECORDING 4702 @@ -803,5 +829,6 @@ #define IDR_PDF_PAGE_INDICATOR_BACKGROUND 4806 #define IDR_PDF_PAGE_DROPSHADOW 4807 #define IDR_PASSWORD_GENERATION_ICON 4808 +#define IDR_PASSWORD_GENERATION_ICON_HOVER 4809 #endif // CEF_INCLUDE_CEF_PACK_RESOURCES_H_ diff --git a/cef/include/cef_pack_strings.h b/cef/include/cef_pack_strings.h index 02c6b8317..6c17b910d 100644 --- a/cef/include/cef_pack_strings.h +++ b/cef/include/cef_pack_strings.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -129,6 +129,15 @@ #define IDS_APP_GIBIBYTES_PER_SECOND 11064 #define IDS_APP_TEBIBYTES_PER_SECOND 11065 #define IDS_APP_PEBIBYTES_PER_SECOND 11066 +#define IDS_MESSAGE_CENTER_EXTENSIONS_DISABLE 11067 +#define IDS_MESSAGE_CENTER_SITE_DISABLE 11068 +#define IDS_MESSAGE_CENTER_SETTINGS 11069 +#define IDS_MESSAGE_CENTER_CLEAR_ALL 11070 +#define IDS_MESSAGE_CENTER_NO_MESSAGES 11071 +#define IDS_MESSAGE_CENTER_QUIET_MODE 11072 +#define IDS_MESSAGE_CENTER_QUIET_MODE_EXIT 11073 +#define IDS_MESSAGE_CENTER_QUIET_MODE_1HOUR 11074 +#define IDS_MESSAGE_CENTER_QUIET_MODE_1DAY 11075 // --------------------------------------------------------------------------- // From webkit_strings.h: @@ -149,55 +158,68 @@ #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_ROLE_STEPPER 18026 -#define IDS_AX_BUTTON_ACTION_VERB 18027 -#define IDS_AX_RADIO_BUTTON_ACTION_VERB 18028 -#define IDS_AX_TEXT_FIELD_ACTION_VERB 18029 -#define IDS_AX_CHECKED_CHECK_BOX_ACTION_VERB 18030 -#define IDS_AX_UNCHECKED_CHECK_BOX_ACTION_VERB 18031 -#define IDS_AX_LINK_ACTION_VERB 18032 -#define IDS_AX_AM_PM_FIELD_TEXT 18033 -#define IDS_AX_DAY_OF_MONTH_FIELD_TEXT 18034 -#define IDS_AX_DATE_TIME_FIELD_EMPTY_VALUE_TEXT 18035 -#define IDS_AX_HOUR_FIELD_TEXT 18036 -#define IDS_AX_MILLISECOND_FIELD_TEXT 18037 -#define IDS_AX_MINUTE_FIELD_TEXT 18038 -#define IDS_AX_MONTH_FIELD_TEXT 18039 -#define IDS_AX_SECOND_FIELD_TEXT 18040 -#define IDS_AX_WEEK_OF_YEAR_FIELD_TEXT 18041 -#define IDS_AX_YEAR_FIELD_TEXT 18042 -#define IDS_KEYGEN_HIGH_GRADE_KEY 18043 -#define IDS_KEYGEN_MED_GRADE_KEY 18044 -#define IDS_FORM_VALIDATION_VALUE_MISSING_MULTIPLE_FILE 18045 -#define IDS_FORM_VALIDATION_TYPE_MISMATCH 18046 -#define IDS_FORM_VALIDATION_TYPE_MISMATCH_MULTIPLE_EMAIL 18047 -#define IDS_FORM_VALIDATION_RANGE_UNDERFLOW 18048 -#define IDS_FORM_VALIDATION_RANGE_OVERFLOW 18049 -#define IDS_FORM_VALIDATION_STEP_MISMATCH 18050 -#define IDS_FORM_VALIDATION_VALUE_MISSING 18051 -#define IDS_FORM_VALIDATION_VALUE_MISSING_CHECKBOX 18052 -#define IDS_FORM_VALIDATION_VALUE_MISSING_FILE 18053 -#define IDS_FORM_VALIDATION_VALUE_MISSING_RADIO 18054 -#define IDS_FORM_VALIDATION_VALUE_MISSING_SELECT 18055 -#define IDS_FORM_VALIDATION_TYPE_MISMATCH_EMAIL 18056 -#define IDS_FORM_VALIDATION_TYPE_MISMATCH_URL 18057 -#define IDS_FORM_VALIDATION_PATTERN_MISMATCH 18058 -#define IDS_FORM_VALIDATION_TOO_LONG 18059 -#define IDS_PDF_NEED_PASSWORD 18060 -#define IDS_PDF_PAGE_LOADING 18061 -#define IDS_PDF_LOADING_PROGRESS 18062 -#define IDS_PDF_PAGE_LOAD_FAILED 18063 -#define IDS_PDF_PROGRESS_LOADING 18064 -#define IDS_PLUGIN_INITIALIZATION_ERROR 18065 +#define IDS_FORM_OTHER_DATE_LABEL 18016 +#define IDS_FORM_OTHER_MONTH_LABEL 18017 +#define IDS_FORM_OTHER_TIME_LABEL 18018 +#define IDS_FORM_OTHER_WEEK_LABEL 18019 +#define IDS_FORM_PLACEHOLDER_FOR_DAY_OF_MONTH_FIELD 18020 +#define IDS_FORM_PLACEHOLDER_FOR_MONTH_FIELD 18021 +#define IDS_FORM_PLACEHOLDER_FOR_YEAR_FIELD 18022 +#define IDS_FORM_THIS_MONTH_LABEL 18023 +#define IDS_FORM_THIS_WEEK_LABEL 18024 +#define IDS_FORM_WEEK_NUMBER_LABEL 18025 +#define IDS_RECENT_SEARCHES_NONE 18026 +#define IDS_RECENT_SEARCHES 18027 +#define IDS_RECENT_SEARCHES_CLEAR 18028 +#define IDS_IMAGE_TITLE_FOR_FILENAME 18029 +#define IDS_AX_ROLE_WEB_AREA 18030 +#define IDS_AX_ROLE_LINK 18031 +#define IDS_AX_ROLE_LIST_MARKER 18032 +#define IDS_AX_ROLE_IMAGE_MAP 18033 +#define IDS_AX_ROLE_HEADING 18034 +#define IDS_AX_ROLE_FOOTER 18035 +#define IDS_AX_ROLE_STEPPER 18036 +#define IDS_AX_BUTTON_ACTION_VERB 18037 +#define IDS_AX_RADIO_BUTTON_ACTION_VERB 18038 +#define IDS_AX_TEXT_FIELD_ACTION_VERB 18039 +#define IDS_AX_CHECKED_CHECK_BOX_ACTION_VERB 18040 +#define IDS_AX_UNCHECKED_CHECK_BOX_ACTION_VERB 18041 +#define IDS_AX_LINK_ACTION_VERB 18042 +#define IDS_AX_AM_PM_FIELD_TEXT 18043 +#define IDS_AX_DAY_OF_MONTH_FIELD_TEXT 18044 +#define IDS_AX_DATE_TIME_FIELD_EMPTY_VALUE_TEXT 18045 +#define IDS_AX_HOUR_FIELD_TEXT 18046 +#define IDS_AX_MILLISECOND_FIELD_TEXT 18047 +#define IDS_AX_MINUTE_FIELD_TEXT 18048 +#define IDS_AX_MONTH_FIELD_TEXT 18049 +#define IDS_AX_SECOND_FIELD_TEXT 18050 +#define IDS_AX_WEEK_OF_YEAR_FIELD_TEXT 18051 +#define IDS_AX_YEAR_FIELD_TEXT 18052 +#define IDS_KEYGEN_HIGH_GRADE_KEY 18053 +#define IDS_KEYGEN_MED_GRADE_KEY 18054 +#define IDS_FORM_INPUT_WEEK_TEMPLATE 18055 +#define IDS_FORM_VALIDATION_VALUE_MISSING_MULTIPLE_FILE 18056 +#define IDS_FORM_VALIDATION_TYPE_MISMATCH 18057 +#define IDS_FORM_VALIDATION_TYPE_MISMATCH_MULTIPLE_EMAIL 18058 +#define IDS_FORM_VALIDATION_RANGE_UNDERFLOW 18059 +#define IDS_FORM_VALIDATION_RANGE_OVERFLOW 18060 +#define IDS_FORM_VALIDATION_STEP_MISMATCH 18061 +#define IDS_FORM_VALIDATION_BAD_INPUT_DATETIME 18062 +#define IDS_FORM_VALIDATION_BAD_INPUT_NUMBER 18063 +#define IDS_FORM_VALIDATION_VALUE_MISSING 18064 +#define IDS_FORM_VALIDATION_VALUE_MISSING_CHECKBOX 18065 +#define IDS_FORM_VALIDATION_VALUE_MISSING_FILE 18066 +#define IDS_FORM_VALIDATION_VALUE_MISSING_RADIO 18067 +#define IDS_FORM_VALIDATION_VALUE_MISSING_SELECT 18068 +#define IDS_FORM_VALIDATION_TYPE_MISMATCH_EMAIL 18069 +#define IDS_FORM_VALIDATION_TYPE_MISMATCH_URL 18070 +#define IDS_FORM_VALIDATION_PATTERN_MISMATCH 18071 +#define IDS_FORM_VALIDATION_TOO_LONG 18072 +#define IDS_PDF_NEED_PASSWORD 18073 +#define IDS_PDF_PAGE_LOADING 18074 +#define IDS_PDF_LOADING_PROGRESS 18075 +#define IDS_PDF_PAGE_LOAD_FAILED 18076 +#define IDS_PDF_PROGRESS_LOADING 18077 +#define IDS_PLUGIN_INITIALIZATION_ERROR 18078 #endif // CEF_INCLUDE_CEF_PACK_STRINGS_H_ diff --git a/cef/include/cef_render_handler.h b/cef/include/cef_render_handler.h new file mode 100644 index 000000000..5064950cd --- /dev/null +++ b/cef/include/cef_render_handler.h @@ -0,0 +1,119 @@ +// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the name Chromium Embedded +// Framework nor the names of its contributors may be used to endorse +// or promote products derived from this software without specific prior +// written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// --------------------------------------------------------------------------- +// +// The contents of this file must follow a specific format in order to +// support the CEF translator tool. See the translator.README.txt file in the +// tools directory for more information. +// + +#ifndef CEF_INCLUDE_CEF_RENDER_HANDLER_H_ +#define CEF_INCLUDE_CEF_RENDER_HANDLER_H_ +#pragma once + +#include "include/cef_base.h" +#include "include/cef_browser.h" +#include + +/// +// Implement this interface to handle events when window rendering is disabled. +// The methods of this class will be called on the UI thread. +/// +/*--cef(source=client)--*/ +class CefRenderHandler : public virtual CefBase { + public: + typedef cef_paint_element_type_t PaintElementType; + typedef std::vector RectList; + + /// + // Called to retrieve the root window rectangle in screen coordinates. Return + // true if the rectangle was provided. + /// + /*--cef()--*/ + virtual bool GetRootScreenRect(CefRefPtr browser, + CefRect& rect) { return false; } + + /// + // Called to retrieve the view rectangle which is relative to screen + // coordinates. Return true if the rectangle was provided. + /// + /*--cef()--*/ + virtual bool GetViewRect(CefRefPtr browser, CefRect& rect) =0; + + /// + // Called to retrieve the translation from view coordinates to actual screen + // coordinates. Return true if the screen coordinates were provided. + /// + /*--cef()--*/ + virtual bool GetScreenPoint(CefRefPtr browser, + int viewX, + int viewY, + int& screenX, + int& screenY) { return false; } + + /// + // Called when the browser wants to show or hide the popup widget. The popup + // should be shown if |show| is true and hidden if |show| is false. + /// + /*--cef()--*/ + virtual void OnPopupShow(CefRefPtr browser, + bool show) {} + + /// + // Called when the browser wants to move or resize the popup widget. |rect| + // contains the new location and size. + /// + /*--cef()--*/ + virtual void OnPopupSize(CefRefPtr browser, + const CefRect& rect) {} + + /// + // Called when an element should be painted. |type| indicates whether the + // element is the view or the popup widget. |buffer| contains the pixel data + // for the whole image. |dirtyRects| contains the set of rectangles that need + // to be repainted. On Windows |buffer| will be |width|*|height|*4 bytes + // in size and represents a BGRA image with an upper-left origin. + /// + /*--cef()--*/ + virtual void OnPaint(CefRefPtr browser, + PaintElementType type, + const RectList& dirtyRects, + const void* buffer, + int width, int height) =0; + + /// + // Called when the browser window's cursor has changed. + /// + /*--cef()--*/ + virtual void OnCursorChange(CefRefPtr browser, + CefCursorHandle cursor) {} +}; + +#endif // CEF_INCLUDE_CEF_RENDER_HANDLER_H_ diff --git a/cef/include/cef_render_process_handler.h b/cef/include/cef_render_process_handler.h index f81fc2dee..0f21b1d2c 100644 --- a/cef/include/cef_render_process_handler.h +++ b/cef/include/cef_render_process_handler.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -44,19 +44,26 @@ #include "include/cef_frame.h" #include "include/cef_process_message.h" #include "include/cef_v8.h" +#include "include/cef_values.h" /// // Class used to implement render process callbacks. The methods of this class -// will always be called on the render process main thread. +// will be called on the render process main thread (TID_RENDERER) unless +// otherwise indicated. /// /*--cef(source=client)--*/ class CefRenderProcessHandler : public virtual CefBase { public: + typedef cef_navigation_type_t NavigationType; + /// - // Called after the render process main thread has been created. + // Called after the render process main thread has been created. |extra_info| + // is a read-only value originating from + // CefBrowserProcessHandler::OnRenderProcessThreadCreated(). Do not keep a + // reference to |extra_info| outside of this method. /// /*--cef()--*/ - virtual void OnRenderThreadCreated() {} + virtual void OnRenderThreadCreated(CefRefPtr extra_info) {} /// // Called after WebKit has been initialized. @@ -65,7 +72,9 @@ class CefRenderProcessHandler : public virtual CefBase { virtual void OnWebKitInitialized() {} /// - // Called after a browser has been created. + // Called after a browser has been created. When browsing cross-origin a new + // browser will be created before the old browser with the same identifier is + // destroyed. /// /*--cef()--*/ virtual void OnBrowserCreated(CefRefPtr browser) {} @@ -76,10 +85,24 @@ class CefRenderProcessHandler : public virtual CefBase { /*--cef()--*/ virtual void OnBrowserDestroyed(CefRefPtr browser) {} + /// + // Called before browser navigation. Return true to cancel the navigation or + // false to allow the navigation to proceed. The |request| object cannot be + // modified in this callback. + /// + /*--cef()--*/ + virtual bool OnBeforeNavigation(CefRefPtr browser, + CefRefPtr frame, + CefRefPtr request, + NavigationType navigation_type, + bool is_redirect) { return false; } + /// // Called immediately after the V8 context for a frame has been created. To // retrieve the JavaScript 'window' object use the CefV8Context::GetGlobal() - // method. + // method. V8 handles can only be accessed from the thread on which they are + // created. A task runner for posting tasks on the associated thread can be + // retrieved via the CefV8Context::GetTaskRunner() method. /// /*--cef()--*/ virtual void OnContextCreated(CefRefPtr browser, @@ -95,6 +118,55 @@ class CefRenderProcessHandler : public virtual CefBase { CefRefPtr frame, CefRefPtr context) {} + /// + // Called for global uncaught exceptions in a frame. Execution of this + // callback is disabled by default. To enable set + // CefSettings.uncaught_exception_stack_size > 0. + /// + /*--cef()--*/ + virtual void OnUncaughtException(CefRefPtr browser, + CefRefPtr frame, + CefRefPtr context, + CefRefPtr exception, + CefRefPtr stackTrace) {} + + /// + // Called on the WebWorker thread immediately after the V8 context for a new + // WebWorker has been created. To retrieve the JavaScript 'self' object use + // the CefV8Context::GetGlobal() method. V8 handles can only be accessed from + // the thread on which they are created. A task runner for posting tasks on + // the associated thread can be retrieved via the + // CefV8Context::GetTaskRunner() method. + /// + /*--cef()--*/ + virtual void OnWorkerContextCreated(int worker_id, + const CefString& url, + CefRefPtr context) {} + + /// + // Called on the WebWorker thread immediately before the V8 context for a + // WebWorker is released. No references to the context should be kept after + // this method is called. Any tasks posted or pending on the WebWorker + // thread after this method is called may not be executed. + /// + /*--cef()--*/ + virtual void OnWorkerContextReleased(int worker_id, + const CefString& url, + CefRefPtr context) {} + + /// + // Called on the WebWorker thread for global uncaught exceptions in a + // WebWorker. Execution of this callback is disabled by default. To enable set + // CefSettings.uncaught_exception_stack_size > 0. + /// + /*--cef()--*/ + virtual void OnWorkerUncaughtException( + int worker_id, + const CefString& url, + CefRefPtr context, + CefRefPtr exception, + CefRefPtr stackTrace) {} + /// // Called when a new node in the the browser gets focus. The |node| value may // be empty if no specific node has gained focus. The node object passed to diff --git a/cef/include/cef_request_handler.h b/cef/include/cef_request_handler.h index 42ab13f0a..e01f89189 100644 --- a/cef/include/cef_request_handler.h +++ b/cef/include/cef_request_handler.h @@ -138,7 +138,7 @@ class CefRequestHandler : public virtual CefBase { // Called on the IO thread when the browser needs credentials from the user. // |isProxy| indicates whether the host is a proxy server. |host| contains the // hostname and |port| contains the port number. Return true to continue the - // request and call CefAuthCallback::Complete() when the authentication + // request and call CefAuthCallback::Continue() when the authentication // information is available. Return false to cancel the request. /// /*--cef(optional_param=realm)--*/ @@ -157,7 +157,7 @@ class CefRequestHandler : public virtual CefBase { // Called on the IO thread when JavaScript requests a specific storage quota // size via the webkitStorageInfo.requestQuota function. |origin_url| is the // origin of the page making the request. |new_size| is the requested quota - // size in bytes. Return true and call CefQuotaCallback::Complete() either in + // size in bytes. Return true and call CefQuotaCallback::Continue() either in // this function or at a later time to grant or deny the request. Return false // to cancel the request. /// diff --git a/cef/include/cef_runnable.h b/cef/include/cef_runnable.h index 7002d431b..37ad0efe2 100644 --- a/cef/include/cef_runnable.h +++ b/cef/include/cef_runnable.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. Portions Copyright (c) +// Copyright (c) 2013 Marshall A. Greenblatt. Portions Copyright (c) // 2006-2011 Google Inc. All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -145,7 +145,7 @@ class CefRunnableMethod : public CefTask { traits_.ReleaseCallee(obj); } - virtual void Execute(CefThreadId threadId) { + virtual void Execute() { if (obj_) DispatchToMethod(obj_, meth_, params_); } @@ -253,7 +253,7 @@ class CefRunnableFunction : public CefTask { ~CefRunnableFunction() { } - virtual void Execute(CefThreadId threadId) { + virtual void Execute() { if (function_) DispatchToFunction(function_, params_); } diff --git a/cef/include/cef_task.h b/cef/include/cef_task.h index 77dd3b991..0ecaa7526 100644 --- a/cef/include/cef_task.h +++ b/cef/include/cef_task.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -39,50 +39,110 @@ #include "include/cef_base.h" -class CefTask; - typedef cef_thread_id_t CefThreadId; /// +// Implement this interface for asynchronous task execution. If the task is +// posted successfully and if the associated message loop is still running then +// the Execute() method will be called on the target thread. If the task fails +// to post then the task object may be destroyed on the source thread instead of +// the target thread. For this reason be cautious when performing work in the +// task object destructor. +/// +/*--cef(source=client)--*/ +class CefTask : public virtual CefBase { + public: + /// + // Method that will be executed on the target thread. + /// + /*--cef()--*/ + virtual void Execute() =0; +}; + +/// +// Class that asynchronously executes tasks on the associated thread. It is safe +// to call the methods of this class on any thread. +// // CEF maintains multiple internal threads that are used for handling different -// types of tasks in different processes. See the cef_thread_id_t definitions in -// cef_types.h for more information. This function will return true if called on -// the specified thread. It is an error to request a thread from the wrong -// process. +// types of tasks in different processes. The cef_thread_id_t definitions in +// cef_types.h list the common CEF threads. Task runners are also available for +// other CEF threads as appropriate (for example, V8 WebWorker threads). +/// +/*--cef(source=library)--*/ +class CefTaskRunner : public virtual CefBase { + public: + /// + // Returns the task runner for the current thread. Only CEF threads will have + // task runners. An empty reference will be returned if this method is called + // on an invalid thread. + /// + /*--cef()--*/ + static CefRefPtr GetForCurrentThread(); + + /// + // Returns the task runner for the specified CEF thread. + /// + /*--cef()--*/ + static CefRefPtr GetForThread(CefThreadId threadId); + + /// + // Returns true if this object is pointing to the same task runner as |that| + // object. + /// + /*--cef()--*/ + virtual bool IsSame(CefRefPtr that) =0; + + /// + // Returns true if this task runner belongs to the current thread. + /// + /*--cef()--*/ + virtual bool BelongsToCurrentThread() =0; + + /// + // Returns true if this task runner is for the specified CEF thread. + /// + /*--cef()--*/ + virtual bool BelongsToThread(CefThreadId threadId) =0; + + /// + // Post a task for execution on the thread associated with this task runner. + // Execution will occur asynchronously. + /// + /*--cef()--*/ + virtual bool PostTask(CefRefPtr task) =0; + + /// + // Post a task for delayed execution on the thread associated with this task + // runner. Execution will occur asynchronously. Delayed tasks are not + // supported on V8 WebWorker threads and will be executed without the + // specified delay. + /// + /*--cef()--*/ + virtual bool PostDelayedTask(CefRefPtr task, int64 delay_ms) =0; +}; + + +/// +// Returns true if called on the specified thread. Equivalent to using +// CefTaskRunner::GetForThread(threadId)->BelongsToCurrentThread(). /// /*--cef()--*/ bool CefCurrentlyOn(CefThreadId threadId); /// -// Post a task for execution on the specified thread. This function may be -// called on any thread. It is an error to request a thread from the wrong -// process. +// Post a task for execution on the specified thread. Equivalent to +// using CefTaskRunner::GetForThread(threadId)->PostTask(task). /// /*--cef()--*/ bool CefPostTask(CefThreadId threadId, CefRefPtr task); /// -// Post a task for delayed execution on the specified thread. This function may -// be called on any thread. It is an error to request a thread from the wrong -// process. +// Post a task for delayed execution on the specified thread. Equivalent to +// using CefTaskRunner::GetForThread(threadId)->PostDelayedTask(task, delay_ms). /// /*--cef()--*/ bool CefPostDelayedTask(CefThreadId threadId, CefRefPtr task, int64 delay_ms); -/// -// Implement this interface for task execution. The methods of this class may -// be called on any thread. -/// -/*--cef(source=client)--*/ -class CefTask : public virtual CefBase { - public: - /// - // Method that will be executed. |threadId| is the thread executing the call. - /// - /*--cef()--*/ - virtual void Execute(CefThreadId threadId) =0; -}; - #endif // CEF_INCLUDE_CEF_TASK_H_ diff --git a/cef/include/cef_trace_event.h b/cef/include/cef_trace_event.h index b93a2cf9a..7fee2183f 100644 --- a/cef/include/cef_trace_event.h +++ b/cef/include/cef_trace_event.h @@ -184,13 +184,6 @@ CEF_EXPORT void cef_trace_event_end(const char* category, const char* arg2_name, uint64 arg2_val, int copy); -CEF_EXPORT void cef_trace_event_if_longer_than(long long threshold_us, - const char* category, - const char* name, - const char* arg1_name, - uint64 arg1_val, - const char* arg2_name, - uint64 arg2_val); CEF_EXPORT void cef_trace_counter(const char* category, const char* name, const char* value1_name, @@ -312,25 +305,6 @@ CEF_EXPORT void cef_trace_event_async_end(const char* category, cef_trace_event_end(category, name, arg1_name, arg1_val, arg2_name, \ arg2_val, true) -// Time threshold event: -// Only record the event if the duration is greater than the specified -// threshold_us (time in microseconds). -// Records a pair of begin and end events called "name" for the current -// scope, with 0, 1 or 2 associated arguments. If the category is not -// enabled, then this does nothing. -// - category and name strings must have application lifetime (statics or -// literals). They may not include " chars. -#define CEF_TRACE_EVENT_IF_LONGER_THAN0(threshold_us, category, name) \ - cef_trace_event_if_longer_than(threshold_us, category, name, NULL, 0, NULL, 0) -#define CEF_TRACE_EVENT_IF_LONGER_THAN1(threshold_us, category, name, \ - arg1_name, arg1_val) \ - cef_trace_event_if_longer_than(threshold_us, category, name, arg1_name, \ - arg1_val, NULL, 0) -#define CEF_TRACE_EVENT_IF_LONGER_THAN2(threshold_us, category, name, \ - arg1_name, arg1_val, arg2_name, arg2_val) \ - cef_trace_event_if_longer_than(threshold_us, category, name, arg1_name, \ - arg1_val, arg2_name, arg2_val) - // Records the value of a counter called "name" immediately. Value // must be representable as a 32 bit integer. // - category and name strings must have application lifetime (statics or diff --git a/cef/include/cef_v8.h b/cef/include/cef_v8.h index 77b45fa8c..3f05b802e 100644 --- a/cef/include/cef_v8.h +++ b/cef/include/cef_v8.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -42,6 +42,7 @@ #include "include/cef_base.h" #include "include/cef_browser.h" #include "include/cef_frame.h" +#include "include/cef_task.h" #include class CefV8Exception; @@ -116,8 +117,11 @@ bool CefRegisterExtension(const CefString& extension_name, /// -// Class that encapsulates a V8 context handle. The methods of this class may -// only be called on the render process main thread. +// Class representing a V8 context handle. V8 handles can only be accessed from +// the thread on which they are created. Valid threads for creating a V8 handle +// include the render process main thread (TID_RENDERER) and WebWorker threads. +// A task runner for posting tasks on the associated thread can be retrieved via +// the CefV8Context::GetTaskRunner() method. /// /*--cef(source=library)--*/ class CefV8Context : public virtual CefBase { @@ -141,13 +145,31 @@ class CefV8Context : public virtual CefBase { static bool InContext(); /// - // Returns the browser for this context. + // Returns the task runner associated with this context. V8 handles can only + // be accessed from the thread on which they are created. This method can be + // called on any render process thread. + /// + /*--cef()--*/ + virtual CefRefPtr GetTaskRunner() =0; + + /// + // Returns true if the underlying handle is valid and it can be accessed on + // the current thread. Do not call any other methods if this method returns + // false. + /// + /*--cef()--*/ + virtual bool IsValid() =0; + + /// + // Returns the browser for this context. This method will return an empty + // reference for WebWorker contexts. /// /*--cef()--*/ virtual CefRefPtr GetBrowser() =0; /// - // Returns the frame for this context. + // Returns the frame for this context. This method will return an empty + // reference for WebWorker contexts. /// /*--cef()--*/ virtual CefRefPtr GetFrame() =0; @@ -200,7 +222,7 @@ typedef std::vector > CefV8ValueList; /// // Interface that should be implemented to handle V8 function calls. The methods -// of this class will always be called on the render process main thread. +// of this class will be called on the thread associated with the V8 function. /// /*--cef(source=client)--*/ class CefV8Handler : public virtual CefBase { @@ -223,7 +245,7 @@ class CefV8Handler : public virtual CefBase { /// // Interface that should be implemented to handle V8 accessor calls. Accessor // identifiers are registered by calling CefV8Value::SetValue(). The methods -// of this class will always be called on the render process main thread. +// of this class will be called on the thread associated with the V8 accessor. /// /*--cef(source=client)--*/ class CefV8Accessor : public virtual CefBase { @@ -256,7 +278,8 @@ class CefV8Accessor : public virtual CefBase { }; /// -// Class representing a V8 exception. +// Class representing a V8 exception. The methods of this class may be called on +// any render process thread. /// /*--cef(source=library)--*/ class CefV8Exception : public virtual CefBase { @@ -317,8 +340,11 @@ class CefV8Exception : public virtual CefBase { }; /// -// Class representing a V8 value. The methods of this class may only be called -// on the render process main thread. +// Class representing a V8 value handle. V8 handles can only be accessed from +// the thread on which they are created. Valid threads for creating a V8 handle +// include the render process main thread (TID_RENDERER) and WebWorker threads. +// A task runner for posting tasks on the associated thread can be retrieved via +// the CefV8Context::GetTaskRunner() method. /// /*--cef(source=library)--*/ class CefV8Value : public virtual CefBase { @@ -407,6 +433,14 @@ class CefV8Value : public virtual CefBase { static CefRefPtr CreateFunction(const CefString& name, CefRefPtr handler); + /// + // Returns true if the underlying handle is valid and it can be accessed on + // the current thread. Do not call any other methods if this method returns + // false. + /// + /*--cef()--*/ + virtual bool IsValid() =0; + /// // True if the value type is undefined. /// @@ -741,8 +775,11 @@ class CefV8Value : public virtual CefBase { }; /// -// Class representing a V8 stack trace. The methods of this class may only be -// called on the render process main thread. +// Class representing a V8 stack trace handle. V8 handles can only be accessed +// from the thread on which they are created. Valid threads for creating a V8 +// handle include the render process main thread (TID_RENDERER) and WebWorker +// threads. A task runner for posting tasks on the associated thread can be +// retrieved via the CefV8Context::GetTaskRunner() method. /// /*--cef(source=library)--*/ class CefV8StackTrace : public virtual CefBase { @@ -754,6 +791,14 @@ class CefV8StackTrace : public virtual CefBase { /*--cef()--*/ static CefRefPtr GetCurrent(int frame_limit); + /// + // Returns true if the underlying handle is valid and it can be accessed on + // the current thread. Do not call any other methods if this method returns + // false. + /// + /*--cef()--*/ + virtual bool IsValid() =0; + /// // Returns the number of stack frames. /// @@ -768,12 +813,23 @@ class CefV8StackTrace : public virtual CefBase { }; /// -// Class representing a V8 stack frame. The methods of this class may only be -// called on the render process main thread. +// Class representing a V8 stack frame handle. V8 handles can only be accessed +// from the thread on which they are created. Valid threads for creating a V8 +// handle include the render process main thread (TID_RENDERER) and WebWorker +// threads. A task runner for posting tasks on the associated thread can be +// retrieved via the CefV8Context::GetTaskRunner() method. /// /*--cef(source=library)--*/ class CefV8StackFrame : public virtual CefBase { public: + /// + // Returns true if the underlying handle is valid and it can be accessed on + // the current thread. Do not call any other methods if this method returns + // false. + /// + /*--cef()--*/ + virtual bool IsValid() =0; + /// // Returns the name of the resource script that contains the function. /// diff --git a/cef/include/cef_version.h b/cef/include/cef_version.h index 8ba54455d..8776f303f 100644 --- a/cef/include/cef_version.h +++ b/cef/include/cef_version.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -36,13 +36,13 @@ #define CEF_INCLUDE_CEF_VERSION_H_ #define CEF_VERSION_MAJOR 3 -#define CEF_REVISION 883 -#define COPYRIGHT_YEAR 2012 +#define CEF_REVISION 1050 +#define COPYRIGHT_YEAR 2013 -#define CHROME_VERSION_MAJOR 23 +#define CHROME_VERSION_MAJOR 25 #define CHROME_VERSION_MINOR 0 -#define CHROME_VERSION_BUILD 1271 -#define CHROME_VERSION_PATCH 18 +#define CHROME_VERSION_BUILD 1364 +#define CHROME_VERSION_PATCH 29 #define DO_MAKE_STRING(p) #p #define MAKE_STRING(p) DO_MAKE_STRING(p) diff --git a/cef/include/internal/cef_time.h b/cef/include/internal/cef_time.h index ccaf19320..64e601fe0 100644 --- a/cef/include/internal/cef_time.h +++ b/cef/include/internal/cef_time.h @@ -69,6 +69,18 @@ CEF_EXPORT int cef_time_from_timet(time_t time, cef_time_t* cef_time); CEF_EXPORT int cef_time_to_doublet(const cef_time_t* cef_time, double* time); CEF_EXPORT int cef_time_from_doublet(double time, cef_time_t* cef_time); +/// +// Retrieve the current system time. +// +CEF_EXPORT int cef_time_now(cef_time_t* cef_time); + +/// +// Retrieve the delta in milliseconds between two time values. +// +CEF_EXPORT int cef_time_delta(const cef_time_t* cef_time1, + const cef_time_t* cef_time2, + long long* delta); + #ifdef __cplusplus } #endif diff --git a/cef/include/internal/cef_types.h b/cef/include/internal/cef_types.h index dd3df948d..d6772fb5b 100644 --- a/cef/include/internal/cef_types.h +++ b/cef/include/internal/cef_types.h @@ -130,7 +130,8 @@ enum cef_log_severity_t { /// // Initialization settings. Specify NULL or 0 to get the recommended default -// values. +// values. Many of these and other settings can also configured using command- +// line flags. /// typedef struct _cef_settings_t { /// @@ -208,6 +209,11 @@ typedef struct _cef_settings_t { /// cef_log_severity_t log_severity; + /// + // Enable DCHECK in release mode to ease debugging. + /// + bool release_dcheck_enabled; + /// // Custom flags that will be used when initializing the V8 JavaScript engine. // The consequences of using custom flags may not be well tested. @@ -252,12 +258,40 @@ typedef struct _cef_settings_t { // Chrome browser window. /// int remote_debugging_port; + + /// + // The number of stack trace frames to capture for uncaught exceptions. + // Specify a positive value to enable the CefV8ContextHandler:: + // OnUncaughtException() callback. Specify 0 (default value) and + // OnUncaughtException() will not be called. + /// + int uncaught_exception_stack_size; + + /// + // By default CEF V8 references will be invalidated (the IsValid() method will + // return false) after the owning context has been released. This reduces the + // need for external record keeping and avoids crashes due to the use of V8 + // references after the associated context has been released. + // + // CEF currently offers two context safety implementations with different + // performance characteristics. The default implementation (value of 0) uses a + // map of hash values and should provide better performance in situations with + // a small number contexts. The alternate implementation (value of 1) uses a + // hidden value attached to each context and should provide better performance + // in situations with a large number of contexts. + // + // If you need better performance in the creation of V8 references and you + // plan to manually track context lifespan you can disable context safety by + // specifying a value of -1. + /// + int context_safety_implementation; } cef_settings_t; /// // Browser initialization settings. Specify NULL or 0 to get the recommended // default values. The consequences of using custom values may not be well -// tested. +// tested. Many of these and other settings can also configured using command- +// line flags. /// typedef struct _cef_browser_settings_t { /// @@ -452,16 +486,6 @@ typedef struct _cef_browser_settings_t { /// bool accelerated_2d_canvas_disabled; - /// - // Set to true (1) to enable accelerated painting. - /// - bool accelerated_painting_enabled; - - /// - // Set to true (1) to enable accelerated filters. - /// - bool accelerated_filters_enabled; - /// // Set to true (1) to disable accelerated plugins. /// @@ -471,11 +495,6 @@ typedef struct _cef_browser_settings_t { // Set to true (1) to disable developer tools (WebKit inspector). /// bool developer_tools_disabled; - - /// - // Set to true (1) to enable fullscreen mode. - /// - bool fullscreen_enabled; } cef_browser_settings_t; /// @@ -738,28 +757,28 @@ enum cef_urlrequest_flags_t { // Default behavior. /// UR_FLAG_NONE = 0, - + /// // If set the cache will be skipped when handling the request. /// UR_FLAG_SKIP_CACHE = 1 << 0, - + /// // If set user name, password, and cookies may be sent with the request. /// UR_FLAG_ALLOW_CACHED_CREDENTIALS = 1 << 1, - + /// // If set cookies may be sent with the request and saved from the response. // UR_FLAG_ALLOW_CACHED_CREDENTIALS must also be set. /// UR_FLAG_ALLOW_COOKIES = 1 << 2, - + /// // If set upload progress events will be generated when a request has a body. /// UR_FLAG_REPORT_UPLOAD_PROGRESS = 1 << 3, - + /// // If set load timing info will be collected for the request. /// @@ -791,23 +810,23 @@ enum cef_urlrequest_status_t { // Unknown status. /// UR_UNKNOWN = 0, - + /// // Request succeeded. /// UR_SUCCESS, - + /// // An IO request is pending, and the caller will be informed when it is // completed. /// UR_IO_PENDING, - + /// // Request was canceled programatically. /// UR_CANCELED, - + /// // Request failed for some reason. /// @@ -947,12 +966,50 @@ enum cef_menu_id_t { MENU_ID_USER_LAST = 28500, }; +/// +// Mouse button types. +/// +enum cef_mouse_button_type_t { + MBT_LEFT = 0, + MBT_MIDDLE, + MBT_RIGHT, +}; + +/// +// Structure representing mouse event information. +/// +typedef struct _cef_mouse_event_t { + /// + // X coordinate relative to the left side of the view. + /// + int x; + + /// + // Y coordinate relative to the top side of the view. + /// + int y; + + /// + // Bit flags describing any pressed modifier keys. See + // cef_event_flags_t for values. + /// + uint32 modifiers; +} cef_mouse_event_t; + +/// +// Paint element types. +/// +enum cef_paint_element_type_t { + PET_VIEW = 0, + PET_POPUP, +}; + /// // Supported event bit flags. /// enum cef_event_flags_t { EVENTFLAG_NONE = 0, - EVENTFLAG_CAPS_LOCK_DOWN = 1 << 0, + EVENTFLAG_CAPS_LOCK_ON = 1 << 0, EVENTFLAG_SHIFT_DOWN = 1 << 1, EVENTFLAG_CONTROL_DOWN = 1 << 2, EVENTFLAG_ALT_DOWN = 1 << 3, @@ -961,8 +1018,10 @@ enum cef_event_flags_t { EVENTFLAG_RIGHT_MOUSE_BUTTON = 1 << 6, // Mac OS-X command key. EVENTFLAG_COMMAND_DOWN = 1 << 7, - // Windows extended key (see WM_KEYDOWN doc). - EVENTFLAG_EXTENDED = 1 << 8, + EVENTFLAG_NUM_LOCK_ON = 1 << 8, + EVENTFLAG_IS_KEY_PAD = 1 << 9, + EVENTFLAG_IS_LEFT = 1 << 10, + EVENTFLAG_IS_RIGHT = 1 << 11, }; /// @@ -1083,17 +1142,6 @@ enum cef_key_event_type_t { KEYEVENT_CHAR }; -/// -// Key event modifiers. -/// -enum cef_key_event_modifiers_t { - KEY_SHIFT = 1 << 0, - KEY_CTRL = 1 << 1, - KEY_ALT = 1 << 2, - KEY_META = 1 << 3, - KEY_KEYPAD = 1 << 4, // Only used on Mac OS-X -}; - /// // Structure representing keyboard event information. /// @@ -1102,12 +1150,12 @@ typedef struct _cef_key_event_t { // The type of keyboard event. /// cef_key_event_type_t type; - + /// // Bit flags describing any pressed modifier keys. See - // cef_key_event_modifiers_t for values. + // cef_event_flags_t for values. /// - int modifiers; + uint32 modifiers; /// // The Windows key code for the key event. This value is used by the DOM @@ -1161,6 +1209,18 @@ enum cef_focus_source_t { FOCUS_SOURCE_SYSTEM, }; +/// +// Navigation types. +/// +enum cef_navigation_type_t { + NAVIGATION_LINK_CLICKED = 0, + NAVIGATION_FORM_SUBMITTED, + NAVIGATION_BACK_FORWARD, + NAVIGATION_RELOAD, + NAVIGATION_FORM_RESUBMITTED, + NAVIGATION_OTHER, +}; + /// // Supported XML encoding types. The parser supports ASCII, ISO-8859-1, and // UTF16 (LE and BE) by default. All other types must be translated to UTF8 diff --git a/cef/include/internal/cef_types_wrappers.h b/cef/include/internal/cef_types_wrappers.h index 4b6a3d876..54e9dc917 100644 --- a/cef/include/internal/cef_types_wrappers.h +++ b/cef/include/internal/cef_types_wrappers.h @@ -199,6 +199,25 @@ struct CefKeyEventTraits { /// typedef CefStructBase CefKeyEvent; +struct CefMouseEventTraits { + typedef cef_mouse_event_t struct_type; + + static inline void init(struct_type* s) {} + + static inline void clear(struct_type* s) {} + + static inline void set(const struct_type* src, struct_type* target, + bool copy) { + target->x = src->x; + target->y = src->y; + target->modifiers = src->modifiers; + } +}; + +/// +// Class representing a mouse event. +/// +typedef CefStructBase CefMouseEvent; struct CefPopupFeaturesTraits { typedef cef_popup_features_t struct_type; @@ -288,6 +307,7 @@ struct CefSettingsTraits { cef_string_set(src->log_file.str, src->log_file.length, &target->log_file, copy); target->log_severity = src->log_severity; + target->release_dcheck_enabled = src->release_dcheck_enabled; cef_string_set(src->javascript_flags.str, src->javascript_flags.length, &target->javascript_flags, copy); @@ -300,6 +320,8 @@ struct CefSettingsTraits { &target->locales_dir_path, copy); target->pack_loading_disabled = src->pack_loading_disabled; target->remote_debugging_port = src->remote_debugging_port; + target->uncaught_exception_stack_size = src->uncaught_exception_stack_size; + target->context_safety_implementation = src->context_safety_implementation; } }; @@ -396,11 +418,8 @@ struct CefBrowserSettingsTraits { target->accelerated_video_disabled = src->accelerated_video_disabled; target->accelerated_2d_canvas_disabled = src->accelerated_2d_canvas_disabled; - target->accelerated_painting_enabled = src->accelerated_painting_enabled; - target->accelerated_filters_enabled = src->accelerated_filters_enabled; target->accelerated_plugins_disabled = src->accelerated_plugins_disabled; target->developer_tools_disabled = src->developer_tools_disabled; - target->fullscreen_enabled = src->fullscreen_enabled; } }; @@ -494,6 +513,18 @@ class CefTime : public CefStructBase { cef_time_to_doublet(this, &time); return time; } + + // Set this object to now. + void Now() { + cef_time_now(this); + } + + // Return the delta between this object and |other| in milliseconds. + long long Delta(const CefTime& other) { + long long delta = 0; + cef_time_delta(this, &other, &delta); + return delta; + } }; diff --git a/cef/libcef_dll/cpptoc/app_cpptoc.cc b/cef/libcef_dll/cpptoc/app_cpptoc.cc index d699d148b..5973f0f6b 100644 --- a/cef/libcef_dll/cpptoc/app_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/app_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/app_cpptoc.h b/cef/libcef_dll/cpptoc/app_cpptoc.h index 0809df8b4..3daad00fc 100644 --- a/cef/libcef_dll/cpptoc/app_cpptoc.h +++ b/cef/libcef_dll/cpptoc/app_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc index a492c973a..380053a7b 100644 --- a/cef/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // @@ -13,6 +13,7 @@ #include "libcef_dll/cpptoc/browser_process_handler_cpptoc.h" #include "libcef_dll/cpptoc/proxy_handler_cpptoc.h" #include "libcef_dll/ctocpp/command_line_ctocpp.h" +#include "libcef_dll/ctocpp/list_value_ctocpp.h" // MEMBER FUNCTIONS - Body may be edited by hand. @@ -63,6 +64,24 @@ void CEF_CALLBACK browser_process_handler_on_before_child_process_launch( CefCommandLineCToCpp::Wrap(command_line)); } +void CEF_CALLBACK browser_process_handler_on_render_process_thread_created( + struct _cef_browser_process_handler_t* self, + struct _cef_list_value_t* extra_info) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) + return; + // Verify param: extra_info; type: refptr_diff + DCHECK(extra_info); + if (!extra_info) + return; + + // Execute + CefBrowserProcessHandlerCppToC::Get(self)->OnRenderProcessThreadCreated( + CefListValueCToCpp::Wrap(extra_info)); +} + // CONSTRUCTOR - Do not edit by hand. @@ -75,6 +94,8 @@ CefBrowserProcessHandlerCppToC::CefBrowserProcessHandlerCppToC( browser_process_handler_on_context_initialized; struct_.struct_.on_before_child_process_launch = browser_process_handler_on_before_child_process_launch; + struct_.struct_.on_render_process_thread_created = + browser_process_handler_on_render_process_thread_created; } #ifndef NDEBUG diff --git a/cef/libcef_dll/cpptoc/browser_process_handler_cpptoc.h b/cef/libcef_dll/cpptoc/browser_process_handler_cpptoc.h index e9047dd07..4285b4c1a 100644 --- a/cef/libcef_dll/cpptoc/browser_process_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/browser_process_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/client_cpptoc.cc b/cef/libcef_dll/cpptoc/client_cpptoc.cc index 68df6d6de..5ff860181 100644 --- a/cef/libcef_dll/cpptoc/client_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/client_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // @@ -21,6 +21,7 @@ #include "libcef_dll/cpptoc/keyboard_handler_cpptoc.h" #include "libcef_dll/cpptoc/life_span_handler_cpptoc.h" #include "libcef_dll/cpptoc/load_handler_cpptoc.h" +#include "libcef_dll/cpptoc/render_handler_cpptoc.h" #include "libcef_dll/cpptoc/request_handler_cpptoc.h" #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/process_message_ctocpp.h" @@ -188,6 +189,22 @@ struct _cef_load_handler_t* CEF_CALLBACK client_get_load_handler( return CefLoadHandlerCppToC::Wrap(_retval); } +struct _cef_render_handler_t* CEF_CALLBACK client_get_render_handler( + struct _cef_client_t* self) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) + return NULL; + + // Execute + CefRefPtr _retval = CefClientCppToC::Get( + self)->GetRenderHandler(); + + // Return type: refptr_same + return CefRenderHandlerCppToC::Wrap(_retval); +} + struct _cef_request_handler_t* CEF_CALLBACK client_get_request_handler( struct _cef_client_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -246,6 +263,7 @@ CefClientCppToC::CefClientCppToC(CefClient* cls) struct_.struct_.get_keyboard_handler = client_get_keyboard_handler; struct_.struct_.get_life_span_handler = client_get_life_span_handler; struct_.struct_.get_load_handler = client_get_load_handler; + struct_.struct_.get_render_handler = client_get_render_handler; struct_.struct_.get_request_handler = client_get_request_handler; struct_.struct_.on_process_message_received = client_on_process_message_received; diff --git a/cef/libcef_dll/cpptoc/client_cpptoc.h b/cef/libcef_dll/cpptoc/client_cpptoc.h index 1db8e5b12..93731f15d 100644 --- a/cef/libcef_dll/cpptoc/client_cpptoc.h +++ b/cef/libcef_dll/cpptoc/client_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc index a09c3bc39..24d99be51 100644 --- a/cef/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/context_menu_handler_cpptoc.h b/cef/libcef_dll/cpptoc/context_menu_handler_cpptoc.h index eba5d929c..f7592de0b 100644 --- a/cef/libcef_dll/cpptoc/context_menu_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/context_menu_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc b/cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc index fa61fe6c1..0b26e62b5 100644 --- a/cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.h b/cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.h index 6473a2309..24d7d62f9 100644 --- a/cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.h +++ b/cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/dialog_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/dialog_handler_cpptoc.cc index 0d9fa2a01..7714183b6 100644 --- a/cef/libcef_dll/cpptoc/dialog_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/dialog_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/dialog_handler_cpptoc.h b/cef/libcef_dll/cpptoc/dialog_handler_cpptoc.h index 3e916170a..9d69fbadf 100644 --- a/cef/libcef_dll/cpptoc/dialog_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/dialog_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/display_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/display_handler_cpptoc.cc index 68b675964..dcf222d42 100644 --- a/cef/libcef_dll/cpptoc/display_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/display_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/display_handler_cpptoc.h b/cef/libcef_dll/cpptoc/display_handler_cpptoc.h index 0622ced14..bfa04645d 100644 --- a/cef/libcef_dll/cpptoc/display_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/display_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/domevent_listener_cpptoc.cc b/cef/libcef_dll/cpptoc/domevent_listener_cpptoc.cc index 59e22c653..50e0158a2 100644 --- a/cef/libcef_dll/cpptoc/domevent_listener_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/domevent_listener_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/domevent_listener_cpptoc.h b/cef/libcef_dll/cpptoc/domevent_listener_cpptoc.h index 562882f3e..4e8c84d7b 100644 --- a/cef/libcef_dll/cpptoc/domevent_listener_cpptoc.h +++ b/cef/libcef_dll/cpptoc/domevent_listener_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/domvisitor_cpptoc.cc b/cef/libcef_dll/cpptoc/domvisitor_cpptoc.cc index aefbe1c92..e3c649648 100644 --- a/cef/libcef_dll/cpptoc/domvisitor_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/domvisitor_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/domvisitor_cpptoc.h b/cef/libcef_dll/cpptoc/domvisitor_cpptoc.h index 0f09b0b60..21d015c89 100644 --- a/cef/libcef_dll/cpptoc/domvisitor_cpptoc.h +++ b/cef/libcef_dll/cpptoc/domvisitor_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/download_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/download_handler_cpptoc.cc index 28113de7c..9963a05ee 100644 --- a/cef/libcef_dll/cpptoc/download_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/download_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/download_handler_cpptoc.h b/cef/libcef_dll/cpptoc/download_handler_cpptoc.h index f659d613d..b8c9ec319 100644 --- a/cef/libcef_dll/cpptoc/download_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/download_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/focus_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/focus_handler_cpptoc.cc index e33ff796b..09d7038c4 100644 --- a/cef/libcef_dll/cpptoc/focus_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/focus_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/focus_handler_cpptoc.h b/cef/libcef_dll/cpptoc/focus_handler_cpptoc.h index b88e246ec..5ed79a643 100644 --- a/cef/libcef_dll/cpptoc/focus_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/focus_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/geolocation_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/geolocation_handler_cpptoc.cc index 432fc8e30..d9c852e91 100644 --- a/cef/libcef_dll/cpptoc/geolocation_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/geolocation_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/geolocation_handler_cpptoc.h b/cef/libcef_dll/cpptoc/geolocation_handler_cpptoc.h index 9774ff4db..577422796 100644 --- a/cef/libcef_dll/cpptoc/geolocation_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/geolocation_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.cc b/cef/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.cc index 5956d241d..e51cda2e8 100644 --- a/cef/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.h b/cef/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.h index b459711b1..d239c6962 100644 --- a/cef/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.h +++ b/cef/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc index b75d13c3a..d3dd01940 100644 --- a/cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h b/cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h index af58e7049..68a07b83e 100644 --- a/cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc index 95779c88b..bee1102e1 100644 --- a/cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.h b/cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.h index 4685a74ea..7a4829b7d 100644 --- a/cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/life_span_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/life_span_handler_cpptoc.cc index 85b1e2708..cdb031b2d 100644 --- a/cef/libcef_dll/cpptoc/life_span_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/life_span_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/life_span_handler_cpptoc.h b/cef/libcef_dll/cpptoc/life_span_handler_cpptoc.h index 247d131bc..360073aad 100644 --- a/cef/libcef_dll/cpptoc/life_span_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/life_span_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/load_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/load_handler_cpptoc.cc index c68f442cd..ee3a7bc9e 100644 --- a/cef/libcef_dll/cpptoc/load_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/load_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/load_handler_cpptoc.h b/cef/libcef_dll/cpptoc/load_handler_cpptoc.h index f5af7e734..7043d0aad 100644 --- a/cef/libcef_dll/cpptoc/load_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/load_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/proxy_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/proxy_handler_cpptoc.cc index 2243abd5b..98aaeb7b5 100644 --- a/cef/libcef_dll/cpptoc/proxy_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/proxy_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/proxy_handler_cpptoc.h b/cef/libcef_dll/cpptoc/proxy_handler_cpptoc.h index 7dd0b64ad..560b82698 100644 --- a/cef/libcef_dll/cpptoc/proxy_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/proxy_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/read_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/read_handler_cpptoc.cc index 6ac89f694..cc5495019 100644 --- a/cef/libcef_dll/cpptoc/read_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/read_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/read_handler_cpptoc.h b/cef/libcef_dll/cpptoc/read_handler_cpptoc.h index b4ca3c0c3..04ffba8d4 100644 --- a/cef/libcef_dll/cpptoc/read_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/read_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/render_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/render_handler_cpptoc.cc new file mode 100644 index 000000000..c77bed238 --- /dev/null +++ b/cef/libcef_dll/cpptoc/render_handler_cpptoc.cc @@ -0,0 +1,252 @@ +// Copyright (c) 2013 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/render_handler_cpptoc.h" +#include "libcef_dll/ctocpp/browser_ctocpp.h" + + +// MEMBER FUNCTIONS - Body may be edited by hand. + +int CEF_CALLBACK render_handler_get_root_screen_rect( + struct _cef_render_handler_t* self, cef_browser_t* browser, + cef_rect_t* rect) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) + return 0; + // Verify param: browser; type: refptr_diff + DCHECK(browser); + if (!browser) + return 0; + // Verify param: rect; type: simple_byref + DCHECK(rect); + if (!rect) + return 0; + + // Translate param: rect; type: simple_byref + CefRect rectVal = rect?*rect:CefRect(); + + // Execute + bool _retval = CefRenderHandlerCppToC::Get(self)->GetRootScreenRect( + CefBrowserCToCpp::Wrap(browser), + rectVal); + + // Restore param: rect; type: simple_byref + if (rect) + *rect = rectVal; + + // Return type: bool + return _retval; +} + +int CEF_CALLBACK render_handler_get_view_rect( + struct _cef_render_handler_t* self, cef_browser_t* browser, + cef_rect_t* rect) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) + return 0; + // Verify param: browser; type: refptr_diff + DCHECK(browser); + if (!browser) + return 0; + // Verify param: rect; type: simple_byref + DCHECK(rect); + if (!rect) + return 0; + + // Translate param: rect; type: simple_byref + CefRect rectVal = rect?*rect:CefRect(); + + // Execute + bool _retval = CefRenderHandlerCppToC::Get(self)->GetViewRect( + CefBrowserCToCpp::Wrap(browser), + rectVal); + + // Restore param: rect; type: simple_byref + if (rect) + *rect = rectVal; + + // Return type: bool + return _retval; +} + +int CEF_CALLBACK render_handler_get_screen_point( + struct _cef_render_handler_t* self, cef_browser_t* browser, int viewX, + int viewY, int* screenX, int* screenY) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) + return 0; + // Verify param: browser; type: refptr_diff + DCHECK(browser); + if (!browser) + return 0; + // Verify param: screenX; type: simple_byref + DCHECK(screenX); + if (!screenX) + return 0; + // Verify param: screenY; type: simple_byref + DCHECK(screenY); + if (!screenY) + return 0; + + // Translate param: screenX; type: simple_byref + int screenXVal = screenX?*screenX:0; + // Translate param: screenY; type: simple_byref + int screenYVal = screenY?*screenY:0; + + // Execute + bool _retval = CefRenderHandlerCppToC::Get(self)->GetScreenPoint( + CefBrowserCToCpp::Wrap(browser), + viewX, + viewY, + screenXVal, + screenYVal); + + // Restore param: screenX; type: simple_byref + if (screenX) + *screenX = screenXVal; + // Restore param: screenY; type: simple_byref + if (screenY) + *screenY = screenYVal; + + // Return type: bool + return _retval; +} + +void CEF_CALLBACK render_handler_on_popup_show( + struct _cef_render_handler_t* self, cef_browser_t* browser, int show) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) + return; + // Verify param: browser; type: refptr_diff + DCHECK(browser); + if (!browser) + return; + + // Execute + CefRenderHandlerCppToC::Get(self)->OnPopupShow( + CefBrowserCToCpp::Wrap(browser), + show?true:false); +} + +void CEF_CALLBACK render_handler_on_popup_size( + struct _cef_render_handler_t* self, cef_browser_t* browser, + const cef_rect_t* rect) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) + return; + // Verify param: browser; type: refptr_diff + DCHECK(browser); + if (!browser) + return; + // Verify param: rect; type: simple_byref_const + DCHECK(rect); + if (!rect) + return; + + // Translate param: rect; type: simple_byref_const + CefRect rectVal = rect?*rect:CefRect(); + + // Execute + CefRenderHandlerCppToC::Get(self)->OnPopupSize( + CefBrowserCToCpp::Wrap(browser), + rectVal); +} + +void CEF_CALLBACK render_handler_on_paint(struct _cef_render_handler_t* self, + cef_browser_t* browser, enum cef_paint_element_type_t type, + size_t dirtyRectsCount, cef_rect_t const* dirtyRects, const void* buffer, + int width, int height) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) + return; + // Verify param: browser; type: refptr_diff + DCHECK(browser); + if (!browser) + return; + // Verify param: dirtyRects; type: simple_vec_byref_const + DCHECK(dirtyRectsCount == 0 || dirtyRects); + if (dirtyRectsCount > 0 && !dirtyRects) + return; + // Verify param: buffer; type: simple_byaddr + DCHECK(buffer); + if (!buffer) + return; + + // Translate param: dirtyRects; type: simple_vec_byref_const + std::vector dirtyRectsList; + if (dirtyRectsCount > 0) { + for (size_t i = 0; i < dirtyRectsCount; ++i) { + dirtyRectsList.push_back(dirtyRects[i]); + } + } + + // Execute + CefRenderHandlerCppToC::Get(self)->OnPaint( + CefBrowserCToCpp::Wrap(browser), + type, + dirtyRectsList, + buffer, + width, + height); +} + +void CEF_CALLBACK render_handler_on_cursor_change( + struct _cef_render_handler_t* self, cef_browser_t* browser, + cef_cursor_handle_t cursor) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) + return; + // Verify param: browser; type: refptr_diff + DCHECK(browser); + if (!browser) + return; + + // Execute + CefRenderHandlerCppToC::Get(self)->OnCursorChange( + CefBrowserCToCpp::Wrap(browser), + cursor); +} + + +// CONSTRUCTOR - Do not edit by hand. + +CefRenderHandlerCppToC::CefRenderHandlerCppToC(CefRenderHandler* cls) + : CefCppToC( + cls) { + struct_.struct_.get_root_screen_rect = render_handler_get_root_screen_rect; + struct_.struct_.get_view_rect = render_handler_get_view_rect; + struct_.struct_.get_screen_point = render_handler_get_screen_point; + struct_.struct_.on_popup_show = render_handler_on_popup_show; + struct_.struct_.on_popup_size = render_handler_on_popup_size; + struct_.struct_.on_paint = render_handler_on_paint; + struct_.struct_.on_cursor_change = render_handler_on_cursor_change; +} + +#ifndef NDEBUG +template<> long CefCppToC::DebugObjCt = 0; +#endif + diff --git a/cef/libcef_dll/cpptoc/render_handler_cpptoc.h b/cef/libcef_dll/cpptoc/render_handler_cpptoc.h new file mode 100644 index 000000000..1fd90fe3f --- /dev/null +++ b/cef/libcef_dll/cpptoc/render_handler_cpptoc.h @@ -0,0 +1,37 @@ +// Copyright (c) 2013 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_RENDER_HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_RENDER_HANDLER_CPPTOC_H_ +#pragma once + +#ifndef USING_CEF_SHARED +#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") +#else // USING_CEF_SHARED + +#include "include/cef_render_handler.h" +#include "include/capi/cef_render_handler_capi.h" +#include "libcef_dll/cpptoc/cpptoc.h" + +// Wrap a C++ class with a C structure. +// This class may be instantiated and accessed wrapper-side only. +class CefRenderHandlerCppToC + : public CefCppToC { + public: + explicit CefRenderHandlerCppToC(CefRenderHandler* cls); + virtual ~CefRenderHandlerCppToC() {} +}; + +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_RENDER_HANDLER_CPPTOC_H_ + diff --git a/cef/libcef_dll/cpptoc/render_process_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/render_process_handler_cpptoc.cc index 904b83fd5..11684705a 100644 --- a/cef/libcef_dll/cpptoc/render_process_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/render_process_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // @@ -14,22 +14,32 @@ #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/domnode_ctocpp.h" #include "libcef_dll/ctocpp/frame_ctocpp.h" +#include "libcef_dll/ctocpp/list_value_ctocpp.h" #include "libcef_dll/ctocpp/process_message_ctocpp.h" +#include "libcef_dll/ctocpp/request_ctocpp.h" #include "libcef_dll/ctocpp/v8context_ctocpp.h" +#include "libcef_dll/ctocpp/v8exception_ctocpp.h" +#include "libcef_dll/ctocpp/v8stack_trace_ctocpp.h" // MEMBER FUNCTIONS - Body may be edited by hand. void CEF_CALLBACK render_process_handler_on_render_thread_created( - struct _cef_render_process_handler_t* self) { + struct _cef_render_process_handler_t* self, + struct _cef_list_value_t* extra_info) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); if (!self) return; + // Verify param: extra_info; type: refptr_diff + DCHECK(extra_info); + if (!extra_info) + return; // Execute - CefRenderProcessHandlerCppToC::Get(self)->OnRenderThreadCreated(); + CefRenderProcessHandlerCppToC::Get(self)->OnRenderThreadCreated( + CefListValueCToCpp::Wrap(extra_info)); } void CEF_CALLBACK render_process_handler_on_web_kit_initialized( @@ -78,6 +88,40 @@ void CEF_CALLBACK render_process_handler_on_browser_destroyed( CefBrowserCToCpp::Wrap(browser)); } +int CEF_CALLBACK render_process_handler_on_before_navigation( + struct _cef_render_process_handler_t* self, cef_browser_t* browser, + cef_frame_t* frame, struct _cef_request_t* request, + enum cef_navigation_type_t navigation_type, int is_redirect) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) + return 0; + // Verify param: browser; type: refptr_diff + DCHECK(browser); + if (!browser) + return 0; + // Verify param: frame; type: refptr_diff + DCHECK(frame); + if (!frame) + return 0; + // Verify param: request; type: refptr_diff + DCHECK(request); + if (!request) + return 0; + + // Execute + bool _retval = CefRenderProcessHandlerCppToC::Get(self)->OnBeforeNavigation( + CefBrowserCToCpp::Wrap(browser), + CefFrameCToCpp::Wrap(frame), + CefRequestCToCpp::Wrap(request), + navigation_type, + is_redirect?true:false); + + // Return type: bool + return _retval; +} + void CEF_CALLBACK render_process_handler_on_context_created( struct _cef_render_process_handler_t* self, cef_browser_t* browser, cef_frame_t* frame, struct _cef_v8context_t* context) { @@ -134,6 +178,130 @@ void CEF_CALLBACK render_process_handler_on_context_released( CefV8ContextCToCpp::Wrap(context)); } +void CEF_CALLBACK render_process_handler_on_uncaught_exception( + struct _cef_render_process_handler_t* self, cef_browser_t* browser, + cef_frame_t* frame, struct _cef_v8context_t* context, + struct _cef_v8exception_t* exception, + struct _cef_v8stack_trace_t* stackTrace) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) + return; + // Verify param: browser; type: refptr_diff + DCHECK(browser); + if (!browser) + return; + // Verify param: frame; type: refptr_diff + DCHECK(frame); + if (!frame) + return; + // Verify param: context; type: refptr_diff + DCHECK(context); + if (!context) + return; + // Verify param: exception; type: refptr_diff + DCHECK(exception); + if (!exception) + return; + // Verify param: stackTrace; type: refptr_diff + DCHECK(stackTrace); + if (!stackTrace) + return; + + // Execute + CefRenderProcessHandlerCppToC::Get(self)->OnUncaughtException( + CefBrowserCToCpp::Wrap(browser), + CefFrameCToCpp::Wrap(frame), + CefV8ContextCToCpp::Wrap(context), + CefV8ExceptionCToCpp::Wrap(exception), + CefV8StackTraceCToCpp::Wrap(stackTrace)); +} + +void CEF_CALLBACK render_process_handler_on_worker_context_created( + struct _cef_render_process_handler_t* self, int worker_id, + const cef_string_t* url, struct _cef_v8context_t* context) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) + return; + // Verify param: url; type: string_byref_const + DCHECK(url); + if (!url) + return; + // Verify param: context; type: refptr_diff + DCHECK(context); + if (!context) + return; + + // Execute + CefRenderProcessHandlerCppToC::Get(self)->OnWorkerContextCreated( + worker_id, + CefString(url), + CefV8ContextCToCpp::Wrap(context)); +} + +void CEF_CALLBACK render_process_handler_on_worker_context_released( + struct _cef_render_process_handler_t* self, int worker_id, + const cef_string_t* url, struct _cef_v8context_t* context) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) + return; + // Verify param: url; type: string_byref_const + DCHECK(url); + if (!url) + return; + // Verify param: context; type: refptr_diff + DCHECK(context); + if (!context) + return; + + // Execute + CefRenderProcessHandlerCppToC::Get(self)->OnWorkerContextReleased( + worker_id, + CefString(url), + CefV8ContextCToCpp::Wrap(context)); +} + +void CEF_CALLBACK render_process_handler_on_worker_uncaught_exception( + struct _cef_render_process_handler_t* self, int worker_id, + const cef_string_t* url, struct _cef_v8context_t* context, + struct _cef_v8exception_t* exception, + struct _cef_v8stack_trace_t* stackTrace) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) + return; + // Verify param: url; type: string_byref_const + DCHECK(url); + if (!url) + return; + // Verify param: context; type: refptr_diff + DCHECK(context); + if (!context) + return; + // Verify param: exception; type: refptr_diff + DCHECK(exception); + if (!exception) + return; + // Verify param: stackTrace; type: refptr_diff + DCHECK(stackTrace); + if (!stackTrace) + return; + + // Execute + CefRenderProcessHandlerCppToC::Get(self)->OnWorkerUncaughtException( + worker_id, + CefString(url), + CefV8ContextCToCpp::Wrap(context), + CefV8ExceptionCToCpp::Wrap(exception), + CefV8StackTraceCToCpp::Wrap(stackTrace)); +} + void CEF_CALLBACK render_process_handler_on_focused_node_changed( struct _cef_render_process_handler_t* self, cef_browser_t* browser, cef_frame_t* frame, cef_domnode_t* node) { @@ -198,10 +366,20 @@ CefRenderProcessHandlerCppToC::CefRenderProcessHandlerCppToC( render_process_handler_on_browser_created; struct_.struct_.on_browser_destroyed = render_process_handler_on_browser_destroyed; + struct_.struct_.on_before_navigation = + render_process_handler_on_before_navigation; struct_.struct_.on_context_created = render_process_handler_on_context_created; struct_.struct_.on_context_released = render_process_handler_on_context_released; + struct_.struct_.on_uncaught_exception = + render_process_handler_on_uncaught_exception; + struct_.struct_.on_worker_context_created = + render_process_handler_on_worker_context_created; + struct_.struct_.on_worker_context_released = + render_process_handler_on_worker_context_released; + struct_.struct_.on_worker_uncaught_exception = + render_process_handler_on_worker_uncaught_exception; struct_.struct_.on_focused_node_changed = render_process_handler_on_focused_node_changed; struct_.struct_.on_process_message_received = diff --git a/cef/libcef_dll/cpptoc/render_process_handler_cpptoc.h b/cef/libcef_dll/cpptoc/render_process_handler_cpptoc.h index 838819783..42ecf803b 100644 --- a/cef/libcef_dll/cpptoc/render_process_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/render_process_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/request_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/request_handler_cpptoc.cc index bf7b12c82..d64e9393d 100644 --- a/cef/libcef_dll/cpptoc/request_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/request_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/request_handler_cpptoc.h b/cef/libcef_dll/cpptoc/request_handler_cpptoc.h index 1b4c79160..866ef1152 100644 --- a/cef/libcef_dll/cpptoc/request_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/request_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc index 23dd259b3..9a6bcd8e8 100644 --- a/cef/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h b/cef/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h index 3b11fb62c..8aefc1374 100644 --- a/cef/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/resource_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/resource_handler_cpptoc.cc index bac30539f..c33b28c54 100644 --- a/cef/libcef_dll/cpptoc/resource_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/resource_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/resource_handler_cpptoc.h b/cef/libcef_dll/cpptoc/resource_handler_cpptoc.h index 99e64dd90..8c4972a44 100644 --- a/cef/libcef_dll/cpptoc/resource_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/resource_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc b/cef/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc index 950722346..5bafa8b42 100644 --- a/cef/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h b/cef/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h index 637c6dbae..0302dc471 100644 --- a/cef/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h +++ b/cef/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc b/cef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc index 698527aa0..bf1a82e24 100644 --- a/cef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h b/cef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h index c47b338da..cb2f1472d 100644 --- a/cef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h +++ b/cef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/string_visitor_cpptoc.cc b/cef/libcef_dll/cpptoc/string_visitor_cpptoc.cc index b1bdf5144..73edb9dfd 100644 --- a/cef/libcef_dll/cpptoc/string_visitor_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/string_visitor_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/string_visitor_cpptoc.h b/cef/libcef_dll/cpptoc/string_visitor_cpptoc.h index 7e9c08759..2cdd3b547 100644 --- a/cef/libcef_dll/cpptoc/string_visitor_cpptoc.h +++ b/cef/libcef_dll/cpptoc/string_visitor_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/task_cpptoc.cc b/cef/libcef_dll/cpptoc/task_cpptoc.cc index a5e31e6b1..f0de3a4f2 100644 --- a/cef/libcef_dll/cpptoc/task_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/task_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // @@ -15,8 +15,7 @@ // MEMBER FUNCTIONS - Body may be edited by hand. -void CEF_CALLBACK task_execute(struct _cef_task_t* self, - cef_thread_id_t threadId) { +void CEF_CALLBACK task_execute(struct _cef_task_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -24,8 +23,7 @@ void CEF_CALLBACK task_execute(struct _cef_task_t* self, return; // Execute - CefTaskCppToC::Get(self)->Execute( - threadId); + CefTaskCppToC::Get(self)->Execute(); } diff --git a/cef/libcef_dll/cpptoc/task_cpptoc.h b/cef/libcef_dll/cpptoc/task_cpptoc.h index 8f2e2fc2e..495de4c60 100644 --- a/cef/libcef_dll/cpptoc/task_cpptoc.h +++ b/cef/libcef_dll/cpptoc/task_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/trace_client_cpptoc.cc b/cef/libcef_dll/cpptoc/trace_client_cpptoc.cc index 004cdd10f..580d837ba 100644 --- a/cef/libcef_dll/cpptoc/trace_client_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/trace_client_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/trace_client_cpptoc.h b/cef/libcef_dll/cpptoc/trace_client_cpptoc.h index 2704f3482..f005ea9ed 100644 --- a/cef/libcef_dll/cpptoc/trace_client_cpptoc.h +++ b/cef/libcef_dll/cpptoc/trace_client_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc b/cef/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc index b7e931eb0..086129203 100644 --- a/cef/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/urlrequest_client_cpptoc.h b/cef/libcef_dll/cpptoc/urlrequest_client_cpptoc.h index faac3d89d..6640749a8 100644 --- a/cef/libcef_dll/cpptoc/urlrequest_client_cpptoc.h +++ b/cef/libcef_dll/cpptoc/urlrequest_client_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/v8accessor_cpptoc.cc b/cef/libcef_dll/cpptoc/v8accessor_cpptoc.cc index d533fcf06..cd92d6c9f 100644 --- a/cef/libcef_dll/cpptoc/v8accessor_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/v8accessor_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/v8accessor_cpptoc.h b/cef/libcef_dll/cpptoc/v8accessor_cpptoc.h index b0dbb8ebd..80791a9a1 100644 --- a/cef/libcef_dll/cpptoc/v8accessor_cpptoc.h +++ b/cef/libcef_dll/cpptoc/v8accessor_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/v8handler_cpptoc.cc b/cef/libcef_dll/cpptoc/v8handler_cpptoc.cc index 08f003247..49c7c28cc 100644 --- a/cef/libcef_dll/cpptoc/v8handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/v8handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/v8handler_cpptoc.h b/cef/libcef_dll/cpptoc/v8handler_cpptoc.h index 1dd0886e9..aab996c24 100644 --- a/cef/libcef_dll/cpptoc/v8handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/v8handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc b/cef/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc index 35593acab..755223bd9 100644 --- a/cef/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h b/cef/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h index 420c74460..c81f056ba 100644 --- a/cef/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h +++ b/cef/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.cc b/cef/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.cc index 3966cfb26..a1e27f086 100644 --- a/cef/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.h b/cef/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.h index d6c5c4707..43f62a30d 100644 --- a/cef/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.h +++ b/cef/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/write_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/write_handler_cpptoc.cc index 07df04525..001928442 100644 --- a/cef/libcef_dll/cpptoc/write_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/write_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/cpptoc/write_handler_cpptoc.h b/cef/libcef_dll/cpptoc/write_handler_cpptoc.h index f0e75a9f6..eda6ea830 100644 --- a/cef/libcef_dll/cpptoc/write_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/write_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/auth_callback_ctocpp.cc b/cef/libcef_dll/ctocpp/auth_callback_ctocpp.cc index a914971b2..736f2ca3d 100644 --- a/cef/libcef_dll/ctocpp/auth_callback_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/auth_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/auth_callback_ctocpp.h b/cef/libcef_dll/ctocpp/auth_callback_ctocpp.h index 7bc3a281a..08ae159c9 100644 --- a/cef/libcef_dll/ctocpp/auth_callback_ctocpp.h +++ b/cef/libcef_dll/ctocpp/auth_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/before_download_callback_ctocpp.cc b/cef/libcef_dll/ctocpp/before_download_callback_ctocpp.cc index 1bc27870b..157debb03 100644 --- a/cef/libcef_dll/ctocpp/before_download_callback_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/before_download_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/before_download_callback_ctocpp.h b/cef/libcef_dll/ctocpp/before_download_callback_ctocpp.h index ad8106a2b..4d7944d3e 100644 --- a/cef/libcef_dll/ctocpp/before_download_callback_ctocpp.h +++ b/cef/libcef_dll/ctocpp/before_download_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/binary_value_ctocpp.cc b/cef/libcef_dll/ctocpp/binary_value_ctocpp.cc index 4e62a8385..e9ad6d39f 100644 --- a/cef/libcef_dll/ctocpp/binary_value_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/binary_value_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/binary_value_ctocpp.h b/cef/libcef_dll/ctocpp/binary_value_ctocpp.h index 89b604bfa..6eb440767 100644 --- a/cef/libcef_dll/ctocpp/binary_value_ctocpp.h +++ b/cef/libcef_dll/ctocpp/binary_value_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/browser_ctocpp.cc b/cef/libcef_dll/ctocpp/browser_ctocpp.cc index 3cc245e40..4b99d471b 100644 --- a/cef/libcef_dll/ctocpp/browser_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/browser_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // @@ -134,6 +134,25 @@ int CefBrowserCToCpp::GetIdentifier() { return _retval; } +bool CefBrowserCToCpp::IsSame(CefRefPtr that) { + if (CEF_MEMBER_MISSING(struct_, is_same)) + return false; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: that; type: refptr_same + DCHECK(that.get()); + if (!that.get()) + return false; + + // Execute + int _retval = struct_->is_same(struct_, + CefBrowserCToCpp::Unwrap(that)); + + // Return type: bool + return _retval?true:false; +} + bool CefBrowserCToCpp::IsPopup() { if (CEF_MEMBER_MISSING(struct_, is_popup)) return false; diff --git a/cef/libcef_dll/ctocpp/browser_ctocpp.h b/cef/libcef_dll/ctocpp/browser_ctocpp.h index 9b0375243..c836e74db 100644 --- a/cef/libcef_dll/ctocpp/browser_ctocpp.h +++ b/cef/libcef_dll/ctocpp/browser_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // @@ -45,6 +45,7 @@ class CefBrowserCToCpp virtual void ReloadIgnoreCache() OVERRIDE; virtual void StopLoad() OVERRIDE; virtual int GetIdentifier() OVERRIDE; + virtual bool IsSame(CefRefPtr that) OVERRIDE; virtual bool IsPopup() OVERRIDE; virtual bool HasDocument() OVERRIDE; virtual CefRefPtr GetMainFrame() OVERRIDE; diff --git a/cef/libcef_dll/ctocpp/browser_host_ctocpp.cc b/cef/libcef_dll/ctocpp/browser_host_ctocpp.cc index 5d268c719..63f1849a1 100644 --- a/cef/libcef_dll/ctocpp/browser_host_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/browser_host_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // @@ -24,11 +24,7 @@ bool CefBrowserHost::CreateBrowser(const CefWindowInfo& windowInfo, const CefBrowserSettings& settings) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - // Verify param: client; type: refptr_diff - DCHECK(client.get()); - if (!client.get()) - return false; - // Unverified params: url + // Unverified params: client, url // Execute int _retval = cef_browser_host_create_browser( @@ -46,11 +42,7 @@ CefRefPtr CefBrowserHost::CreateBrowserSync( const CefString& url, const CefBrowserSettings& settings) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - // Verify param: client; type: refptr_diff - DCHECK(client.get()); - if (!client.get()) - return NULL; - // Unverified params: url + // Unverified params: client, url // Execute cef_browser_t* _retval = cef_browser_host_create_browser_sync( @@ -223,6 +215,116 @@ void CefBrowserHostCToCpp::RunFileDialog(FileDialogMode mode, cef_string_list_free(accept_typesList); } +bool CefBrowserHostCToCpp::IsWindowRenderingDisabled() { + if (CEF_MEMBER_MISSING(struct_, is_window_rendering_disabled)) + return false; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = struct_->is_window_rendering_disabled(struct_); + + // Return type: bool + return _retval?true:false; +} + +void CefBrowserHostCToCpp::WasResized() { + if (CEF_MEMBER_MISSING(struct_, was_resized)) + return; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + struct_->was_resized(struct_); +} + +void CefBrowserHostCToCpp::Invalidate(const CefRect& dirtyRect, + PaintElementType type) { + if (CEF_MEMBER_MISSING(struct_, invalidate)) + return; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + struct_->invalidate(struct_, + &dirtyRect, + type); +} + +void CefBrowserHostCToCpp::SendKeyEvent(const CefKeyEvent& event) { + if (CEF_MEMBER_MISSING(struct_, send_key_event)) + return; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + struct_->send_key_event(struct_, + &event); +} + +void CefBrowserHostCToCpp::SendMouseClickEvent(const CefMouseEvent& event, + MouseButtonType type, bool mouseUp, int clickCount) { + if (CEF_MEMBER_MISSING(struct_, send_mouse_click_event)) + return; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + struct_->send_mouse_click_event(struct_, + &event, + type, + mouseUp, + clickCount); +} + +void CefBrowserHostCToCpp::SendMouseMoveEvent(const CefMouseEvent& event, + bool mouseLeave) { + if (CEF_MEMBER_MISSING(struct_, send_mouse_move_event)) + return; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + struct_->send_mouse_move_event(struct_, + &event, + mouseLeave); +} + +void CefBrowserHostCToCpp::SendMouseWheelEvent(const CefMouseEvent& event, + int deltaX, int deltaY) { + if (CEF_MEMBER_MISSING(struct_, send_mouse_wheel_event)) + return; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + struct_->send_mouse_wheel_event(struct_, + &event, + deltaX, + deltaY); +} + +void CefBrowserHostCToCpp::SendFocusEvent(bool setFocus) { + if (CEF_MEMBER_MISSING(struct_, send_focus_event)) + return; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + struct_->send_focus_event(struct_, + setFocus); +} + +void CefBrowserHostCToCpp::SendCaptureLostEvent() { + if (CEF_MEMBER_MISSING(struct_, send_capture_lost_event)) + return; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + struct_->send_capture_lost_event(struct_); +} + #ifndef NDEBUG template<> long CefCToCpp& accept_types, CefRefPtr callback) OVERRIDE; + virtual bool IsWindowRenderingDisabled() OVERRIDE; + virtual void WasResized() OVERRIDE; + virtual void Invalidate(const CefRect& dirtyRect, + PaintElementType type) OVERRIDE; + virtual void SendKeyEvent(const CefKeyEvent& event) OVERRIDE; + virtual void SendMouseClickEvent(const CefMouseEvent& event, + MouseButtonType type, bool mouseUp, int clickCount) OVERRIDE; + virtual void SendMouseMoveEvent(const CefMouseEvent& event, + bool mouseLeave) OVERRIDE; + virtual void SendMouseWheelEvent(const CefMouseEvent& event, int deltaX, + int deltaY) OVERRIDE; + virtual void SendFocusEvent(bool setFocus) OVERRIDE; + virtual void SendCaptureLostEvent() OVERRIDE; }; #endif // USING_CEF_SHARED diff --git a/cef/libcef_dll/ctocpp/callback_ctocpp.cc b/cef/libcef_dll/ctocpp/callback_ctocpp.cc index 6c622ecc0..e6cd4799e 100644 --- a/cef/libcef_dll/ctocpp/callback_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/callback_ctocpp.h b/cef/libcef_dll/ctocpp/callback_ctocpp.h index 3581e286d..9cbe99593 100644 --- a/cef/libcef_dll/ctocpp/callback_ctocpp.h +++ b/cef/libcef_dll/ctocpp/callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/command_line_ctocpp.cc b/cef/libcef_dll/ctocpp/command_line_ctocpp.cc index f5883f333..8ab94a0cf 100644 --- a/cef/libcef_dll/ctocpp/command_line_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/command_line_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/command_line_ctocpp.h b/cef/libcef_dll/ctocpp/command_line_ctocpp.h index 063e62077..723885683 100644 --- a/cef/libcef_dll/ctocpp/command_line_ctocpp.h +++ b/cef/libcef_dll/ctocpp/command_line_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/context_menu_params_ctocpp.cc b/cef/libcef_dll/ctocpp/context_menu_params_ctocpp.cc index e70638aef..5fcbf3b47 100644 --- a/cef/libcef_dll/ctocpp/context_menu_params_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/context_menu_params_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/context_menu_params_ctocpp.h b/cef/libcef_dll/ctocpp/context_menu_params_ctocpp.h index dd1e782c1..bcbebc9b5 100644 --- a/cef/libcef_dll/ctocpp/context_menu_params_ctocpp.h +++ b/cef/libcef_dll/ctocpp/context_menu_params_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/cookie_manager_ctocpp.cc b/cef/libcef_dll/ctocpp/cookie_manager_ctocpp.cc index f33ef0d7d..4db768d76 100644 --- a/cef/libcef_dll/ctocpp/cookie_manager_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/cookie_manager_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/cookie_manager_ctocpp.h b/cef/libcef_dll/ctocpp/cookie_manager_ctocpp.h index 78cd1f460..760021ba0 100644 --- a/cef/libcef_dll/ctocpp/cookie_manager_ctocpp.h +++ b/cef/libcef_dll/ctocpp/cookie_manager_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/dictionary_value_ctocpp.cc b/cef/libcef_dll/ctocpp/dictionary_value_ctocpp.cc index 8fa08e686..efb99061c 100644 --- a/cef/libcef_dll/ctocpp/dictionary_value_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/dictionary_value_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/dictionary_value_ctocpp.h b/cef/libcef_dll/ctocpp/dictionary_value_ctocpp.h index d3959def4..79de9f7e6 100644 --- a/cef/libcef_dll/ctocpp/dictionary_value_ctocpp.h +++ b/cef/libcef_dll/ctocpp/dictionary_value_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/domdocument_ctocpp.cc b/cef/libcef_dll/ctocpp/domdocument_ctocpp.cc index 63aeafb67..3afa95215 100644 --- a/cef/libcef_dll/ctocpp/domdocument_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/domdocument_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/domdocument_ctocpp.h b/cef/libcef_dll/ctocpp/domdocument_ctocpp.h index 92fc5957d..23fee5b21 100644 --- a/cef/libcef_dll/ctocpp/domdocument_ctocpp.h +++ b/cef/libcef_dll/ctocpp/domdocument_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/domevent_ctocpp.cc b/cef/libcef_dll/ctocpp/domevent_ctocpp.cc index d812312f2..3bec4e5bf 100644 --- a/cef/libcef_dll/ctocpp/domevent_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/domevent_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/domevent_ctocpp.h b/cef/libcef_dll/ctocpp/domevent_ctocpp.h index 64b05c62a..22fbed79f 100644 --- a/cef/libcef_dll/ctocpp/domevent_ctocpp.h +++ b/cef/libcef_dll/ctocpp/domevent_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/domnode_ctocpp.cc b/cef/libcef_dll/ctocpp/domnode_ctocpp.cc index 3a0abe7f4..f0b3a4756 100644 --- a/cef/libcef_dll/ctocpp/domnode_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/domnode_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/domnode_ctocpp.h b/cef/libcef_dll/ctocpp/domnode_ctocpp.h index 6bedac7ba..c5448ad0e 100644 --- a/cef/libcef_dll/ctocpp/domnode_ctocpp.h +++ b/cef/libcef_dll/ctocpp/domnode_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/download_item_callback_ctocpp.cc b/cef/libcef_dll/ctocpp/download_item_callback_ctocpp.cc index 99981cf0a..092787640 100644 --- a/cef/libcef_dll/ctocpp/download_item_callback_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/download_item_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/download_item_callback_ctocpp.h b/cef/libcef_dll/ctocpp/download_item_callback_ctocpp.h index 1a05a07d4..f10b8fd5d 100644 --- a/cef/libcef_dll/ctocpp/download_item_callback_ctocpp.h +++ b/cef/libcef_dll/ctocpp/download_item_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/download_item_ctocpp.cc b/cef/libcef_dll/ctocpp/download_item_ctocpp.cc index f49712d37..ae50f3ffc 100644 --- a/cef/libcef_dll/ctocpp/download_item_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/download_item_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // @@ -233,21 +233,6 @@ CefString CefDownloadItemCToCpp::GetMimeType() { return _retvalStr; } -CefString CefDownloadItemCToCpp::GetReferrerCharset() { - if (CEF_MEMBER_MISSING(struct_, get_referrer_charset)) - return CefString(); - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Execute - cef_string_userfree_t _retval = struct_->get_referrer_charset(struct_); - - // Return type: string - CefString _retvalStr; - _retvalStr.AttachToUserFree(_retval); - return _retvalStr; -} - #ifndef NDEBUG template<> long CefCToCpp CefTaskRunner::GetForCurrentThread() { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + cef_task_runner_t* _retval = cef_task_runner_get_for_current_thread(); + + // Return type: refptr_same + return CefTaskRunnerCToCpp::Wrap(_retval); +} + +CefRefPtr CefTaskRunner::GetForThread(CefThreadId threadId) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + cef_task_runner_t* _retval = cef_task_runner_get_for_thread( + threadId); + + // Return type: refptr_same + return CefTaskRunnerCToCpp::Wrap(_retval); +} + + +// VIRTUAL METHODS - Body may be edited by hand. + +bool CefTaskRunnerCToCpp::IsSame(CefRefPtr that) { + if (CEF_MEMBER_MISSING(struct_, is_same)) + return false; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: that; type: refptr_same + DCHECK(that.get()); + if (!that.get()) + return false; + + // Execute + int _retval = struct_->is_same(struct_, + CefTaskRunnerCToCpp::Unwrap(that)); + + // Return type: bool + return _retval?true:false; +} + +bool CefTaskRunnerCToCpp::BelongsToCurrentThread() { + if (CEF_MEMBER_MISSING(struct_, belongs_to_current_thread)) + return false; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = struct_->belongs_to_current_thread(struct_); + + // Return type: bool + return _retval?true:false; +} + +bool CefTaskRunnerCToCpp::BelongsToThread(CefThreadId threadId) { + if (CEF_MEMBER_MISSING(struct_, belongs_to_thread)) + return false; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = struct_->belongs_to_thread(struct_, + threadId); + + // Return type: bool + return _retval?true:false; +} + +bool CefTaskRunnerCToCpp::PostTask(CefRefPtr task) { + if (CEF_MEMBER_MISSING(struct_, post_task)) + return false; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: task; type: refptr_diff + DCHECK(task.get()); + if (!task.get()) + return false; + + // Execute + int _retval = struct_->post_task(struct_, + CefTaskCppToC::Wrap(task)); + + // Return type: bool + return _retval?true:false; +} + +bool CefTaskRunnerCToCpp::PostDelayedTask(CefRefPtr task, + int64 delay_ms) { + if (CEF_MEMBER_MISSING(struct_, post_delayed_task)) + return false; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: task; type: refptr_diff + DCHECK(task.get()); + if (!task.get()) + return false; + + // Execute + int _retval = struct_->post_delayed_task(struct_, + CefTaskCppToC::Wrap(task), + delay_ms); + + // Return type: bool + return _retval?true:false; +} + + +#ifndef NDEBUG +template<> long CefCToCpp::DebugObjCt = 0; +#endif + diff --git a/cef/libcef_dll/ctocpp/task_runner_ctocpp.h b/cef/libcef_dll/ctocpp/task_runner_ctocpp.h new file mode 100644 index 000000000..ef671934c --- /dev/null +++ b/cef/libcef_dll/ctocpp/task_runner_ctocpp.h @@ -0,0 +1,45 @@ +// Copyright (c) 2013 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_TASK_RUNNER_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_TASK_RUNNER_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_task.h" +#include "include/capi/cef_task_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 CefTaskRunnerCToCpp + : public CefCToCpp { + public: + explicit CefTaskRunnerCToCpp(cef_task_runner_t* str) + : CefCToCpp(str) {} + virtual ~CefTaskRunnerCToCpp() {} + + // CefTaskRunner methods + virtual bool IsSame(CefRefPtr that) OVERRIDE; + virtual bool BelongsToCurrentThread() OVERRIDE; + virtual bool BelongsToThread(CefThreadId threadId) OVERRIDE; + virtual bool PostTask(CefRefPtr task) OVERRIDE; + virtual bool PostDelayedTask(CefRefPtr task, + int64 delay_ms) OVERRIDE; +}; + +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_TASK_RUNNER_CTOCPP_H_ + diff --git a/cef/libcef_dll/ctocpp/urlrequest_ctocpp.cc b/cef/libcef_dll/ctocpp/urlrequest_ctocpp.cc index 9292295a5..c91fe9dc5 100644 --- a/cef/libcef_dll/ctocpp/urlrequest_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/urlrequest_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/urlrequest_ctocpp.h b/cef/libcef_dll/ctocpp/urlrequest_ctocpp.h index f13c7c638..793b9b97f 100644 --- a/cef/libcef_dll/ctocpp/urlrequest_ctocpp.h +++ b/cef/libcef_dll/ctocpp/urlrequest_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/v8context_ctocpp.cc b/cef/libcef_dll/ctocpp/v8context_ctocpp.cc index bc1e0559b..5427893a7 100644 --- a/cef/libcef_dll/ctocpp/v8context_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/v8context_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // @@ -12,6 +12,7 @@ #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/frame_ctocpp.h" +#include "libcef_dll/ctocpp/task_runner_ctocpp.h" #include "libcef_dll/ctocpp/v8context_ctocpp.h" #include "libcef_dll/ctocpp/v8exception_ctocpp.h" #include "libcef_dll/ctocpp/v8value_ctocpp.h" @@ -52,6 +53,32 @@ bool CefV8Context::InContext() { // VIRTUAL METHODS - Body may be edited by hand. +CefRefPtr CefV8ContextCToCpp::GetTaskRunner() { + if (CEF_MEMBER_MISSING(struct_, get_task_runner)) + return NULL; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + cef_task_runner_t* _retval = struct_->get_task_runner(struct_); + + // Return type: refptr_same + return CefTaskRunnerCToCpp::Wrap(_retval); +} + +bool CefV8ContextCToCpp::IsValid() { + if (CEF_MEMBER_MISSING(struct_, is_valid)) + return false; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = struct_->is_valid(struct_); + + // Return type: bool + return _retval?true:false; +} + CefRefPtr CefV8ContextCToCpp::GetBrowser() { if (CEF_MEMBER_MISSING(struct_, get_browser)) return NULL; diff --git a/cef/libcef_dll/ctocpp/v8context_ctocpp.h b/cef/libcef_dll/ctocpp/v8context_ctocpp.h index 314082fee..f364361b2 100644 --- a/cef/libcef_dll/ctocpp/v8context_ctocpp.h +++ b/cef/libcef_dll/ctocpp/v8context_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // @@ -32,6 +32,8 @@ class CefV8ContextCToCpp virtual ~CefV8ContextCToCpp() {} // CefV8Context methods + virtual CefRefPtr GetTaskRunner() OVERRIDE; + virtual bool IsValid() OVERRIDE; virtual CefRefPtr GetBrowser() OVERRIDE; virtual CefRefPtr GetFrame() OVERRIDE; virtual CefRefPtr GetGlobal() OVERRIDE; diff --git a/cef/libcef_dll/ctocpp/v8exception_ctocpp.cc b/cef/libcef_dll/ctocpp/v8exception_ctocpp.cc index 277f24f01..633a21dc4 100644 --- a/cef/libcef_dll/ctocpp/v8exception_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/v8exception_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/v8exception_ctocpp.h b/cef/libcef_dll/ctocpp/v8exception_ctocpp.h index 8966e61a2..1006a4c0c 100644 --- a/cef/libcef_dll/ctocpp/v8exception_ctocpp.h +++ b/cef/libcef_dll/ctocpp/v8exception_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc b/cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc index 8d685df90..a0de4d3a0 100644 --- a/cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // @@ -15,6 +15,19 @@ // VIRTUAL METHODS - Body may be edited by hand. +bool CefV8StackFrameCToCpp::IsValid() { + if (CEF_MEMBER_MISSING(struct_, is_valid)) + return false; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = struct_->is_valid(struct_); + + // Return type: bool + return _retval?true:false; +} + CefString CefV8StackFrameCToCpp::GetScriptName() { if (CEF_MEMBER_MISSING(struct_, get_script_name)) return CefString(); diff --git a/cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.h b/cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.h index 6a6a32999..7d1cace31 100644 --- a/cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.h +++ b/cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // @@ -34,6 +34,7 @@ class CefV8StackFrameCToCpp virtual ~CefV8StackFrameCToCpp() {} // CefV8StackFrame methods + virtual bool IsValid() OVERRIDE; virtual CefString GetScriptName() OVERRIDE; virtual CefString GetScriptNameOrSourceURL() OVERRIDE; virtual CefString GetFunctionName() OVERRIDE; diff --git a/cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc b/cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc index a569e3948..0764c7ead 100644 --- a/cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // @@ -30,6 +30,19 @@ CefRefPtr CefV8StackTrace::GetCurrent(int frame_limit) { // VIRTUAL METHODS - Body may be edited by hand. +bool CefV8StackTraceCToCpp::IsValid() { + if (CEF_MEMBER_MISSING(struct_, is_valid)) + return false; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = struct_->is_valid(struct_); + + // Return type: bool + return _retval?true:false; +} + int CefV8StackTraceCToCpp::GetFrameCount() { if (CEF_MEMBER_MISSING(struct_, get_frame_count)) return 0; diff --git a/cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.h b/cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.h index 05ac92a90..8e72b8865 100644 --- a/cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.h +++ b/cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // @@ -34,6 +34,7 @@ class CefV8StackTraceCToCpp virtual ~CefV8StackTraceCToCpp() {} // CefV8StackTrace methods + virtual bool IsValid() OVERRIDE; virtual int GetFrameCount() OVERRIDE; virtual CefRefPtr GetFrame(int index) OVERRIDE; }; diff --git a/cef/libcef_dll/ctocpp/v8value_ctocpp.cc b/cef/libcef_dll/ctocpp/v8value_ctocpp.cc index 5e28c4020..36d2063d2 100644 --- a/cef/libcef_dll/ctocpp/v8value_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/v8value_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // @@ -159,6 +159,19 @@ CefRefPtr CefV8Value::CreateFunction(const CefString& name, // VIRTUAL METHODS - Body may be edited by hand. +bool CefV8ValueCToCpp::IsValid() { + if (CEF_MEMBER_MISSING(struct_, is_valid)) + return false; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = struct_->is_valid(struct_); + + // Return type: bool + return _retval?true:false; +} + bool CefV8ValueCToCpp::IsUndefined() { if (CEF_MEMBER_MISSING(struct_, is_undefined)) return false; diff --git a/cef/libcef_dll/ctocpp/v8value_ctocpp.h b/cef/libcef_dll/ctocpp/v8value_ctocpp.h index 15efb7941..552b020b5 100644 --- a/cef/libcef_dll/ctocpp/v8value_ctocpp.h +++ b/cef/libcef_dll/ctocpp/v8value_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // @@ -33,6 +33,7 @@ class CefV8ValueCToCpp virtual ~CefV8ValueCToCpp() {} // CefV8Value methods + virtual bool IsValid() OVERRIDE; virtual bool IsUndefined() OVERRIDE; virtual bool IsNull() OVERRIDE; virtual bool IsBool() OVERRIDE; diff --git a/cef/libcef_dll/ctocpp/web_plugin_info_ctocpp.cc b/cef/libcef_dll/ctocpp/web_plugin_info_ctocpp.cc index 4c814e969..602021219 100644 --- a/cef/libcef_dll/ctocpp/web_plugin_info_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/web_plugin_info_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/web_plugin_info_ctocpp.h b/cef/libcef_dll/ctocpp/web_plugin_info_ctocpp.h index b8bd1cbf0..c1be75da0 100644 --- a/cef/libcef_dll/ctocpp/web_plugin_info_ctocpp.h +++ b/cef/libcef_dll/ctocpp/web_plugin_info_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/xml_reader_ctocpp.cc b/cef/libcef_dll/ctocpp/xml_reader_ctocpp.cc index 73f0724ad..be5c533b7 100644 --- a/cef/libcef_dll/ctocpp/xml_reader_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/xml_reader_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/xml_reader_ctocpp.h b/cef/libcef_dll/ctocpp/xml_reader_ctocpp.h index eeaad3dd6..ab8653c76 100644 --- a/cef/libcef_dll/ctocpp/xml_reader_ctocpp.h +++ b/cef/libcef_dll/ctocpp/xml_reader_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/zip_reader_ctocpp.cc b/cef/libcef_dll/ctocpp/zip_reader_ctocpp.cc index 44401ed48..a1dc226ed 100644 --- a/cef/libcef_dll/ctocpp/zip_reader_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/zip_reader_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/ctocpp/zip_reader_ctocpp.h b/cef/libcef_dll/ctocpp/zip_reader_ctocpp.h index c9464a7d3..812516d5a 100644 --- a/cef/libcef_dll/ctocpp/zip_reader_ctocpp.h +++ b/cef/libcef_dll/ctocpp/zip_reader_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // diff --git a/cef/libcef_dll/wrapper/libcef_dll_wrapper.cc b/cef/libcef_dll/wrapper/libcef_dll_wrapper.cc index 2531d3ca8..0559d0e4f 100644 --- a/cef/libcef_dll/wrapper/libcef_dll_wrapper.cc +++ b/cef/libcef_dll/wrapper/libcef_dll_wrapper.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2013 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. // @@ -51,6 +51,7 @@ #include "libcef_dll/cpptoc/load_handler_cpptoc.h" #include "libcef_dll/cpptoc/proxy_handler_cpptoc.h" #include "libcef_dll/cpptoc/read_handler_cpptoc.h" +#include "libcef_dll/cpptoc/render_handler_cpptoc.h" #include "libcef_dll/cpptoc/render_process_handler_cpptoc.h" #include "libcef_dll/cpptoc/request_handler_cpptoc.h" #include "libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h" @@ -92,6 +93,7 @@ #include "libcef_dll/ctocpp/scheme_registrar_ctocpp.h" #include "libcef_dll/ctocpp/stream_reader_ctocpp.h" #include "libcef_dll/ctocpp/stream_writer_ctocpp.h" +#include "libcef_dll/ctocpp/task_runner_ctocpp.h" #include "libcef_dll/ctocpp/urlrequest_ctocpp.h" #include "libcef_dll/ctocpp/v8context_ctocpp.h" #include "libcef_dll/ctocpp/v8exception_ctocpp.h" @@ -200,6 +202,7 @@ CEF_GLOBAL void CefShutdown() { DCHECK_EQ(CefProxyHandlerCppToC::DebugObjCt, 0); DCHECK_EQ(CefQuotaCallbackCToCpp::DebugObjCt, 0); DCHECK_EQ(CefReadHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefRenderHandlerCppToC::DebugObjCt, 0); DCHECK_EQ(CefRenderProcessHandlerCppToC::DebugObjCt, 0); DCHECK_EQ(CefRequestHandlerCppToC::DebugObjCt, 0); DCHECK_EQ(CefResourceBundleHandlerCppToC::DebugObjCt, 0); @@ -211,6 +214,7 @@ CEF_GLOBAL void CefShutdown() { DCHECK_EQ(CefStreamWriterCToCpp::DebugObjCt, 0); DCHECK_EQ(CefStringVisitorCppToC::DebugObjCt, 0); DCHECK_EQ(CefTaskCppToC::DebugObjCt, 0); + DCHECK_EQ(CefTaskRunnerCToCpp::DebugObjCt, 0); DCHECK_EQ(CefTraceClientCppToC::DebugObjCt, 0); DCHECK_EQ(CefURLRequestCToCpp::DebugObjCt, 0); DCHECK_EQ(CefURLRequestClientCppToC::DebugObjCt, 0); diff --git a/native/atom_cef_client.cpp b/native/atom_cef_client.cpp index 41a0c2383..38c25470b 100644 --- a/native/atom_cef_client.cpp +++ b/native/atom_cef_client.cpp @@ -6,6 +6,7 @@ #include "include/cef_task.h" #include "include/cef_runnable.h" #include "include/cef_trace.h" +#include "cef_types.h" #include "native/atom_cef_client.h" #include "cef_v8.h" @@ -124,21 +125,21 @@ bool AtomCefClient::OnConsoleMessage(CefRefPtr browser, bool AtomCefClient::OnKeyEvent(CefRefPtr browser, const CefKeyEvent& event, CefEventHandle os_event) { - if (event.modifiers == KEY_META && event.unmodified_character == 'r') { + if (event.modifiers == EVENTFLAG_COMMAND_DOWN && event.unmodified_character == 'r') { browser->SendProcessMessage(PID_RENDERER, CefProcessMessage::Create("reload")); } - if (m_HandlePasteboardCommands && event.modifiers == KEY_META && event.unmodified_character == 'x') { + if (m_HandlePasteboardCommands && event.modifiers == EVENTFLAG_COMMAND_DOWN && event.unmodified_character == 'x') { browser->GetFocusedFrame()->Cut(); } - if (m_HandlePasteboardCommands && event.modifiers == KEY_META && event.unmodified_character == 'c') { + if (m_HandlePasteboardCommands && event.modifiers == EVENTFLAG_COMMAND_DOWN && event.unmodified_character == 'c') { browser->GetFocusedFrame()->Copy(); } - if (m_HandlePasteboardCommands && event.modifiers == KEY_META && event.unmodified_character == 'v') { + if (m_HandlePasteboardCommands && event.modifiers == EVENTFLAG_COMMAND_DOWN && event.unmodified_character == 'v') { browser->GetFocusedFrame()->Paste(); } - else if (event.modifiers == (KEY_META | KEY_ALT) && event.unmodified_character == 'i') { + else if (event.modifiers == (EVENTFLAG_COMMAND_DOWN | EVENTFLAG_ALT_DOWN) && event.unmodified_character == 'i') { ToggleDevTools(browser); - } else if (event.modifiers == KEY_META && event.unmodified_character == '`') { + } else if (event.modifiers == EVENTFLAG_COMMAND_DOWN && event.unmodified_character == '`') { FocusNextWindow(); } else { diff --git a/native/atom_window_controller.mm b/native/atom_window_controller.mm index 785d85071..29dca8447 100644 --- a/native/atom_window_controller.mm +++ b/native/atom_window_controller.mm @@ -223,11 +223,11 @@ settings.accelerated_layers_disabled = false; settings.accelerated_video_disabled = false; settings.accelerated_2d_canvas_disabled = false; - settings.accelerated_painting_enabled = true; - settings.accelerated_filters_enabled = true; +// settings.accelerated_painting_enabled = true; +// settings.accelerated_filters_enabled = true; settings.accelerated_plugins_disabled = false; settings.developer_tools_disabled = false; - settings.fullscreen_enabled = true; +// settings.fullscreen_enabled = true; } @end