diff --git a/Atom.xcodeproj/project.pbxproj b/Atom.xcodeproj/project.pbxproj index e70914b72..54298716d 100644 --- a/Atom.xcodeproj/project.pbxproj +++ b/Atom.xcodeproj/project.pbxproj @@ -20,65 +20,70 @@ 0487CD9B14FEE1740045E5E3 /* libcef.dylib in Copy Required Chrome Frameworks */ = {isa = PBXBuildFile; fileRef = 0487CD6C14FEE0EC0045E5E3 /* libcef.dylib */; }; 0487CD9F14FEE1D70045E5E3 /* libcef.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0487CD6C14FEE0EC0045E5E3 /* libcef.dylib */; }; 0487CDA014FEE1DA0045E5E3 /* liblibcef_wrapper.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0487CC8114FEDF990045E5E3 /* liblibcef_wrapper.a */; }; - 0487D12614FEE6D60045E5E3 /* app_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0B514FEE6D60045E5E3 /* app_cpptoc.cc */; }; - 0487D12714FEE6D60045E5E3 /* client_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0B814FEE6D60045E5E3 /* client_cpptoc.cc */; }; - 0487D12814FEE6D60045E5E3 /* content_filter_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0BA14FEE6D60045E5E3 /* content_filter_cpptoc.cc */; }; - 0487D12914FEE6D60045E5E3 /* cookie_visitor_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0BC14FEE6D60045E5E3 /* cookie_visitor_cpptoc.cc */; }; - 0487D12A14FEE6D60045E5E3 /* display_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0BF14FEE6D60045E5E3 /* display_handler_cpptoc.cc */; }; - 0487D12B14FEE6D60045E5E3 /* domevent_listener_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0C114FEE6D60045E5E3 /* domevent_listener_cpptoc.cc */; }; - 0487D12C14FEE6D60045E5E3 /* domvisitor_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0C314FEE6D60045E5E3 /* domvisitor_cpptoc.cc */; }; - 0487D12D14FEE6D60045E5E3 /* download_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0C514FEE6D60045E5E3 /* download_handler_cpptoc.cc */; }; - 0487D12E14FEE6D60045E5E3 /* drag_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0C714FEE6D60045E5E3 /* drag_handler_cpptoc.cc */; }; - 0487D12F14FEE6D60045E5E3 /* find_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0C914FEE6D60045E5E3 /* find_handler_cpptoc.cc */; }; - 0487D13014FEE6D60045E5E3 /* focus_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0CB14FEE6D60045E5E3 /* focus_handler_cpptoc.cc */; }; - 0487D13114FEE6D60045E5E3 /* jsdialog_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0CD14FEE6D60045E5E3 /* jsdialog_handler_cpptoc.cc */; }; - 0487D13214FEE6D60045E5E3 /* keyboard_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0CF14FEE6D60045E5E3 /* keyboard_handler_cpptoc.cc */; }; - 0487D13314FEE6D60045E5E3 /* life_span_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0D114FEE6D60045E5E3 /* life_span_handler_cpptoc.cc */; }; - 0487D13414FEE6D60045E5E3 /* load_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0D314FEE6D60045E5E3 /* load_handler_cpptoc.cc */; }; - 0487D13514FEE6D60045E5E3 /* menu_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0D514FEE6D60045E5E3 /* menu_handler_cpptoc.cc */; }; - 0487D13614FEE6D60045E5E3 /* print_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0D714FEE6D60045E5E3 /* print_handler_cpptoc.cc */; }; - 0487D13714FEE6D60045E5E3 /* proxy_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0D914FEE6D60045E5E3 /* proxy_handler_cpptoc.cc */; }; - 0487D13814FEE6D60045E5E3 /* read_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0DB14FEE6D60045E5E3 /* read_handler_cpptoc.cc */; }; - 0487D13914FEE6D60045E5E3 /* render_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0DD14FEE6D60045E5E3 /* render_handler_cpptoc.cc */; }; - 0487D13A14FEE6D60045E5E3 /* request_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0DF14FEE6D60045E5E3 /* request_handler_cpptoc.cc */; }; - 0487D13B14FEE6D60045E5E3 /* scheme_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0E114FEE6D60045E5E3 /* scheme_handler_cpptoc.cc */; }; - 0487D13C14FEE6D60045E5E3 /* scheme_handler_factory_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0E314FEE6D60045E5E3 /* scheme_handler_factory_cpptoc.cc */; }; - 0487D13D14FEE6D60045E5E3 /* storage_visitor_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0E514FEE6D60045E5E3 /* storage_visitor_cpptoc.cc */; }; - 0487D13E14FEE6D60045E5E3 /* task_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0E714FEE6D60045E5E3 /* task_cpptoc.cc */; }; - 0487D13F14FEE6D60045E5E3 /* v8accessor_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0E914FEE6D60045E5E3 /* v8accessor_cpptoc.cc */; }; - 0487D14014FEE6D60045E5E3 /* v8context_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0EB14FEE6D60045E5E3 /* v8context_handler_cpptoc.cc */; }; - 0487D14114FEE6D60045E5E3 /* v8handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0ED14FEE6D60045E5E3 /* v8handler_cpptoc.cc */; }; - 0487D14214FEE6D60045E5E3 /* web_urlrequest_client_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0EF14FEE6D60045E5E3 /* web_urlrequest_client_cpptoc.cc */; }; - 0487D14314FEE6D60045E5E3 /* write_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0F114FEE6D60045E5E3 /* write_handler_cpptoc.cc */; }; - 0487D14414FEE6D60045E5E3 /* browser_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0F514FEE6D60045E5E3 /* browser_ctocpp.cc */; }; - 0487D14514FEE6D60045E5E3 /* command_line_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0F714FEE6D60045E5E3 /* command_line_ctocpp.cc */; }; - 0487D14614FEE6D60045E5E3 /* domdocument_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0FA14FEE6D60045E5E3 /* domdocument_ctocpp.cc */; }; - 0487D14714FEE6D60045E5E3 /* domevent_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0FC14FEE6D60045E5E3 /* domevent_ctocpp.cc */; }; - 0487D14814FEE6D60045E5E3 /* domnode_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D0FE14FEE6D60045E5E3 /* domnode_ctocpp.cc */; }; - 0487D14914FEE6D60045E5E3 /* drag_data_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D10014FEE6D60045E5E3 /* drag_data_ctocpp.cc */; }; - 0487D14A14FEE6D60045E5E3 /* frame_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D10214FEE6D60045E5E3 /* frame_ctocpp.cc */; }; - 0487D14B14FEE6D60045E5E3 /* post_data_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D10414FEE6D60045E5E3 /* post_data_ctocpp.cc */; }; - 0487D14C14FEE6D60045E5E3 /* post_data_element_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D10614FEE6D60045E5E3 /* post_data_element_ctocpp.cc */; }; - 0487D14D14FEE6D60045E5E3 /* request_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D10814FEE6D60045E5E3 /* request_ctocpp.cc */; }; - 0487D14E14FEE6D60045E5E3 /* response_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D10A14FEE6D60045E5E3 /* response_ctocpp.cc */; }; - 0487D14F14FEE6D60045E5E3 /* scheme_handler_callback_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D10C14FEE6D60045E5E3 /* scheme_handler_callback_ctocpp.cc */; }; - 0487D15014FEE6D60045E5E3 /* stream_reader_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D10E14FEE6D60045E5E3 /* stream_reader_ctocpp.cc */; }; - 0487D15114FEE6D60045E5E3 /* stream_writer_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D11014FEE6D60045E5E3 /* stream_writer_ctocpp.cc */; }; - 0487D15214FEE6D60045E5E3 /* v8context_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D11214FEE6D60045E5E3 /* v8context_ctocpp.cc */; }; - 0487D15314FEE6D60045E5E3 /* v8exception_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D11414FEE6D60045E5E3 /* v8exception_ctocpp.cc */; }; - 0487D15414FEE6D60045E5E3 /* v8value_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D11614FEE6D60045E5E3 /* v8value_ctocpp.cc */; }; - 0487D15514FEE6D60045E5E3 /* web_urlrequest_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D11814FEE6D60045E5E3 /* web_urlrequest_ctocpp.cc */; }; - 0487D15614FEE6D60045E5E3 /* xml_reader_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D11A14FEE6D60045E5E3 /* xml_reader_ctocpp.cc */; }; - 0487D15714FEE6D60045E5E3 /* zip_reader_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D11C14FEE6D60045E5E3 /* zip_reader_ctocpp.cc */; }; - 0487D15814FEE6D60045E5E3 /* transfer_util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0487D11E14FEE6D60045E5E3 /* transfer_util.cpp */; }; - 0487D15914FEE6D60045E5E3 /* cef_byte_read_handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D12114FEE6D60045E5E3 /* cef_byte_read_handler.cc */; }; - 0487D15A14FEE6D60045E5E3 /* cef_xml_object.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D12214FEE6D60045E5E3 /* cef_xml_object.cc */; }; - 0487D15B14FEE6D60045E5E3 /* cef_zip_archive.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D12314FEE6D60045E5E3 /* cef_zip_archive.cc */; }; - 0487D15C14FEE6D60045E5E3 /* libcef_dll_wrapper.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D12414FEE6D60045E5E3 /* libcef_dll_wrapper.cc */; }; - 0487D15D14FEE6D60045E5E3 /* libcef_dll_wrapper2.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0487D12514FEE6D60045E5E3 /* libcef_dll_wrapper2.cc */; }; 0487D15F14FEE7880045E5E3 /* Resources in Resources */ = {isa = PBXBuildFile; fileRef = 0487D15E14FEE7880045E5E3 /* Resources */; }; 0487D16014FEE78E0045E5E3 /* Resources in Copy Chrome Resources */ = {isa = PBXBuildFile; fileRef = 0487D15E14FEE7880045E5E3 /* Resources */; }; 048A2FC7154870DC0051715C /* PathWatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 048A2FC6154870DC0051715C /* PathWatcher.m */; }; + 04DD81011553444800BE097F /* README-TRANSFER.txt in Resources */ = {isa = PBXBuildFile; fileRef = 04DD80F31553444800BE097F /* README-TRANSFER.txt */; }; + 04DD817E1553445100BE097F /* app_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81051553445100BE097F /* app_cpptoc.cc */; }; + 04DD817F1553445100BE097F /* client_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81081553445100BE097F /* client_cpptoc.cc */; }; + 04DD81801553445100BE097F /* content_filter_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD810A1553445100BE097F /* content_filter_cpptoc.cc */; }; + 04DD81811553445100BE097F /* cookie_visitor_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD810C1553445100BE097F /* cookie_visitor_cpptoc.cc */; }; + 04DD81821553445100BE097F /* display_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD810F1553445100BE097F /* display_handler_cpptoc.cc */; }; + 04DD81831553445100BE097F /* domevent_listener_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81111553445100BE097F /* domevent_listener_cpptoc.cc */; }; + 04DD81841553445100BE097F /* domvisitor_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81131553445100BE097F /* domvisitor_cpptoc.cc */; }; + 04DD81851553445100BE097F /* download_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81151553445100BE097F /* download_handler_cpptoc.cc */; }; + 04DD81861553445100BE097F /* drag_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81171553445100BE097F /* drag_handler_cpptoc.cc */; }; + 04DD81871553445100BE097F /* find_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81191553445100BE097F /* find_handler_cpptoc.cc */; }; + 04DD81881553445100BE097F /* focus_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD811B1553445100BE097F /* focus_handler_cpptoc.cc */; }; + 04DD81891553445100BE097F /* jsdialog_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD811D1553445100BE097F /* jsdialog_handler_cpptoc.cc */; }; + 04DD818A1553445100BE097F /* keyboard_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD811F1553445100BE097F /* keyboard_handler_cpptoc.cc */; }; + 04DD818B1553445100BE097F /* life_span_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81211553445100BE097F /* life_span_handler_cpptoc.cc */; }; + 04DD818C1553445100BE097F /* load_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81231553445100BE097F /* load_handler_cpptoc.cc */; }; + 04DD818D1553445100BE097F /* menu_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81251553445100BE097F /* menu_handler_cpptoc.cc */; }; + 04DD818E1553445100BE097F /* permission_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81271553445100BE097F /* permission_handler_cpptoc.cc */; }; + 04DD818F1553445100BE097F /* print_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81291553445100BE097F /* print_handler_cpptoc.cc */; }; + 04DD81901553445100BE097F /* proxy_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD812B1553445100BE097F /* proxy_handler_cpptoc.cc */; }; + 04DD81911553445100BE097F /* read_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD812D1553445100BE097F /* read_handler_cpptoc.cc */; }; + 04DD81921553445100BE097F /* render_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD812F1553445100BE097F /* render_handler_cpptoc.cc */; }; + 04DD81931553445100BE097F /* request_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81311553445100BE097F /* request_handler_cpptoc.cc */; }; + 04DD81941553445100BE097F /* resource_bundle_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81331553445100BE097F /* resource_bundle_handler_cpptoc.cc */; }; + 04DD81951553445100BE097F /* scheme_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81351553445100BE097F /* scheme_handler_cpptoc.cc */; }; + 04DD81961553445100BE097F /* scheme_handler_factory_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81371553445100BE097F /* scheme_handler_factory_cpptoc.cc */; }; + 04DD81971553445100BE097F /* storage_visitor_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81391553445100BE097F /* storage_visitor_cpptoc.cc */; }; + 04DD81981553445100BE097F /* task_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD813B1553445100BE097F /* task_cpptoc.cc */; }; + 04DD81991553445100BE097F /* v8accessor_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD813D1553445100BE097F /* v8accessor_cpptoc.cc */; }; + 04DD819A1553445100BE097F /* v8context_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD813F1553445100BE097F /* v8context_handler_cpptoc.cc */; }; + 04DD819B1553445100BE097F /* v8handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81411553445100BE097F /* v8handler_cpptoc.cc */; }; + 04DD819C1553445100BE097F /* web_urlrequest_client_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81431553445100BE097F /* web_urlrequest_client_cpptoc.cc */; }; + 04DD819D1553445100BE097F /* write_handler_cpptoc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81451553445100BE097F /* write_handler_cpptoc.cc */; }; + 04DD819E1553445100BE097F /* browser_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81491553445100BE097F /* browser_ctocpp.cc */; }; + 04DD819F1553445100BE097F /* command_line_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD814B1553445100BE097F /* command_line_ctocpp.cc */; }; + 04DD81A01553445100BE097F /* cookie_manager_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD814D1553445100BE097F /* cookie_manager_ctocpp.cc */; }; + 04DD81A11553445100BE097F /* domdocument_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81501553445100BE097F /* domdocument_ctocpp.cc */; }; + 04DD81A21553445100BE097F /* domevent_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81521553445100BE097F /* domevent_ctocpp.cc */; }; + 04DD81A31553445100BE097F /* domnode_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81541553445100BE097F /* domnode_ctocpp.cc */; }; + 04DD81A41553445100BE097F /* drag_data_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81561553445100BE097F /* drag_data_ctocpp.cc */; }; + 04DD81A51553445100BE097F /* frame_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81581553445100BE097F /* frame_ctocpp.cc */; }; + 04DD81A61553445100BE097F /* post_data_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD815A1553445100BE097F /* post_data_ctocpp.cc */; }; + 04DD81A71553445100BE097F /* post_data_element_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD815C1553445100BE097F /* post_data_element_ctocpp.cc */; }; + 04DD81A81553445100BE097F /* request_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD815E1553445100BE097F /* request_ctocpp.cc */; }; + 04DD81A91553445100BE097F /* response_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81601553445100BE097F /* response_ctocpp.cc */; }; + 04DD81AA1553445100BE097F /* scheme_handler_callback_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81621553445100BE097F /* scheme_handler_callback_ctocpp.cc */; }; + 04DD81AB1553445100BE097F /* stream_reader_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81641553445100BE097F /* stream_reader_ctocpp.cc */; }; + 04DD81AC1553445100BE097F /* stream_writer_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81661553445100BE097F /* stream_writer_ctocpp.cc */; }; + 04DD81AD1553445100BE097F /* v8context_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81681553445100BE097F /* v8context_ctocpp.cc */; }; + 04DD81AE1553445100BE097F /* v8exception_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD816A1553445100BE097F /* v8exception_ctocpp.cc */; }; + 04DD81AF1553445100BE097F /* v8value_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD816C1553445100BE097F /* v8value_ctocpp.cc */; }; + 04DD81B01553445100BE097F /* web_plugin_info_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD816E1553445100BE097F /* web_plugin_info_ctocpp.cc */; }; + 04DD81B11553445100BE097F /* web_urlrequest_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81701553445100BE097F /* web_urlrequest_ctocpp.cc */; }; + 04DD81B21553445100BE097F /* xml_reader_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81721553445100BE097F /* xml_reader_ctocpp.cc */; }; + 04DD81B31553445100BE097F /* zip_reader_ctocpp.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81741553445100BE097F /* zip_reader_ctocpp.cc */; }; + 04DD81B41553445100BE097F /* transfer_util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81761553445100BE097F /* transfer_util.cpp */; }; + 04DD81B51553445100BE097F /* cef_byte_read_handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD81791553445100BE097F /* cef_byte_read_handler.cc */; }; + 04DD81B61553445100BE097F /* cef_xml_object.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD817A1553445100BE097F /* cef_xml_object.cc */; }; + 04DD81B71553445100BE097F /* cef_zip_archive.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD817B1553445100BE097F /* cef_zip_archive.cc */; }; + 04DD81B81553445100BE097F /* libcef_dll_wrapper.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD817C1553445100BE097F /* libcef_dll_wrapper.cc */; }; + 04DD81B91553445100BE097F /* libcef_dll_wrapper2.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04DD817D1553445100BE097F /* libcef_dll_wrapper2.cc */; }; 04E1DDDD152A0941001A9D07 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04E1DDDC152A0941001A9D07 /* Sparkle.framework */; }; 04E1DDDF152A09C3001A9D07 /* Sparkle.framework in Copy Sparkle Framework */ = {isa = PBXBuildFile; fileRef = 04E1DDDC152A0941001A9D07 /* Sparkle.framework */; }; /* End PBXBuildFile section */ @@ -153,155 +158,243 @@ 0487CC8114FEDF990045E5E3 /* liblibcef_wrapper.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblibcef_wrapper.a; sourceTree = BUILT_PRODUCTS_DIR; }; 0487CD6B14FEE0EC0045E5E3 /* ffmpegsumo.so */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.bundle"; name = ffmpegsumo.so; path = frameworks/ffmpegsumo.so; sourceTree = ""; }; 0487CD6C14FEE0EC0045E5E3 /* libcef.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcef.dylib; path = frameworks/libcef.dylib; sourceTree = ""; }; - 0487CF3614FEE5C40045E5E3 /* cef.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef.h; sourceTree = ""; }; - 0487CF3714FEE5C40045E5E3 /* cef_application_mac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_application_mac.h; sourceTree = ""; }; - 0487CF3814FEE5C40045E5E3 /* cef_capi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_capi.h; sourceTree = ""; }; - 0487CF3914FEE5C40045E5E3 /* cef_nplugin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_nplugin.h; sourceTree = ""; }; - 0487CF3A14FEE5C40045E5E3 /* cef_nplugin_capi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_nplugin_capi.h; sourceTree = ""; }; - 0487CF3B14FEE5C40045E5E3 /* cef_runnable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_runnable.h; sourceTree = ""; }; - 0487CF3C14FEE5C40045E5E3 /* cef_version.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_version.h; sourceTree = ""; }; - 0487CF3D14FEE5C40045E5E3 /* cef_wrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_wrapper.h; sourceTree = ""; }; - 0487CF3F14FEE5C40045E5E3 /* cef_build.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_build.h; sourceTree = ""; }; - 0487CF4014FEE5C40045E5E3 /* cef_export.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_export.h; sourceTree = ""; }; - 0487CF4114FEE5C40045E5E3 /* cef_mac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_mac.h; sourceTree = ""; }; - 0487CF4214FEE5C40045E5E3 /* cef_nplugin_types.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_nplugin_types.h; sourceTree = ""; }; - 0487CF4314FEE5C40045E5E3 /* cef_ptr.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_ptr.h; sourceTree = ""; }; - 0487CF4414FEE5C40045E5E3 /* cef_string.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_string.h; sourceTree = ""; }; - 0487CF4514FEE5C40045E5E3 /* cef_string_list.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_string_list.h; sourceTree = ""; }; - 0487CF4614FEE5C40045E5E3 /* cef_string_map.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_string_map.h; sourceTree = ""; }; - 0487CF4714FEE5C40045E5E3 /* cef_string_multimap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_string_multimap.h; sourceTree = ""; }; - 0487CF4814FEE5C40045E5E3 /* cef_string_types.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_string_types.h; sourceTree = ""; }; - 0487CF4914FEE5C40045E5E3 /* cef_string_wrappers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_string_wrappers.h; sourceTree = ""; }; - 0487CF4A14FEE5C40045E5E3 /* cef_time.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_time.h; sourceTree = ""; }; - 0487CF4B14FEE5C40045E5E3 /* cef_tuple.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_tuple.h; sourceTree = ""; }; - 0487CF4C14FEE5C40045E5E3 /* cef_types.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_types.h; sourceTree = ""; }; - 0487CF4D14FEE5C40045E5E3 /* cef_types_mac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_types_mac.h; sourceTree = ""; }; - 0487CF4E14FEE5C40045E5E3 /* cef_types_wrappers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cef_types_wrappers.h; sourceTree = ""; }; - 0487CF5014FEE5C40045E5E3 /* basictypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = basictypes.h; sourceTree = ""; }; - 0487CF5114FEE5C40045E5E3 /* build_config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = build_config.h; sourceTree = ""; }; - 0487CF5214FEE5C40045E5E3 /* npapi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = npapi.h; sourceTree = ""; }; - 0487CF5314FEE5C40045E5E3 /* npapi_extensions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = npapi_extensions.h; sourceTree = ""; }; - 0487CF5414FEE5C40045E5E3 /* npfunctions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = npfunctions.h; sourceTree = ""; }; - 0487CF5514FEE5C40045E5E3 /* nphostapi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = nphostapi.h; sourceTree = ""; }; - 0487CF5614FEE5C40045E5E3 /* npruntime.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = npruntime.h; sourceTree = ""; }; - 0487CF5714FEE5C40045E5E3 /* nptypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = nptypes.h; sourceTree = ""; }; - 0487CF5814FEE5C40045E5E3 /* port.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = port.h; sourceTree = ""; }; - 0487CF5914FEE5C40045E5E3 /* README-TRANSFER.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "README-TRANSFER.txt"; sourceTree = ""; }; - 0487D0B314FEE6D60045E5E3 /* cef_logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_logging.h; sourceTree = ""; }; - 0487D0B514FEE6D60045E5E3 /* app_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = app_cpptoc.cc; sourceTree = ""; }; - 0487D0B614FEE6D60045E5E3 /* app_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = app_cpptoc.h; sourceTree = ""; }; - 0487D0B714FEE6D60045E5E3 /* base_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = base_cpptoc.h; sourceTree = ""; }; - 0487D0B814FEE6D60045E5E3 /* client_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = client_cpptoc.cc; sourceTree = ""; }; - 0487D0B914FEE6D60045E5E3 /* client_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = client_cpptoc.h; sourceTree = ""; }; - 0487D0BA14FEE6D60045E5E3 /* content_filter_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = content_filter_cpptoc.cc; sourceTree = ""; }; - 0487D0BB14FEE6D60045E5E3 /* content_filter_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = content_filter_cpptoc.h; sourceTree = ""; }; - 0487D0BC14FEE6D60045E5E3 /* cookie_visitor_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cookie_visitor_cpptoc.cc; sourceTree = ""; }; - 0487D0BD14FEE6D60045E5E3 /* cookie_visitor_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cookie_visitor_cpptoc.h; sourceTree = ""; }; - 0487D0BE14FEE6D60045E5E3 /* cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpptoc.h; sourceTree = ""; }; - 0487D0BF14FEE6D60045E5E3 /* display_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = display_handler_cpptoc.cc; sourceTree = ""; }; - 0487D0C014FEE6D60045E5E3 /* display_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = display_handler_cpptoc.h; sourceTree = ""; }; - 0487D0C114FEE6D60045E5E3 /* domevent_listener_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = domevent_listener_cpptoc.cc; sourceTree = ""; }; - 0487D0C214FEE6D60045E5E3 /* domevent_listener_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = domevent_listener_cpptoc.h; sourceTree = ""; }; - 0487D0C314FEE6D60045E5E3 /* domvisitor_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = domvisitor_cpptoc.cc; sourceTree = ""; }; - 0487D0C414FEE6D60045E5E3 /* domvisitor_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = domvisitor_cpptoc.h; sourceTree = ""; }; - 0487D0C514FEE6D60045E5E3 /* download_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = download_handler_cpptoc.cc; sourceTree = ""; }; - 0487D0C614FEE6D60045E5E3 /* download_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = download_handler_cpptoc.h; sourceTree = ""; }; - 0487D0C714FEE6D60045E5E3 /* drag_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drag_handler_cpptoc.cc; sourceTree = ""; }; - 0487D0C814FEE6D60045E5E3 /* drag_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = drag_handler_cpptoc.h; sourceTree = ""; }; - 0487D0C914FEE6D60045E5E3 /* find_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = find_handler_cpptoc.cc; sourceTree = ""; }; - 0487D0CA14FEE6D60045E5E3 /* find_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = find_handler_cpptoc.h; sourceTree = ""; }; - 0487D0CB14FEE6D60045E5E3 /* focus_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = focus_handler_cpptoc.cc; sourceTree = ""; }; - 0487D0CC14FEE6D60045E5E3 /* focus_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = focus_handler_cpptoc.h; sourceTree = ""; }; - 0487D0CD14FEE6D60045E5E3 /* jsdialog_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jsdialog_handler_cpptoc.cc; sourceTree = ""; }; - 0487D0CE14FEE6D60045E5E3 /* jsdialog_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jsdialog_handler_cpptoc.h; sourceTree = ""; }; - 0487D0CF14FEE6D60045E5E3 /* keyboard_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = keyboard_handler_cpptoc.cc; sourceTree = ""; }; - 0487D0D014FEE6D60045E5E3 /* keyboard_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keyboard_handler_cpptoc.h; sourceTree = ""; }; - 0487D0D114FEE6D60045E5E3 /* life_span_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = life_span_handler_cpptoc.cc; sourceTree = ""; }; - 0487D0D214FEE6D60045E5E3 /* life_span_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = life_span_handler_cpptoc.h; sourceTree = ""; }; - 0487D0D314FEE6D60045E5E3 /* load_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = load_handler_cpptoc.cc; sourceTree = ""; }; - 0487D0D414FEE6D60045E5E3 /* load_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = load_handler_cpptoc.h; sourceTree = ""; }; - 0487D0D514FEE6D60045E5E3 /* menu_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = menu_handler_cpptoc.cc; sourceTree = ""; }; - 0487D0D614FEE6D60045E5E3 /* menu_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = menu_handler_cpptoc.h; sourceTree = ""; }; - 0487D0D714FEE6D60045E5E3 /* print_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = print_handler_cpptoc.cc; sourceTree = ""; }; - 0487D0D814FEE6D60045E5E3 /* print_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = print_handler_cpptoc.h; sourceTree = ""; }; - 0487D0D914FEE6D60045E5E3 /* proxy_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = proxy_handler_cpptoc.cc; sourceTree = ""; }; - 0487D0DA14FEE6D60045E5E3 /* proxy_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = proxy_handler_cpptoc.h; sourceTree = ""; }; - 0487D0DB14FEE6D60045E5E3 /* read_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = read_handler_cpptoc.cc; sourceTree = ""; }; - 0487D0DC14FEE6D60045E5E3 /* read_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = read_handler_cpptoc.h; sourceTree = ""; }; - 0487D0DD14FEE6D60045E5E3 /* render_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = render_handler_cpptoc.cc; sourceTree = ""; }; - 0487D0DE14FEE6D60045E5E3 /* render_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = render_handler_cpptoc.h; sourceTree = ""; }; - 0487D0DF14FEE6D60045E5E3 /* request_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = request_handler_cpptoc.cc; sourceTree = ""; }; - 0487D0E014FEE6D60045E5E3 /* request_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = request_handler_cpptoc.h; sourceTree = ""; }; - 0487D0E114FEE6D60045E5E3 /* scheme_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scheme_handler_cpptoc.cc; sourceTree = ""; }; - 0487D0E214FEE6D60045E5E3 /* scheme_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scheme_handler_cpptoc.h; sourceTree = ""; }; - 0487D0E314FEE6D60045E5E3 /* scheme_handler_factory_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scheme_handler_factory_cpptoc.cc; sourceTree = ""; }; - 0487D0E414FEE6D60045E5E3 /* scheme_handler_factory_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scheme_handler_factory_cpptoc.h; sourceTree = ""; }; - 0487D0E514FEE6D60045E5E3 /* storage_visitor_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_visitor_cpptoc.cc; sourceTree = ""; }; - 0487D0E614FEE6D60045E5E3 /* storage_visitor_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = storage_visitor_cpptoc.h; sourceTree = ""; }; - 0487D0E714FEE6D60045E5E3 /* task_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = task_cpptoc.cc; sourceTree = ""; }; - 0487D0E814FEE6D60045E5E3 /* task_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = task_cpptoc.h; sourceTree = ""; }; - 0487D0E914FEE6D60045E5E3 /* v8accessor_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = v8accessor_cpptoc.cc; sourceTree = ""; }; - 0487D0EA14FEE6D60045E5E3 /* v8accessor_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = v8accessor_cpptoc.h; sourceTree = ""; }; - 0487D0EB14FEE6D60045E5E3 /* v8context_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = v8context_handler_cpptoc.cc; sourceTree = ""; }; - 0487D0EC14FEE6D60045E5E3 /* v8context_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = v8context_handler_cpptoc.h; sourceTree = ""; }; - 0487D0ED14FEE6D60045E5E3 /* v8handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = v8handler_cpptoc.cc; sourceTree = ""; }; - 0487D0EE14FEE6D60045E5E3 /* v8handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = v8handler_cpptoc.h; sourceTree = ""; }; - 0487D0EF14FEE6D60045E5E3 /* web_urlrequest_client_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = web_urlrequest_client_cpptoc.cc; sourceTree = ""; }; - 0487D0F014FEE6D60045E5E3 /* web_urlrequest_client_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = web_urlrequest_client_cpptoc.h; sourceTree = ""; }; - 0487D0F114FEE6D60045E5E3 /* write_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = write_handler_cpptoc.cc; sourceTree = ""; }; - 0487D0F214FEE6D60045E5E3 /* write_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = write_handler_cpptoc.h; sourceTree = ""; }; - 0487D0F414FEE6D60045E5E3 /* base_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = base_ctocpp.h; sourceTree = ""; }; - 0487D0F514FEE6D60045E5E3 /* browser_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = browser_ctocpp.cc; sourceTree = ""; }; - 0487D0F614FEE6D60045E5E3 /* browser_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = browser_ctocpp.h; sourceTree = ""; }; - 0487D0F714FEE6D60045E5E3 /* command_line_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = command_line_ctocpp.cc; sourceTree = ""; }; - 0487D0F814FEE6D60045E5E3 /* command_line_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = command_line_ctocpp.h; sourceTree = ""; }; - 0487D0F914FEE6D60045E5E3 /* ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ctocpp.h; sourceTree = ""; }; - 0487D0FA14FEE6D60045E5E3 /* domdocument_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = domdocument_ctocpp.cc; sourceTree = ""; }; - 0487D0FB14FEE6D60045E5E3 /* domdocument_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = domdocument_ctocpp.h; sourceTree = ""; }; - 0487D0FC14FEE6D60045E5E3 /* domevent_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = domevent_ctocpp.cc; sourceTree = ""; }; - 0487D0FD14FEE6D60045E5E3 /* domevent_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = domevent_ctocpp.h; sourceTree = ""; }; - 0487D0FE14FEE6D60045E5E3 /* domnode_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = domnode_ctocpp.cc; sourceTree = ""; }; - 0487D0FF14FEE6D60045E5E3 /* domnode_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = domnode_ctocpp.h; sourceTree = ""; }; - 0487D10014FEE6D60045E5E3 /* drag_data_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drag_data_ctocpp.cc; sourceTree = ""; }; - 0487D10114FEE6D60045E5E3 /* drag_data_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = drag_data_ctocpp.h; sourceTree = ""; }; - 0487D10214FEE6D60045E5E3 /* frame_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = frame_ctocpp.cc; sourceTree = ""; }; - 0487D10314FEE6D60045E5E3 /* frame_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = frame_ctocpp.h; sourceTree = ""; }; - 0487D10414FEE6D60045E5E3 /* post_data_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = post_data_ctocpp.cc; sourceTree = ""; }; - 0487D10514FEE6D60045E5E3 /* post_data_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = post_data_ctocpp.h; sourceTree = ""; }; - 0487D10614FEE6D60045E5E3 /* post_data_element_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = post_data_element_ctocpp.cc; sourceTree = ""; }; - 0487D10714FEE6D60045E5E3 /* post_data_element_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = post_data_element_ctocpp.h; sourceTree = ""; }; - 0487D10814FEE6D60045E5E3 /* request_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = request_ctocpp.cc; sourceTree = ""; }; - 0487D10914FEE6D60045E5E3 /* request_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = request_ctocpp.h; sourceTree = ""; }; - 0487D10A14FEE6D60045E5E3 /* response_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = response_ctocpp.cc; sourceTree = ""; }; - 0487D10B14FEE6D60045E5E3 /* response_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = response_ctocpp.h; sourceTree = ""; }; - 0487D10C14FEE6D60045E5E3 /* scheme_handler_callback_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scheme_handler_callback_ctocpp.cc; sourceTree = ""; }; - 0487D10D14FEE6D60045E5E3 /* scheme_handler_callback_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scheme_handler_callback_ctocpp.h; sourceTree = ""; }; - 0487D10E14FEE6D60045E5E3 /* stream_reader_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stream_reader_ctocpp.cc; sourceTree = ""; }; - 0487D10F14FEE6D60045E5E3 /* stream_reader_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stream_reader_ctocpp.h; sourceTree = ""; }; - 0487D11014FEE6D60045E5E3 /* stream_writer_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stream_writer_ctocpp.cc; sourceTree = ""; }; - 0487D11114FEE6D60045E5E3 /* stream_writer_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stream_writer_ctocpp.h; sourceTree = ""; }; - 0487D11214FEE6D60045E5E3 /* v8context_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = v8context_ctocpp.cc; sourceTree = ""; }; - 0487D11314FEE6D60045E5E3 /* v8context_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = v8context_ctocpp.h; sourceTree = ""; }; - 0487D11414FEE6D60045E5E3 /* v8exception_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = v8exception_ctocpp.cc; sourceTree = ""; }; - 0487D11514FEE6D60045E5E3 /* v8exception_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = v8exception_ctocpp.h; sourceTree = ""; }; - 0487D11614FEE6D60045E5E3 /* v8value_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = v8value_ctocpp.cc; sourceTree = ""; }; - 0487D11714FEE6D60045E5E3 /* v8value_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = v8value_ctocpp.h; sourceTree = ""; }; - 0487D11814FEE6D60045E5E3 /* web_urlrequest_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = web_urlrequest_ctocpp.cc; sourceTree = ""; }; - 0487D11914FEE6D60045E5E3 /* web_urlrequest_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = web_urlrequest_ctocpp.h; sourceTree = ""; }; - 0487D11A14FEE6D60045E5E3 /* xml_reader_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xml_reader_ctocpp.cc; sourceTree = ""; }; - 0487D11B14FEE6D60045E5E3 /* xml_reader_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xml_reader_ctocpp.h; sourceTree = ""; }; - 0487D11C14FEE6D60045E5E3 /* zip_reader_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zip_reader_ctocpp.cc; sourceTree = ""; }; - 0487D11D14FEE6D60045E5E3 /* zip_reader_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zip_reader_ctocpp.h; sourceTree = ""; }; - 0487D11E14FEE6D60045E5E3 /* transfer_util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transfer_util.cpp; sourceTree = ""; }; - 0487D11F14FEE6D60045E5E3 /* transfer_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = transfer_util.h; sourceTree = ""; }; - 0487D12114FEE6D60045E5E3 /* cef_byte_read_handler.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cef_byte_read_handler.cc; sourceTree = ""; }; - 0487D12214FEE6D60045E5E3 /* cef_xml_object.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cef_xml_object.cc; sourceTree = ""; }; - 0487D12314FEE6D60045E5E3 /* cef_zip_archive.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cef_zip_archive.cc; sourceTree = ""; }; - 0487D12414FEE6D60045E5E3 /* libcef_dll_wrapper.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = libcef_dll_wrapper.cc; sourceTree = ""; }; - 0487D12514FEE6D60045E5E3 /* libcef_dll_wrapper2.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = libcef_dll_wrapper2.cc; sourceTree = ""; }; 0487D15E14FEE7880045E5E3 /* Resources */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Resources; sourceTree = ""; }; 048A2FC5154870DC0051715C /* PathWatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PathWatcher.h; sourceTree = ""; }; 048A2FC6154870DC0051715C /* PathWatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PathWatcher.m; sourceTree = ""; }; + 04DD808C1553444800BE097F /* cef_app_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_app_capi.h; sourceTree = ""; }; + 04DD808D1553444800BE097F /* cef_base_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_base_capi.h; sourceTree = ""; }; + 04DD808E1553444800BE097F /* cef_browser_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_browser_capi.h; sourceTree = ""; }; + 04DD808F1553444800BE097F /* cef_client_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_client_capi.h; sourceTree = ""; }; + 04DD80901553444800BE097F /* cef_command_line_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_command_line_capi.h; sourceTree = ""; }; + 04DD80911553444800BE097F /* cef_content_filter_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_content_filter_capi.h; sourceTree = ""; }; + 04DD80921553444800BE097F /* cef_cookie_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_cookie_capi.h; sourceTree = ""; }; + 04DD80931553444800BE097F /* cef_display_handler_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_display_handler_capi.h; sourceTree = ""; }; + 04DD80941553444800BE097F /* cef_dom_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_dom_capi.h; sourceTree = ""; }; + 04DD80951553444800BE097F /* cef_download_handler_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_download_handler_capi.h; sourceTree = ""; }; + 04DD80961553444800BE097F /* cef_drag_data_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_drag_data_capi.h; sourceTree = ""; }; + 04DD80971553444800BE097F /* cef_drag_handler_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_drag_handler_capi.h; sourceTree = ""; }; + 04DD80981553444800BE097F /* cef_find_handler_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_find_handler_capi.h; sourceTree = ""; }; + 04DD80991553444800BE097F /* cef_focus_handler_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_focus_handler_capi.h; sourceTree = ""; }; + 04DD809A1553444800BE097F /* cef_frame_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_frame_capi.h; sourceTree = ""; }; + 04DD809B1553444800BE097F /* cef_jsdialog_handler_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_jsdialog_handler_capi.h; sourceTree = ""; }; + 04DD809C1553444800BE097F /* cef_keyboard_handler_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_keyboard_handler_capi.h; sourceTree = ""; }; + 04DD809D1553444800BE097F /* cef_life_span_handler_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_life_span_handler_capi.h; sourceTree = ""; }; + 04DD809E1553444800BE097F /* cef_load_handler_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_load_handler_capi.h; sourceTree = ""; }; + 04DD809F1553444800BE097F /* cef_menu_handler_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_menu_handler_capi.h; sourceTree = ""; }; + 04DD80A01553444800BE097F /* cef_nplugin_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_nplugin_capi.h; sourceTree = ""; }; + 04DD80A11553444800BE097F /* cef_origin_whitelist_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_origin_whitelist_capi.h; sourceTree = ""; }; + 04DD80A21553444800BE097F /* cef_permission_handler_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_permission_handler_capi.h; sourceTree = ""; }; + 04DD80A31553444800BE097F /* cef_print_handler_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_print_handler_capi.h; sourceTree = ""; }; + 04DD80A41553444800BE097F /* cef_proxy_handler_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_proxy_handler_capi.h; sourceTree = ""; }; + 04DD80A51553444800BE097F /* cef_render_handler_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_render_handler_capi.h; sourceTree = ""; }; + 04DD80A61553444800BE097F /* cef_request_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_request_capi.h; sourceTree = ""; }; + 04DD80A71553444800BE097F /* cef_request_handler_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_request_handler_capi.h; sourceTree = ""; }; + 04DD80A81553444800BE097F /* cef_resource_bundle_handler_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_resource_bundle_handler_capi.h; sourceTree = ""; }; + 04DD80A91553444800BE097F /* cef_response_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_response_capi.h; sourceTree = ""; }; + 04DD80AA1553444800BE097F /* cef_scheme_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_scheme_capi.h; sourceTree = ""; }; + 04DD80AB1553444800BE097F /* cef_storage_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_storage_capi.h; sourceTree = ""; }; + 04DD80AC1553444800BE097F /* cef_stream_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_stream_capi.h; sourceTree = ""; }; + 04DD80AD1553444800BE097F /* cef_task_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_task_capi.h; sourceTree = ""; }; + 04DD80AE1553444800BE097F /* cef_url_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_url_capi.h; sourceTree = ""; }; + 04DD80AF1553444800BE097F /* cef_v8_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_v8_capi.h; sourceTree = ""; }; + 04DD80B01553444800BE097F /* cef_v8context_handler_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_v8context_handler_capi.h; sourceTree = ""; }; + 04DD80B11553444800BE097F /* cef_web_plugin_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_web_plugin_capi.h; sourceTree = ""; }; + 04DD80B21553444800BE097F /* cef_web_urlrequest_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_web_urlrequest_capi.h; sourceTree = ""; }; + 04DD80B31553444800BE097F /* cef_xml_reader_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_xml_reader_capi.h; sourceTree = ""; }; + 04DD80B41553444800BE097F /* cef_zip_reader_capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_zip_reader_capi.h; sourceTree = ""; }; + 04DD80B51553444800BE097F /* cef_app.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_app.h; sourceTree = ""; }; + 04DD80B61553444800BE097F /* cef_application_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_application_mac.h; sourceTree = ""; }; + 04DD80B71553444800BE097F /* cef_base.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_base.h; sourceTree = ""; }; + 04DD80B81553444800BE097F /* cef_browser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_browser.h; sourceTree = ""; }; + 04DD80B91553444800BE097F /* cef_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_client.h; sourceTree = ""; }; + 04DD80BA1553444800BE097F /* cef_command_line.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_command_line.h; sourceTree = ""; }; + 04DD80BB1553444800BE097F /* cef_content_filter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_content_filter.h; sourceTree = ""; }; + 04DD80BC1553444800BE097F /* cef_cookie.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_cookie.h; sourceTree = ""; }; + 04DD80BD1553444800BE097F /* cef_display_handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_display_handler.h; sourceTree = ""; }; + 04DD80BE1553444800BE097F /* cef_dom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_dom.h; sourceTree = ""; }; + 04DD80BF1553444800BE097F /* cef_download_handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_download_handler.h; sourceTree = ""; }; + 04DD80C01553444800BE097F /* cef_drag_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_drag_data.h; sourceTree = ""; }; + 04DD80C11553444800BE097F /* cef_drag_handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_drag_handler.h; sourceTree = ""; }; + 04DD80C21553444800BE097F /* cef_find_handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_find_handler.h; sourceTree = ""; }; + 04DD80C31553444800BE097F /* cef_focus_handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_focus_handler.h; sourceTree = ""; }; + 04DD80C41553444800BE097F /* cef_frame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_frame.h; sourceTree = ""; }; + 04DD80C51553444800BE097F /* cef_jsdialog_handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_jsdialog_handler.h; sourceTree = ""; }; + 04DD80C61553444800BE097F /* cef_keyboard_handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_keyboard_handler.h; sourceTree = ""; }; + 04DD80C71553444800BE097F /* cef_life_span_handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_life_span_handler.h; sourceTree = ""; }; + 04DD80C81553444800BE097F /* cef_load_handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_load_handler.h; sourceTree = ""; }; + 04DD80C91553444800BE097F /* cef_menu_handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_menu_handler.h; sourceTree = ""; }; + 04DD80CA1553444800BE097F /* cef_nplugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_nplugin.h; sourceTree = ""; }; + 04DD80CB1553444800BE097F /* cef_origin_whitelist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_origin_whitelist.h; sourceTree = ""; }; + 04DD80CC1553444800BE097F /* cef_permission_handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_permission_handler.h; sourceTree = ""; }; + 04DD80CD1553444800BE097F /* cef_print_handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_print_handler.h; sourceTree = ""; }; + 04DD80CE1553444800BE097F /* cef_proxy_handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_proxy_handler.h; sourceTree = ""; }; + 04DD80CF1553444800BE097F /* cef_render_handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_render_handler.h; sourceTree = ""; }; + 04DD80D01553444800BE097F /* cef_request.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_request.h; sourceTree = ""; }; + 04DD80D11553444800BE097F /* cef_request_handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_request_handler.h; sourceTree = ""; }; + 04DD80D21553444800BE097F /* cef_resource_bundle_handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_resource_bundle_handler.h; sourceTree = ""; }; + 04DD80D31553444800BE097F /* cef_response.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_response.h; sourceTree = ""; }; + 04DD80D41553444800BE097F /* cef_runnable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_runnable.h; sourceTree = ""; }; + 04DD80D51553444800BE097F /* cef_scheme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_scheme.h; sourceTree = ""; }; + 04DD80D61553444800BE097F /* cef_storage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_storage.h; sourceTree = ""; }; + 04DD80D71553444800BE097F /* cef_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_stream.h; sourceTree = ""; }; + 04DD80D81553444800BE097F /* cef_task.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_task.h; sourceTree = ""; }; + 04DD80D91553444800BE097F /* cef_url.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_url.h; sourceTree = ""; }; + 04DD80DA1553444800BE097F /* cef_v8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_v8.h; sourceTree = ""; }; + 04DD80DB1553444800BE097F /* cef_v8context_handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_v8context_handler.h; sourceTree = ""; }; + 04DD80DC1553444800BE097F /* cef_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_version.h; sourceTree = ""; }; + 04DD80DD1553444800BE097F /* cef_web_plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_web_plugin.h; sourceTree = ""; }; + 04DD80DE1553444800BE097F /* cef_web_urlrequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_web_urlrequest.h; sourceTree = ""; }; + 04DD80DF1553444800BE097F /* cef_xml_reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_xml_reader.h; sourceTree = ""; }; + 04DD80E01553444800BE097F /* cef_zip_reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_zip_reader.h; sourceTree = ""; }; + 04DD80E21553444800BE097F /* cef_build.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_build.h; sourceTree = ""; }; + 04DD80E31553444800BE097F /* cef_export.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_export.h; sourceTree = ""; }; + 04DD80E41553444800BE097F /* cef_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_mac.h; sourceTree = ""; }; + 04DD80E51553444800BE097F /* cef_nplugin_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_nplugin_types.h; sourceTree = ""; }; + 04DD80E61553444800BE097F /* cef_ptr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_ptr.h; sourceTree = ""; }; + 04DD80E71553444800BE097F /* cef_string.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_string.h; sourceTree = ""; }; + 04DD80E81553444800BE097F /* cef_string_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_string_list.h; sourceTree = ""; }; + 04DD80E91553444800BE097F /* cef_string_map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_string_map.h; sourceTree = ""; }; + 04DD80EA1553444800BE097F /* cef_string_multimap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_string_multimap.h; sourceTree = ""; }; + 04DD80EB1553444800BE097F /* cef_string_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_string_types.h; sourceTree = ""; }; + 04DD80EC1553444800BE097F /* cef_string_wrappers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_string_wrappers.h; sourceTree = ""; }; + 04DD80ED1553444800BE097F /* cef_time.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_time.h; sourceTree = ""; }; + 04DD80EE1553444800BE097F /* cef_tuple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_tuple.h; sourceTree = ""; }; + 04DD80EF1553444800BE097F /* cef_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_types.h; sourceTree = ""; }; + 04DD80F01553444800BE097F /* cef_types_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_types_mac.h; sourceTree = ""; }; + 04DD80F11553444800BE097F /* cef_types_wrappers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_types_wrappers.h; sourceTree = ""; }; + 04DD80F31553444800BE097F /* README-TRANSFER.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "README-TRANSFER.txt"; sourceTree = ""; }; + 04DD80F41553444800BE097F /* basictypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = basictypes.h; sourceTree = ""; }; + 04DD80F51553444800BE097F /* build_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = build_config.h; sourceTree = ""; }; + 04DD80F61553444800BE097F /* npapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = npapi.h; sourceTree = ""; }; + 04DD80F71553444800BE097F /* npapi_extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = npapi_extensions.h; sourceTree = ""; }; + 04DD80F81553444800BE097F /* npfunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = npfunctions.h; sourceTree = ""; }; + 04DD80F91553444800BE097F /* nphostapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nphostapi.h; sourceTree = ""; }; + 04DD80FA1553444800BE097F /* npruntime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = npruntime.h; sourceTree = ""; }; + 04DD80FB1553444800BE097F /* nptypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nptypes.h; sourceTree = ""; }; + 04DD80FC1553444800BE097F /* port.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = port.h; sourceTree = ""; }; + 04DD80FE1553444800BE097F /* cef_byte_read_handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_byte_read_handler.h; sourceTree = ""; }; + 04DD80FF1553444800BE097F /* cef_xml_object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_xml_object.h; sourceTree = ""; }; + 04DD81001553444800BE097F /* cef_zip_archive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_zip_archive.h; sourceTree = ""; }; + 04DD81031553445100BE097F /* cef_logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cef_logging.h; sourceTree = ""; }; + 04DD81051553445100BE097F /* app_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = app_cpptoc.cc; sourceTree = ""; }; + 04DD81061553445100BE097F /* app_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = app_cpptoc.h; sourceTree = ""; }; + 04DD81071553445100BE097F /* base_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = base_cpptoc.h; sourceTree = ""; }; + 04DD81081553445100BE097F /* client_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = client_cpptoc.cc; sourceTree = ""; }; + 04DD81091553445100BE097F /* client_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = client_cpptoc.h; sourceTree = ""; }; + 04DD810A1553445100BE097F /* content_filter_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = content_filter_cpptoc.cc; sourceTree = ""; }; + 04DD810B1553445100BE097F /* content_filter_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = content_filter_cpptoc.h; sourceTree = ""; }; + 04DD810C1553445100BE097F /* cookie_visitor_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cookie_visitor_cpptoc.cc; sourceTree = ""; }; + 04DD810D1553445100BE097F /* cookie_visitor_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cookie_visitor_cpptoc.h; sourceTree = ""; }; + 04DD810E1553445100BE097F /* cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpptoc.h; sourceTree = ""; }; + 04DD810F1553445100BE097F /* display_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = display_handler_cpptoc.cc; sourceTree = ""; }; + 04DD81101553445100BE097F /* display_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = display_handler_cpptoc.h; sourceTree = ""; }; + 04DD81111553445100BE097F /* domevent_listener_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = domevent_listener_cpptoc.cc; sourceTree = ""; }; + 04DD81121553445100BE097F /* domevent_listener_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = domevent_listener_cpptoc.h; sourceTree = ""; }; + 04DD81131553445100BE097F /* domvisitor_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = domvisitor_cpptoc.cc; sourceTree = ""; }; + 04DD81141553445100BE097F /* domvisitor_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = domvisitor_cpptoc.h; sourceTree = ""; }; + 04DD81151553445100BE097F /* download_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = download_handler_cpptoc.cc; sourceTree = ""; }; + 04DD81161553445100BE097F /* download_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = download_handler_cpptoc.h; sourceTree = ""; }; + 04DD81171553445100BE097F /* drag_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drag_handler_cpptoc.cc; sourceTree = ""; }; + 04DD81181553445100BE097F /* drag_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = drag_handler_cpptoc.h; sourceTree = ""; }; + 04DD81191553445100BE097F /* find_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = find_handler_cpptoc.cc; sourceTree = ""; }; + 04DD811A1553445100BE097F /* find_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = find_handler_cpptoc.h; sourceTree = ""; }; + 04DD811B1553445100BE097F /* focus_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = focus_handler_cpptoc.cc; sourceTree = ""; }; + 04DD811C1553445100BE097F /* focus_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = focus_handler_cpptoc.h; sourceTree = ""; }; + 04DD811D1553445100BE097F /* jsdialog_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jsdialog_handler_cpptoc.cc; sourceTree = ""; }; + 04DD811E1553445100BE097F /* jsdialog_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jsdialog_handler_cpptoc.h; sourceTree = ""; }; + 04DD811F1553445100BE097F /* keyboard_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = keyboard_handler_cpptoc.cc; sourceTree = ""; }; + 04DD81201553445100BE097F /* keyboard_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keyboard_handler_cpptoc.h; sourceTree = ""; }; + 04DD81211553445100BE097F /* life_span_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = life_span_handler_cpptoc.cc; sourceTree = ""; }; + 04DD81221553445100BE097F /* life_span_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = life_span_handler_cpptoc.h; sourceTree = ""; }; + 04DD81231553445100BE097F /* load_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = load_handler_cpptoc.cc; sourceTree = ""; }; + 04DD81241553445100BE097F /* load_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = load_handler_cpptoc.h; sourceTree = ""; }; + 04DD81251553445100BE097F /* menu_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = menu_handler_cpptoc.cc; sourceTree = ""; }; + 04DD81261553445100BE097F /* menu_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = menu_handler_cpptoc.h; sourceTree = ""; }; + 04DD81271553445100BE097F /* permission_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = permission_handler_cpptoc.cc; sourceTree = ""; }; + 04DD81281553445100BE097F /* permission_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = permission_handler_cpptoc.h; sourceTree = ""; }; + 04DD81291553445100BE097F /* print_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = print_handler_cpptoc.cc; sourceTree = ""; }; + 04DD812A1553445100BE097F /* print_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = print_handler_cpptoc.h; sourceTree = ""; }; + 04DD812B1553445100BE097F /* proxy_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = proxy_handler_cpptoc.cc; sourceTree = ""; }; + 04DD812C1553445100BE097F /* proxy_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = proxy_handler_cpptoc.h; sourceTree = ""; }; + 04DD812D1553445100BE097F /* read_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = read_handler_cpptoc.cc; sourceTree = ""; }; + 04DD812E1553445100BE097F /* read_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = read_handler_cpptoc.h; sourceTree = ""; }; + 04DD812F1553445100BE097F /* render_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = render_handler_cpptoc.cc; sourceTree = ""; }; + 04DD81301553445100BE097F /* render_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = render_handler_cpptoc.h; sourceTree = ""; }; + 04DD81311553445100BE097F /* request_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = request_handler_cpptoc.cc; sourceTree = ""; }; + 04DD81321553445100BE097F /* request_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = request_handler_cpptoc.h; sourceTree = ""; }; + 04DD81331553445100BE097F /* resource_bundle_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_bundle_handler_cpptoc.cc; sourceTree = ""; }; + 04DD81341553445100BE097F /* resource_bundle_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource_bundle_handler_cpptoc.h; sourceTree = ""; }; + 04DD81351553445100BE097F /* scheme_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scheme_handler_cpptoc.cc; sourceTree = ""; }; + 04DD81361553445100BE097F /* scheme_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scheme_handler_cpptoc.h; sourceTree = ""; }; + 04DD81371553445100BE097F /* scheme_handler_factory_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scheme_handler_factory_cpptoc.cc; sourceTree = ""; }; + 04DD81381553445100BE097F /* scheme_handler_factory_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scheme_handler_factory_cpptoc.h; sourceTree = ""; }; + 04DD81391553445100BE097F /* storage_visitor_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_visitor_cpptoc.cc; sourceTree = ""; }; + 04DD813A1553445100BE097F /* storage_visitor_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = storage_visitor_cpptoc.h; sourceTree = ""; }; + 04DD813B1553445100BE097F /* task_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = task_cpptoc.cc; sourceTree = ""; }; + 04DD813C1553445100BE097F /* task_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = task_cpptoc.h; sourceTree = ""; }; + 04DD813D1553445100BE097F /* v8accessor_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = v8accessor_cpptoc.cc; sourceTree = ""; }; + 04DD813E1553445100BE097F /* v8accessor_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = v8accessor_cpptoc.h; sourceTree = ""; }; + 04DD813F1553445100BE097F /* v8context_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = v8context_handler_cpptoc.cc; sourceTree = ""; }; + 04DD81401553445100BE097F /* v8context_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = v8context_handler_cpptoc.h; sourceTree = ""; }; + 04DD81411553445100BE097F /* v8handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = v8handler_cpptoc.cc; sourceTree = ""; }; + 04DD81421553445100BE097F /* v8handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = v8handler_cpptoc.h; sourceTree = ""; }; + 04DD81431553445100BE097F /* web_urlrequest_client_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = web_urlrequest_client_cpptoc.cc; sourceTree = ""; }; + 04DD81441553445100BE097F /* web_urlrequest_client_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = web_urlrequest_client_cpptoc.h; sourceTree = ""; }; + 04DD81451553445100BE097F /* write_handler_cpptoc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = write_handler_cpptoc.cc; sourceTree = ""; }; + 04DD81461553445100BE097F /* write_handler_cpptoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = write_handler_cpptoc.h; sourceTree = ""; }; + 04DD81481553445100BE097F /* base_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = base_ctocpp.h; sourceTree = ""; }; + 04DD81491553445100BE097F /* browser_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = browser_ctocpp.cc; sourceTree = ""; }; + 04DD814A1553445100BE097F /* browser_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = browser_ctocpp.h; sourceTree = ""; }; + 04DD814B1553445100BE097F /* command_line_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = command_line_ctocpp.cc; sourceTree = ""; }; + 04DD814C1553445100BE097F /* command_line_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = command_line_ctocpp.h; sourceTree = ""; }; + 04DD814D1553445100BE097F /* cookie_manager_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cookie_manager_ctocpp.cc; sourceTree = ""; }; + 04DD814E1553445100BE097F /* cookie_manager_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cookie_manager_ctocpp.h; sourceTree = ""; }; + 04DD814F1553445100BE097F /* ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ctocpp.h; sourceTree = ""; }; + 04DD81501553445100BE097F /* domdocument_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = domdocument_ctocpp.cc; sourceTree = ""; }; + 04DD81511553445100BE097F /* domdocument_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = domdocument_ctocpp.h; sourceTree = ""; }; + 04DD81521553445100BE097F /* domevent_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = domevent_ctocpp.cc; sourceTree = ""; }; + 04DD81531553445100BE097F /* domevent_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = domevent_ctocpp.h; sourceTree = ""; }; + 04DD81541553445100BE097F /* domnode_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = domnode_ctocpp.cc; sourceTree = ""; }; + 04DD81551553445100BE097F /* domnode_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = domnode_ctocpp.h; sourceTree = ""; }; + 04DD81561553445100BE097F /* drag_data_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drag_data_ctocpp.cc; sourceTree = ""; }; + 04DD81571553445100BE097F /* drag_data_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = drag_data_ctocpp.h; sourceTree = ""; }; + 04DD81581553445100BE097F /* frame_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = frame_ctocpp.cc; sourceTree = ""; }; + 04DD81591553445100BE097F /* frame_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = frame_ctocpp.h; sourceTree = ""; }; + 04DD815A1553445100BE097F /* post_data_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = post_data_ctocpp.cc; sourceTree = ""; }; + 04DD815B1553445100BE097F /* post_data_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = post_data_ctocpp.h; sourceTree = ""; }; + 04DD815C1553445100BE097F /* post_data_element_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = post_data_element_ctocpp.cc; sourceTree = ""; }; + 04DD815D1553445100BE097F /* post_data_element_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = post_data_element_ctocpp.h; sourceTree = ""; }; + 04DD815E1553445100BE097F /* request_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = request_ctocpp.cc; sourceTree = ""; }; + 04DD815F1553445100BE097F /* request_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = request_ctocpp.h; sourceTree = ""; }; + 04DD81601553445100BE097F /* response_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = response_ctocpp.cc; sourceTree = ""; }; + 04DD81611553445100BE097F /* response_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = response_ctocpp.h; sourceTree = ""; }; + 04DD81621553445100BE097F /* scheme_handler_callback_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scheme_handler_callback_ctocpp.cc; sourceTree = ""; }; + 04DD81631553445100BE097F /* scheme_handler_callback_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scheme_handler_callback_ctocpp.h; sourceTree = ""; }; + 04DD81641553445100BE097F /* stream_reader_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stream_reader_ctocpp.cc; sourceTree = ""; }; + 04DD81651553445100BE097F /* stream_reader_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stream_reader_ctocpp.h; sourceTree = ""; }; + 04DD81661553445100BE097F /* stream_writer_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stream_writer_ctocpp.cc; sourceTree = ""; }; + 04DD81671553445100BE097F /* stream_writer_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stream_writer_ctocpp.h; sourceTree = ""; }; + 04DD81681553445100BE097F /* v8context_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = v8context_ctocpp.cc; sourceTree = ""; }; + 04DD81691553445100BE097F /* v8context_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = v8context_ctocpp.h; sourceTree = ""; }; + 04DD816A1553445100BE097F /* v8exception_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = v8exception_ctocpp.cc; sourceTree = ""; }; + 04DD816B1553445100BE097F /* v8exception_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = v8exception_ctocpp.h; sourceTree = ""; }; + 04DD816C1553445100BE097F /* v8value_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = v8value_ctocpp.cc; sourceTree = ""; }; + 04DD816D1553445100BE097F /* v8value_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = v8value_ctocpp.h; sourceTree = ""; }; + 04DD816E1553445100BE097F /* web_plugin_info_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = web_plugin_info_ctocpp.cc; sourceTree = ""; }; + 04DD816F1553445100BE097F /* web_plugin_info_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = web_plugin_info_ctocpp.h; sourceTree = ""; }; + 04DD81701553445100BE097F /* web_urlrequest_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = web_urlrequest_ctocpp.cc; sourceTree = ""; }; + 04DD81711553445100BE097F /* web_urlrequest_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = web_urlrequest_ctocpp.h; sourceTree = ""; }; + 04DD81721553445100BE097F /* xml_reader_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xml_reader_ctocpp.cc; sourceTree = ""; }; + 04DD81731553445100BE097F /* xml_reader_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xml_reader_ctocpp.h; sourceTree = ""; }; + 04DD81741553445100BE097F /* zip_reader_ctocpp.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zip_reader_ctocpp.cc; sourceTree = ""; }; + 04DD81751553445100BE097F /* zip_reader_ctocpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zip_reader_ctocpp.h; sourceTree = ""; }; + 04DD81761553445100BE097F /* transfer_util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transfer_util.cpp; sourceTree = ""; }; + 04DD81771553445100BE097F /* transfer_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = transfer_util.h; sourceTree = ""; }; + 04DD81791553445100BE097F /* cef_byte_read_handler.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cef_byte_read_handler.cc; sourceTree = ""; }; + 04DD817A1553445100BE097F /* cef_xml_object.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cef_xml_object.cc; sourceTree = ""; }; + 04DD817B1553445100BE097F /* cef_zip_archive.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cef_zip_archive.cc; sourceTree = ""; }; + 04DD817C1553445100BE097F /* libcef_dll_wrapper.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = libcef_dll_wrapper.cc; sourceTree = ""; }; + 04DD817D1553445100BE097F /* libcef_dll_wrapper2.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = libcef_dll_wrapper2.cc; sourceTree = ""; }; 04E1DDDC152A0941001A9D07 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = frameworks/Sparkle.framework; sourceTree = ""; }; /* End PBXFileReference section */ @@ -330,8 +423,8 @@ 042180E71500266500DF25EA /* cef */ = { isa = PBXGroup; children = ( - 0487D0B214FEE6D60045E5E3 /* libcef_wrapper */, - 0487CF3514FEE5C40045E5E3 /* include */, + 04DD81021553445100BE097F /* libcef_dll */, + 04DD808A1553444800BE097F /* include */, ); name = cef; path = Atom; @@ -418,204 +511,308 @@ path = src; sourceTree = ""; }; - 0487CF3514FEE5C40045E5E3 /* include */ = { + 04DD808A1553444800BE097F /* include */ = { isa = PBXGroup; children = ( - 0487CF3614FEE5C40045E5E3 /* cef.h */, - 0487CF3714FEE5C40045E5E3 /* cef_application_mac.h */, - 0487CF3814FEE5C40045E5E3 /* cef_capi.h */, - 0487CF3914FEE5C40045E5E3 /* cef_nplugin.h */, - 0487CF3A14FEE5C40045E5E3 /* cef_nplugin_capi.h */, - 0487CF3B14FEE5C40045E5E3 /* cef_runnable.h */, - 0487CF3C14FEE5C40045E5E3 /* cef_version.h */, - 0487CF3D14FEE5C40045E5E3 /* cef_wrapper.h */, - 0487CF3E14FEE5C40045E5E3 /* internal */, + 04DD808B1553444800BE097F /* capi */, + 04DD80B51553444800BE097F /* cef_app.h */, + 04DD80B61553444800BE097F /* cef_application_mac.h */, + 04DD80B71553444800BE097F /* cef_base.h */, + 04DD80B81553444800BE097F /* cef_browser.h */, + 04DD80B91553444800BE097F /* cef_client.h */, + 04DD80BA1553444800BE097F /* cef_command_line.h */, + 04DD80BB1553444800BE097F /* cef_content_filter.h */, + 04DD80BC1553444800BE097F /* cef_cookie.h */, + 04DD80BD1553444800BE097F /* cef_display_handler.h */, + 04DD80BE1553444800BE097F /* cef_dom.h */, + 04DD80BF1553444800BE097F /* cef_download_handler.h */, + 04DD80C01553444800BE097F /* cef_drag_data.h */, + 04DD80C11553444800BE097F /* cef_drag_handler.h */, + 04DD80C21553444800BE097F /* cef_find_handler.h */, + 04DD80C31553444800BE097F /* cef_focus_handler.h */, + 04DD80C41553444800BE097F /* cef_frame.h */, + 04DD80C51553444800BE097F /* cef_jsdialog_handler.h */, + 04DD80C61553444800BE097F /* cef_keyboard_handler.h */, + 04DD80C71553444800BE097F /* cef_life_span_handler.h */, + 04DD80C81553444800BE097F /* cef_load_handler.h */, + 04DD80C91553444800BE097F /* cef_menu_handler.h */, + 04DD80CA1553444800BE097F /* cef_nplugin.h */, + 04DD80CB1553444800BE097F /* cef_origin_whitelist.h */, + 04DD80CC1553444800BE097F /* cef_permission_handler.h */, + 04DD80CD1553444800BE097F /* cef_print_handler.h */, + 04DD80CE1553444800BE097F /* cef_proxy_handler.h */, + 04DD80CF1553444800BE097F /* cef_render_handler.h */, + 04DD80D01553444800BE097F /* cef_request.h */, + 04DD80D11553444800BE097F /* cef_request_handler.h */, + 04DD80D21553444800BE097F /* cef_resource_bundle_handler.h */, + 04DD80D31553444800BE097F /* cef_response.h */, + 04DD80D41553444800BE097F /* cef_runnable.h */, + 04DD80D51553444800BE097F /* cef_scheme.h */, + 04DD80D61553444800BE097F /* cef_storage.h */, + 04DD80D71553444800BE097F /* cef_stream.h */, + 04DD80D81553444800BE097F /* cef_task.h */, + 04DD80D91553444800BE097F /* cef_url.h */, + 04DD80DA1553444800BE097F /* cef_v8.h */, + 04DD80DB1553444800BE097F /* cef_v8context_handler.h */, + 04DD80DC1553444800BE097F /* cef_version.h */, + 04DD80DD1553444800BE097F /* cef_web_plugin.h */, + 04DD80DE1553444800BE097F /* cef_web_urlrequest.h */, + 04DD80DF1553444800BE097F /* cef_xml_reader.h */, + 04DD80E01553444800BE097F /* cef_zip_reader.h */, + 04DD80E11553444800BE097F /* internal */, + 04DD80FD1553444800BE097F /* wrapper */, ); name = include; - path = ../cef/include; - sourceTree = ""; + path = cef/include; + sourceTree = SOURCE_ROOT; }; - 0487CF3E14FEE5C40045E5E3 /* internal */ = { + 04DD808B1553444800BE097F /* capi */ = { isa = PBXGroup; children = ( - 0487CF3F14FEE5C40045E5E3 /* cef_build.h */, - 0487CF4014FEE5C40045E5E3 /* cef_export.h */, - 0487CF4114FEE5C40045E5E3 /* cef_mac.h */, - 0487CF4214FEE5C40045E5E3 /* cef_nplugin_types.h */, - 0487CF4314FEE5C40045E5E3 /* cef_ptr.h */, - 0487CF4414FEE5C40045E5E3 /* cef_string.h */, - 0487CF4514FEE5C40045E5E3 /* cef_string_list.h */, - 0487CF4614FEE5C40045E5E3 /* cef_string_map.h */, - 0487CF4714FEE5C40045E5E3 /* cef_string_multimap.h */, - 0487CF4814FEE5C40045E5E3 /* cef_string_types.h */, - 0487CF4914FEE5C40045E5E3 /* cef_string_wrappers.h */, - 0487CF4A14FEE5C40045E5E3 /* cef_time.h */, - 0487CF4B14FEE5C40045E5E3 /* cef_tuple.h */, - 0487CF4C14FEE5C40045E5E3 /* cef_types.h */, - 0487CF4D14FEE5C40045E5E3 /* cef_types_mac.h */, - 0487CF4E14FEE5C40045E5E3 /* cef_types_wrappers.h */, - 0487CF4F14FEE5C40045E5E3 /* npapi */, + 04DD808C1553444800BE097F /* cef_app_capi.h */, + 04DD808D1553444800BE097F /* cef_base_capi.h */, + 04DD808E1553444800BE097F /* cef_browser_capi.h */, + 04DD808F1553444800BE097F /* cef_client_capi.h */, + 04DD80901553444800BE097F /* cef_command_line_capi.h */, + 04DD80911553444800BE097F /* cef_content_filter_capi.h */, + 04DD80921553444800BE097F /* cef_cookie_capi.h */, + 04DD80931553444800BE097F /* cef_display_handler_capi.h */, + 04DD80941553444800BE097F /* cef_dom_capi.h */, + 04DD80951553444800BE097F /* cef_download_handler_capi.h */, + 04DD80961553444800BE097F /* cef_drag_data_capi.h */, + 04DD80971553444800BE097F /* cef_drag_handler_capi.h */, + 04DD80981553444800BE097F /* cef_find_handler_capi.h */, + 04DD80991553444800BE097F /* cef_focus_handler_capi.h */, + 04DD809A1553444800BE097F /* cef_frame_capi.h */, + 04DD809B1553444800BE097F /* cef_jsdialog_handler_capi.h */, + 04DD809C1553444800BE097F /* cef_keyboard_handler_capi.h */, + 04DD809D1553444800BE097F /* cef_life_span_handler_capi.h */, + 04DD809E1553444800BE097F /* cef_load_handler_capi.h */, + 04DD809F1553444800BE097F /* cef_menu_handler_capi.h */, + 04DD80A01553444800BE097F /* cef_nplugin_capi.h */, + 04DD80A11553444800BE097F /* cef_origin_whitelist_capi.h */, + 04DD80A21553444800BE097F /* cef_permission_handler_capi.h */, + 04DD80A31553444800BE097F /* cef_print_handler_capi.h */, + 04DD80A41553444800BE097F /* cef_proxy_handler_capi.h */, + 04DD80A51553444800BE097F /* cef_render_handler_capi.h */, + 04DD80A61553444800BE097F /* cef_request_capi.h */, + 04DD80A71553444800BE097F /* cef_request_handler_capi.h */, + 04DD80A81553444800BE097F /* cef_resource_bundle_handler_capi.h */, + 04DD80A91553444800BE097F /* cef_response_capi.h */, + 04DD80AA1553444800BE097F /* cef_scheme_capi.h */, + 04DD80AB1553444800BE097F /* cef_storage_capi.h */, + 04DD80AC1553444800BE097F /* cef_stream_capi.h */, + 04DD80AD1553444800BE097F /* cef_task_capi.h */, + 04DD80AE1553444800BE097F /* cef_url_capi.h */, + 04DD80AF1553444800BE097F /* cef_v8_capi.h */, + 04DD80B01553444800BE097F /* cef_v8context_handler_capi.h */, + 04DD80B11553444800BE097F /* cef_web_plugin_capi.h */, + 04DD80B21553444800BE097F /* cef_web_urlrequest_capi.h */, + 04DD80B31553444800BE097F /* cef_xml_reader_capi.h */, + 04DD80B41553444800BE097F /* cef_zip_reader_capi.h */, + ); + path = capi; + sourceTree = ""; + }; + 04DD80E11553444800BE097F /* internal */ = { + isa = PBXGroup; + children = ( + 04DD80E21553444800BE097F /* cef_build.h */, + 04DD80E31553444800BE097F /* cef_export.h */, + 04DD80E41553444800BE097F /* cef_mac.h */, + 04DD80E51553444800BE097F /* cef_nplugin_types.h */, + 04DD80E61553444800BE097F /* cef_ptr.h */, + 04DD80E71553444800BE097F /* cef_string.h */, + 04DD80E81553444800BE097F /* cef_string_list.h */, + 04DD80E91553444800BE097F /* cef_string_map.h */, + 04DD80EA1553444800BE097F /* cef_string_multimap.h */, + 04DD80EB1553444800BE097F /* cef_string_types.h */, + 04DD80EC1553444800BE097F /* cef_string_wrappers.h */, + 04DD80ED1553444800BE097F /* cef_time.h */, + 04DD80EE1553444800BE097F /* cef_tuple.h */, + 04DD80EF1553444800BE097F /* cef_types.h */, + 04DD80F01553444800BE097F /* cef_types_mac.h */, + 04DD80F11553444800BE097F /* cef_types_wrappers.h */, + 04DD80F21553444800BE097F /* npapi */, ); path = internal; sourceTree = ""; }; - 0487CF4F14FEE5C40045E5E3 /* npapi */ = { + 04DD80F21553444800BE097F /* npapi */ = { isa = PBXGroup; children = ( - 0487CF5014FEE5C40045E5E3 /* basictypes.h */, - 0487CF5114FEE5C40045E5E3 /* build_config.h */, - 0487CF5214FEE5C40045E5E3 /* npapi.h */, - 0487CF5314FEE5C40045E5E3 /* npapi_extensions.h */, - 0487CF5414FEE5C40045E5E3 /* npfunctions.h */, - 0487CF5514FEE5C40045E5E3 /* nphostapi.h */, - 0487CF5614FEE5C40045E5E3 /* npruntime.h */, - 0487CF5714FEE5C40045E5E3 /* nptypes.h */, - 0487CF5814FEE5C40045E5E3 /* port.h */, - 0487CF5914FEE5C40045E5E3 /* README-TRANSFER.txt */, + 04DD80F31553444800BE097F /* README-TRANSFER.txt */, + 04DD80F41553444800BE097F /* basictypes.h */, + 04DD80F51553444800BE097F /* build_config.h */, + 04DD80F61553444800BE097F /* npapi.h */, + 04DD80F71553444800BE097F /* npapi_extensions.h */, + 04DD80F81553444800BE097F /* npfunctions.h */, + 04DD80F91553444800BE097F /* nphostapi.h */, + 04DD80FA1553444800BE097F /* npruntime.h */, + 04DD80FB1553444800BE097F /* nptypes.h */, + 04DD80FC1553444800BE097F /* port.h */, ); path = npapi; sourceTree = ""; }; - 0487D0B214FEE6D60045E5E3 /* libcef_wrapper */ = { + 04DD80FD1553444800BE097F /* wrapper */ = { isa = PBXGroup; children = ( - 0487D0B314FEE6D60045E5E3 /* cef_logging.h */, - 0487D0B414FEE6D60045E5E3 /* cpptoc */, - 0487D0F314FEE6D60045E5E3 /* ctocpp */, - 0487D11E14FEE6D60045E5E3 /* transfer_util.cpp */, - 0487D11F14FEE6D60045E5E3 /* transfer_util.h */, - 0487D12014FEE6D60045E5E3 /* wrapper */, + 04DD80FE1553444800BE097F /* cef_byte_read_handler.h */, + 04DD80FF1553444800BE097F /* cef_xml_object.h */, + 04DD81001553444800BE097F /* cef_zip_archive.h */, ); - name = libcef_wrapper; - path = ../cef/libcef_dll; + path = wrapper; sourceTree = ""; }; - 0487D0B414FEE6D60045E5E3 /* cpptoc */ = { + 04DD81021553445100BE097F /* libcef_dll */ = { isa = PBXGroup; children = ( - 0487D0B514FEE6D60045E5E3 /* app_cpptoc.cc */, - 0487D0B614FEE6D60045E5E3 /* app_cpptoc.h */, - 0487D0B714FEE6D60045E5E3 /* base_cpptoc.h */, - 0487D0B814FEE6D60045E5E3 /* client_cpptoc.cc */, - 0487D0B914FEE6D60045E5E3 /* client_cpptoc.h */, - 0487D0BA14FEE6D60045E5E3 /* content_filter_cpptoc.cc */, - 0487D0BB14FEE6D60045E5E3 /* content_filter_cpptoc.h */, - 0487D0BC14FEE6D60045E5E3 /* cookie_visitor_cpptoc.cc */, - 0487D0BD14FEE6D60045E5E3 /* cookie_visitor_cpptoc.h */, - 0487D0BE14FEE6D60045E5E3 /* cpptoc.h */, - 0487D0BF14FEE6D60045E5E3 /* display_handler_cpptoc.cc */, - 0487D0C014FEE6D60045E5E3 /* display_handler_cpptoc.h */, - 0487D0C114FEE6D60045E5E3 /* domevent_listener_cpptoc.cc */, - 0487D0C214FEE6D60045E5E3 /* domevent_listener_cpptoc.h */, - 0487D0C314FEE6D60045E5E3 /* domvisitor_cpptoc.cc */, - 0487D0C414FEE6D60045E5E3 /* domvisitor_cpptoc.h */, - 0487D0C514FEE6D60045E5E3 /* download_handler_cpptoc.cc */, - 0487D0C614FEE6D60045E5E3 /* download_handler_cpptoc.h */, - 0487D0C714FEE6D60045E5E3 /* drag_handler_cpptoc.cc */, - 0487D0C814FEE6D60045E5E3 /* drag_handler_cpptoc.h */, - 0487D0C914FEE6D60045E5E3 /* find_handler_cpptoc.cc */, - 0487D0CA14FEE6D60045E5E3 /* find_handler_cpptoc.h */, - 0487D0CB14FEE6D60045E5E3 /* focus_handler_cpptoc.cc */, - 0487D0CC14FEE6D60045E5E3 /* focus_handler_cpptoc.h */, - 0487D0CD14FEE6D60045E5E3 /* jsdialog_handler_cpptoc.cc */, - 0487D0CE14FEE6D60045E5E3 /* jsdialog_handler_cpptoc.h */, - 0487D0CF14FEE6D60045E5E3 /* keyboard_handler_cpptoc.cc */, - 0487D0D014FEE6D60045E5E3 /* keyboard_handler_cpptoc.h */, - 0487D0D114FEE6D60045E5E3 /* life_span_handler_cpptoc.cc */, - 0487D0D214FEE6D60045E5E3 /* life_span_handler_cpptoc.h */, - 0487D0D314FEE6D60045E5E3 /* load_handler_cpptoc.cc */, - 0487D0D414FEE6D60045E5E3 /* load_handler_cpptoc.h */, - 0487D0D514FEE6D60045E5E3 /* menu_handler_cpptoc.cc */, - 0487D0D614FEE6D60045E5E3 /* menu_handler_cpptoc.h */, - 0487D0D714FEE6D60045E5E3 /* print_handler_cpptoc.cc */, - 0487D0D814FEE6D60045E5E3 /* print_handler_cpptoc.h */, - 0487D0D914FEE6D60045E5E3 /* proxy_handler_cpptoc.cc */, - 0487D0DA14FEE6D60045E5E3 /* proxy_handler_cpptoc.h */, - 0487D0DB14FEE6D60045E5E3 /* read_handler_cpptoc.cc */, - 0487D0DC14FEE6D60045E5E3 /* read_handler_cpptoc.h */, - 0487D0DD14FEE6D60045E5E3 /* render_handler_cpptoc.cc */, - 0487D0DE14FEE6D60045E5E3 /* render_handler_cpptoc.h */, - 0487D0DF14FEE6D60045E5E3 /* request_handler_cpptoc.cc */, - 0487D0E014FEE6D60045E5E3 /* request_handler_cpptoc.h */, - 0487D0E114FEE6D60045E5E3 /* scheme_handler_cpptoc.cc */, - 0487D0E214FEE6D60045E5E3 /* scheme_handler_cpptoc.h */, - 0487D0E314FEE6D60045E5E3 /* scheme_handler_factory_cpptoc.cc */, - 0487D0E414FEE6D60045E5E3 /* scheme_handler_factory_cpptoc.h */, - 0487D0E514FEE6D60045E5E3 /* storage_visitor_cpptoc.cc */, - 0487D0E614FEE6D60045E5E3 /* storage_visitor_cpptoc.h */, - 0487D0E714FEE6D60045E5E3 /* task_cpptoc.cc */, - 0487D0E814FEE6D60045E5E3 /* task_cpptoc.h */, - 0487D0E914FEE6D60045E5E3 /* v8accessor_cpptoc.cc */, - 0487D0EA14FEE6D60045E5E3 /* v8accessor_cpptoc.h */, - 0487D0EB14FEE6D60045E5E3 /* v8context_handler_cpptoc.cc */, - 0487D0EC14FEE6D60045E5E3 /* v8context_handler_cpptoc.h */, - 0487D0ED14FEE6D60045E5E3 /* v8handler_cpptoc.cc */, - 0487D0EE14FEE6D60045E5E3 /* v8handler_cpptoc.h */, - 0487D0EF14FEE6D60045E5E3 /* web_urlrequest_client_cpptoc.cc */, - 0487D0F014FEE6D60045E5E3 /* web_urlrequest_client_cpptoc.h */, - 0487D0F114FEE6D60045E5E3 /* write_handler_cpptoc.cc */, - 0487D0F214FEE6D60045E5E3 /* write_handler_cpptoc.h */, + 04DD81031553445100BE097F /* cef_logging.h */, + 04DD81041553445100BE097F /* cpptoc */, + 04DD81471553445100BE097F /* ctocpp */, + 04DD81761553445100BE097F /* transfer_util.cpp */, + 04DD81771553445100BE097F /* transfer_util.h */, + 04DD81781553445100BE097F /* wrapper */, + ); + name = libcef_dll; + path = cef/libcef_dll; + sourceTree = SOURCE_ROOT; + }; + 04DD81041553445100BE097F /* cpptoc */ = { + isa = PBXGroup; + children = ( + 04DD81051553445100BE097F /* app_cpptoc.cc */, + 04DD81061553445100BE097F /* app_cpptoc.h */, + 04DD81071553445100BE097F /* base_cpptoc.h */, + 04DD81081553445100BE097F /* client_cpptoc.cc */, + 04DD81091553445100BE097F /* client_cpptoc.h */, + 04DD810A1553445100BE097F /* content_filter_cpptoc.cc */, + 04DD810B1553445100BE097F /* content_filter_cpptoc.h */, + 04DD810C1553445100BE097F /* cookie_visitor_cpptoc.cc */, + 04DD810D1553445100BE097F /* cookie_visitor_cpptoc.h */, + 04DD810E1553445100BE097F /* cpptoc.h */, + 04DD810F1553445100BE097F /* display_handler_cpptoc.cc */, + 04DD81101553445100BE097F /* display_handler_cpptoc.h */, + 04DD81111553445100BE097F /* domevent_listener_cpptoc.cc */, + 04DD81121553445100BE097F /* domevent_listener_cpptoc.h */, + 04DD81131553445100BE097F /* domvisitor_cpptoc.cc */, + 04DD81141553445100BE097F /* domvisitor_cpptoc.h */, + 04DD81151553445100BE097F /* download_handler_cpptoc.cc */, + 04DD81161553445100BE097F /* download_handler_cpptoc.h */, + 04DD81171553445100BE097F /* drag_handler_cpptoc.cc */, + 04DD81181553445100BE097F /* drag_handler_cpptoc.h */, + 04DD81191553445100BE097F /* find_handler_cpptoc.cc */, + 04DD811A1553445100BE097F /* find_handler_cpptoc.h */, + 04DD811B1553445100BE097F /* focus_handler_cpptoc.cc */, + 04DD811C1553445100BE097F /* focus_handler_cpptoc.h */, + 04DD811D1553445100BE097F /* jsdialog_handler_cpptoc.cc */, + 04DD811E1553445100BE097F /* jsdialog_handler_cpptoc.h */, + 04DD811F1553445100BE097F /* keyboard_handler_cpptoc.cc */, + 04DD81201553445100BE097F /* keyboard_handler_cpptoc.h */, + 04DD81211553445100BE097F /* life_span_handler_cpptoc.cc */, + 04DD81221553445100BE097F /* life_span_handler_cpptoc.h */, + 04DD81231553445100BE097F /* load_handler_cpptoc.cc */, + 04DD81241553445100BE097F /* load_handler_cpptoc.h */, + 04DD81251553445100BE097F /* menu_handler_cpptoc.cc */, + 04DD81261553445100BE097F /* menu_handler_cpptoc.h */, + 04DD81271553445100BE097F /* permission_handler_cpptoc.cc */, + 04DD81281553445100BE097F /* permission_handler_cpptoc.h */, + 04DD81291553445100BE097F /* print_handler_cpptoc.cc */, + 04DD812A1553445100BE097F /* print_handler_cpptoc.h */, + 04DD812B1553445100BE097F /* proxy_handler_cpptoc.cc */, + 04DD812C1553445100BE097F /* proxy_handler_cpptoc.h */, + 04DD812D1553445100BE097F /* read_handler_cpptoc.cc */, + 04DD812E1553445100BE097F /* read_handler_cpptoc.h */, + 04DD812F1553445100BE097F /* render_handler_cpptoc.cc */, + 04DD81301553445100BE097F /* render_handler_cpptoc.h */, + 04DD81311553445100BE097F /* request_handler_cpptoc.cc */, + 04DD81321553445100BE097F /* request_handler_cpptoc.h */, + 04DD81331553445100BE097F /* resource_bundle_handler_cpptoc.cc */, + 04DD81341553445100BE097F /* resource_bundle_handler_cpptoc.h */, + 04DD81351553445100BE097F /* scheme_handler_cpptoc.cc */, + 04DD81361553445100BE097F /* scheme_handler_cpptoc.h */, + 04DD81371553445100BE097F /* scheme_handler_factory_cpptoc.cc */, + 04DD81381553445100BE097F /* scheme_handler_factory_cpptoc.h */, + 04DD81391553445100BE097F /* storage_visitor_cpptoc.cc */, + 04DD813A1553445100BE097F /* storage_visitor_cpptoc.h */, + 04DD813B1553445100BE097F /* task_cpptoc.cc */, + 04DD813C1553445100BE097F /* task_cpptoc.h */, + 04DD813D1553445100BE097F /* v8accessor_cpptoc.cc */, + 04DD813E1553445100BE097F /* v8accessor_cpptoc.h */, + 04DD813F1553445100BE097F /* v8context_handler_cpptoc.cc */, + 04DD81401553445100BE097F /* v8context_handler_cpptoc.h */, + 04DD81411553445100BE097F /* v8handler_cpptoc.cc */, + 04DD81421553445100BE097F /* v8handler_cpptoc.h */, + 04DD81431553445100BE097F /* web_urlrequest_client_cpptoc.cc */, + 04DD81441553445100BE097F /* web_urlrequest_client_cpptoc.h */, + 04DD81451553445100BE097F /* write_handler_cpptoc.cc */, + 04DD81461553445100BE097F /* write_handler_cpptoc.h */, ); path = cpptoc; sourceTree = ""; }; - 0487D0F314FEE6D60045E5E3 /* ctocpp */ = { + 04DD81471553445100BE097F /* ctocpp */ = { isa = PBXGroup; children = ( - 0487D0F414FEE6D60045E5E3 /* base_ctocpp.h */, - 0487D0F514FEE6D60045E5E3 /* browser_ctocpp.cc */, - 0487D0F614FEE6D60045E5E3 /* browser_ctocpp.h */, - 0487D0F714FEE6D60045E5E3 /* command_line_ctocpp.cc */, - 0487D0F814FEE6D60045E5E3 /* command_line_ctocpp.h */, - 0487D0F914FEE6D60045E5E3 /* ctocpp.h */, - 0487D0FA14FEE6D60045E5E3 /* domdocument_ctocpp.cc */, - 0487D0FB14FEE6D60045E5E3 /* domdocument_ctocpp.h */, - 0487D0FC14FEE6D60045E5E3 /* domevent_ctocpp.cc */, - 0487D0FD14FEE6D60045E5E3 /* domevent_ctocpp.h */, - 0487D0FE14FEE6D60045E5E3 /* domnode_ctocpp.cc */, - 0487D0FF14FEE6D60045E5E3 /* domnode_ctocpp.h */, - 0487D10014FEE6D60045E5E3 /* drag_data_ctocpp.cc */, - 0487D10114FEE6D60045E5E3 /* drag_data_ctocpp.h */, - 0487D10214FEE6D60045E5E3 /* frame_ctocpp.cc */, - 0487D10314FEE6D60045E5E3 /* frame_ctocpp.h */, - 0487D10414FEE6D60045E5E3 /* post_data_ctocpp.cc */, - 0487D10514FEE6D60045E5E3 /* post_data_ctocpp.h */, - 0487D10614FEE6D60045E5E3 /* post_data_element_ctocpp.cc */, - 0487D10714FEE6D60045E5E3 /* post_data_element_ctocpp.h */, - 0487D10814FEE6D60045E5E3 /* request_ctocpp.cc */, - 0487D10914FEE6D60045E5E3 /* request_ctocpp.h */, - 0487D10A14FEE6D60045E5E3 /* response_ctocpp.cc */, - 0487D10B14FEE6D60045E5E3 /* response_ctocpp.h */, - 0487D10C14FEE6D60045E5E3 /* scheme_handler_callback_ctocpp.cc */, - 0487D10D14FEE6D60045E5E3 /* scheme_handler_callback_ctocpp.h */, - 0487D10E14FEE6D60045E5E3 /* stream_reader_ctocpp.cc */, - 0487D10F14FEE6D60045E5E3 /* stream_reader_ctocpp.h */, - 0487D11014FEE6D60045E5E3 /* stream_writer_ctocpp.cc */, - 0487D11114FEE6D60045E5E3 /* stream_writer_ctocpp.h */, - 0487D11214FEE6D60045E5E3 /* v8context_ctocpp.cc */, - 0487D11314FEE6D60045E5E3 /* v8context_ctocpp.h */, - 0487D11414FEE6D60045E5E3 /* v8exception_ctocpp.cc */, - 0487D11514FEE6D60045E5E3 /* v8exception_ctocpp.h */, - 0487D11614FEE6D60045E5E3 /* v8value_ctocpp.cc */, - 0487D11714FEE6D60045E5E3 /* v8value_ctocpp.h */, - 0487D11814FEE6D60045E5E3 /* web_urlrequest_ctocpp.cc */, - 0487D11914FEE6D60045E5E3 /* web_urlrequest_ctocpp.h */, - 0487D11A14FEE6D60045E5E3 /* xml_reader_ctocpp.cc */, - 0487D11B14FEE6D60045E5E3 /* xml_reader_ctocpp.h */, - 0487D11C14FEE6D60045E5E3 /* zip_reader_ctocpp.cc */, - 0487D11D14FEE6D60045E5E3 /* zip_reader_ctocpp.h */, + 04DD81481553445100BE097F /* base_ctocpp.h */, + 04DD81491553445100BE097F /* browser_ctocpp.cc */, + 04DD814A1553445100BE097F /* browser_ctocpp.h */, + 04DD814B1553445100BE097F /* command_line_ctocpp.cc */, + 04DD814C1553445100BE097F /* command_line_ctocpp.h */, + 04DD814D1553445100BE097F /* cookie_manager_ctocpp.cc */, + 04DD814E1553445100BE097F /* cookie_manager_ctocpp.h */, + 04DD814F1553445100BE097F /* ctocpp.h */, + 04DD81501553445100BE097F /* domdocument_ctocpp.cc */, + 04DD81511553445100BE097F /* domdocument_ctocpp.h */, + 04DD81521553445100BE097F /* domevent_ctocpp.cc */, + 04DD81531553445100BE097F /* domevent_ctocpp.h */, + 04DD81541553445100BE097F /* domnode_ctocpp.cc */, + 04DD81551553445100BE097F /* domnode_ctocpp.h */, + 04DD81561553445100BE097F /* drag_data_ctocpp.cc */, + 04DD81571553445100BE097F /* drag_data_ctocpp.h */, + 04DD81581553445100BE097F /* frame_ctocpp.cc */, + 04DD81591553445100BE097F /* frame_ctocpp.h */, + 04DD815A1553445100BE097F /* post_data_ctocpp.cc */, + 04DD815B1553445100BE097F /* post_data_ctocpp.h */, + 04DD815C1553445100BE097F /* post_data_element_ctocpp.cc */, + 04DD815D1553445100BE097F /* post_data_element_ctocpp.h */, + 04DD815E1553445100BE097F /* request_ctocpp.cc */, + 04DD815F1553445100BE097F /* request_ctocpp.h */, + 04DD81601553445100BE097F /* response_ctocpp.cc */, + 04DD81611553445100BE097F /* response_ctocpp.h */, + 04DD81621553445100BE097F /* scheme_handler_callback_ctocpp.cc */, + 04DD81631553445100BE097F /* scheme_handler_callback_ctocpp.h */, + 04DD81641553445100BE097F /* stream_reader_ctocpp.cc */, + 04DD81651553445100BE097F /* stream_reader_ctocpp.h */, + 04DD81661553445100BE097F /* stream_writer_ctocpp.cc */, + 04DD81671553445100BE097F /* stream_writer_ctocpp.h */, + 04DD81681553445100BE097F /* v8context_ctocpp.cc */, + 04DD81691553445100BE097F /* v8context_ctocpp.h */, + 04DD816A1553445100BE097F /* v8exception_ctocpp.cc */, + 04DD816B1553445100BE097F /* v8exception_ctocpp.h */, + 04DD816C1553445100BE097F /* v8value_ctocpp.cc */, + 04DD816D1553445100BE097F /* v8value_ctocpp.h */, + 04DD816E1553445100BE097F /* web_plugin_info_ctocpp.cc */, + 04DD816F1553445100BE097F /* web_plugin_info_ctocpp.h */, + 04DD81701553445100BE097F /* web_urlrequest_ctocpp.cc */, + 04DD81711553445100BE097F /* web_urlrequest_ctocpp.h */, + 04DD81721553445100BE097F /* xml_reader_ctocpp.cc */, + 04DD81731553445100BE097F /* xml_reader_ctocpp.h */, + 04DD81741553445100BE097F /* zip_reader_ctocpp.cc */, + 04DD81751553445100BE097F /* zip_reader_ctocpp.h */, ); path = ctocpp; sourceTree = ""; }; - 0487D12014FEE6D60045E5E3 /* wrapper */ = { + 04DD81781553445100BE097F /* wrapper */ = { isa = PBXGroup; children = ( - 0487D12114FEE6D60045E5E3 /* cef_byte_read_handler.cc */, - 0487D12214FEE6D60045E5E3 /* cef_xml_object.cc */, - 0487D12314FEE6D60045E5E3 /* cef_zip_archive.cc */, - 0487D12414FEE6D60045E5E3 /* libcef_dll_wrapper.cc */, - 0487D12514FEE6D60045E5E3 /* libcef_dll_wrapper2.cc */, + 04DD81791553445100BE097F /* cef_byte_read_handler.cc */, + 04DD817A1553445100BE097F /* cef_xml_object.cc */, + 04DD817B1553445100BE097F /* cef_zip_archive.cc */, + 04DD817C1553445100BE097F /* libcef_dll_wrapper.cc */, + 04DD817D1553445100BE097F /* libcef_dll_wrapper2.cc */, ); path = wrapper; sourceTree = ""; @@ -698,6 +895,7 @@ 0487C93A14FED5FB0045E5E3 /* MainMenu.xib in Resources */, 0487D15F14FEE7880045E5E3 /* Resources in Resources */, 0415A1FE1524EC8A0075C91C /* atom.icns in Resources */, + 04DD81011553444800BE097F /* README-TRANSFER.txt in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -771,62 +969,66 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 0487D12614FEE6D60045E5E3 /* app_cpptoc.cc in Sources */, - 0487D12714FEE6D60045E5E3 /* client_cpptoc.cc in Sources */, - 0487D12814FEE6D60045E5E3 /* content_filter_cpptoc.cc in Sources */, - 0487D12914FEE6D60045E5E3 /* cookie_visitor_cpptoc.cc in Sources */, - 0487D12A14FEE6D60045E5E3 /* display_handler_cpptoc.cc in Sources */, - 0487D12B14FEE6D60045E5E3 /* domevent_listener_cpptoc.cc in Sources */, - 0487D12C14FEE6D60045E5E3 /* domvisitor_cpptoc.cc in Sources */, - 0487D12D14FEE6D60045E5E3 /* download_handler_cpptoc.cc in Sources */, - 0487D12E14FEE6D60045E5E3 /* drag_handler_cpptoc.cc in Sources */, - 0487D12F14FEE6D60045E5E3 /* find_handler_cpptoc.cc in Sources */, - 0487D13014FEE6D60045E5E3 /* focus_handler_cpptoc.cc in Sources */, - 0487D13114FEE6D60045E5E3 /* jsdialog_handler_cpptoc.cc in Sources */, - 0487D13214FEE6D60045E5E3 /* keyboard_handler_cpptoc.cc in Sources */, - 0487D13314FEE6D60045E5E3 /* life_span_handler_cpptoc.cc in Sources */, - 0487D13414FEE6D60045E5E3 /* load_handler_cpptoc.cc in Sources */, - 0487D13514FEE6D60045E5E3 /* menu_handler_cpptoc.cc in Sources */, - 0487D13614FEE6D60045E5E3 /* print_handler_cpptoc.cc in Sources */, - 0487D13714FEE6D60045E5E3 /* proxy_handler_cpptoc.cc in Sources */, - 0487D13814FEE6D60045E5E3 /* read_handler_cpptoc.cc in Sources */, - 0487D13914FEE6D60045E5E3 /* render_handler_cpptoc.cc in Sources */, - 0487D13A14FEE6D60045E5E3 /* request_handler_cpptoc.cc in Sources */, - 0487D13B14FEE6D60045E5E3 /* scheme_handler_cpptoc.cc in Sources */, - 0487D13C14FEE6D60045E5E3 /* scheme_handler_factory_cpptoc.cc in Sources */, - 0487D13D14FEE6D60045E5E3 /* storage_visitor_cpptoc.cc in Sources */, - 0487D13E14FEE6D60045E5E3 /* task_cpptoc.cc in Sources */, - 0487D13F14FEE6D60045E5E3 /* v8accessor_cpptoc.cc in Sources */, - 0487D14014FEE6D60045E5E3 /* v8context_handler_cpptoc.cc in Sources */, - 0487D14114FEE6D60045E5E3 /* v8handler_cpptoc.cc in Sources */, - 0487D14214FEE6D60045E5E3 /* web_urlrequest_client_cpptoc.cc in Sources */, - 0487D14314FEE6D60045E5E3 /* write_handler_cpptoc.cc in Sources */, - 0487D14414FEE6D60045E5E3 /* browser_ctocpp.cc in Sources */, - 0487D14514FEE6D60045E5E3 /* command_line_ctocpp.cc in Sources */, - 0487D14614FEE6D60045E5E3 /* domdocument_ctocpp.cc in Sources */, - 0487D14714FEE6D60045E5E3 /* domevent_ctocpp.cc in Sources */, - 0487D14814FEE6D60045E5E3 /* domnode_ctocpp.cc in Sources */, - 0487D14914FEE6D60045E5E3 /* drag_data_ctocpp.cc in Sources */, - 0487D14A14FEE6D60045E5E3 /* frame_ctocpp.cc in Sources */, - 0487D14B14FEE6D60045E5E3 /* post_data_ctocpp.cc in Sources */, - 0487D14C14FEE6D60045E5E3 /* post_data_element_ctocpp.cc in Sources */, - 0487D14D14FEE6D60045E5E3 /* request_ctocpp.cc in Sources */, - 0487D14E14FEE6D60045E5E3 /* response_ctocpp.cc in Sources */, - 0487D14F14FEE6D60045E5E3 /* scheme_handler_callback_ctocpp.cc in Sources */, - 0487D15014FEE6D60045E5E3 /* stream_reader_ctocpp.cc in Sources */, - 0487D15114FEE6D60045E5E3 /* stream_writer_ctocpp.cc in Sources */, - 0487D15214FEE6D60045E5E3 /* v8context_ctocpp.cc in Sources */, - 0487D15314FEE6D60045E5E3 /* v8exception_ctocpp.cc in Sources */, - 0487D15414FEE6D60045E5E3 /* v8value_ctocpp.cc in Sources */, - 0487D15514FEE6D60045E5E3 /* web_urlrequest_ctocpp.cc in Sources */, - 0487D15614FEE6D60045E5E3 /* xml_reader_ctocpp.cc in Sources */, - 0487D15714FEE6D60045E5E3 /* zip_reader_ctocpp.cc in Sources */, - 0487D15814FEE6D60045E5E3 /* transfer_util.cpp in Sources */, - 0487D15914FEE6D60045E5E3 /* cef_byte_read_handler.cc in Sources */, - 0487D15A14FEE6D60045E5E3 /* cef_xml_object.cc in Sources */, - 0487D15B14FEE6D60045E5E3 /* cef_zip_archive.cc in Sources */, - 0487D15C14FEE6D60045E5E3 /* libcef_dll_wrapper.cc in Sources */, - 0487D15D14FEE6D60045E5E3 /* libcef_dll_wrapper2.cc in Sources */, + 04DD817E1553445100BE097F /* app_cpptoc.cc in Sources */, + 04DD817F1553445100BE097F /* client_cpptoc.cc in Sources */, + 04DD81801553445100BE097F /* content_filter_cpptoc.cc in Sources */, + 04DD81811553445100BE097F /* cookie_visitor_cpptoc.cc in Sources */, + 04DD81821553445100BE097F /* display_handler_cpptoc.cc in Sources */, + 04DD81831553445100BE097F /* domevent_listener_cpptoc.cc in Sources */, + 04DD81841553445100BE097F /* domvisitor_cpptoc.cc in Sources */, + 04DD81851553445100BE097F /* download_handler_cpptoc.cc in Sources */, + 04DD81861553445100BE097F /* drag_handler_cpptoc.cc in Sources */, + 04DD81871553445100BE097F /* find_handler_cpptoc.cc in Sources */, + 04DD81881553445100BE097F /* focus_handler_cpptoc.cc in Sources */, + 04DD81891553445100BE097F /* jsdialog_handler_cpptoc.cc in Sources */, + 04DD818A1553445100BE097F /* keyboard_handler_cpptoc.cc in Sources */, + 04DD818B1553445100BE097F /* life_span_handler_cpptoc.cc in Sources */, + 04DD818C1553445100BE097F /* load_handler_cpptoc.cc in Sources */, + 04DD818D1553445100BE097F /* menu_handler_cpptoc.cc in Sources */, + 04DD818E1553445100BE097F /* permission_handler_cpptoc.cc in Sources */, + 04DD818F1553445100BE097F /* print_handler_cpptoc.cc in Sources */, + 04DD81901553445100BE097F /* proxy_handler_cpptoc.cc in Sources */, + 04DD81911553445100BE097F /* read_handler_cpptoc.cc in Sources */, + 04DD81921553445100BE097F /* render_handler_cpptoc.cc in Sources */, + 04DD81931553445100BE097F /* request_handler_cpptoc.cc in Sources */, + 04DD81941553445100BE097F /* resource_bundle_handler_cpptoc.cc in Sources */, + 04DD81951553445100BE097F /* scheme_handler_cpptoc.cc in Sources */, + 04DD81961553445100BE097F /* scheme_handler_factory_cpptoc.cc in Sources */, + 04DD81971553445100BE097F /* storage_visitor_cpptoc.cc in Sources */, + 04DD81981553445100BE097F /* task_cpptoc.cc in Sources */, + 04DD81991553445100BE097F /* v8accessor_cpptoc.cc in Sources */, + 04DD819A1553445100BE097F /* v8context_handler_cpptoc.cc in Sources */, + 04DD819B1553445100BE097F /* v8handler_cpptoc.cc in Sources */, + 04DD819C1553445100BE097F /* web_urlrequest_client_cpptoc.cc in Sources */, + 04DD819D1553445100BE097F /* write_handler_cpptoc.cc in Sources */, + 04DD819E1553445100BE097F /* browser_ctocpp.cc in Sources */, + 04DD819F1553445100BE097F /* command_line_ctocpp.cc in Sources */, + 04DD81A01553445100BE097F /* cookie_manager_ctocpp.cc in Sources */, + 04DD81A11553445100BE097F /* domdocument_ctocpp.cc in Sources */, + 04DD81A21553445100BE097F /* domevent_ctocpp.cc in Sources */, + 04DD81A31553445100BE097F /* domnode_ctocpp.cc in Sources */, + 04DD81A41553445100BE097F /* drag_data_ctocpp.cc in Sources */, + 04DD81A51553445100BE097F /* frame_ctocpp.cc in Sources */, + 04DD81A61553445100BE097F /* post_data_ctocpp.cc in Sources */, + 04DD81A71553445100BE097F /* post_data_element_ctocpp.cc in Sources */, + 04DD81A81553445100BE097F /* request_ctocpp.cc in Sources */, + 04DD81A91553445100BE097F /* response_ctocpp.cc in Sources */, + 04DD81AA1553445100BE097F /* scheme_handler_callback_ctocpp.cc in Sources */, + 04DD81AB1553445100BE097F /* stream_reader_ctocpp.cc in Sources */, + 04DD81AC1553445100BE097F /* stream_writer_ctocpp.cc in Sources */, + 04DD81AD1553445100BE097F /* v8context_ctocpp.cc in Sources */, + 04DD81AE1553445100BE097F /* v8exception_ctocpp.cc in Sources */, + 04DD81AF1553445100BE097F /* v8value_ctocpp.cc in Sources */, + 04DD81B01553445100BE097F /* web_plugin_info_ctocpp.cc in Sources */, + 04DD81B11553445100BE097F /* web_urlrequest_ctocpp.cc in Sources */, + 04DD81B21553445100BE097F /* xml_reader_ctocpp.cc in Sources */, + 04DD81B31553445100BE097F /* zip_reader_ctocpp.cc in Sources */, + 04DD81B41553445100BE097F /* transfer_util.cpp in Sources */, + 04DD81B51553445100BE097F /* cef_byte_read_handler.cc in Sources */, + 04DD81B61553445100BE097F /* cef_xml_object.cc in Sources */, + 04DD81B71553445100BE097F /* cef_zip_archive.cc in Sources */, + 04DD81B81553445100BE097F /* libcef_dll_wrapper.cc in Sources */, + 04DD81B91553445100BE097F /* libcef_dll_wrapper2.cc in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Atom/src/Atom.h b/Atom/src/Atom.h index 1f4f314c1..5fe3729e7 100755 --- a/Atom/src/Atom.h +++ b/Atom/src/Atom.h @@ -1,5 +1,5 @@ #import "BrowserDelegate.h" -#import "include/cef.h" +#import "include/cef_base.h" #import "include/cef_application_mac.h" class ClientHandler; diff --git a/Atom/src/Atom.mm b/Atom/src/Atom.mm index b9acc466a..4a46dfa93 100755 --- a/Atom/src/Atom.mm +++ b/Atom/src/Atom.mm @@ -1,9 +1,10 @@ #import "Atom.h" -#import "include/cef.h" +#import "include/cef_base.h" #import "AtomController.h" #import "native_handler.h" #import "client_handler.h" +#import "include/cef_app.h" @interface Atom () - (CefRefPtr)atomContext; @@ -105,7 +106,7 @@ CefRefPtr nativeHandler = new NativeHandler(); global->SetValue("$native", nativeHandler->m_object, V8_PROPERTY_ATTRIBUTE_NONE); - CefRefPtr atom = CefV8Value::CreateObject(NULL); + CefRefPtr atom = CefV8Value::CreateObject(NULL, NULL); global->SetValue("atom", atom, V8_PROPERTY_ATTRIBUTE_NONE); #ifdef DEBUG diff --git a/Atom/src/AtomController.h b/Atom/src/AtomController.h index c5b7ff43d..6a04bbda6 100644 --- a/Atom/src/AtomController.h +++ b/Atom/src/AtomController.h @@ -1,7 +1,8 @@ #import #import "BrowserDelegate.h" -#import "include/cef.h" +#import "include/cef_base.h" +#import "include/cef_v8.h" class ClientHandler; diff --git a/Atom/src/AtomController.mm b/Atom/src/AtomController.mm index 6e055e57c..1984ecb31 100644 --- a/Atom/src/AtomController.mm +++ b/Atom/src/AtomController.mm @@ -1,6 +1,6 @@ #import "AtomController.h" -#import "include/cef.h" +#import "include/cef_base.h" #import "client_handler.h" #import "native_handler.h" #import "PathWatcher.h" @@ -167,7 +167,6 @@ void AppGetBrowserSettings(CefBrowserSettings& settings) { settings.accelerated_layers_disabled = false; settings.accelerated_video_disabled = false; settings.accelerated_2d_canvas_disabled = false; - settings.accelerated_drawing_disabled = false; settings.accelerated_plugins_disabled = false; settings.developer_tools_disabled = false; } diff --git a/Atom/src/BrowserDelegate.h b/Atom/src/BrowserDelegate.h index b81f812f4..1082461b9 100644 --- a/Atom/src/BrowserDelegate.h +++ b/Atom/src/BrowserDelegate.h @@ -1,5 +1,5 @@ #import -#import "include/cef.h" +#import "include/cef_base.h" @protocol BrowserDelegate diff --git a/Atom/src/client_handler.h b/Atom/src/client_handler.h index 7a366082a..043c1d892 100755 --- a/Atom/src/client_handler.h +++ b/Atom/src/client_handler.h @@ -5,7 +5,8 @@ #ifndef _CLIENT_HANDLER_H #define _CLIENT_HANDLER_H -#import "include/cef.h" +#import "include/cef_base.h" +#import "include/cef_client.h" @class AtomController; diff --git a/Atom/src/client_handler.mm b/Atom/src/client_handler.mm index 203fe0fd5..eb1073749 100755 --- a/Atom/src/client_handler.mm +++ b/Atom/src/client_handler.mm @@ -1,5 +1,4 @@ -#import "include/cef.h" -#import "include/cef_wrapper.h" +#import "include/cef_base.h" #import "client_handler.h" #import "AtomController.h" diff --git a/Atom/src/main.mm b/Atom/src/main.mm index 33cf2af3b..375871eed 100644 --- a/Atom/src/main.mm +++ b/Atom/src/main.mm @@ -1,6 +1,7 @@ #import -#include "include/cef.h" +#include "include/cef_base.h" +#include "include/cef_app.h" int main(int argc, char* argv[]) { NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary]; diff --git a/Atom/src/native_handler.h b/Atom/src/native_handler.h index 3b0bd5d5a..86c875312 100644 --- a/Atom/src/native_handler.h +++ b/Atom/src/native_handler.h @@ -1,5 +1,6 @@ #import -#import "include/cef.h" +#import "include/cef_base.h" +#import "include/cef_v8.h" class NativeHandler : public CefV8Handler { public: diff --git a/Atom/src/native_handler.mm b/Atom/src/native_handler.mm index 933c3e654..c381d1173 100644 --- a/Atom/src/native_handler.mm +++ b/Atom/src/native_handler.mm @@ -1,5 +1,5 @@ #import "native_handler.h" -#import "include/cef.h" +#import "include/cef_base.h" #import "Atom.h" #import "AtomController.h" #import "client_handler.h" @@ -14,7 +14,7 @@ NSString *stringFromCefV8Value(const CefRefPtr& value) { } NativeHandler::NativeHandler() : CefV8Handler() { - m_object = CefV8Value::CreateObject(NULL); + m_object = CefV8Value::CreateObject(NULL, NULL); const char *functionNames[] = {"exists", "read", "write", "absolute", "list", "isFile", "isDirectory", "remove", "asyncList", "open", "openDialog", "quit", "writeToPasteboard", "readFromPasteboard", "showDevTools", "newWindow", "saveDialog", "exit", "watchPath", "unwatchPath", "makeDirectory", "move"}; NSUInteger arrayLength = sizeof(functionNames) / sizeof(const char *); @@ -288,7 +288,7 @@ bool NativeHandler::Execute(const CefString& name, CefRefPtr retval; CefRefPtr e; - CefRefPtr eventObject = CefV8Value::CreateObject(NULL); + CefRefPtr eventObject = CefV8Value::CreateObject(NULL, NULL); for (NSString *event in eventList) { eventObject->SetValue([event UTF8String], CefV8Value::CreateBool(true), V8_PROPERTY_ATTRIBUTE_NONE); } diff --git a/cef/include/cef.h b/cef/include/cef.h deleted file mode 100755 index a3a24bafe..000000000 --- a/cef/include/cef.h +++ /dev/null @@ -1,3975 +0,0 @@ -// Copyright (c) 2011 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_H -#define _CEF_H - -#include -#include -#include -#include "internal/cef_build.h" -#include "internal/cef_ptr.h" -#include "internal/cef_types_wrappers.h" - -/// -// Bring in platform-specific definitions. -#if defined(OS_WIN) -#include "internal/cef_win.h" -#elif defined(OS_MACOSX) -#include "internal/cef_mac.h" -#elif defined(OS_LINUX) -#include "internal/cef_linux.h" -#endif - -class CefApp; -class CefBrowser; -class CefClient; -class CefContentFilter; -class CefCookieVisitor; -class CefDOMDocument; -class CefDOMEvent; -class CefDOMEventListener; -class CefDOMNode; -class CefDOMVisitor; -class CefDownloadHandler; -class CefDragData; -class CefFrame; -class CefPostData; -class CefPostDataElement; -class CefRequest; -class CefResponse; -class CefSchemeHandler; -class CefSchemeHandlerFactory; -class CefStorageVisitor; -class CefStreamReader; -class CefStreamWriter; -class CefTask; -class CefV8Context; -class CefV8Handler; -class CefV8Value; -class CefWebURLRequest; -class CefWebURLRequestClient; - -/// -// This function should be called on the main application thread to initialize -// CEF when the application is started. The |application| parameter may be -// empty. A return value of true indicates that it succeeded and false indicates -// that it failed. -/// -/*--cef(revision_check,optional_param=application)--*/ -bool CefInitialize(const CefSettings& settings, CefRefPtr application); - -/// -// This function should be called on the main application thread to shut down -// CEF before the application exits. -/// -/*--cef()--*/ -void CefShutdown(); - -/// -// Perform a single iteration of CEF message loop processing. This function is -// used to integrate the CEF message loop into an existing application message -// loop. Care must be taken to balance performance against excessive CPU usage. -// This function should only be called on the main application thread and only -// if CefInitialize() is called with a CefSettings.multi_threaded_message_loop -// value of false. This function will not block. -/// -/*--cef()--*/ -void CefDoMessageLoopWork(); - -/// -// Run the CEF message loop. Use this function instead of an application- -// provided message loop to get the best balance between performance and CPU -// usage. This function should only be called on the main application thread and -// only if CefInitialize() is called with a -// CefSettings.multi_threaded_message_loop value of false. This function will -// block until a quit message is received by the system. -/// -/*--cef()--*/ -void CefRunMessageLoop(); - -/// -// Quit the CEF message loop that was started by calling CefRunMessageLoop(). -// This function should only be called on the main application thread and only -// if CefRunMessageLoop() was used. -/// -/*--cef()--*/ -void CefQuitMessageLoop(); - -/// -// Register a new V8 extension with the specified JavaScript extension code and -// handler. Functions implemented by the handler are prototyped using the -// keyword 'native'. The calling of a native function is restricted to the scope -// in which the prototype of the native function is defined. This function may -// be called on any thread. -// -// Example JavaScript extension code: -// 
-//   // create the 'example' global object if it doesn't already exist.
-//   if (!example)
-//     example = {};
-//   // create the 'example.test' global object if it doesn't already exist.
-//   if (!example.test)
-//     example.test = {};
-//   (function() {
-//     // Define the function 'example.test.myfunction'.
-//     example.test.myfunction = function() {
-//       // Call CefV8Handler::Execute() with the function name 'MyFunction'
-//       // and no arguments.
-//       native function MyFunction();
-//       return MyFunction();
-//     };
-//     // Define the getter function for parameter 'example.test.myparam'.
-//     example.test.__defineGetter__('myparam', function() {
-//       // Call CefV8Handler::Execute() with the function name 'GetMyParam'
-//       // and no arguments.
-//       native function GetMyParam();
-//       return GetMyParam();
-//     });
-//     // Define the setter function for parameter 'example.test.myparam'.
-//     example.test.__defineSetter__('myparam', function(b) {
-//       // Call CefV8Handler::Execute() with the function name 'SetMyParam'
-//       // and a single argument.
-//       native function SetMyParam();
-//       if(b) SetMyParam(b);
-//     });
-//
-//     // Extension definitions can also contain normal JavaScript variables
-//     // and functions.
-//     var myint = 0;
-//     example.test.increment = function() {
-//       myint += 1;
-//       return myint;
-//     };
-//   })();
-//
-// Example usage in the page: -// 
-//   // Call the function.
-//   example.test.myfunction();
-//   // Set the parameter.
-//   example.test.myparam = value;
-//   // Get the parameter.
-//   value = example.test.myparam;
-//   // Call another function.
-//   example.test.increment();
-//
-/// -/*--cef(optional_param=handler)--*/ -bool CefRegisterExtension(const CefString& extension_name, - const CefString& javascript_code, - CefRefPtr handler); - -/// -// Register a custom scheme. This method should not be called for the built-in -// HTTP, HTTPS, FILE, FTP, ABOUT and DATA schemes. -// -// If |is_standard| is true the scheme will be treated as a standard scheme. -// Standard schemes are subject to URL canonicalization and parsing rules as -// defined in the Common Internet Scheme Syntax RFC 1738 Section 3.1 available -// at http://www.ietf.org/rfc/rfc1738.txt -// -// In particular, the syntax for standard scheme URLs must be of the form: -// 
-//  [scheme]://[username]:[password]@[host]:[port]/[url-path]
-//
-// Standard scheme URLs must have a host component that is a fully qualified -// domain name as defined in Section 3.5 of RFC 1034 [13] and Section 2.1 of RFC -// 1123. These URLs will be canonicalized to "scheme://host/path" in the -// simplest case and "scheme://username:password@host:port/path" in the most -// explicit case. For example, "scheme:host/path" and "scheme:///host/path" will -// both be canonicalized to "scheme://host/path". The origin of a standard -// scheme URL is the combination of scheme, host and port (i.e., -// "scheme://host:port" in the most explicit case). -// -// For non-standard scheme URLs only the "scheme:" component is parsed and -// canonicalized. The remainder of the URL will be passed to the handler as-is. -// For example, "scheme:///some%20text" will remain the same. Non-standard -// scheme URLs cannot be used as a target for form submission. -// -// If |is_local| is true the scheme will be treated as local (i.e., with the -// same security rules as those applied to "file" URLs). Normal pages cannot -// link to or access local URLs. Also, by default, local URLs can only perform -// XMLHttpRequest calls to the same URL (origin + path) that originated the -// request. To allow XMLHttpRequest calls from a local URL to other URLs with -// the same origin set the CefSettings.file_access_from_file_urls_allowed value -// to true. To allow XMLHttpRequest calls from a local URL to all origins set -// the CefSettings.universal_access_from_file_urls_allowed value to true. -// -// If |is_display_isolated| is true the scheme will be treated as display- -// isolated. This means that pages cannot display these URLs unless they are -// from the same scheme. For example, pages in another origin cannot create -// iframes or hyperlinks to URLs with this scheme. -// -// This function may be called on any thread. It should only be called once -// per unique |scheme_name| value. If |scheme_name| is already registered or if -// an error occurs this method will return false. -/// -/*--cef()--*/ -bool CefRegisterCustomScheme(const CefString& scheme_name, - bool is_standard, - bool is_local, - bool is_display_isolated); - -/// -// Register a scheme handler factory for the specified |scheme_name| and -// optional |domain_name|. An empty |domain_name| value for a standard scheme -// will cause the factory to match all domain names. The |domain_name| value -// will be ignored for non-standard schemes. If |scheme_name| is a built-in -// scheme and no handler is returned by |factory| then the built-in scheme -// handler factory will be called. If |scheme_name| is a custom scheme the -// CefRegisterCustomScheme() function should be called for that scheme. -// This function may be called multiple times to change or remove the factory -// that matches the specified |scheme_name| and optional |domain_name|. -// Returns false if an error occurs. This function may be called on any thread. -/// -/*--cef(optional_param=domain_name,optional_param=factory)--*/ -bool CefRegisterSchemeHandlerFactory(const CefString& scheme_name, - const CefString& domain_name, - CefRefPtr factory); - -/// -// Clear all registered scheme handler factories. Returns false on error. This -// function may be called on any thread. -/// -/*--cef()--*/ -bool CefClearSchemeHandlerFactories(); - -/// -// Add an entry to the cross-origin access whitelist. -// -// The same-origin policy restricts how scripts hosted from different origins -// (scheme + domain + port) can communicate. By default, scripts can only access -// resources with the same origin. Scripts hosted on the HTTP and HTTPS schemes -// (but no other schemes) can use the "Access-Control-Allow-Origin" header to -// allow cross-origin requests. For example, https://source.example.com can make -// XMLHttpRequest requests on http://target.example.com if the -// http://target.example.com request returns an "Access-Control-Allow-Origin: -// https://source.example.com" response header. -// -// Scripts in separate frames or iframes and hosted from the same protocol and -// domain suffix can execute cross-origin JavaScript if both pages set the -// document.domain value to the same domain suffix. For example, -// scheme://foo.example.com and scheme://bar.example.com can communicate using -// JavaScript if both domains set document.domain="example.com". -// -// This method is used to allow access to origins that would otherwise violate -// the same-origin policy. Scripts hosted underneath the fully qualified -// |source_origin| URL (like http://www.example.com) will be allowed access to -// all resources hosted on the specified |target_protocol| and |target_domain|. -// If |allow_target_subdomains| is true access will also be allowed to all -// subdomains of the target domain. -// -// This method cannot be used to bypass the restrictions on local or display -// isolated schemes. See the comments on CefRegisterCustomScheme for more -// information. -// -// This function may be called on any thread. Returns false if |source_origin| -// is invalid or the whitelist cannot be accessed. -/// -/*--cef()--*/ -bool CefAddCrossOriginWhitelistEntry(const CefString& source_origin, - const CefString& target_protocol, - const CefString& target_domain, - bool allow_target_subdomains); - -/// -// Remove an entry from the cross-origin access whitelist. Returns false if -// |source_origin| is invalid or the whitelist cannot be accessed. -/// -/*--cef()--*/ -bool CefRemoveCrossOriginWhitelistEntry(const CefString& source_origin, - const CefString& target_protocol, - const CefString& target_domain, - bool allow_target_subdomains); - -/// -// Remove all entries from the cross-origin access whitelist. Returns false if -// the whitelist cannot be accessed. -/// -/*--cef()--*/ -bool CefClearCrossOriginWhitelist(); - -typedef cef_thread_id_t CefThreadId; - -/// -// CEF maintains multiple internal threads that are used for handling different -// types of tasks. The UI thread creates the browser window and is used for all -// interaction with the WebKit rendering engine and V8 JavaScript engine (The -// UI thread will be the same as the main application thread if CefInitialize() -// is called with a CefSettings.multi_threaded_message_loop value of false.) The -// IO thread is used for handling schema and network requests. The FILE thread -// is used for the application cache and other miscellaneous activities. This -// function will return true if called on the specified thread. -/// -/*--cef()--*/ -bool CefCurrentlyOn(CefThreadId threadId); - -/// -// Post a task for execution on the specified thread. This function may be -// called on any thread. -/// -/*--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. -/// -/*--cef()--*/ -bool CefPostDelayedTask(CefThreadId threadId, CefRefPtr task, - long delay_ms); - -/// -// Parse the specified |url| into its component parts. -// Returns false if the URL is empty or invalid. -/// -/*--cef()--*/ -bool CefParseURL(const CefString& url, - CefURLParts& parts); - -/// -// Creates a URL from the specified |parts|, which must contain a non-empty -// spec or a non-empty host and path (at a minimum), but not both. -// Returns false if |parts| isn't initialized as described. -/// -/*--cef()--*/ -bool CefCreateURL(const CefURLParts& parts, - CefString& url); - -/// -// Visit all cookies. The returned cookies are ordered by longest path, then by -// earliest creation date. Returns false if cookies cannot be accessed. -/// -/*--cef()--*/ -bool CefVisitAllCookies(CefRefPtr visitor); - -/// -// Visit a subset of cookies. The results are filtered by the given url scheme, -// host, domain and path. If |includeHttpOnly| is true HTTP-only cookies will -// also be included in the results. The returned cookies are ordered by longest -// path, then by earliest creation date. Returns false if cookies cannot be -// accessed. -/// -/*--cef()--*/ -bool CefVisitUrlCookies(const CefString& url, bool includeHttpOnly, - CefRefPtr visitor); - -/// -// Sets a cookie given a valid URL and explicit user-provided cookie attributes. -// This function expects each attribute to be well-formed. It will check for -// disallowed characters (e.g. the ';' character is disallowed within the cookie -// value attribute) and will return false without setting the cookie if such -// characters are found. This method must be called on the IO thread. -/// -/*--cef()--*/ -bool CefSetCookie(const CefString& url, const CefCookie& cookie); - -/// -// Delete all cookies that match the specified parameters. If both |url| and -// |cookie_name| are specified all host and domain cookies matching both values -// will be deleted. If only |url| is specified all host cookies (but not domain -// cookies) irrespective of path will be deleted. If |url| is empty all cookies -// for all hosts and domains will be deleted. Returns false if a non-empty -// invalid URL is specified or if cookies cannot be accessed. This method must -// be called on the IO thread. -/// -/*--cef(optional_param=url,optional_param=cookie_name)--*/ -bool CefDeleteCookies(const CefString& url, const CefString& cookie_name); - -/// -// Sets the directory path that will be used for storing cookie data. If |path| -// is empty data will be stored in memory only. By default the cookie path is -// the same as the cache path. Returns false if cookies cannot be accessed. -/// -/*--cef(optional_param=path)--*/ -bool CefSetCookiePath(const CefString& path); - - -typedef cef_storage_type_t CefStorageType; - -/// -// Visit storage of the specified type. If |origin| is non-empty only data -// matching that origin will be visited. If |key| is non-empty only data -// matching that key will be visited. Otherwise, all data for the storage -// type will be visited. Origin should be of the form scheme://domain. If no -// origin is specified only data currently in memory will be returned. Returns -// false if the storage cannot be accessed. -/// -/*--cef(optional_param=origin,optional_param=key)--*/ -bool CefVisitStorage(CefStorageType type, const CefString& origin, - const CefString& key, - CefRefPtr visitor); - -/// -// Sets storage of the specified type, origin, key and value. Returns false if -// storage cannot be accessed. This method must be called on the UI thread. -/// -/*--cef()--*/ -bool CefSetStorage(CefStorageType type, const CefString& origin, - const CefString& key, const CefString& value); - -/// -// Deletes all storage of the specified type. If |origin| is non-empty only data -// matching that origin will be cleared. If |key| is non-empty only data -// matching that key will be cleared. Otherwise, all data for the storage type -// will be cleared. Returns false if storage cannot be accessed. This method -// must be called on the UI thread. -/// -/*--cef(optional_param=origin,optional_param=key)--*/ -bool CefDeleteStorage(CefStorageType type, const CefString& origin, - const CefString& key); - -/// -// Sets the directory path that will be used for storing data of the specified -// type. Currently only the ST_LOCALSTORAGE type is supported by this method. -// If |path| is empty data will be stored in memory only. By default the storage -// path is the same as the cache path. Returns false if the storage cannot be -// accessed. -/// -/*--cef(optional_param=path)--*/ -bool CefSetStoragePath(CefStorageType type, const CefString& path); - - -/// -// Interface defining the reference count implementation methods. All framework -// classes must extend the CefBase class. -/// -class CefBase -{ -public: - /// - // The AddRef method increments the reference count for the object. It should - // be called for every new copy of a pointer to a given object. The resulting - // reference count value is returned and should be used for diagnostic/testing - // purposes only. - /// - virtual int AddRef() =0; - - /// - // The Release method decrements the reference count for the object. If the - // reference count on the object falls to 0, then the object should free - // itself from memory. The resulting reference count value is returned and - // should be used for diagnostic/testing purposes only. - /// - virtual int Release() =0; - - /// - // Return the current number of references. - /// - virtual int GetRefCt() =0; - -protected: - virtual ~CefBase() {} -}; - - -/// -// Class that implements atomic reference counting. -/// -class CefRefCount -{ -public: - CefRefCount() : refct_(0) {} - - /// - // Atomic reference increment. - /// - int AddRef() { - return CefAtomicIncrement(&refct_); - } - - /// - // Atomic reference decrement. Delete the object when no references remain. - /// - int Release() { - return CefAtomicDecrement(&refct_); - } - - /// - // Return the current number of references. - /// - int GetRefCt() { return refct_; } - -private: - long refct_; -}; - -/// -// Macro that provides a reference counting implementation for classes extending -// CefBase. -/// -#define IMPLEMENT_REFCOUNTING(ClassName) \ - public: \ - int AddRef() { return refct_.AddRef(); } \ - int Release() { \ - int retval = refct_.Release(); \ - if(retval == 0) \ - delete this; \ - return retval; \ - } \ - int GetRefCt() { return refct_.GetRefCt(); } \ - private: \ - CefRefCount refct_; - -/// -// Macro that provides a locking implementation. Use the Lock() and Unlock() -// methods to protect a section of code from simultaneous access by multiple -// threads. The AutoLock class is a helper that will hold the lock while in -// scope. -/// -#define IMPLEMENT_LOCKING(ClassName) \ - public: \ - class AutoLock { \ - public: \ - AutoLock(ClassName* base) : base_(base) { base_->Lock(); } \ - ~AutoLock() { base_->Unlock(); } \ - private: \ - ClassName* base_; \ - }; \ - void Lock() { critsec_.Lock(); } \ - void Unlock() { critsec_.Unlock(); } \ - private: \ - CefCriticalSection critsec_; - - -/// -// 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; -}; - - -/// -// Interface to implement for visiting cookie values. The methods of this class -// will always be called on the IO thread. -/// -/*--cef(source=client)--*/ -class CefCookieVisitor : public virtual CefBase -{ -public: - /// - // Method that will be called once for each cookie. |count| is the 0-based - // index for the current cookie. |total| is the total number of cookies. - // Set |deleteCookie| to true to delete the cookie currently being visited. - // Return false to stop visiting cookies. This method may never be called if - // no cookies are found. - /// - /*--cef()--*/ - virtual bool Visit(const CefCookie& cookie, int count, int total, - bool& deleteCookie) =0; -}; - - -/// -// Interface to implement for visiting storage. The methods of this class will -// always be called on the UI thread. -/// -/*--cef(source=client)--*/ -class CefStorageVisitor : public virtual CefBase -{ -public: - /// - // Method that will be called once for each key/value data pair in storage. - // |count| is the 0-based index for the current pair. |total| is the total - // number of pairs. Set |deleteData| to true to delete the pair currently - // being visited. Return false to stop visiting pairs. This method may never - // be called if no data is found. - /// - /*--cef()--*/ - virtual bool Visit(CefStorageType type, const CefString& origin, - const CefString& key, const CefString& value, int count, - int total, bool& deleteData) =0; -}; - - -/// -// Class used to represent a browser window. The methods of this class may be -// called on any thread unless otherwise indicated in the comments. -/// -/*--cef(source=library)--*/ -class CefBrowser : public virtual CefBase -{ -public: - typedef cef_key_type_t KeyType; - 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 - // |windowInfo|. All values will be copied internally and the actual window - // will be created on the UI thread. This method call will not block. - /// - /*--cef(optional_param=url)--*/ - static bool CreateBrowser(CefWindowInfo& windowInfo, - CefRefPtr client, - const CefString& url, - const CefBrowserSettings& settings); - - /// - // Create a new browser window using the window parameters specified by - // |windowInfo|. This method should only be called on the UI thread. - /// - /*--cef(optional_param=url)--*/ - static CefRefPtr CreateBrowserSync(CefWindowInfo& windowInfo, - CefRefPtr client, - const CefString& url, - const CefBrowserSettings& settings); - - /// - // Call this method before destroying a contained browser window. This method - // performs any internal cleanup that may be needed before the browser window - // is destroyed. - /// - /*--cef()--*/ - virtual void ParentWindowWillClose() =0; - - /// - // Closes this browser window. - /// - /*--cef()--*/ - virtual void CloseBrowser() =0; - - /// - // Returns true if the browser can navigate backwards. - /// - /*--cef()--*/ - virtual bool CanGoBack() =0; - /// - // Navigate backwards. - /// - /*--cef()--*/ - virtual void GoBack() =0; - /// - // Returns true if the browser can navigate forwards. - /// - /*--cef()--*/ - virtual bool CanGoForward() =0; - /// - // Navigate forwards. - /// - /*--cef()--*/ - virtual void GoForward() =0; - /// - // Reload the current page. - /// - /*--cef()--*/ - virtual void Reload() =0; - /// - // Reload the current page ignoring any cached data. - /// - /*--cef()--*/ - virtual void ReloadIgnoreCache() =0; - /// - // Stop loading the page. - /// - /*--cef()--*/ - virtual void StopLoad() =0; - - /// - // Set focus for the browser window. If |enable| is true focus will be set to - // the window. Otherwise, focus will be removed. - /// - /*--cef()--*/ - virtual void SetFocus(bool enable) =0; - - /// - // Retrieve the window handle for this browser. - /// - /*--cef()--*/ - virtual CefWindowHandle GetWindowHandle() =0; - - /// - // Retrieve the window handle of the browser that opened this browser. Will - // return NULL for non-popup windows. This method can be used in combination - // with custom handling of modal windows. - /// - /*--cef()--*/ - virtual CefWindowHandle GetOpenerWindowHandle() =0; - - /// - // Returns true if the window is a popup window. - /// - /*--cef()--*/ - virtual bool IsPopup() =0; - - // Returns true if a document has been loaded in the browser. - /*--cef()--*/ - virtual bool HasDocument() =0; - - /// - // Returns the client for this browser. - /// - /*--cef()--*/ - virtual CefRefPtr GetClient() =0; - - /// - // Returns the main (top-level) frame for the browser window. - /// - /*--cef()--*/ - virtual CefRefPtr GetMainFrame() =0; - - /// - // Returns the focused frame for the browser window. This method should only - // be called on the UI thread. - /// - /*--cef()--*/ - virtual CefRefPtr GetFocusedFrame() =0; - - /// - // Returns the frame with the specified name, or NULL if not found. This - // method should only be called on the UI thread. - /// - /*--cef()--*/ - virtual CefRefPtr GetFrame(const CefString& name) =0; - - /// - // Returns the names of all existing frames. This method should only be called - // on the UI thread. - /// - /*--cef()--*/ - virtual void GetFrameNames(std::vector& names) =0; - - /// - // Search for |searchText|. |identifier| can be used to have multiple searches - // running simultaniously. |forward| indicates whether to search forward or - // backward within the page. |matchCase| indicates whether the search should - // be case-sensitive. |findNext| indicates whether this is the first request - // or a follow-up. - /// - /*--cef()--*/ - virtual void Find(int identifier, const CefString& searchText, - bool forward, bool matchCase, bool findNext) =0; - - /// - // Cancel all searches that are currently going on. - /// - /*--cef()--*/ - virtual void StopFinding(bool clearSelection) =0; - - /// - // Get the zoom level. - /// - /*--cef()--*/ - virtual double GetZoomLevel() =0; - - /// - // Change the zoom level to the specified value. - /// - /*--cef()--*/ - virtual void SetZoomLevel(double zoomLevel) =0; - - /// - // Clear the back/forward browsing history. - /// - /*--cef()--*/ - virtual void ClearHistory() =0; - - /// - // Open developer tools in its own window. - /// - /*--cef()--*/ - virtual void ShowDevTools() =0; - - /// - // Explicitly close the developer tools window if one exists for this browser - // instance. - /// - /*--cef()--*/ - virtual void CloseDevTools() =0; - - /// - // Returns true if window rendering is disabled. - /// - /*--cef()--*/ - virtual bool IsWindowRenderingDisabled() =0; - - /// - // Get the size of the specified element. This method should only be called on - // the UI thread. - /// - /*--cef()--*/ - virtual bool GetSize(PaintElementType type, int& width, int& height) =0; - - /// - // Set the size of the specified element. This method is only used when window - // rendering is disabled. - /// - /*--cef()--*/ - virtual void SetSize(PaintElementType type, int width, int height) =0; - - /// - // Returns true if a popup is currently visible. This method should only be - // called on the UI thread. - /// - /*--cef()--*/ - virtual bool IsPopupVisible() =0; - - /// - // Hide the currently visible popup, if any. - /// - /*--cef()--*/ - virtual void HidePopup() =0; - - /// - // Invalidate the |dirtyRect| region of the view. This method is only used - // when window rendering is disabled and will result in a call to - // HandlePaint(). - /// - /*--cef()--*/ - virtual void Invalidate(const CefRect& dirtyRect) =0; - - /// - // Get the raw image data contained in the specified element without - // performing validation. The specified |width| and |height| dimensions must - // match the current element size. On Windows |buffer| must be width*height*4 - // bytes in size and represents a BGRA image with an upper-left origin. This - // method should only be called on the UI thread. - /// - /*--cef()--*/ - virtual bool GetImage(PaintElementType type, int width, int height, - void* buffer) =0; - - /// - // Send a key event to the browser. - /// - /*--cef()--*/ - virtual void SendKeyEvent(KeyType type, int key, int modifiers, bool sysChar, - bool imeChar) =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(int x, int y, 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(int x, int y, 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. - /// - /*--cef()--*/ - virtual void SendMouseWheelEvent(int x, int y, int delta) =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; -}; - - -/// -// Class used to represent a frame in the browser window. The methods of this -// class may be called on any thread unless otherwise indicated in the comments. -/// -/*--cef(source=library)--*/ -class CefFrame : public virtual CefBase -{ -public: - /// - // Execute undo in this frame. - /// - /*--cef()--*/ - virtual void Undo() =0; - /// - // Execute redo in this frame. - /// - /*--cef()--*/ - virtual void Redo() =0; - /// - // Execute cut in this frame. - /// - /*--cef()--*/ - virtual void Cut() =0; - /// - // Execute copy in this frame. - /// - /*--cef()--*/ - virtual void Copy() =0; - /// - // Execute paste in this frame. - /// - /*--cef()--*/ - virtual void Paste() =0; - /// - // Execute delete in this frame. - /// - /*--cef(capi_name=del)--*/ - virtual void Delete() =0; - /// - // Execute select all in this frame. - /// - /*--cef()--*/ - virtual void SelectAll() =0; - - /// - // Execute printing in the this frame. The user will be prompted with the - // print dialog appropriate to the operating system. - /// - /*--cef()--*/ - virtual void Print() =0; - - /// - // Save this frame's HTML source to a temporary file and open it in the - // default text viewing application. - /// - /*--cef()--*/ - virtual void ViewSource() =0; - - /// - // Returns this frame's HTML source as a string. This method should only be - // called on the UI thread. - /// - /*--cef()--*/ - virtual CefString GetSource() =0; - - /// - // Returns this frame's display text as a string. This method should only be - // called on the UI thread. - /// - /*--cef()--*/ - virtual CefString GetText() =0; - - /// - // Load the request represented by the |request| object. - /// - /*--cef()--*/ - virtual void LoadRequest(CefRefPtr request) =0; - - /// - // Load the specified |url|. - /// - /*--cef()--*/ - virtual void LoadURL(const CefString& url) =0; - - /// - // Load the contents of |string| with the optional dummy target |url|. - /// - /*--cef()--*/ - virtual void LoadString(const CefString& string, - const CefString& url) =0; - - /// - // Load the contents of |stream| with the optional dummy target |url|. - /// - /*--cef()--*/ - virtual void LoadStream(CefRefPtr stream, - const CefString& url) =0; - - /// - // Execute a string of JavaScript code in this frame. The |script_url| - // parameter is the URL where the script in question can be found, if any. - // The renderer may request this URL to show the developer the source of the - // error. The |start_line| parameter is the base line number to use for error - // reporting. - /// - /*--cef(optional_param=scriptUrl)--*/ - virtual void ExecuteJavaScript(const CefString& jsCode, - const CefString& scriptUrl, - int startLine) =0; - - /// - // Returns true if this is the main (top-level) frame. - /// - /*--cef()--*/ - virtual bool IsMain() =0; - - /// - // Returns true if this is the focused frame. This method should only be - // called on the UI thread. - /// - /*--cef()--*/ - virtual bool IsFocused() =0; - - /// - // Returns the name for this frame. If the frame has an assigned name (for - // example, set via the iframe "name" attribute) then that value will be - // returned. Otherwise a unique name will be constructed based on the frame - // parent hierarchy. The main (top-level) frame will always have an empty name - // value. - /// - /*--cef()--*/ - virtual CefString GetName() =0; - - /// - // Returns the globally unique identifier for this frame. This method should - // only be called on the UI thread. - /// - /*--cef()--*/ - virtual long long GetIdentifier() =0; - - /// - // Returns the parent of this frame or NULL if this is the main (top-level) - // frame. This method should only be called on the UI thread. - /// - /*--cef()--*/ - virtual CefRefPtr GetParent() =0; - - /// - // Returns the URL currently loaded in this frame. This method should only be - // called on the UI thread. - /// - /*--cef()--*/ - virtual CefString GetURL() =0; - - /// - // Returns the browser that this frame belongs to. - /// - /*--cef()--*/ - virtual CefRefPtr GetBrowser() =0; - - /// - // Visit the DOM document. - /// - /*--cef()--*/ - virtual void VisitDOM(CefRefPtr visitor) =0; - - /// - // Get the V8 context associated with the frame. This method should only be - // called on the UI thread. - /// - /*--cef()--*/ - virtual CefRefPtr GetV8Context() =0; -}; - - -/// -// Implement this interface to handle proxy resolution events. -/// -/*--cef(source=client)--*/ -class CefProxyHandler : public virtual CefBase -{ -public: - /// - // Called to retrieve proxy information for the specified |url|. - /// - /*--cef()--*/ - virtual void GetProxyForUrl(const CefString& url, - CefProxyInfo& proxy_info) {} -}; - - -/// -// Implement this interface to provide handler implementations. -/// -/*--cef(source=client,no_debugct_check)--*/ -class CefApp : public virtual CefBase -{ -public: - /// - // Return the handler for proxy events. If not handler is returned the default - // system handler will be used. - /// - /*--cef()--*/ - virtual CefRefPtr GetProxyHandler() { return NULL; } -}; - - -/// -// Implement this interface to handle events related to browser life span. The -// methods of this class will be called on the UI thread. -/// -/*--cef(source=client)--*/ -class CefLifeSpanHandler : public virtual CefBase -{ -public: - /// - // Called before a new popup window is created. The |parentBrowser| parameter - // will point to the parent browser window. The |popupFeatures| parameter will - // contain information about the style of popup window requested. Return false - // to have the framework create the new popup window based on the parameters - // in |windowInfo|. Return true to cancel creation of the popup window. By - // default, a newly created popup window will have the same client and - // settings as the parent window. To change the client for the new window - // modify the object that |client| points to. To change the settings for the - // new window modify the |settings| structure. - /// - /*--cef(optional_param=url)--*/ - virtual bool OnBeforePopup(CefRefPtr parentBrowser, - const CefPopupFeatures& popupFeatures, - CefWindowInfo& windowInfo, - const CefString& url, - CefRefPtr& client, - CefBrowserSettings& settings) { return false; } - - /// - // Called after a new window is created. - /// - /*--cef()--*/ - virtual void OnAfterCreated(CefRefPtr browser) {} - - /// - // Called when a modal window is about to display and the modal loop should - // begin running. Return false to use the default modal loop implementation or - // true to use a custom implementation. - /// - /*--cef()--*/ - virtual bool RunModal(CefRefPtr browser) { return false; } - - /// - // Called when a window has recieved a request to close. Return false to - // proceed with the window close or true to cancel the window close. If this - // is a modal window and a custom modal loop implementation was provided in - // RunModal() this callback should be used to restore the opener window to a - // usable state. - /// - /*--cef()--*/ - virtual bool DoClose(CefRefPtr browser) { return false; } - - /// - // Called just before a window is closed. If this is a modal window and a - // custom modal loop implementation was provided in RunModal() this callback - // should be used to exit the custom modal loop. - /// - /*--cef()--*/ - virtual void OnBeforeClose(CefRefPtr browser) {} -}; - - -/// -// Implement this interface to handle events related to browser load status. The -// methods of this class will be called on the UI thread. -/// -/*--cef(source=client)--*/ -class CefLoadHandler : public virtual CefBase -{ -public: - typedef cef_handler_errorcode_t ErrorCode; - - /// - // Called when the browser begins loading a frame. The |frame| value will - // never be empty -- call the IsMain() method to check if this frame is the - // main frame. Multiple frames may be loading at the same time. Sub-frames may - // start or continue loading after the main frame load has ended. This method - // may not be called for a particular frame if the load request for that frame - // fails. - /// - /*--cef()--*/ - virtual void OnLoadStart(CefRefPtr browser, - CefRefPtr frame) {} - - /// - // Called when the browser is done loading a frame. The |frame| value will - // never be empty -- call the IsMain() method to check if this frame is the - // main frame. Multiple frames may be loading at the same time. Sub-frames may - // start or continue loading after the main frame load has ended. This method - // will always be called for all frames irrespective of whether the request - // completes successfully. - /// - /*--cef()--*/ - virtual void OnLoadEnd(CefRefPtr browser, - CefRefPtr frame, - int httpStatusCode) {} - - /// - // Called when the browser fails to load a resource. |errorCode| is the error - // code number and |failedUrl| is the URL that failed to load. To provide - // custom error text assign the text to |errorText| and return true. - // Otherwise, return false for the default error text. See - // net\base\net_error_list.h for complete descriptions of the error codes. - /// - /*--cef()--*/ - virtual bool OnLoadError(CefRefPtr browser, - CefRefPtr frame, - ErrorCode errorCode, - const CefString& failedUrl, - CefString& errorText) { return false; } -}; - - -/// -// Implement this interface to handle events related to browser requests. The -// methods of this class will be called on the thread indicated. -/// -/*--cef(source=client)--*/ -class CefRequestHandler : public virtual CefBase -{ -public: - typedef cef_handler_navtype_t NavType; - - /// - // Called on the UI thread before browser navigation. Return true to cancel - // the navigation or false to allow the navigation to proceed. - /// - /*--cef()--*/ - virtual bool OnBeforeBrowse(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr request, - NavType navType, - bool isRedirect) { return false; } - - /// - // Called on the IO thread before a resource is loaded. To allow the resource - // to load normally return false. To redirect the resource to a new url - // populate the |redirectUrl| value and return false. To specify data for the - // resource return a CefStream object in |resourceStream|, use the |response| - // object to set mime type, HTTP status code and optional header values, and - // return false. To cancel loading of the resource return true. Any - // modifications to |request| will be observed. If the URL in |request| is - // changed and |redirectUrl| is also set, the URL in |request| will be used. - /// - /*--cef()--*/ - virtual bool OnBeforeResourceLoad(CefRefPtr browser, - CefRefPtr request, - CefString& redirectUrl, - CefRefPtr& resourceStream, - CefRefPtr response, - int loadFlags) { return false; } - - /// - // Called on the IO thread when a resource load is redirected. The |old_url| - // parameter will contain the old URL. The |new_url| parameter will contain - // the new URL and can be changed if desired. - /// - /*--cef()--*/ - virtual void OnResourceRedirect(CefRefPtr browser, - const CefString& old_url, - CefString& new_url) {} - - /// - // Called on the UI thread after a response to the resource request is - // received. Set |filter| if response content needs to be monitored and/or - // modified as it arrives. - /// - /*--cef()--*/ - virtual void OnResourceResponse(CefRefPtr browser, - const CefString& url, - CefRefPtr response, - CefRefPtr& filter) {} - - /// - // Called on the IO thread to handle requests for URLs with an unknown - // protocol component. Return true to indicate that the request should - // succeed because it was handled externally. Set |allowOSExecution| to true - // and return false to attempt execution via the registered OS protocol - // handler, if any. If false is returned and either |allow_os_execution| - // is false or OS protocol handler execution fails then the request will fail - // with an error condition. - // SECURITY WARNING: YOU SHOULD USE THIS METHOD TO ENFORCE RESTRICTIONS BASED - // ON SCHEME, HOST OR OTHER URL ANALYSIS BEFORE ALLOWING OS EXECUTION. - /// - /*--cef()--*/ - virtual bool OnProtocolExecution(CefRefPtr browser, - const CefString& url, - bool& allowOSExecution) { return false; } - - /// - // Called on the UI thread when a server indicates via the - // 'Content-Disposition' header that a response represents a file to download. - // |mimeType| is the mime type for the download, |fileName| is the suggested - // target file name and |contentLength| is either the value of the - // 'Content-Size' header or -1 if no size was provided. Set |handler| to the - // CefDownloadHandler instance that will recieve the file contents. Return - // true to download the file or false to cancel the file download. - /// - /*--cef()--*/ - virtual bool GetDownloadHandler(CefRefPtr browser, - const CefString& mimeType, - const CefString& fileName, - int64 contentLength, - CefRefPtr& handler) - { return false; } - - /// - // 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 number. Set |username| and |password| and return - // true to handle the request. Return false to cancel the request. - /// - /*--cef(optional_param=realm)--*/ - virtual bool GetAuthCredentials(CefRefPtr browser, - bool isProxy, - const CefString& host, - int port, - const CefString& realm, - const CefString& scheme, - CefString& username, - CefString& password) { return false; } -}; - - -/// -// Implement this interface to handle events related to browser display state. -// The methods of this class will be called on the UI thread. -/// -/*--cef(source=client)--*/ -class CefDisplayHandler : public virtual CefBase -{ -public: - typedef cef_handler_statustype_t StatusType; - - /// - // Called when the navigation state has changed. - /// - /*--cef()--*/ - virtual void OnNavStateChange(CefRefPtr browser, - bool canGoBack, - bool canGoForward) {} - - /// - // Called when a frame's address has changed. - /// - /*--cef()--*/ - virtual void OnAddressChange(CefRefPtr browser, - CefRefPtr frame, - const CefString& url) {} - - /// - // Called when the size of the content area has changed. - /// - /*--cef()--*/ - virtual void OnContentsSizeChange(CefRefPtr browser, - CefRefPtr frame, - int width, - int height) {} - - /// - // Called when the page title changes. - /// - /*--cef(optional_param=title)--*/ - virtual void OnTitleChange(CefRefPtr browser, - const CefString& title) {} - - /// - // Called when the browser is about to display a tooltip. |text| contains the - // 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. - /// - /*--cef(optional_param=text)--*/ - virtual bool OnTooltip(CefRefPtr browser, - CefString& text) { return false; } - - /// - // Called when the browser receives a status message. |text| contains the text - // that will be displayed in the status message and |type| indicates the - // status message type. - /// - /*--cef(optional_param=value)--*/ - virtual void OnStatusMessage(CefRefPtr browser, - const CefString& value, - StatusType type) {} - - /// - // Called to display a console message. Return true to stop the message from - // being output to the console. - /// - /*--cef(optional_param=message,optional_param=source)--*/ - virtual bool OnConsoleMessage(CefRefPtr browser, - const CefString& message, - const CefString& source, - int line) { return false; } -}; - - -/// -// Implement this interface to handle events related to focus. The methods of -// this class will be called on the UI thread. -/// -/*--cef(source=client)--*/ -class CefFocusHandler : public virtual CefBase -{ -public: - typedef cef_handler_focus_source_t FocusSource; - - /// - // Called when the browser component is about to loose focus. For instance, if - // focus was on the last HTML element and the user pressed the TAB key. |next| - // will be true if the browser is giving focus to the next component and false - // if the browser is giving focus to the previous component. - /// - /*--cef()--*/ - virtual void OnTakeFocus(CefRefPtr browser, - bool next) {} - - /// - // Called when the browser component is requesting focus. |source| indicates - // where the focus request is originating from. Return false to allow the - // focus to be set or true to cancel setting the focus. - /// - /*--cef()--*/ - virtual bool OnSetFocus(CefRefPtr browser, - FocusSource source) { return false; } - - /// - // 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 - // this method represents a snapshot of the DOM at the time this method is - // executed. DOM objects are only valid for the scope of this method. Do not - // keep references to or attempt to access any DOM objects outside the scope - // of this method. - /// - /*--cef(optional_param=frame,optional_param=node)--*/ - virtual void OnFocusedNodeChanged(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr node) {} -}; - - -/// -// Implement this interface to handle events related to keyboard input. The -// methods of this class will be called on the UI thread. -/// -/*--cef(source=client)--*/ -class CefKeyboardHandler : public virtual CefBase -{ -public: - typedef cef_handler_keyevent_type_t KeyEventType; - - /// - // Called when the browser component receives a keyboard event. This method - // is called both before the event is passed to the renderer and after - // JavaScript in the page has had a chance to handle the event. |type| is the - // type of keyboard event, |code| is the windows scan-code for the event, - // |modifiers| is a set of bit- flags describing any pressed modifier keys and - // |isSystemKey| is true if Windows considers this a 'system key' message (see - // http://msdn.microsoft.com/en-us/library/ms646286(VS.85).aspx). If - // |isAfterJavaScript| is true then JavaScript in the page has had a chance - // to handle the event and has chosen not to. Only RAWKEYDOWN, KEYDOWN and - // CHAR events will be sent with |isAfterJavaScript| set to true. Return - // true if the keyboard event was handled or false to allow continued handling - // of the event by the renderer. - /// - /*--cef()--*/ - virtual bool OnKeyEvent(CefRefPtr browser, - KeyEventType type, - int code, - int modifiers, - bool isSystemKey, - bool isAfterJavaScript) { return false; } -}; - - -/// -// Implement this interface to handle events related to browser context menus. -// The methods of this class will be called on the UI thread. -/// -/*--cef(source=client)--*/ -class CefMenuHandler : public virtual CefBase -{ -public: - typedef cef_menu_id_t MenuId; - - /// - // Called before a context menu is displayed. Return false to display the - // default context menu or true to cancel the display. - /// - /*--cef()--*/ - virtual bool OnBeforeMenu(CefRefPtr browser, - const CefMenuInfo& menuInfo) { return false; } - - /// - // Called to optionally override the default text for a context menu item. - // |label| contains the default text and may be modified to substitute - // alternate text. - /// - /*--cef()--*/ - virtual void GetMenuLabel(CefRefPtr browser, - MenuId menuId, - CefString& label) {} - - /// - // Called when an option is selected from the default context menu. Return - // false to execute the default action or true to cancel the action. - /// - /*--cef()--*/ - virtual bool OnMenuAction(CefRefPtr browser, - MenuId menuId) { return false; } -}; - - -/// -// Implement this interface to handle events related to printing. The methods of -// this class will be called on the UI thread. -/// -/*--cef(source=client)--*/ -class CefPrintHandler : public virtual CefBase -{ -public: - /// - // Called to allow customization of standard print options before the print - // dialog is displayed. |printOptions| allows specification of paper size, - // orientation and margins. Note that the specified margins may be adjusted if - // they are outside the range supported by the printer. All units are in - // inches. Return false to display the default print options or true to - // display the modified |printOptions|. - /// - /*--cef()--*/ - virtual bool GetPrintOptions(CefRefPtr browser, - CefPrintOptions& printOptions) { return false; } - - /// - // Called to format print headers and footers. |printInfo| contains platform- - // specific information about the printer context. |url| is the URL if the - // currently printing page, |title| is the title of the currently printing - // page, |currentPage| is the current page number and |maxPages| is the total - // number of pages. Six default header locations are provided by the - // implementation: top left, top center, top right, bottom left, bottom center - // and bottom right. To use one of these default locations just assign a - // string to the appropriate variable. To draw the header and footer yourself - // return true. Otherwise, populate the approprate variables and return false. - /// - /*--cef()--*/ - virtual bool GetPrintHeaderFooter(CefRefPtr browser, - CefRefPtr frame, - const CefPrintInfo& printInfo, - const CefString& url, - const CefString& title, - int currentPage, - int maxPages, - CefString& topLeft, - CefString& topCenter, - CefString& topRight, - CefString& bottomLeft, - CefString& bottomCenter, - CefString& bottomRight) { return false; } -}; - - -/// -// Implement this interface to handle events related to find results. The -// methods of this class will be called on the UI thread. -/// -/*--cef(source=client)--*/ -class CefFindHandler : public virtual CefBase -{ -public: - /// - // Called to report find results returned by CefBrowser::Find(). |identifer| - // is the identifier passed to CefBrowser::Find(), |count| is the number of - // matches currently identified, |selectionRect| is the location of where the - // match was found (in window coordinates), |activeMatchOrdinal| is the - // current position in the search results, and |finalUpdate| is true if this - // is the last find notification. - /// - /*--cef()--*/ - virtual void OnFindResult(CefRefPtr browser, - int identifier, - int count, - const CefRect& selectionRect, - int activeMatchOrdinal, - bool finalUpdate) {} -}; - - -/// -// Implement this interface to handle events related to JavaScript dialogs. The -// methods of this class will be called on the UI thread. -/// -/*--cef(source=client)--*/ -class CefJSDialogHandler : public virtual CefBase -{ -public: - /// - // Called to run a JavaScript alert message. Return false to display the - // default alert or true if you displayed a custom alert. - /// - /*--cef()--*/ - virtual bool OnJSAlert(CefRefPtr browser, - CefRefPtr frame, - const CefString& message) { return false; } - - /// - // Called to run a JavaScript confirm request. Return false to display the - // default alert or true if you displayed a custom alert. If you handled the - // alert set |retval| to true if the user accepted the confirmation. - /// - /*--cef()--*/ - virtual bool OnJSConfirm(CefRefPtr browser, - CefRefPtr frame, - const CefString& message, - bool& retval) { return false; } - - /// - // Called to run a JavaScript prompt request. Return false to display the - // default prompt or true if you displayed a custom prompt. If you handled - // the prompt set |retval| to true if the user accepted the prompt and request - // and |result| to the resulting value. - /// - /*--cef()--*/ - virtual bool OnJSPrompt(CefRefPtr browser, - CefRefPtr frame, - const CefString& message, - const CefString& defaultValue, - bool& retval, - CefString& result) { return false; } -}; - - -/// -// Implement this interface to handle V8 context events. The methods of this -// class will be called on the UI thread. -/// -/*--cef(source=client)--*/ -class CefV8ContextHandler : public virtual CefBase -{ -public: - /// - // Called immediately after the V8 context for a frame has been created. To - // retrieve the JavaScript 'window' object use the CefV8Context::GetGlobal() - // method. - /// - /*--cef()--*/ - virtual void OnContextCreated(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr context) {} - - /// - // Called immediately before the V8 context for a frame is released. No - // references to the context should be kept after this method is called. - /// - /*--cef()--*/ - virtual void OnContextReleased(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr context) {} -}; - - -/// -// 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 view rectangle which is relative to screen - // coordinates. Return true if the rectangle was provided. - /// - /*--cef()--*/ - virtual bool GetViewRect(CefRefPtr browser, - CefRect& rect) { return false; } - - /// - // Called to retrieve the simulated screen rectangle. Return true if the - // rectangle was provided. - /// - /*--cef()--*/ - virtual bool GetScreenRect(CefRefPtr browser, - CefRect& rect) { return false; } - - /// - // 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) {} - - /// - // Called when the browser window's cursor has changed. - /// - /*--cef()--*/ - virtual void OnCursorChange(CefRefPtr browser, - CefCursorHandle cursor) {} -}; - - -/// -// Implement this interface to handle events related to dragging. The methods of -// this class will be called on the UI thread. -/// -/*--cef(source=client)--*/ -class CefDragHandler : public virtual CefBase -{ -public: - typedef cef_drag_operations_mask_t DragOperationsMask; - - /// - // Called when the browser window initiates a drag event. |dragData| - // contains the drag event data and |mask| represents the type of drag - // operation. Return false for default drag handling behavior or true to - // cancel the drag event. - /// - /*--cef()--*/ - virtual bool OnDragStart(CefRefPtr browser, - CefRefPtr dragData, - DragOperationsMask mask) { return false; } - - /// - // Called when an external drag event enters the browser window. |dragData| - // contains the drag event data and |mask| represents the type of drag - // operation. Return false for default drag handling behavior or true to - // cancel the drag event. - /// - /*--cef()--*/ - virtual bool OnDragEnter(CefRefPtr browser, - CefRefPtr dragData, - DragOperationsMask mask) { return false; } -}; - - -/// -// Implement this interface to provide handler implementations. -/// -/*--cef(source=client,no_debugct_check)--*/ -class CefClient : public virtual CefBase -{ -public: - /// - // Return the handler for browser life span events. - /// - /*--cef()--*/ - virtual CefRefPtr GetLifeSpanHandler() { return NULL; } - - /// - // Return the handler for browser load status events. - /// - /*--cef()--*/ - virtual CefRefPtr GetLoadHandler() { return NULL; } - - /// - // Return the handler for browser request events. - /// - /*--cef()--*/ - virtual CefRefPtr GetRequestHandler() { return NULL; } - - /// - // Return the handler for browser display state events. - /// - /*--cef()--*/ - virtual CefRefPtr GetDisplayHandler() { return NULL; } - - /// - // Return the handler for focus events. - /// - /*--cef()--*/ - virtual CefRefPtr GetFocusHandler() { return NULL; } - - /// - // Return the handler for keyboard events. - /// - /*--cef()--*/ - virtual CefRefPtr GetKeyboardHandler() { return NULL; } - - /// - // Return the handler for context menu events. - /// - /*--cef()--*/ - virtual CefRefPtr GetMenuHandler() { return NULL; } - - /// - // Return the handler for printing events. - /// - /*--cef()--*/ - virtual CefRefPtr GetPrintHandler() { return NULL; } - - /// - // Return the handler for find result events. - /// - /*--cef()--*/ - virtual CefRefPtr GetFindHandler() { return NULL; } - - /// - // Return the handler for JavaScript dialog events. - /// - /*--cef()--*/ - virtual CefRefPtr GetJSDialogHandler() { return NULL; } - - /// - // Return the handler for V8 context events. - /// - /*--cef()--*/ - virtual CefRefPtr GetV8ContextHandler() { return NULL; } - - /// - // Return the handler for off-screen rendering events. - /// - /*--cef()--*/ - virtual CefRefPtr GetRenderHandler() { return NULL; } - - /// - // Return the handler for drag events. - /// - /*--cef()--*/ - virtual CefRefPtr GetDragHandler() { return NULL; } -}; - - -/// -// Class used to represent a web request. The methods of this class may be -// called on any thread. -/// -/*--cef(source=library)--*/ -class CefRequest : public virtual CefBase -{ -public: - typedef std::multimap HeaderMap; - typedef cef_weburlrequest_flags_t RequestFlags; - - /// - // Create a new CefRequest object. - /// - /*--cef()--*/ - static CefRefPtr CreateRequest(); - - /// - // Get the fully qualified URL. - /// - /*--cef()--*/ - virtual CefString GetURL() =0; - /// - // Set the fully qualified URL. - /// - /*--cef()--*/ - virtual void SetURL(const CefString& url) =0; - - /// - // Get the request method type. The value will default to POST if post data - // is provided and GET otherwise. - /// - /*--cef()--*/ - virtual CefString GetMethod() =0; - /// - // Set the request method type. - /// - /*--cef()--*/ - virtual void SetMethod(const CefString& method) =0; - - /// - // Get the post data. - /// - /*--cef()--*/ - virtual CefRefPtr GetPostData() =0; - /// - // Set the post data. - /// - /*--cef()--*/ - virtual void SetPostData(CefRefPtr postData) =0; - - /// - // Get the header values. - /// - /*--cef()--*/ - virtual void GetHeaderMap(HeaderMap& headerMap) =0; - /// - // Set the header values. - /// - /*--cef()--*/ - virtual void SetHeaderMap(const HeaderMap& headerMap) =0; - - /// - // Set all values at one time. - /// - /*--cef(optional_param=postData)--*/ - virtual void Set(const CefString& url, - const CefString& method, - CefRefPtr postData, - const HeaderMap& headerMap) =0; - - /// - // Get the flags used in combination with CefWebURLRequest. - /// - /*--cef(default_retval=WUR_FLAG_NONE)--*/ - virtual RequestFlags GetFlags() =0; - /// - // Set the flags used in combination with CefWebURLRequest. - /// - /*--cef()--*/ - virtual void SetFlags(RequestFlags flags) =0; - - /// - // Set the URL to the first party for cookies used in combination with - // CefWebURLRequest. - /// - /*--cef()--*/ - virtual CefString GetFirstPartyForCookies() =0; - /// - // Get the URL to the first party for cookies used in combination with - // CefWebURLRequest. - /// - /*--cef()--*/ - virtual void SetFirstPartyForCookies(const CefString& url) =0; -}; - - -/// -// Class used to represent post data for a web request. The methods of this -// class may be called on any thread. -/// -/*--cef(source=library)--*/ -class CefPostData : public virtual CefBase -{ -public: - typedef std::vector > ElementVector; - - /// - // Create a new CefPostData object. - /// - /*--cef()--*/ - static CefRefPtr CreatePostData(); - - /// - // Returns the number of existing post data elements. - /// - /*--cef()--*/ - virtual size_t GetElementCount() =0; - - /// - // Retrieve the post data elements. - /// - /*--cef(count_func=elements:GetElementCount)--*/ - virtual void GetElements(ElementVector& elements) =0; - - /// - // Remove the specified post data element. Returns true if the removal - // succeeds. - /// - /*--cef()--*/ - virtual bool RemoveElement(CefRefPtr element) =0; - - /// - // Add the specified post data element. Returns true if the add succeeds. - /// - /*--cef()--*/ - virtual bool AddElement(CefRefPtr element) =0; - - /// - // Remove all existing post data elements. - /// - /*--cef()--*/ - virtual void RemoveElements() =0; -}; - - -/// -// Class used to represent a single element in the request post data. The -// methods of this class may be called on any thread. -/// -/*--cef(source=library)--*/ -class CefPostDataElement : public virtual CefBase -{ -public: - /// - // Post data elements may represent either bytes or files. - /// - typedef cef_postdataelement_type_t Type; - - /// - // Create a new CefPostDataElement object. - /// - /*--cef()--*/ - static CefRefPtr CreatePostDataElement(); - - /// - // Remove all contents from the post data element. - /// - /*--cef()--*/ - virtual void SetToEmpty() =0; - - /// - // The post data element will represent a file. - /// - /*--cef()--*/ - virtual void SetToFile(const CefString& fileName) =0; - - /// - // The post data element will represent bytes. The bytes passed - // in will be copied. - /// - /*--cef()--*/ - virtual void SetToBytes(size_t size, const void* bytes) =0; - - /// - // Return the type of this post data element. - /// - /*--cef(default_retval=PDE_TYPE_EMPTY)--*/ - virtual Type GetType() =0; - - /// - // Return the file name. - /// - /*--cef()--*/ - virtual CefString GetFile() =0; - - /// - // Return the number of bytes. - /// - /*--cef()--*/ - virtual size_t GetBytesCount() =0; - - /// - // Read up to |size| bytes into |bytes| and return the number of bytes - // actually read. - /// - /*--cef()--*/ - virtual size_t GetBytes(size_t size, void* bytes) =0; -}; - - -/// -// Class used to represent a web response. The methods of this class may be -// called on any thread. -/// -/*--cef(source=library)--*/ -class CefResponse : public virtual CefBase -{ -public: - typedef std::multimap HeaderMap; - - /// - // Get the response status code. - /// - /*--cef()--*/ - virtual int GetStatus() =0; - /// - // Set the response status code. - /// - /*--cef()--*/ - virtual void SetStatus(int status) = 0; - - /// - // Get the response status text. - /// - /*--cef()--*/ - virtual CefString GetStatusText() =0; - /// - // Set the response status text. - /// - /*--cef()--*/ - virtual void SetStatusText(const CefString& statusText) = 0; - - /// - // Get the response mime type. - /// - /*--cef()--*/ - virtual CefString GetMimeType() = 0; - /// - // Set the response mime type. - /// - /*--cef()--*/ - virtual void SetMimeType(const CefString& mimeType) = 0; - - /// - // Get the value for the specified response header field. - /// - /*--cef()--*/ - virtual CefString GetHeader(const CefString& name) =0; - - /// - // Get all response header fields. - /// - /*--cef()--*/ - virtual void GetHeaderMap(HeaderMap& headerMap) =0; - /// - // Set all response header fields. - /// - /*--cef()--*/ - virtual void SetHeaderMap(const HeaderMap& headerMap) =0; -}; - - -/// -// Interface the client can implement to provide a custom stream reader. The -// methods of this class may be called on any thread. -/// -/*--cef(source=client)--*/ -class CefReadHandler : public virtual CefBase -{ -public: - /// - // Read raw binary data. - /// - /*--cef()--*/ - virtual size_t Read(void* ptr, size_t size, size_t n) =0; - - /// - // Seek to the specified offset position. |whence| may be any one of - // SEEK_CUR, SEEK_END or SEEK_SET. - /// - /*--cef()--*/ - virtual int Seek(long offset, int whence) =0; - - /// - // Return the current offset position. - /// - /*--cef()--*/ - virtual long Tell() =0; - - /// - // Return non-zero if at end of file. - /// - /*--cef()--*/ - virtual int Eof() =0; -}; - - -/// -// Class used to read data from a stream. The methods of this class may be -// called on any thread. -/// -/*--cef(source=library)--*/ -class CefStreamReader : public virtual CefBase -{ -public: - /// - // Create a new CefStreamReader object from a file. - /// - /*--cef()--*/ - static CefRefPtr CreateForFile(const CefString& fileName); - /// - // Create a new CefStreamReader object from data. - /// - /*--cef()--*/ - static CefRefPtr CreateForData(void* data, size_t size); - /// - // Create a new CefStreamReader object from a custom handler. - /// - /*--cef()--*/ - static CefRefPtr CreateForHandler( - CefRefPtr handler); - - /// - // Read raw binary data. - /// - /*--cef()--*/ - virtual size_t Read(void* ptr, size_t size, size_t n) =0; - - /// - // Seek to the specified offset position. |whence| may be any one of - // SEEK_CUR, SEEK_END or SEEK_SET. Returns zero on success and non-zero on - // failure. - /// - /*--cef()--*/ - virtual int Seek(long offset, int whence) =0; - - /// - // Return the current offset position. - /// - /*--cef()--*/ - virtual long Tell() =0; - - /// - // Return non-zero if at end of file. - /// - /*--cef()--*/ - virtual int Eof() =0; -}; - - -/// -// Interface the client can implement to provide a custom stream writer. The -// methods of this class may be called on any thread. -/// -/*--cef(source=client)--*/ -class CefWriteHandler : public virtual CefBase -{ -public: - /// - // Write raw binary data. - /// - /*--cef()--*/ - virtual size_t Write(const void* ptr, size_t size, size_t n) =0; - - /// - // Seek to the specified offset position. |whence| may be any one of - // SEEK_CUR, SEEK_END or SEEK_SET. - /// - /*--cef()--*/ - virtual int Seek(long offset, int whence) =0; - - /// - // Return the current offset position. - /// - /*--cef()--*/ - virtual long Tell() =0; - - /// - // Flush the stream. - /// - /*--cef()--*/ - virtual int Flush() =0; -}; - - -/// -// Class used to write data to a stream. The methods of this class may be called -// on any thread. -/// -/*--cef(source=library)--*/ -class CefStreamWriter : public virtual CefBase -{ -public: - /// - // Create a new CefStreamWriter object for a file. - /// - /*--cef()--*/ - static CefRefPtr CreateForFile(const CefString& fileName); - /// - // Create a new CefStreamWriter object for a custom handler. - /// - /*--cef()--*/ - static CefRefPtr CreateForHandler( - CefRefPtr handler); - - /// - // Write raw binary data. - /// - /*--cef()--*/ - virtual size_t Write(const void* ptr, size_t size, size_t n) =0; - - /// - // Seek to the specified offset position. |whence| may be any one of - // SEEK_CUR, SEEK_END or SEEK_SET. - /// - /*--cef()--*/ - virtual int Seek(long offset, int whence) =0; - - /// - // Return the current offset position. - /// - /*--cef()--*/ - virtual long Tell() =0; - - /// - // Flush the stream. - /// - /*--cef()--*/ - virtual int Flush() =0; -}; - - -/// -// Class that encapsulates a V8 context handle. -/// -/*--cef(source=library)--*/ -class CefV8Context : public virtual CefBase -{ -public: - /// - // Returns the current (top) context object in the V8 context stack. - /// - /*--cef()--*/ - static CefRefPtr GetCurrentContext(); - - /// - // Returns the entered (bottom) context object in the V8 context stack. - /// - /*--cef()--*/ - static CefRefPtr GetEnteredContext(); - - /// - // Returns true if V8 is currently inside a context. - /// - /*--cef()--*/ - static bool InContext(); - - /// - // Returns the browser for this context. - /// - /*--cef()--*/ - virtual CefRefPtr GetBrowser() =0; - - /// - // Returns the frame for this context. - /// - /*--cef()--*/ - virtual CefRefPtr GetFrame() =0; - - /// - // Returns the global object for this context. - /// - /*--cef()--*/ - virtual CefRefPtr GetGlobal() =0; - - /// - // Enter this context. A context must be explicitly entered before creating a - // V8 Object, Array or Function asynchronously. Exit() must be called the same - // number of times as Enter() before releasing this context. V8 objects belong - // to the context in which they are created. Returns true if the scope was - // entered successfully. - /// - /*--cef()--*/ - virtual bool Enter() =0; - - /// - // Exit this context. Call this method only after calling Enter(). Returns - // true if the scope was exited successfully. - /// - /*--cef()--*/ - virtual bool Exit() =0; - - /// - // Returns true if this object is pointing to the same handle as |that| - // object. - /// - /*--cef()--*/ - virtual bool IsSame(CefRefPtr that) =0; -}; - - -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 UI thread. -/// -/*--cef(source=client)--*/ -class CefV8Handler : public virtual CefBase -{ -public: - /// - // Handle execution of the function identified by |name|. |object| is the - // receiver ('this' object) of the function. |arguments| is the list of - // arguments passed to the function. If execution succeeds set |retval| to the - // function return value. If execution fails set |exception| to the exception - // that will be thrown. Return true if execution was handled. - /// - /*--cef()--*/ - virtual bool Execute(const CefString& name, - CefRefPtr object, - const CefV8ValueList& arguments, - CefRefPtr& retval, - CefString& exception) =0; -}; - -/// -// 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 UI thread. -/// -/*--cef(source=client)--*/ -class CefV8Accessor : public virtual CefBase -{ -public: - /// - // Handle retrieval the accessor value identified by |name|. |object| is the - // receiver ('this' object) of the accessor. If retrieval succeeds set - // |retval| to the return value. If retrieval fails set |exception| to the - // exception that will be thrown. Return true if accessor retrieval was - // handled. - /// - /*--cef()--*/ - virtual bool Get(const CefString& name, - const CefRefPtr object, - CefRefPtr& retval, - CefString& exception) =0; - - /// - // Handle assignment of the accessor value identified by |name|. |object| is - // the receiver ('this' object) of the accessor. |value| is the new value - // being assigned to the accessor. If assignment fails set |exception| to the - // exception that will be thrown. Return true if accessor assignment was - // handled. - /// - /*--cef()--*/ - virtual bool Set(const CefString& name, - const CefRefPtr object, - const CefRefPtr value, - CefString& exception) =0; -}; - -/// -// Class representing a V8 exception. -/// -/*--cef(source=library)--*/ -class CefV8Exception : public virtual CefBase -{ -public: - /// - // Returns the exception message. - /// - /*--cef()--*/ - virtual CefString GetMessage() =0; - - /// - // Returns the line of source code that the exception occurred within. - /// - /*--cef()--*/ - virtual CefString GetSourceLine() =0; - - /// - // Returns the resource name for the script from where the function causing - // the error originates. - /// - /*--cef()--*/ - virtual CefString GetScriptResourceName() =0; - - /// - // Returns the 1-based number of the line where the error occurred or 0 if the - // line number is unknown. - /// - /*--cef()--*/ - virtual int GetLineNumber() =0; - - /// - // Returns the index within the script of the first character where the error - // occurred. - /// - /*--cef()--*/ - virtual int GetStartPosition() =0; - - /// - // Returns the index within the script of the last character where the error - // occurred. - /// - /*--cef()--*/ - virtual int GetEndPosition() =0; - - /// - // Returns the index within the line of the first character where the error - // occurred. - /// - /*--cef()--*/ - virtual int GetStartColumn() =0; - - /// - // Returns the index within the line of the last character where the error - // occurred. - /// - /*--cef()--*/ - virtual int GetEndColumn() =0; -}; - -/// -// Class representing a V8 value. The methods of this class should only be -// called on the UI thread. -/// -/*--cef(source=library)--*/ -class CefV8Value : public virtual CefBase -{ -public: - typedef cef_v8_accesscontrol_t AccessControl; - typedef cef_v8_propertyattribute_t PropertyAttribute; - - /// - // Create a new CefV8Value object of type undefined. - /// - /*--cef()--*/ - static CefRefPtr CreateUndefined(); - /// - // Create a new CefV8Value object of type null. - /// - /*--cef()--*/ - static CefRefPtr CreateNull(); - /// - // Create a new CefV8Value object of type bool. - /// - /*--cef()--*/ - static CefRefPtr CreateBool(bool value); - /// - // Create a new CefV8Value object of type int. - /// - /*--cef()--*/ - static CefRefPtr CreateInt(int value); - /// - // Create a new CefV8Value object of type double. - /// - /*--cef()--*/ - static CefRefPtr CreateDouble(double value); - /// - // Create a new CefV8Value object of type Date. - /// - /*--cef()--*/ - static CefRefPtr CreateDate(const CefTime& date); - /// - // Create a new CefV8Value object of type string. - /// - /*--cef(optional_param=value)--*/ - static CefRefPtr CreateString(const CefString& value); - /// - // Create a new CefV8Value object of type object. This method should only be - // called from within the scope of a CefV8ContextHandler, CefV8Handler or - // CefV8Accessor callback, or in combination with calling Enter() and Exit() - // on a stored CefV8Context reference. - /// - /*--cef(optional_param=user_data)--*/ - static CefRefPtr CreateObject(CefRefPtr user_data); - /// - // Create a new CefV8Value object of type object with accessors. This method - // should only be called from within the scope of a CefV8ContextHandler, - // CefV8Handler or CefV8Accessor callback, or in combination with calling - // Enter() and Exit() on a stored CefV8Context reference. - /// - /*--cef(capi_name=cef_v8value_create_object_with_accessor, - optional_param=user_data,optional_param=accessor)--*/ - static CefRefPtr CreateObject(CefRefPtr user_data, - CefRefPtr accessor); - /// - // Create a new CefV8Value object of type array. This method should only be - // called from within the scope of a CefV8ContextHandler, CefV8Handler or - // CefV8Accessor callback, or in combination with calling Enter() and Exit() - // on a stored CefV8Context reference. - /// - /*--cef()--*/ - static CefRefPtr CreateArray(); - /// - // Create a new CefV8Value object of type function. This method should only be - // called from within the scope of a CefV8ContextHandler, CefV8Handler or - // CefV8Accessor callback, or in combination with calling Enter() and Exit() - // on a stored CefV8Context reference. - /// - /*--cef()--*/ - static CefRefPtr CreateFunction(const CefString& name, - CefRefPtr handler); - - /// - // True if the value type is undefined. - /// - /*--cef()--*/ - virtual bool IsUndefined() =0; - /// - // True if the value type is null. - /// - /*--cef()--*/ - virtual bool IsNull() =0; - /// - // True if the value type is bool. - /// - /*--cef()--*/ - virtual bool IsBool() =0; - /// - // True if the value type is int. - /// - /*--cef()--*/ - virtual bool IsInt() =0; - /// - // True if the value type is double. - /// - /*--cef()--*/ - virtual bool IsDouble() =0; - /// - // True if the value type is Date. - /// - /*--cef()--*/ - virtual bool IsDate() =0; - /// - // True if the value type is string. - /// - /*--cef()--*/ - virtual bool IsString() =0; - /// - // True if the value type is object. - /// - /*--cef()--*/ - virtual bool IsObject() =0; - /// - // True if the value type is array. - /// - /*--cef()--*/ - virtual bool IsArray() =0; - /// - // True if the value type is function. - /// - /*--cef()--*/ - virtual bool IsFunction() =0; - - /// - // Returns true if this object is pointing to the same handle as |that| - // object. - /// - /*--cef()--*/ - virtual bool IsSame(CefRefPtr that) =0; - - /// - // Return a bool value. The underlying data will be converted to if - // necessary. - /// - /*--cef()--*/ - virtual bool GetBoolValue() =0; - /// - // Return an int value. The underlying data will be converted to if - // necessary. - /// - /*--cef()--*/ - virtual int GetIntValue() =0; - /// - // Return a double value. The underlying data will be converted to if - // necessary. - /// - /*--cef()--*/ - virtual double GetDoubleValue() =0; - /// - // Return a Date value. The underlying data will be converted to if - // necessary. - /// - /*--cef()--*/ - virtual CefTime GetDateValue() =0; - /// - // Return a string value. The underlying data will be converted to if - // necessary. - /// - /*--cef()--*/ - virtual CefString GetStringValue() =0; - - - // OBJECT METHODS - These methods are only available on objects. Arrays and - // functions are also objects. String- and integer-based keys can be used - // interchangably with the framework converting between them as necessary. - - /// - // Returns true if the object has a value with the specified identifier. - /// - /*--cef(capi_name=has_value_bykey)--*/ - virtual bool HasValue(const CefString& key) =0; - /// - // Returns true if the object has a value with the specified identifier. - /// - /*--cef(capi_name=has_value_byindex,index_param=index)--*/ - virtual bool HasValue(int index) =0; - - /// - // Delete the value with the specified identifier. - /// - /*--cef(capi_name=delete_value_bykey)--*/ - virtual bool DeleteValue(const CefString& key) =0; - /// - // Delete the value with the specified identifier. - /// - /*--cef(capi_name=delete_value_byindex,index_param=index)--*/ - virtual bool DeleteValue(int index) =0; - - /// - // Returns the value with the specified identifier. - /// - /*--cef(capi_name=get_value_bykey)--*/ - virtual CefRefPtr GetValue(const CefString& key) =0; - /// - // Returns the value with the specified identifier. - /// - /*--cef(capi_name=get_value_byindex,index_param=index)--*/ - virtual CefRefPtr GetValue(int index) =0; - - /// - // Associate a value with the specified identifier. - /// - /*--cef(capi_name=set_value_bykey)--*/ - virtual bool SetValue(const CefString& key, CefRefPtr value, - PropertyAttribute attribute) =0; - /// - // Associate a value with the specified identifier. - /// - /*--cef(capi_name=set_value_byindex,index_param=index)--*/ - virtual bool SetValue(int index, CefRefPtr value) =0; - - /// - // Register an identifier whose access will be forwarded to the CefV8Accessor - // instance passed to CefV8Value::CreateObject(). - /// - /*--cef(capi_name=set_value_byaccessor)--*/ - virtual bool SetValue(const CefString& key, AccessControl settings, - PropertyAttribute attribute) =0; - - /// - // Read the keys for the object's values into the specified vector. Integer- - // based keys will also be returned as strings. - /// - /*--cef()--*/ - virtual bool GetKeys(std::vector& keys) =0; - - /// - // Returns the user data, if any, specified when the object was created. - /// - /*--cef()--*/ - virtual CefRefPtr GetUserData() =0; - - - // ARRAY METHODS - These methods are only available on arrays. - - /// - // Returns the number of elements in the array. - /// - /*--cef()--*/ - virtual int GetArrayLength() =0; - - - // FUNCTION METHODS - These methods are only available on functions. - - /// - // Returns the function name. - /// - /*--cef()--*/ - virtual CefString GetFunctionName() =0; - - /// - // Returns the function handler or NULL if not a CEF-created function. - /// - /*--cef()--*/ - virtual CefRefPtr GetFunctionHandler() =0; - - /// - // Execute the function using the current V8 context. This method should only - // be called from within the scope of a CefV8Handler or CefV8Accessor - // callback, or in combination with calling Enter() and Exit() on a stored - // CefV8Context reference. |object| is the receiver ('this' object) of the - // function. |arguments| is the list of arguments that will be passed to the - // function. If execution succeeds |retval| will be set to the function return - // value. If execution fails |exception| will be set to the exception that was - // thrown. If |rethrow_exception| is true any exception will also be re- - // thrown. This method returns false if called incorrectly. - /// - /*--cef(optional_param=object)--*/ - virtual bool ExecuteFunction(CefRefPtr object, - const CefV8ValueList& arguments, - CefRefPtr& retval, - CefRefPtr& exception, - bool rethrow_exception) =0; - - /// - // Execute the function using the specified V8 context. |object| is the - // receiver ('this' object) of the function. |arguments| is the list of - // arguments that will be passed to the function. If execution succeeds - // |retval| will be set to the function return value. If execution fails - // |exception| will be set to the exception that was thrown. If - // |rethrow_exception| is true any exception will also be re-thrown. This - // method returns false if called incorrectly. - /// - /*--cef(optional_param=object)--*/ - virtual bool ExecuteFunctionWithContext(CefRefPtr context, - CefRefPtr object, - const CefV8ValueList& arguments, - CefRefPtr& retval, - CefRefPtr& exception, - bool rethrow_exception) =0; -}; - - -/// -// Class that creates CefSchemeHandler instances. The methods of this class will -// always be called on the IO thread. -/// -/*--cef(source=client)--*/ -class CefSchemeHandlerFactory : public virtual CefBase -{ -public: - /// - // Return a new scheme handler instance to handle the request. |browser| will - // be the browser window that initiated the request. If the request was - // initiated using the CefWebURLRequest API |browser| will be NULL. - /// - /*--cef()--*/ - virtual CefRefPtr Create(CefRefPtr browser, - const CefString& scheme_name, - CefRefPtr request) =0; -}; - -/// -// Class used to facilitate asynchronous responses to custom scheme handler -// requests. The methods of this class may be called on any thread. -/// -/*--cef(source=library)--*/ -class CefSchemeHandlerCallback : public virtual CefBase -{ -public: - /// - // Notify that header information is now available for retrieval. - /// - /*--cef()--*/ - virtual void HeadersAvailable() =0; - - /// - // Notify that response data is now available for reading. - /// - /*--cef()--*/ - virtual void BytesAvailable() =0; - - /// - // Cancel processing of the request. - /// - /*--cef()--*/ - virtual void Cancel() =0; -}; - -/// -// Class used to implement a custom scheme handler interface. The methods of -// this class will always be called on the IO thread. -/// -/*--cef(source=client)--*/ -class CefSchemeHandler : public virtual CefBase -{ -public: - /// - // Begin processing the request. To handle the request return true and call - // HeadersAvailable() once the response header information is available - // (HeadersAvailable() can also be called from inside this method if header - // information is available immediately). To cancel the request return false. - /// - /*--cef()--*/ - virtual bool ProcessRequest(CefRefPtr request, - CefRefPtr callback) =0; - - /// - // Retrieve response header information. If the response length is not known - // set |response_length| to -1 and ReadResponse() will be called until it - // returns false. If the response length is known set |response_length| - // to a positive value and ReadResponse() will be called until it returns - // false or the specified number of bytes have been read. Use the |response| - // object to set the mime type, http status code and other optional header - // values. To redirect the request to a new URL set |redirectUrl| to the new - // URL. - /// - /*--cef()--*/ - virtual void GetResponseHeaders(CefRefPtr response, - int64& response_length, - CefString& redirectUrl) =0; - - /// - // Read response data. If data is available immediately copy up to - // |bytes_to_read| bytes into |data_out|, set |bytes_read| to the number of - // bytes copied, and return true. To read the data at a later time set - // |bytes_read| to 0, return true and call BytesAvailable() when the data is - // available. To indicate response completion return false. - /// - /*--cef()--*/ - virtual bool ReadResponse(void* data_out, - int bytes_to_read, - int& bytes_read, - CefRefPtr callback) =0; - - /// - // Request processing has been canceled. - /// - /*--cef()--*/ - virtual void Cancel() =0; -}; - - -/// -// Class used to handle file downloads. The methods of this class will always be -// called on the UI thread. -/// -/*--cef(source=client)--*/ -class CefDownloadHandler : public virtual CefBase -{ -public: - /// - // A portion of the file contents have been received. This method will be - // called multiple times until the download is complete. Return |true| to - // continue receiving data and |false| to cancel. - /// - /*--cef()--*/ - virtual bool ReceivedData(void* data, int data_size) =0; - - /// - // The download is complete. - /// - /*--cef()--*/ - virtual void Complete() =0; -}; - - -/// -// Class used to make a Web URL request. Web URL requests are not associated -// with a browser instance so no CefClient callbacks will be executed. The -// methods of this class may be called on any thread. -/// -/*--cef(source=library)--*/ -class CefWebURLRequest : public virtual CefBase -{ -public: - typedef cef_weburlrequest_state_t RequestState; - - /// - // Create a new CefWebUrlRequest object. - /// - /*--cef()--*/ - static CefRefPtr CreateWebURLRequest( - CefRefPtr request, - CefRefPtr client); - - /// - // Cancels the request. - /// - /*--cef()--*/ - virtual void Cancel() =0; - - /// - // Returns the current ready state of the request. - /// - /*--cef(default_retval=WUR_STATE_UNSENT)--*/ - virtual RequestState GetState() =0; -}; - -/// -// Interface that should be implemented by the CefWebURLRequest client. The -// methods of this class will always be called on the UI thread. -/// -/*--cef(source=client)--*/ -class CefWebURLRequestClient : public virtual CefBase -{ -public: - typedef cef_weburlrequest_state_t RequestState; - typedef cef_handler_errorcode_t ErrorCode; - - /// - // Notifies the client that the request state has changed. State change - // notifications will always be sent before the below notification methods - // are called. - /// - /*--cef()--*/ - virtual void OnStateChange(CefRefPtr requester, - RequestState state) =0; - - /// - // Notifies the client that the request has been redirected and provides a - // chance to change the request parameters. - /// - /*--cef()--*/ - virtual void OnRedirect(CefRefPtr requester, - CefRefPtr request, - CefRefPtr response) =0; - - /// - // Notifies the client of the response data. - /// - /*--cef()--*/ - virtual void OnHeadersReceived(CefRefPtr requester, - CefRefPtr response) =0; - - /// - // Notifies the client of the upload progress. - /// - /*--cef()--*/ - virtual void OnProgress(CefRefPtr requester, - uint64 bytesSent, uint64 totalBytesToBeSent) =0; - - /// - // Notifies the client that content has been received. - /// - /*--cef()--*/ - virtual void OnData(CefRefPtr requester, - const void* data, int dataLength) =0; - - /// - // Notifies the client that the request ended with an error. - /// - /*--cef()--*/ - virtual void OnError(CefRefPtr requester, - ErrorCode errorCode) =0; -}; - - -/// -// Class that supports the reading of XML data via the libxml streaming API. -// The methods of this class should only be called on the thread that creates -// the object. -/// -/*--cef(source=library)--*/ -class CefXmlReader : public virtual CefBase -{ -public: - typedef cef_xml_encoding_type_t EncodingType; - typedef cef_xml_node_type_t NodeType; - - /// - // Create a new CefXmlReader object. The returned object's methods can only - // be called from the thread that created the object. - /// - /*--cef()--*/ - static CefRefPtr Create(CefRefPtr stream, - EncodingType encodingType, - const CefString& URI); - - /// - // Moves the cursor to the next node in the document. This method must be - // called at least once to set the current cursor position. Returns true if - // the cursor position was set successfully. - /// - /*--cef()--*/ - virtual bool MoveToNextNode() =0; - - /// - // Close the document. This should be called directly to ensure that cleanup - // occurs on the correct thread. - /// - /*--cef()--*/ - virtual bool Close() =0; - - /// - // Returns true if an error has been reported by the XML parser. - /// - /*--cef()--*/ - virtual bool HasError() =0; - - /// - // Returns the error string. - /// - /*--cef()--*/ - virtual CefString GetError() =0; - - - // The below methods retrieve data for the node at the current cursor - // position. - - /// - // Returns the node type. - /// - /*--cef(default_retval=XML_NODE_UNSUPPORTED)--*/ - virtual NodeType GetType() =0; - - /// - // Returns the node depth. Depth starts at 0 for the root node. - /// - /*--cef()--*/ - virtual int GetDepth() =0; - - /// - // Returns the local name. See - // http://www.w3.org/TR/REC-xml-names/#NT-LocalPart for additional details. - /// - /*--cef()--*/ - virtual CefString GetLocalName() =0; - - /// - // Returns the namespace prefix. See http://www.w3.org/TR/REC-xml-names/ for - // additional details. - /// - /*--cef()--*/ - virtual CefString GetPrefix() =0; - - /// - // Returns the qualified name, equal to (Prefix:)LocalName. See - // http://www.w3.org/TR/REC-xml-names/#ns-qualnames for additional details. - /// - /*--cef()--*/ - virtual CefString GetQualifiedName() =0; - - /// - // Returns the URI defining the namespace associated with the node. See - // http://www.w3.org/TR/REC-xml-names/ for additional details. - /// - /*--cef()--*/ - virtual CefString GetNamespaceURI() =0; - - /// - // Returns the base URI of the node. See http://www.w3.org/TR/xmlbase/ for - // additional details. - /// - /*--cef()--*/ - virtual CefString GetBaseURI() =0; - - /// - // Returns the xml:lang scope within which the node resides. See - // http://www.w3.org/TR/REC-xml/#sec-lang-tag for additional details. - /// - /*--cef()--*/ - virtual CefString GetXmlLang() =0; - - /// - // Returns true if the node represents an empty element. is considered - // empty but is not. - /// - /*--cef()--*/ - virtual bool IsEmptyElement() =0; - - /// - // Returns true if the node has a text value. - /// - /*--cef()--*/ - virtual bool HasValue() =0; - - /// - // Returns the text value. - /// - /*--cef()--*/ - virtual CefString GetValue() =0; - - /// - // Returns true if the node has attributes. - /// - /*--cef()--*/ - virtual bool HasAttributes() =0; - - /// - // Returns the number of attributes. - /// - /*--cef()--*/ - virtual size_t GetAttributeCount() =0; - - /// - // Returns the value of the attribute at the specified 0-based index. - /// - /*--cef(capi_name=get_attribute_byindex,index_param=index)--*/ - virtual CefString GetAttribute(int index) =0; - - /// - // Returns the value of the attribute with the specified qualified name. - /// - /*--cef(capi_name=get_attribute_byqname)--*/ - virtual CefString GetAttribute(const CefString& qualifiedName) =0; - - /// - // Returns the value of the attribute with the specified local name and - // namespace URI. - /// - /*--cef(capi_name=get_attribute_bylname)--*/ - virtual CefString GetAttribute(const CefString& localName, - const CefString& namespaceURI) =0; - - /// - // Returns an XML representation of the current node's children. - /// - /*--cef()--*/ - virtual CefString GetInnerXml() =0; - - /// - // Returns an XML representation of the current node including its children. - /// - /*--cef()--*/ - virtual CefString GetOuterXml() =0; - - /// - // Returns the line number for the current node. - /// - /*--cef()--*/ - virtual int GetLineNumber() =0; - - - // Attribute nodes are not traversed by default. The below methods can be - // used to move the cursor to an attribute node. MoveToCarryingElement() can - // be called afterwards to return the cursor to the carrying element. The - // depth of an attribute node will be 1 + the depth of the carrying element. - - /// - // Moves the cursor to the attribute at the specified 0-based index. Returns - // true if the cursor position was set successfully. - /// - /*--cef(capi_name=move_to_attribute_byindex,index_param=index)--*/ - virtual bool MoveToAttribute(int index) =0; - - /// - // Moves the cursor to the attribute with the specified qualified name. - // Returns true if the cursor position was set successfully. - /// - /*--cef(capi_name=move_to_attribute_byqname)--*/ - virtual bool MoveToAttribute(const CefString& qualifiedName) =0; - - /// - // Moves the cursor to the attribute with the specified local name and - // namespace URI. Returns true if the cursor position was set successfully. - /// - /*--cef(capi_name=move_to_attribute_bylname)--*/ - virtual bool MoveToAttribute(const CefString& localName, - const CefString& namespaceURI) =0; - - /// - // Moves the cursor to the first attribute in the current element. Returns - // true if the cursor position was set successfully. - /// - /*--cef()--*/ - virtual bool MoveToFirstAttribute() =0; - - /// - // Moves the cursor to the next attribute in the current element. Returns - // true if the cursor position was set successfully. - /// - /*--cef()--*/ - virtual bool MoveToNextAttribute() =0; - - /// - // Moves the cursor back to the carrying element. Returns true if the cursor - // position was set successfully. - /// - /*--cef()--*/ - virtual bool MoveToCarryingElement() =0; -}; - - -/// -// Class that supports the reading of zip archives via the zlib unzip API. -// The methods of this class should only be called on the thread that creates -// the object. -/// -/*--cef(source=library)--*/ -class CefZipReader : public virtual CefBase -{ -public: - /// - // Create a new CefZipReader object. The returned object's methods can only - // be called from the thread that created the object. - /// - /*--cef()--*/ - static CefRefPtr Create(CefRefPtr stream); - - /// - // Moves the cursor to the first file in the archive. Returns true if the - // cursor position was set successfully. - /// - /*--cef()--*/ - virtual bool MoveToFirstFile() =0; - - /// - // Moves the cursor to the next file in the archive. Returns true if the - // cursor position was set successfully. - /// - /*--cef()--*/ - virtual bool MoveToNextFile() =0; - - /// - // Moves the cursor to the specified file in the archive. If |caseSensitive| - // is true then the search will be case sensitive. Returns true if the cursor - // position was set successfully. - /// - /*--cef()--*/ - virtual bool MoveToFile(const CefString& fileName, bool caseSensitive) =0; - - /// - // Closes the archive. This should be called directly to ensure that cleanup - // occurs on the correct thread. - /// - /*--cef()--*/ - virtual bool Close() =0; - - - // The below methods act on the file at the current cursor position. - - /// - // Returns the name of the file. - /// - /*--cef()--*/ - virtual CefString GetFileName() =0; - - /// - // Returns the uncompressed size of the file. - /// - /*--cef()--*/ - virtual long GetFileSize() =0; - - /// - // Returns the last modified timestamp for the file. - /// - /*--cef()--*/ - virtual time_t GetFileLastModified() =0; - - /// - // Opens the file for reading of uncompressed data. A read password may - // optionally be specified. - /// - /*--cef(optional_param=password)--*/ - virtual bool OpenFile(const CefString& password) =0; - - /// - // Closes the file. - /// - /*--cef()--*/ - virtual bool CloseFile() =0; - - /// - // Read uncompressed file contents into the specified buffer. Returns < 0 if - // an error occurred, 0 if at the end of file, or the number of bytes read. - /// - /*--cef()--*/ - virtual int ReadFile(void* buffer, size_t bufferSize) =0; - - /// - // Returns the current offset in the uncompressed file contents. - /// - /*--cef()--*/ - virtual long Tell() =0; - - /// - // Returns true if at end of the file contents. - /// - /*--cef()--*/ - virtual bool Eof() =0; -}; - - -/// -// Interface to implement for visiting the DOM. The methods of this class will -// be called on the UI thread. -/// -/*--cef(source=client)--*/ -class CefDOMVisitor : public virtual CefBase -{ -public: - /// - // Method executed for visiting the DOM. The document object passed to this - // method represents a snapshot of the DOM at the time this method is - // executed. DOM objects are only valid for the scope of this method. Do not - // keep references to or attempt to access any DOM objects outside the scope - // of this method. - /// - /*--cef()--*/ - virtual void Visit(CefRefPtr document) =0; -}; - - -/// -// Class used to represent a DOM document. The methods of this class should only -// be called on the UI thread. -/// -/*--cef(source=library)--*/ -class CefDOMDocument : public virtual CefBase -{ -public: - typedef cef_dom_document_type_t Type; - - /// - // Returns the document type. - /// - /*--cef(default_retval=DOM_DOCUMENT_TYPE_UNKNOWN)--*/ - virtual Type GetType() =0; - - /// - // Returns the root document node. - /// - /*--cef()--*/ - virtual CefRefPtr GetDocument() =0; - - /// - // Returns the BODY node of an HTML document. - /// - /*--cef()--*/ - virtual CefRefPtr GetBody() =0; - - /// - // Returns the HEAD node of an HTML document. - /// - /*--cef()--*/ - virtual CefRefPtr GetHead() =0; - - /// - // Returns the title of an HTML document. - /// - /*--cef()--*/ - virtual CefString GetTitle() =0; - - /// - // Returns the document element with the specified ID value. - /// - /*--cef()--*/ - virtual CefRefPtr GetElementById(const CefString& id) =0; - - /// - // Returns the node that currently has keyboard focus. - /// - /*--cef()--*/ - virtual CefRefPtr GetFocusedNode() =0; - - /// - // Returns true if a portion of the document is selected. - /// - /*--cef()--*/ - virtual bool HasSelection() =0; - - /// - // Returns the selection start node. - /// - /*--cef()--*/ - virtual CefRefPtr GetSelectionStartNode() =0; - - /// - // Returns the selection offset within the start node. - /// - /*--cef()--*/ - virtual int GetSelectionStartOffset() =0; - - /// - // Returns the selection end node. - /// - /*--cef()--*/ - virtual CefRefPtr GetSelectionEndNode() =0; - - /// - // Returns the selection offset within the end node. - /// - /*--cef()--*/ - virtual int GetSelectionEndOffset() =0; - - /// - // Returns the contents of this selection as markup. - /// - /*--cef()--*/ - virtual CefString GetSelectionAsMarkup() =0; - - /// - // Returns the contents of this selection as text. - /// - /*--cef()--*/ - virtual CefString GetSelectionAsText() =0; - - /// - // Returns the base URL for the document. - /// - /*--cef()--*/ - virtual CefString GetBaseURL() =0; - - /// - // Returns a complete URL based on the document base URL and the specified - // partial URL. - /// - /*--cef()--*/ - virtual CefString GetCompleteURL(const CefString& partialURL) =0; -}; - - -/// -// Class used to represent a DOM node. The methods of this class should only be -// called on the UI thread. -/// -/*--cef(source=library)--*/ -class CefDOMNode : public virtual CefBase -{ -public: - typedef std::map AttributeMap; - typedef cef_dom_node_type_t Type; - - /// - // Returns the type for this node. - /// - /*--cef(default_retval=DOM_NODE_TYPE_UNSUPPORTED)--*/ - virtual Type GetType() =0; - - /// - // Returns true if this is a text node. - /// - /*--cef()--*/ - virtual bool IsText() =0; - - /// - // Returns true if this is an element node. - /// - /*--cef()--*/ - virtual bool IsElement() =0; - - /// - // Returns true if this is a form control element node. - /// - /*--cef()--*/ - virtual bool IsFormControlElement() =0; - - /// - // Returns the type of this form control element node. - /// - /*--cef()--*/ - virtual CefString GetFormControlElementType() =0; - - /// - // Returns true if this object is pointing to the same handle as |that| - // object. - /// - /*--cef()--*/ - virtual bool IsSame(CefRefPtr that) =0; - - /// - // Returns the name of this node. - /// - /*--cef()--*/ - virtual CefString GetName() =0; - - /// - // Returns the value of this node. - /// - /*--cef()--*/ - virtual CefString GetValue() =0; - - /// - // Set the value of this node. Returns true on success. - /// - /*--cef()--*/ - virtual bool SetValue(const CefString& value) =0; - - /// - // Returns the contents of this node as markup. - /// - /*--cef()--*/ - virtual CefString GetAsMarkup() =0; - - /// - // Returns the document associated with this node. - /// - /*--cef()--*/ - virtual CefRefPtr GetDocument() =0; - - /// - // Returns the parent node. - /// - /*--cef()--*/ - virtual CefRefPtr GetParent() =0; - - /// - // Returns the previous sibling node. - /// - /*--cef()--*/ - virtual CefRefPtr GetPreviousSibling() =0; - - /// - // Returns the next sibling node. - /// - /*--cef()--*/ - virtual CefRefPtr GetNextSibling() =0; - - /// - // Returns true if this node has child nodes. - /// - /*--cef()--*/ - virtual bool HasChildren() =0; - - /// - // Return the first child node. - /// - /*--cef()--*/ - virtual CefRefPtr GetFirstChild() =0; - - /// - // Returns the last child node. - /// - /*--cef()--*/ - virtual CefRefPtr GetLastChild() =0; - - /// - // Add an event listener to this node for the specified event type. If - // |useCapture| is true then this listener will be considered a capturing - // listener. Capturing listeners will recieve all events of the specified - // type before the events are dispatched to any other event targets beneath - // the current node in the tree. Events which are bubbling upwards through - // the tree will not trigger a capturing listener. Separate calls to this - // method can be used to register the same listener with and without capture. - // See WebCore/dom/EventNames.h for the list of supported event types. - /// - /*--cef()--*/ - virtual void AddEventListener(const CefString& eventType, - CefRefPtr listener, - bool useCapture) =0; - - - // The following methods are valid only for element nodes. - - /// - // Returns the tag name of this element. - /// - /*--cef()--*/ - virtual CefString GetElementTagName() =0; - - /// - // Returns true if this element has attributes. - /// - /*--cef()--*/ - virtual bool HasElementAttributes() =0; - - /// - // Returns true if this element has an attribute named |attrName|. - /// - /*--cef()--*/ - virtual bool HasElementAttribute(const CefString& attrName) =0; - - /// - // Returns the element attribute named |attrName|. - /// - /*--cef()--*/ - virtual CefString GetElementAttribute(const CefString& attrName) =0; - - /// - // Returns a map of all element attributes. - /// - /*--cef()--*/ - virtual void GetElementAttributes(AttributeMap& attrMap) =0; - - /// - // Set the value for the element attribute named |attrName|. Returns true on - // success. - /// - /*--cef()--*/ - virtual bool SetElementAttribute(const CefString& attrName, - const CefString& value) =0; - - /// - // Returns the inner text of the element. - /// - /*--cef()--*/ - virtual CefString GetElementInnerText() =0; -}; - - -/// -// Class used to represent a DOM event. The methods of this class should only -// be called on the UI thread. -/// -/*--cef(source=library)--*/ -class CefDOMEvent : public virtual CefBase -{ -public: - typedef cef_dom_event_category_t Category; - typedef cef_dom_event_phase_t Phase; - - /// - // Returns the event type. - /// - /*--cef()--*/ - virtual CefString GetType() =0; - - /// - // Returns the event category. - /// - /*--cef(default_retval=DOM_EVENT_CATEGORY_UNKNOWN)--*/ - virtual Category GetCategory() =0; - - /// - // Returns the event processing phase. - /// - /*--cef(default_retval=DOM_EVENT_PHASE_UNKNOWN)--*/ - virtual Phase GetPhase() =0; - - /// - // Returns true if the event can bubble up the tree. - /// - /*--cef()--*/ - virtual bool CanBubble() =0; - - /// - // Returns true if the event can be canceled. - /// - /*--cef()--*/ - virtual bool CanCancel() =0; - - /// - // Returns the document associated with this event. - /// - /*--cef()--*/ - virtual CefRefPtr GetDocument() =0; - - /// - // Returns the target of the event. - /// - /*--cef()--*/ - virtual CefRefPtr GetTarget() =0; - - /// - // Returns the current target of the event. - /// - /*--cef()--*/ - virtual CefRefPtr GetCurrentTarget() =0; -}; - - -/// -// Interface to implement for handling DOM events. The methods of this class -// will be called on the UI thread. -/// -/*--cef(source=client)--*/ -class CefDOMEventListener : public virtual CefBase -{ -public: - /// - // Called when an event is received. The event object passed to this method - // contains a snapshot of the DOM at the time this method is executed. DOM - // objects are only valid for the scope of this method. Do not keep references - // to or attempt to access any DOM objects outside the scope of this method. - /// - /*--cef()--*/ - virtual void HandleEvent(CefRefPtr event) =0; -}; - - -/// -// Interface to implement for filtering response content. The methods of this -// class will always be called on the UI thread. -/// -/*--cef(source=client)--*/ -class CefContentFilter : public virtual CefBase -{ -public: - /// - // Set |substitute_data| to the replacement for the data in |data| if data - // should be modified. - /// - /*--cef()--*/ - virtual void ProcessData(const void* data, int data_size, - CefRefPtr& substitute_data) {} - - /// - // Called when there is no more data to be processed. It is expected that - // whatever data was retained in the last ProcessData() call, it should be - // returned now by setting |remainder| if appropriate. - /// - /*--cef()--*/ - virtual void Drain(CefRefPtr& remainder) {} -}; - - -/// -// Class used to represent drag data. The methods of this class may be called -// on any thread. -/// -/*--cef(source=library)--*/ -class CefDragData : public virtual CefBase -{ -public: - /// - // Returns true if the drag data is a link. - /// - /*--cef()--*/ - virtual bool IsLink() =0; - - /// - // Returns true if the drag data is a text or html fragment. - /// - /*--cef()--*/ - virtual bool IsFragment() =0; - - /// - // Returns true if the drag data is a file. - /// - /*--cef()--*/ - virtual bool IsFile() =0; - - /// - // Return the link URL that is being dragged. - /// - /*--cef()--*/ - virtual CefString GetLinkURL() =0; - - /// - // Return the title associated with the link being dragged. - /// - /*--cef()--*/ - virtual CefString GetLinkTitle() =0; - - /// - // Return the metadata, if any, associated with the link being dragged. - /// - /*--cef()--*/ - virtual CefString GetLinkMetadata() =0; - - /// - // Return the plain text fragment that is being dragged. - /// - /*--cef()--*/ - virtual CefString GetFragmentText() =0; - - /// - // Return the text/html fragment that is being dragged. - /// - /*--cef()--*/ - virtual CefString GetFragmentHtml() =0; - - /// - // Return the base URL that the fragment came from. This value is used for - // resolving relative URLs and may be empty. - /// - /*--cef()--*/ - virtual CefString GetFragmentBaseURL() =0; - - /// - // Return the extension of the file being dragged out of the browser window. - /// - /*--cef()--*/ - virtual CefString GetFileExtension() =0; - - /// - // Return the name of the file being dragged out of the browser window. - /// - /*--cef()--*/ - virtual CefString GetFileName() =0; - - /// - // Retrieve the list of file names that are being dragged into the browser - // window. - /// - /*--cef()--*/ - virtual bool GetFileNames(std::vector& names) =0; -}; - - -/// -// Class used to create and/or parse command line arguments. Arguments with -// '--', '-' and, on Windows, '/' prefixes are considered switches. Switches -// will always precede any arguments without switch prefixes. Switches can -// optionally have a value specified using the '=' delimiter (e.g. -// "-switch=value"). An argument of "--" will terminate switch parsing with all -// subsequent tokens, regardless of prefix, being interpreted as non-switch -// arguments. Switch names are considered case-insensitive. This class can be -// used before CefInitialize() is called. -/// -/*--cef(source=library,no_debugct_check)--*/ -class CefCommandLine : public virtual CefBase -{ -public: - typedef std::vector ArgumentList; - typedef std::map SwitchMap; - - /// - // Create a new CefCommandLine instance. - /// - /*--cef(revision_check)--*/ - static CefRefPtr CreateCommandLine(); - - /// - // Initialize the command line with the specified |argc| and |argv| values. - // The first argument must be the name of the program. This method is only - // supported on non-Windows platforms. - /// - /*--cef()--*/ - virtual void InitFromArgv(int argc, const char* const* argv) =0; - - /// - // Initialize the command line with the string returned by calling - // GetCommandLineW(). This method is only supported on Windows. - /// - /*--cef()--*/ - virtual void InitFromString(const CefString& command_line) =0; - - /// - // Constructs and returns the represented command line string. Use this method - // cautiously because quoting behavior is unclear. - /// - /*--cef()--*/ - virtual CefString GetCommandLineString() =0; - - /// - // Get the program part of the command line string (the first item). - /// - /*--cef()--*/ - virtual CefString GetProgram() =0; - - /// - // Set the program part of the command line string (the first item). - /// - /*--cef()--*/ - virtual void SetProgram(const CefString& program) =0; - - /// - // Returns true if the command line has switches. - /// - /*--cef()--*/ - virtual bool HasSwitches() =0; - - /// - // Returns true if the command line contains the given switch. - /// - /*--cef()--*/ - virtual bool HasSwitch(const CefString& name) =0; - - /// - // Returns the value associated with the given switch. If the switch has no - // value or isn't present this method returns the empty string. - /// - /*--cef()--*/ - virtual CefString GetSwitchValue(const CefString& name) =0; - - /// - // Returns the map of switch names and values. If a switch has no value an - // empty string is returned. - /// - /*--cef()--*/ - virtual void GetSwitches(SwitchMap& switches) =0; - - /// - // Add a switch to the end of the command line. If the switch has no value - // pass an empty value string. - /// - /*--cef()--*/ - virtual void AppendSwitch(const CefString& name) =0; - - /// - // Add a switch with the specified value to the end of the command line. - /// - /*--cef()--*/ - virtual void AppendSwitchWithValue(const CefString& name, - const CefString& value) =0; - - /// - // True if there are remaining command line arguments. - /// - /*--cef()--*/ - virtual bool HasArguments() =0; - - /// - // Get the remaining command line arguments. - /// - /*--cef()--*/ - virtual void GetArguments(ArgumentList& arguments) =0; - - /// - // Add an argument to the end of the command line. - /// - /*--cef()--*/ - virtual void AppendArgument(const CefString& argument) =0; -}; - -#endif // _CEF_H diff --git a/cef/include/cef_application_mac.h b/cef/include/cef_application_mac.h old mode 100755 new mode 100644 index aa8547ad8..33042478c --- a/cef/include/cef_application_mac.h +++ b/cef/include/cef_application_mac.h @@ -27,11 +27,11 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef _CEF_APPLICATION_MAC_H -#define _CEF_APPLICATION_MAC_H +#ifndef CEF_INCLUDE_CEF_APPLICATION_MAC_H_ +#define CEF_INCLUDE_CEF_APPLICATION_MAC_H_ #pragma once -#include "cef.h" +#include "include/cef_base.h" #if defined(OS_MACOSX) && defined(__OBJC__) @@ -43,7 +43,7 @@ // Use the existing empty protocol definitions. #import "base/mac/cocoa_protocols.h" -#else // BUILDING_CEF_SHARED +#else // BUILDING_CEF_SHARED #import #import @@ -88,7 +88,7 @@ DEFINE_EMPTY_PROTOCOL(NSWindowDelegate) #endif -#endif // BUILDING_CEF_SHARED +#endif // BUILDING_CEF_SHARED // All CEF client applications must subclass NSApplication and implement this // protocol. @@ -99,7 +99,7 @@ DEFINE_EMPTY_PROTOCOL(NSWindowDelegate) // Controls the state of |isHandlingSendEvent| in the event loop so that it is // reset properly. class CefScopedSendingEvent { -public: + public: CefScopedSendingEvent() : app_(static_cast*>( [NSApplication sharedApplication])), @@ -109,12 +109,12 @@ public: ~CefScopedSendingEvent() { [app_ setHandlingSendEvent:handling_]; } - -private: + + private: NSApplication* app_; BOOL handling_; }; #endif // defined(OS_MACOSX) && defined(__OBJC__) -#endif // _CEF_APPLICATION_MAC_H +#endif // CEF_INCLUDE_CEF_APPLICATION_MAC_H_ diff --git a/cef/include/cef_capi.h b/cef/include/cef_capi.h deleted file mode 100755 index 9ac4e0272..000000000 --- a/cef/include/cef_capi.h +++ /dev/null @@ -1,3769 +0,0 @@ -// Copyright (c) 2011 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_CAPI_H -#define _CEF_CAPI_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include "internal/cef_export.h" -#include "internal/cef_string.h" -#include "internal/cef_string_list.h" -#include "internal/cef_string_map.h" -#include "internal/cef_string_multimap.h" -#include "internal/cef_types.h" - - -/// -// This function should be called on the main application thread to initialize -// CEF when the application is started. The |application| parameter may be NULL. -// A return value of true (1) indicates that it succeeded and false (0) -// indicates that it failed. -/// -CEF_EXPORT int cef_initialize(const struct _cef_settings_t* settings, - struct _cef_app_t* application); - -/// -// This function should be called on the main application thread to shut down -// CEF before the application exits. -/// -CEF_EXPORT void cef_shutdown(); - -/// -// Perform a single iteration of CEF message loop processing. This function is -// used to integrate the CEF message loop into an existing application message -// loop. Care must be taken to balance performance against excessive CPU usage. -// This function should only be called on the main application thread and only -// if cef_initialize() is called with a CefSettings.multi_threaded_message_loop -// value of false (0). This function will not block. -/// -CEF_EXPORT void cef_do_message_loop_work(); - -/// -// Run the CEF message loop. Use this function instead of an application- -// provided message loop to get the best balance between performance and CPU -// usage. This function should only be called on the main application thread and -// only if cef_initialize() is called with a -// CefSettings.multi_threaded_message_loop value of false (0). This function -// will block until a quit message is received by the system. -/// -CEF_EXPORT void cef_run_message_loop(); - -/// -// Quit the CEF message loop that was started by calling cef_run_message_loop(). -// This function should only be called on the main application thread and only -// if cef_run_message_loop() was used. -/// -CEF_EXPORT void cef_quit_message_loop(); - -/// -// Register a new V8 extension with the specified JavaScript extension code and -// handler. Functions implemented by the handler are prototyped using the -// keyword 'native'. The calling of a native function is restricted to the scope -// in which the prototype of the native function is defined. This function may -// be called on any thread. -// -// Example JavaScript extension code: 
-//   // create the 'example' global object if it doesn't already exist.
-//   if (!example)
-//     example = {};
-//   // create the 'example.test' global object if it doesn't already exist.
-//   if (!example.test)
-//     example.test = {};
-//   (function() {
-//     // Define the function 'example.test.myfunction'.
-//     example.test.myfunction = function() {
-//       // Call CefV8Handler::Execute() with the function name 'MyFunction'
-//       // and no arguments.
-//       native function MyFunction();
-//       return MyFunction();
-//     };
-//     // Define the getter function for parameter 'example.test.myparam'.
-//     example.test.__defineGetter__('myparam', function() {
-//       // Call CefV8Handler::Execute() with the function name 'GetMyParam'
-//       // and no arguments.
-//       native function GetMyParam();
-//       return GetMyParam();
-//     });
-//     // Define the setter function for parameter 'example.test.myparam'.
-//     example.test.__defineSetter__('myparam', function(b) {
-//       // Call CefV8Handler::Execute() with the function name 'SetMyParam'
-//       // and a single argument.
-//       native function SetMyParam();
-//       if(b) SetMyParam(b);
-//     });
-//
-//     // Extension definitions can also contain normal JavaScript variables
-//     // and functions.
-//     var myint = 0;
-//     example.test.increment = function() {
-//       myint += 1;
-//       return myint;
-//     };
-//   })();
-//
Example usage in the page: 
-//   // Call the function.
-//   example.test.myfunction();
-//   // Set the parameter.
-//   example.test.myparam = value;
-//   // Get the parameter.
-//   value = example.test.myparam;
-//   // Call another function.
-//   example.test.increment();
-//
-/// -CEF_EXPORT int cef_register_extension(const cef_string_t* extension_name, - const cef_string_t* javascript_code, struct _cef_v8handler_t* handler); - -/// -// Register a custom scheme. This function should not be called for the built-in -// HTTP, HTTPS, FILE, FTP, ABOUT and DATA schemes. -// -// If |is_standard| is true (1) the scheme will be treated as a standard scheme. -// Standard schemes are subject to URL canonicalization and parsing rules as -// defined in the Common Internet Scheme Syntax RFC 1738 Section 3.1 available -// at http://www.ietf.org/rfc/rfc1738.txt -// -// In particular, the syntax for standard scheme URLs must be of the form: 
-//  [scheme]://[username]:[password]@[host]:[port]/[url-path]
-//
Standard scheme URLs must have a host component that is a fully -// qualified domain name as defined in Section 3.5 of RFC 1034 [13] and Section -// 2.1 of RFC 1123. These URLs will be canonicalized to "scheme://host/path" in -// the simplest case and "scheme://username:password@host:port/path" in the most -// explicit case. For example, "scheme:host/path" and "scheme:///host/path" will -// both be canonicalized to "scheme://host/path". The origin of a standard -// scheme URL is the combination of scheme, host and port (i.e., -// "scheme://host:port" in the most explicit case). -// -// For non-standard scheme URLs only the "scheme:" component is parsed and -// canonicalized. The remainder of the URL will be passed to the handler as-is. -// For example, "scheme:///some%20text" will remain the same. Non-standard -// scheme URLs cannot be used as a target for form submission. -// -// If |is_local| is true (1) the scheme will be treated as local (i.e., with the -// same security rules as those applied to "file" URLs). Normal pages cannot -// link to or access local URLs. Also, by default, local URLs can only perform -// XMLHttpRequest calls to the same URL (origin + path) that originated the -// request. To allow XMLHttpRequest calls from a local URL to other URLs with -// the same origin set the CefSettings.file_access_from_file_urls_allowed value -// to true (1). To allow XMLHttpRequest calls from a local URL to all origins -// set the CefSettings.universal_access_from_file_urls_allowed value to true -// (1). -// -// If |is_display_isolated| is true (1) the scheme will be treated as display- -// isolated. This means that pages cannot display these URLs unless they are -// from the same scheme. For example, pages in another origin cannot create -// iframes or hyperlinks to URLs with this scheme. -// -// This function may be called on any thread. It should only be called once per -// unique |scheme_name| value. If |scheme_name| is already registered or if an -// error occurs this function will return false (0). -/// -CEF_EXPORT int cef_register_custom_scheme(const cef_string_t* scheme_name, - int is_standard, int is_local, int is_display_isolated); - -/// -// Register a scheme handler factory for the specified |scheme_name| and -// optional |domain_name|. An NULL |domain_name| value for a standard scheme -// will cause the factory to match all domain names. The |domain_name| value -// will be ignored for non-standard schemes. If |scheme_name| is a built-in -// scheme and no handler is returned by |factory| then the built-in scheme -// handler factory will be called. If |scheme_name| is a custom scheme the -// cef_register_custom_scheme() function should be called for that scheme. This -// function may be called multiple times to change or remove the factory that -// matches the specified |scheme_name| and optional |domain_name|. Returns false -// (0) if an error occurs. This function may be called on any thread. -/// -CEF_EXPORT int cef_register_scheme_handler_factory( - const cef_string_t* scheme_name, const cef_string_t* domain_name, - struct _cef_scheme_handler_factory_t* factory); - -/// -// Clear all registered scheme handler factories. Returns false (0) on error. -// This function may be called on any thread. -/// -CEF_EXPORT int cef_clear_scheme_handler_factories(); - -/// -// Add an entry to the cross-origin access whitelist. -// -// The same-origin policy restricts how scripts hosted from different origins -// (scheme + domain + port) can communicate. By default, scripts can only access -// resources with the same origin. Scripts hosted on the HTTP and HTTPS schemes -// (but no other schemes) can use the "Access-Control-Allow-Origin" header to -// allow cross-origin requests. For example, https://source.example.com can make -// XMLHttpRequest requests on http://target.example.com if the -// http://target.example.com request returns an "Access-Control-Allow-Origin: -// https://source.example.com" response header. -// -// Scripts in separate frames or iframes and hosted from the same protocol and -// domain suffix can execute cross-origin JavaScript if both pages set the -// document.domain value to the same domain suffix. For example, -// scheme://foo.example.com and scheme://bar.example.com can communicate using -// JavaScript if both domains set document.domain="example.com". -// -// This function is used to allow access to origins that would otherwise violate -// the same-origin policy. Scripts hosted underneath the fully qualified -// |source_origin| URL (like http://www.example.com) will be allowed access to -// all resources hosted on the specified |target_protocol| and |target_domain|. -// If |allow_target_subdomains| is true (1) access will also be allowed to all -// subdomains of the target domain. -// -// This function cannot be used to bypass the restrictions on local or display -// isolated schemes. See the comments on CefRegisterCustomScheme for more -// information. -// -// This function may be called on any thread. Returns false (0) if -// |source_origin| is invalid or the whitelist cannot be accessed. -/// -CEF_EXPORT int cef_add_cross_origin_whitelist_entry( - const cef_string_t* source_origin, const cef_string_t* target_protocol, - const cef_string_t* target_domain, int allow_target_subdomains); - -/// -// Remove an entry from the cross-origin access whitelist. Returns false (0) if -// |source_origin| is invalid or the whitelist cannot be accessed. -/// -CEF_EXPORT int cef_remove_cross_origin_whitelist_entry( - const cef_string_t* source_origin, const cef_string_t* target_protocol, - const cef_string_t* target_domain, int allow_target_subdomains); - -/// -// Remove all entries from the cross-origin access whitelist. Returns false (0) -// if the whitelist cannot be accessed. -/// -CEF_EXPORT int cef_clear_cross_origin_whitelist(); - -/// -// CEF maintains multiple internal threads that are used for handling different -// types of tasks. The UI thread creates the browser window and is used for all -// interaction with the WebKit rendering engine and V8 JavaScript engine (The UI -// thread will be the same as the main application thread if cef_initialize() is -// called with a CefSettings.multi_threaded_message_loop value of false (0).) -// The IO thread is used for handling schema and network requests. The FILE -// thread is used for the application cache and other miscellaneous activities. -// This function will return true (1) if called on the specified 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. -/// -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. -/// -CEF_EXPORT int cef_post_delayed_task(cef_thread_id_t threadId, - struct _cef_task_t* task, long delay_ms); - -/// -// Parse the specified |url| into its component parts. Returns false (0) if the -// URL is NULL or invalid. -/// -CEF_EXPORT int cef_parse_url(const cef_string_t* url, - struct _cef_urlparts_t* parts); - -/// -// Creates a URL from the specified |parts|, which must contain a non-NULL spec -// or a non-NULL host and path (at a minimum), but not both. Returns false (0) -// if |parts| isn't initialized as described. -/// -CEF_EXPORT int cef_create_url(const struct _cef_urlparts_t* parts, - cef_string_t* url); - -/// -// Visit all cookies. The returned cookies are ordered by longest path, then by -// earliest creation date. Returns false (0) if cookies cannot be accessed. -/// -CEF_EXPORT int cef_visit_all_cookies(struct _cef_cookie_visitor_t* visitor); - -/// -// Visit a subset of cookies. The results are filtered by the given url scheme, -// host, domain and path. If |includeHttpOnly| is true (1) HTTP-only cookies -// will also be included in the results. The returned cookies are ordered by -// longest path, then by earliest creation date. Returns false (0) if cookies -// cannot be accessed. -/// -CEF_EXPORT int cef_visit_url_cookies(const cef_string_t* url, - int includeHttpOnly, struct _cef_cookie_visitor_t* visitor); - -/// -// Sets a cookie given a valid URL and explicit user-provided cookie attributes. -// This function expects each attribute to be well-formed. It will check for -// disallowed characters (e.g. the ';' character is disallowed within the cookie -// value attribute) and will return false (0) without setting the cookie if such -// characters are found. This function must be called on the IO thread. -/// -CEF_EXPORT int cef_set_cookie(const cef_string_t* url, - const struct _cef_cookie_t* cookie); - -/// -// Delete all cookies that match the specified parameters. If both |url| and -// |cookie_name| are specified all host and domain cookies matching both values -// will be deleted. If only |url| is specified all host cookies (but not domain -// cookies) irrespective of path will be deleted. If |url| is NULL all cookies -// for all hosts and domains will be deleted. Returns false (0) if a non-NULL -// invalid URL is specified or if cookies cannot be accessed. This function must -// be called on the IO thread. -/// -CEF_EXPORT int cef_delete_cookies(const cef_string_t* url, - const cef_string_t* cookie_name); - -/// -// Sets the directory path that will be used for storing cookie data. If |path| -// is NULL data will be stored in memory only. By default the cookie path is the -// same as the cache path. Returns false (0) if cookies cannot be accessed. -/// -CEF_EXPORT int cef_set_cookie_path(const cef_string_t* path); - -/// -// Visit storage of the specified type. If |origin| is non-NULL only data -// matching that origin will be visited. If |key| is non-NULL only data matching -// that key will be visited. Otherwise, all data for the storage type will be -// visited. Origin should be of the form scheme://domain. If no origin is -// specified only data currently in memory will be returned. Returns false (0) -// if the storage cannot be accessed. -/// -CEF_EXPORT int cef_visit_storage(enum cef_storage_type_t type, - const cef_string_t* origin, const cef_string_t* key, - struct _cef_storage_visitor_t* visitor); - -/// -// Sets storage of the specified type, origin, key and value. Returns false (0) -// if storage cannot be accessed. This function must be called on the UI thread. -/// -CEF_EXPORT int cef_set_storage(enum cef_storage_type_t type, - const cef_string_t* origin, const cef_string_t* key, - const cef_string_t* value); - -/// -// Deletes all storage of the specified type. If |origin| is non-NULL only data -// matching that origin will be cleared. If |key| is non-NULL only data matching -// that key will be cleared. Otherwise, all data for the storage type will be -// cleared. Returns false (0) if storage cannot be accessed. This function must -// be called on the UI thread. -/// -CEF_EXPORT int cef_delete_storage(enum cef_storage_type_t type, - const cef_string_t* origin, const cef_string_t* key); - -/// -// Sets the directory path that will be used for storing data of the specified -// type. Currently only the ST_LOCALSTORAGE type is supported by this function. -// If |path| is NULL data will be stored in memory only. By default the storage -// path is the same as the cache path. Returns false (0) if the storage cannot -// be accessed. -/// -CEF_EXPORT int cef_set_storage_path(enum cef_storage_type_t type, - const cef_string_t* path); - -typedef struct _cef_base_t -{ - // Size of the data structure. - size_t size; - - // Increment the reference count. - int (CEF_CALLBACK *add_ref)(struct _cef_base_t* self); - // Decrement the reference count. Delete this object when no references - // remain. - int (CEF_CALLBACK *release)(struct _cef_base_t* self); - // Returns the current number of references. - int (CEF_CALLBACK *get_refct)(struct _cef_base_t* self); - -} cef_base_t; - - -// Check that the structure |s|, which is defined with a cef_base_t member named -// |base|, is large enough to contain the specified member |f|. -#define CEF_MEMBER_EXISTS(s, f) \ - ((intptr_t)&((s)->f) - (intptr_t)(s) + sizeof((s)->f) <= (s)->base.size) - -#define CEF_MEMBER_MISSING(s, f) (!CEF_MEMBER_EXISTS(s, f) || !((s)->f)) - - -/// -// Implement this structure for task execution. The functions of this structure -// may be called on any thread. -/// -typedef struct _cef_task_t -{ - // Base structure. - cef_base_t base; - - /// - // Method that will be executed. |threadId| is the thread executing the call. - /// - void (CEF_CALLBACK *execute)(struct _cef_task_t* self, - cef_thread_id_t threadId); - -} cef_task_t; - - -/// -// Structure to implement for visiting cookie values. The functions of this -// structure will always be called on the IO thread. -/// -typedef struct _cef_cookie_visitor_t -{ - // Base structure. - cef_base_t base; - - /// - // Method that will be called once for each cookie. |count| is the 0-based - // index for the current cookie. |total| is the total number of cookies. Set - // |deleteCookie| to true (1) to delete the cookie currently being visited. - // Return false (0) to stop visiting cookies. This function may never be - // called if no cookies are found. - /// - int (CEF_CALLBACK *visit)(struct _cef_cookie_visitor_t* self, - const struct _cef_cookie_t* cookie, int count, int total, - int* deleteCookie); - -} cef_cookie_visitor_t; - - -/// -// Structure to implement for visiting storage. The functions of this structure -// will always be called on the UI thread. -/// -typedef struct _cef_storage_visitor_t -{ - // Base structure. - cef_base_t base; - - /// - // Method that will be called once for each key/value data pair in storage. - // |count| is the 0-based index for the current pair. |total| is the total - // number of pairs. Set |deleteData| to true (1) to delete the pair currently - // being visited. Return false (0) to stop visiting pairs. This function may - // never be called if no data is found. - /// - int (CEF_CALLBACK *visit)(struct _cef_storage_visitor_t* self, - enum cef_storage_type_t type, const cef_string_t* origin, - const cef_string_t* key, const cef_string_t* value, int count, int total, - int* deleteData); - -} cef_storage_visitor_t; - - -/// -// Structure used to represent a browser window. The functions of this structure -// may be called on any thread unless otherwise indicated in the comments. -/// -typedef struct _cef_browser_t -{ - // Base structure. - cef_base_t base; - - /// - // Call this function before destroying a contained browser window. This - // function performs any internal cleanup that may be needed before the - // browser window is destroyed. - /// - void (CEF_CALLBACK *parent_window_will_close)(struct _cef_browser_t* self); - - /// - // Closes this browser window. - /// - void (CEF_CALLBACK *close_browser)(struct _cef_browser_t* self); - - /// - // Returns true (1) if the browser can navigate backwards. - /// - int (CEF_CALLBACK *can_go_back)(struct _cef_browser_t* self); - - /// - // Navigate backwards. - /// - void (CEF_CALLBACK *go_back)(struct _cef_browser_t* self); - - /// - // Returns true (1) if the browser can navigate forwards. - /// - int (CEF_CALLBACK *can_go_forward)(struct _cef_browser_t* self); - - /// - // Navigate forwards. - /// - void (CEF_CALLBACK *go_forward)(struct _cef_browser_t* self); - - /// - // Reload the current page. - /// - void (CEF_CALLBACK *reload)(struct _cef_browser_t* self); - - /// - // Reload the current page ignoring any cached data. - /// - void (CEF_CALLBACK *reload_ignore_cache)(struct _cef_browser_t* self); - - /// - // Stop loading the page. - /// - void (CEF_CALLBACK *stop_load)(struct _cef_browser_t* self); - - /// - // Set focus for the browser window. If |enable| is true (1) focus will be set - // to the window. Otherwise, focus will be removed. - /// - void (CEF_CALLBACK *set_focus)(struct _cef_browser_t* self, int enable); - - /// - // Retrieve the window handle for this browser. - /// - cef_window_handle_t (CEF_CALLBACK *get_window_handle)( - struct _cef_browser_t* self); - - /// - // Retrieve the window handle of the browser that opened this browser. Will - // return NULL for non-popup windows. This function can be used in combination - // with custom handling of modal windows. - /// - cef_window_handle_t (CEF_CALLBACK *get_opener_window_handle)( - struct _cef_browser_t* self); - - /// - // Returns true (1) if the window is a popup window. - /// - int (CEF_CALLBACK *is_popup)(struct _cef_browser_t* self); - - // Returns true (1) if a document has been loaded in the browser. - int (CEF_CALLBACK *has_document)(struct _cef_browser_t* self); - - /// - // Returns the client for this browser. - /// - struct _cef_client_t* (CEF_CALLBACK *get_client)(struct _cef_browser_t* self); - - /// - // Returns the main (top-level) frame for the browser window. - /// - struct _cef_frame_t* (CEF_CALLBACK *get_main_frame)( - struct _cef_browser_t* self); - - /// - // Returns the focused frame for the browser window. This function should only - // be called on the UI thread. - /// - struct _cef_frame_t* (CEF_CALLBACK *get_focused_frame)( - struct _cef_browser_t* self); - - /// - // Returns the frame with the specified name, or NULL if not found. This - // function should only be called on the UI thread. - /// - struct _cef_frame_t* (CEF_CALLBACK *get_frame)(struct _cef_browser_t* self, - const cef_string_t* name); - - /// - // Returns the names of all existing frames. This function should only be - // called on the UI thread. - /// - void (CEF_CALLBACK *get_frame_names)(struct _cef_browser_t* self, - cef_string_list_t names); - - /// - // Search for |searchText|. |identifier| can be used to have multiple searches - // running simultaniously. |forward| indicates whether to search forward or - // backward within the page. |matchCase| indicates whether the search should - // be case-sensitive. |findNext| indicates whether this is the first request - // or a follow-up. - /// - void (CEF_CALLBACK *find)(struct _cef_browser_t* self, int identifier, - const cef_string_t* searchText, int forward, int matchCase, - int findNext); - - /// - // Cancel all searches that are currently going on. - /// - void (CEF_CALLBACK *stop_finding)(struct _cef_browser_t* self, - int clearSelection); - - /// - // Get the zoom level. - /// - double (CEF_CALLBACK *get_zoom_level)(struct _cef_browser_t* self); - - /// - // Change the zoom level to the specified value. - /// - void (CEF_CALLBACK *set_zoom_level)(struct _cef_browser_t* self, - double zoomLevel); - - /// - // Clear the back/forward browsing history. - /// - void (CEF_CALLBACK *clear_history)(struct _cef_browser_t* self); - - /// - // Open developer tools in its own window. - /// - void (CEF_CALLBACK *show_dev_tools)(struct _cef_browser_t* self); - - /// - // Explicitly close the developer tools window if one exists for this browser - // instance. - /// - void (CEF_CALLBACK *close_dev_tools)(struct _cef_browser_t* self); - - /// - // Returns true (1) if window rendering is disabled. - /// - int (CEF_CALLBACK *is_window_rendering_disabled)(struct _cef_browser_t* self); - - /// - // Get the size of the specified element. This function should only be called - // on the UI thread. - /// - int (CEF_CALLBACK *get_size)(struct _cef_browser_t* self, - enum cef_paint_element_type_t type, int* width, int* height); - - /// - // Set the size of the specified element. This function is only used when - // window rendering is disabled. - /// - void (CEF_CALLBACK *set_size)(struct _cef_browser_t* self, - enum cef_paint_element_type_t type, int width, int height); - - /// - // Returns true (1) if a popup is currently visible. This function should only - // be called on the UI thread. - /// - int (CEF_CALLBACK *is_popup_visible)(struct _cef_browser_t* self); - - /// - // Hide the currently visible popup, if any. - /// - void (CEF_CALLBACK *hide_popup)(struct _cef_browser_t* self); - - /// - // Invalidate the |dirtyRect| region of the view. This function is only used - // when window rendering is disabled and will result in a call to - // HandlePaint(). - /// - void (CEF_CALLBACK *invalidate)(struct _cef_browser_t* self, - const cef_rect_t* dirtyRect); - - /// - // Get the raw image data contained in the specified element without - // performing validation. The specified |width| and |height| dimensions must - // match the current element size. On Windows |buffer| must be width*height*4 - // bytes in size and represents a BGRA image with an upper-left origin. This - // function should only be called on the UI thread. - /// - int (CEF_CALLBACK *get_image)(struct _cef_browser_t* self, - enum cef_paint_element_type_t type, int width, int height, - void* buffer); - - /// - // Send a key event to the browser. - /// - void (CEF_CALLBACK *send_key_event)(struct _cef_browser_t* self, - enum cef_key_type_t type, int key, int modifiers, int sysChar, - int imeChar); - - /// - // 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_t* self, - int x, int y, 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_t* self, int x, - int y, 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. - /// - void (CEF_CALLBACK *send_mouse_wheel_event)(struct _cef_browser_t* self, - int x, int y, int delta); - - /// - // Send a focus event to the browser. - /// - void (CEF_CALLBACK *send_focus_event)(struct _cef_browser_t* self, - int setFocus); - - /// - // Send a capture lost event to the browser. - /// - void (CEF_CALLBACK *send_capture_lost_event)(struct _cef_browser_t* self); - -} cef_browser_t; - - -/// -// Create a new browser window using the window parameters specified by -// |windowInfo|. All values will be copied internally and the actual window will -// be created on the UI thread. This function call will not block. -/// -CEF_EXPORT int cef_browser_create(cef_window_info_t* windowInfo, - struct _cef_client_t* client, const cef_string_t* url, - const struct _cef_browser_settings_t* settings); - -/// -// Create a new browser window using the window parameters specified by -// |windowInfo|. This function should only be called on the UI thread. -/// -CEF_EXPORT cef_browser_t* cef_browser_create_sync(cef_window_info_t* windowInfo, - struct _cef_client_t* client, const cef_string_t* url, - const struct _cef_browser_settings_t* settings); - - -/// -// Structure used to represent a frame in the browser window. The functions of -// this structure may be called on any thread unless otherwise indicated in the -// comments. -/// -typedef struct _cef_frame_t -{ - // Base structure. - cef_base_t base; - - /// - // Execute undo in this frame. - /// - void (CEF_CALLBACK *undo)(struct _cef_frame_t* self); - - /// - // Execute redo in this frame. - /// - void (CEF_CALLBACK *redo)(struct _cef_frame_t* self); - - /// - // Execute cut in this frame. - /// - void (CEF_CALLBACK *cut)(struct _cef_frame_t* self); - - /// - // Execute copy in this frame. - /// - void (CEF_CALLBACK *copy)(struct _cef_frame_t* self); - - /// - // Execute paste in this frame. - /// - void (CEF_CALLBACK *paste)(struct _cef_frame_t* self); - - /// - // Execute delete in this frame. - /// - void (CEF_CALLBACK *del)(struct _cef_frame_t* self); - - /// - // Execute select all in this frame. - /// - void (CEF_CALLBACK *select_all)(struct _cef_frame_t* self); - - /// - // Execute printing in the this frame. The user will be prompted with the - // print dialog appropriate to the operating system. - /// - void (CEF_CALLBACK *print)(struct _cef_frame_t* self); - - /// - // Save this frame's HTML source to a temporary file and open it in the - // default text viewing application. - /// - void (CEF_CALLBACK *view_source)(struct _cef_frame_t* self); - - /// - // Returns this frame's HTML source as a string. This function should only be - // called on the UI thread. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_source)(struct _cef_frame_t* self); - - /// - // Returns this frame's display text as a string. This function should only be - // called on the UI thread. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_text)(struct _cef_frame_t* self); - - /// - // Load the request represented by the |request| object. - /// - void (CEF_CALLBACK *load_request)(struct _cef_frame_t* self, - struct _cef_request_t* request); - - /// - // Load the specified |url|. - /// - void (CEF_CALLBACK *load_url)(struct _cef_frame_t* self, - const cef_string_t* url); - - /// - // Load the contents of |string| with the optional dummy target |url|. - /// - void (CEF_CALLBACK *load_string)(struct _cef_frame_t* self, - const cef_string_t* string, const cef_string_t* url); - - /// - // Load the contents of |stream| with the optional dummy target |url|. - /// - void (CEF_CALLBACK *load_stream)(struct _cef_frame_t* self, - struct _cef_stream_reader_t* stream, const cef_string_t* url); - - /// - // Execute a string of JavaScript code in this frame. The |script_url| - // parameter is the URL where the script in question can be found, if any. The - // renderer may request this URL to show the developer the source of the - // error. The |start_line| parameter is the base line number to use for error - // reporting. - /// - void (CEF_CALLBACK *execute_java_script)(struct _cef_frame_t* self, - const cef_string_t* jsCode, const cef_string_t* scriptUrl, - int startLine); - - /// - // Returns true (1) if this is the main (top-level) frame. - /// - int (CEF_CALLBACK *is_main)(struct _cef_frame_t* self); - - /// - // Returns true (1) if this is the focused frame. This function should only be - // called on the UI thread. - /// - int (CEF_CALLBACK *is_focused)(struct _cef_frame_t* self); - - /// - // Returns the name for this frame. If the frame has an assigned name (for - // example, set via the iframe "name" attribute) then that value will be - // returned. Otherwise a unique name will be constructed based on the frame - // parent hierarchy. The main (top-level) frame will always have an NULL name - // value. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_name)(struct _cef_frame_t* self); - - /// - // Returns the globally unique identifier for this frame. This function should - // only be called on the UI thread. - /// - long long (CEF_CALLBACK *get_identifier)(struct _cef_frame_t* self); - - /// - // Returns the parent of this frame or NULL if this is the main (top-level) - // frame. This function should only be called on the UI thread. - /// - struct _cef_frame_t* (CEF_CALLBACK *get_parent)(struct _cef_frame_t* self); - - /// - // Returns the URL currently loaded in this frame. This function should only - // be called on the UI thread. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_url)(struct _cef_frame_t* self); - - /// - // Returns the browser that this frame belongs to. - /// - struct _cef_browser_t* (CEF_CALLBACK *get_browser)(struct _cef_frame_t* self); - - /// - // Visit the DOM document. - /// - void (CEF_CALLBACK *visit_dom)(struct _cef_frame_t* self, - struct _cef_domvisitor_t* visitor); - - /// - // Get the V8 context associated with the frame. This function should only be - // called on the UI thread. - /// - struct _cef_v8context_t* (CEF_CALLBACK *get_v8context)( - struct _cef_frame_t* self); - -} cef_frame_t; - - -/// -// Implement this structure to handle proxy resolution events. -/// -typedef struct _cef_proxy_handler_t -{ - // Base structure. - cef_base_t base; - - /// - // Called to retrieve proxy information for the specified |url|. - /// - void (CEF_CALLBACK *get_proxy_for_url)(struct _cef_proxy_handler_t* self, - const cef_string_t* url, struct _cef_proxy_info_t* proxy_info); - -} cef_proxy_handler_t; - - -/// -// Implement this structure to provide handler implementations. -/// -typedef struct _cef_app_t -{ - // Base structure. - cef_base_t base; - - /// - // Return the handler for proxy events. If not handler is returned the default - // system handler will be used. - /// - struct _cef_proxy_handler_t* (CEF_CALLBACK *get_proxy_handler)( - struct _cef_app_t* self); - -} cef_app_t; - - -/// -// Implement this structure to handle events related to browser life span. The -// functions of this structure will be called on the UI thread. -/// -typedef struct _cef_life_span_handler_t -{ - // Base structure. - cef_base_t base; - - /// - // Called before a new popup window is created. The |parentBrowser| parameter - // will point to the parent browser window. The |popupFeatures| parameter will - // contain information about the style of popup window requested. Return false - // (0) to have the framework create the new popup window based on the - // parameters in |windowInfo|. Return true (1) to cancel creation of the popup - // window. By default, a newly created popup window will have the same client - // and settings as the parent window. To change the client for the new window - // modify the object that |client| points to. To change the settings for the - // new window modify the |settings| structure. - /// - int (CEF_CALLBACK *on_before_popup)(struct _cef_life_span_handler_t* self, - struct _cef_browser_t* parentBrowser, - const struct _cef_popup_features_t* popupFeatures, - struct _cef_window_info_t* windowInfo, const cef_string_t* url, - struct _cef_client_t** client, - struct _cef_browser_settings_t* settings); - - /// - // Called after a new window is created. - /// - void (CEF_CALLBACK *on_after_created)(struct _cef_life_span_handler_t* self, - struct _cef_browser_t* browser); - - /// - // Called when a modal window is about to display and the modal loop should - // begin running. Return false (0) to use the default modal loop - // implementation or true (1) to use a custom implementation. - /// - int (CEF_CALLBACK *run_modal)(struct _cef_life_span_handler_t* self, - struct _cef_browser_t* browser); - - /// - // Called when a window has recieved a request to close. Return false (0) to - // proceed with the window close or true (1) to cancel the window close. If - // this is a modal window and a custom modal loop implementation was provided - // in run_modal() this callback should be used to restore the opener window to - // a usable state. - /// - int (CEF_CALLBACK *do_close)(struct _cef_life_span_handler_t* self, - struct _cef_browser_t* browser); - - /// - // Called just before a window is closed. If this is a modal window and a - // custom modal loop implementation was provided in run_modal() this callback - // should be used to exit the custom modal loop. - /// - void (CEF_CALLBACK *on_before_close)(struct _cef_life_span_handler_t* self, - struct _cef_browser_t* browser); - -} cef_life_span_handler_t; - - -/// -// Implement this structure to handle events related to browser load status. The -// functions of this structure will be called on the UI thread. -/// -typedef struct _cef_load_handler_t -{ - // Base structure. - cef_base_t base; - - /// - // Called when the browser begins loading a frame. The |frame| value will - // never be NULL -- call the is_main() function to check if this frame is the - // main frame. Multiple frames may be loading at the same time. Sub-frames may - // start or continue loading after the main frame load has ended. This - // function may not be called for a particular frame if the load request for - // that frame fails. - /// - void (CEF_CALLBACK *on_load_start)(struct _cef_load_handler_t* self, - struct _cef_browser_t* browser, struct _cef_frame_t* frame); - - /// - // Called when the browser is done loading a frame. The |frame| value will - // never be NULL -- call the is_main() function to check if this frame is the - // main frame. Multiple frames may be loading at the same time. Sub-frames may - // start or continue loading after the main frame load has ended. This - // function will always be called for all frames irrespective of whether the - // request completes successfully. - /// - void (CEF_CALLBACK *on_load_end)(struct _cef_load_handler_t* self, - struct _cef_browser_t* browser, struct _cef_frame_t* frame, - int httpStatusCode); - - /// - // Called when the browser fails to load a resource. |errorCode| is the error - // code number and |failedUrl| is the URL that failed to load. To provide - // custom error text assign the text to |errorText| and return true (1). - // Otherwise, return false (0) for the default error text. See - // net\base\net_error_list.h for complete descriptions of the error codes. - /// - int (CEF_CALLBACK *on_load_error)(struct _cef_load_handler_t* self, - struct _cef_browser_t* browser, struct _cef_frame_t* frame, - enum cef_handler_errorcode_t errorCode, const cef_string_t* failedUrl, - cef_string_t* errorText); - -} cef_load_handler_t; - - -/// -// Implement this structure to handle events related to browser requests. The -// functions of this structure will be called on the thread indicated. -/// -typedef struct _cef_request_handler_t -{ - // Base structure. - cef_base_t base; - - /// - // Called on the UI thread before browser navigation. Return true (1) to - // cancel the navigation or false (0) to allow the navigation to proceed. - /// - int (CEF_CALLBACK *on_before_browse)(struct _cef_request_handler_t* self, - struct _cef_browser_t* browser, struct _cef_frame_t* frame, - struct _cef_request_t* request, enum cef_handler_navtype_t navType, - int isRedirect); - - /// - // Called on the IO thread before a resource is loaded. To allow the resource - // to load normally return false (0). To redirect the resource to a new url - // populate the |redirectUrl| value and return false (0). To specify data for - // the resource return a CefStream object in |resourceStream|, use the - // |response| object to set mime type, HTTP status code and optional header - // values, and return false (0). To cancel loading of the resource return true - // (1). Any modifications to |request| will be observed. If the URL in - // |request| is changed and |redirectUrl| is also set, the URL in |request| - // will be used. - /// - int (CEF_CALLBACK *on_before_resource_load)( - struct _cef_request_handler_t* self, struct _cef_browser_t* browser, - struct _cef_request_t* request, cef_string_t* redirectUrl, - struct _cef_stream_reader_t** resourceStream, - struct _cef_response_t* response, int loadFlags); - - /// - // Called on the IO thread when a resource load is redirected. The |old_url| - // parameter will contain the old URL. The |new_url| parameter will contain - // the new URL and can be changed if desired. - /// - void (CEF_CALLBACK *on_resource_redirect)(struct _cef_request_handler_t* self, - struct _cef_browser_t* browser, const cef_string_t* old_url, - cef_string_t* new_url); - - /// - // Called on the UI thread after a response to the resource request is - // received. Set |filter| if response content needs to be monitored and/or - // modified as it arrives. - /// - void (CEF_CALLBACK *on_resource_response)(struct _cef_request_handler_t* self, - struct _cef_browser_t* browser, const cef_string_t* url, - struct _cef_response_t* response, - struct _cef_content_filter_t** filter); - - /// - // Called on the IO thread to handle requests for URLs with an unknown - // protocol component. Return true (1) to indicate that the request should - // succeed because it was handled externally. Set |allowOSExecution| to true - // (1) and return false (0) to attempt execution via the registered OS - // protocol handler, if any. If false (0) is returned and either - // |allow_os_execution| is false (0) or OS protocol handler execution fails - // then the request will fail with an error condition. SECURITY WARNING: YOU - // SHOULD USE THIS METHOD TO ENFORCE RESTRICTIONS BASED ON SCHEME, HOST OR - // OTHER URL ANALYSIS BEFORE ALLOWING OS EXECUTION. - /// - int (CEF_CALLBACK *on_protocol_execution)(struct _cef_request_handler_t* self, - struct _cef_browser_t* browser, const cef_string_t* url, - int* allowOSExecution); - - /// - // Called on the UI thread when a server indicates via the 'Content- - // Disposition' header that a response represents a file to download. - // |mimeType| is the mime type for the download, |fileName| is the suggested - // target file name and |contentLength| is either the value of the 'Content- - // Size' header or -1 if no size was provided. Set |handler| to the - // cef_download_handler_t instance that will recieve the file contents. Return - // true (1) to download the file or false (0) to cancel the file download. - /// - int (CEF_CALLBACK *get_download_handler)(struct _cef_request_handler_t* self, - struct _cef_browser_t* browser, const cef_string_t* mimeType, - const cef_string_t* fileName, int64 contentLength, - struct _cef_download_handler_t** handler); - - /// - // 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 number. Set |username| and |password| and return true (1) - // to handle the request. Return false (0) to cancel the request. - /// - int (CEF_CALLBACK *get_auth_credentials)(struct _cef_request_handler_t* self, - struct _cef_browser_t* browser, int isProxy, const cef_string_t* host, - int port, const cef_string_t* realm, const cef_string_t* scheme, - cef_string_t* username, cef_string_t* password); - -} cef_request_handler_t; - - -/// -// Implement this structure to handle events related to browser display state. -// The functions of this structure will be called on the UI thread. -/// -typedef struct _cef_display_handler_t -{ - // Base structure. - cef_base_t base; - - /// - // Called when the navigation state has changed. - /// - void (CEF_CALLBACK *on_nav_state_change)(struct _cef_display_handler_t* self, - struct _cef_browser_t* browser, int canGoBack, int canGoForward); - - /// - // Called when a frame's address has changed. - /// - void (CEF_CALLBACK *on_address_change)(struct _cef_display_handler_t* self, - struct _cef_browser_t* browser, struct _cef_frame_t* frame, - const cef_string_t* url); - - /// - // Called when the size of the content area has changed. - /// - void (CEF_CALLBACK *on_contents_size_change)( - struct _cef_display_handler_t* self, struct _cef_browser_t* browser, - struct _cef_frame_t* frame, int width, int height); - - /// - // Called when the page title changes. - /// - void (CEF_CALLBACK *on_title_change)(struct _cef_display_handler_t* self, - struct _cef_browser_t* browser, const cef_string_t* title); - - /// - // Called when the browser is about to display a tooltip. |text| contains the - // 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. - /// - int (CEF_CALLBACK *on_tooltip)(struct _cef_display_handler_t* self, - struct _cef_browser_t* browser, cef_string_t* text); - - /// - // Called when the browser receives a status message. |text| contains the text - // that will be displayed in the status message and |type| indicates the - // status message type. - /// - void (CEF_CALLBACK *on_status_message)(struct _cef_display_handler_t* self, - struct _cef_browser_t* browser, const cef_string_t* value, - enum cef_handler_statustype_t type); - - /// - // Called to display a console message. Return true (1) to stop the message - // from being output to the console. - /// - int (CEF_CALLBACK *on_console_message)(struct _cef_display_handler_t* self, - struct _cef_browser_t* browser, const cef_string_t* message, - const cef_string_t* source, int line); - -} cef_display_handler_t; - - -/// -// Implement this structure to handle events related to focus. The functions of -// this structure will be called on the UI thread. -/// -typedef struct _cef_focus_handler_t -{ - // Base structure. - cef_base_t base; - - /// - // Called when the browser component is about to loose focus. For instance, if - // focus was on the last HTML element and the user pressed the TAB key. |next| - // will be true (1) if the browser is giving focus to the next component and - // false (0) if the browser is giving focus to the previous component. - /// - void (CEF_CALLBACK *on_take_focus)(struct _cef_focus_handler_t* self, - struct _cef_browser_t* browser, int next); - - /// - // Called when the browser component is requesting focus. |source| indicates - // where the focus request is originating from. Return false (0) to allow the - // focus to be set or true (1) to cancel setting the focus. - /// - int (CEF_CALLBACK *on_set_focus)(struct _cef_focus_handler_t* self, - struct _cef_browser_t* browser, enum cef_handler_focus_source_t source); - - /// - // 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 - // this function represents a snapshot of the DOM at the time this function is - // executed. DOM objects are only valid for the scope of this function. Do not - // keep references to or attempt to access any DOM objects outside the scope - // of this function. - /// - void (CEF_CALLBACK *on_focused_node_changed)( - struct _cef_focus_handler_t* self, struct _cef_browser_t* browser, - struct _cef_frame_t* frame, struct _cef_domnode_t* node); - -} cef_focus_handler_t; - - -/// -// Implement this structure to handle events related to keyboard input. The -// functions of this structure will be called on the UI thread. -/// -typedef struct _cef_keyboard_handler_t -{ - // Base structure. - cef_base_t base; - - /// - // Called when the browser component receives a keyboard event. This function - // is called both before the event is passed to the renderer and after - // JavaScript in the page has had a chance to handle the event. |type| is the - // type of keyboard event, |code| is the windows scan-code for the event, - // |modifiers| is a set of bit- flags describing any pressed modifier keys and - // |isSystemKey| is true (1) if Windows considers this a 'system key' message - // (see http://msdn.microsoft.com/en-us/library/ms646286(VS.85).aspx). If - // |isAfterJavaScript| is true (1) then JavaScript in the page has had a - // chance to handle the event and has chosen not to. Only RAWKEYDOWN, KEYDOWN - // and CHAR events will be sent with |isAfterJavaScript| set to true (1). - // Return true (1) if the keyboard event was handled or false (0) to allow - // continued handling of the event by the renderer. - /// - int (CEF_CALLBACK *on_key_event)(struct _cef_keyboard_handler_t* self, - struct _cef_browser_t* browser, enum cef_handler_keyevent_type_t type, - int code, int modifiers, int isSystemKey, int isAfterJavaScript); - -} cef_keyboard_handler_t; - - -/// -// Implement this structure to handle events related to browser context menus. -// The functions of this structure will be called on the UI thread. -/// -typedef struct _cef_menu_handler_t -{ - // Base structure. - cef_base_t base; - - /// - // Called before a context menu is displayed. Return false (0) to display the - // default context menu or true (1) to cancel the display. - /// - int (CEF_CALLBACK *on_before_menu)(struct _cef_menu_handler_t* self, - struct _cef_browser_t* browser, - const struct _cef_menu_info_t* menuInfo); - - /// - // Called to optionally override the default text for a context menu item. - // |label| contains the default text and may be modified to substitute - // alternate text. - /// - void (CEF_CALLBACK *get_menu_label)(struct _cef_menu_handler_t* self, - struct _cef_browser_t* browser, enum cef_menu_id_t menuId, - cef_string_t* label); - - /// - // Called when an option is selected from the default context menu. Return - // false (0) to execute the default action or true (1) to cancel the action. - /// - int (CEF_CALLBACK *on_menu_action)(struct _cef_menu_handler_t* self, - struct _cef_browser_t* browser, enum cef_menu_id_t menuId); - -} cef_menu_handler_t; - - -/// -// Implement this structure to handle events related to printing. The functions -// of this structure will be called on the UI thread. -/// -typedef struct _cef_print_handler_t -{ - // Base structure. - cef_base_t base; - - /// - // Called to allow customization of standard print options before the print - // dialog is displayed. |printOptions| allows specification of paper size, - // orientation and margins. Note that the specified margins may be adjusted if - // they are outside the range supported by the printer. All units are in - // inches. Return false (0) to display the default print options or true (1) - // to display the modified |printOptions|. - /// - int (CEF_CALLBACK *get_print_options)(struct _cef_print_handler_t* self, - struct _cef_browser_t* browser, - struct _cef_print_options_t* printOptions); - - /// - // Called to format print headers and footers. |printInfo| contains platform- - // specific information about the printer context. |url| is the URL if the - // currently printing page, |title| is the title of the currently printing - // page, |currentPage| is the current page number and |maxPages| is the total - // number of pages. Six default header locations are provided by the - // implementation: top left, top center, top right, bottom left, bottom center - // and bottom right. To use one of these default locations just assign a - // string to the appropriate variable. To draw the header and footer yourself - // return true (1). Otherwise, populate the approprate variables and return - // false (0). - /// - int (CEF_CALLBACK *get_print_header_footer)(struct _cef_print_handler_t* self, - struct _cef_browser_t* browser, struct _cef_frame_t* frame, - const struct _cef_print_info_t* printInfo, const cef_string_t* url, - const cef_string_t* title, int currentPage, int maxPages, - cef_string_t* topLeft, cef_string_t* topCenter, cef_string_t* topRight, - cef_string_t* bottomLeft, cef_string_t* bottomCenter, - cef_string_t* bottomRight); - -} cef_print_handler_t; - - -/// -// Implement this structure to handle events related to find results. The -// functions of this structure will be called on the UI thread. -/// -typedef struct _cef_find_handler_t -{ - // Base structure. - cef_base_t base; - - /// - // Called to report find results returned by cef_browser_t::find(). - // |identifer| is the identifier passed to cef_browser_t::find(), |count| is - // the number of matches currently identified, |selectionRect| is the location - // of where the match was found (in window coordinates), |activeMatchOrdinal| - // is the current position in the search results, and |finalUpdate| is true - // (1) if this is the last find notification. - /// - void (CEF_CALLBACK *on_find_result)(struct _cef_find_handler_t* self, - struct _cef_browser_t* browser, int identifier, int count, - const cef_rect_t* selectionRect, int activeMatchOrdinal, - int finalUpdate); - -} cef_find_handler_t; - - -/// -// Implement this structure to handle events related to JavaScript dialogs. The -// functions of this structure will be called on the UI thread. -/// -typedef struct _cef_jsdialog_handler_t -{ - // Base structure. - cef_base_t base; - - /// - // Called to run a JavaScript alert message. Return false (0) to display the - // default alert or true (1) if you displayed a custom alert. - /// - int (CEF_CALLBACK *on_jsalert)(struct _cef_jsdialog_handler_t* self, - struct _cef_browser_t* browser, struct _cef_frame_t* frame, - const cef_string_t* message); - - /// - // Called to run a JavaScript confirm request. Return false (0) to display the - // default alert or true (1) if you displayed a custom alert. If you handled - // the alert set |retval| to true (1) if the user accepted the confirmation. - /// - int (CEF_CALLBACK *on_jsconfirm)(struct _cef_jsdialog_handler_t* self, - struct _cef_browser_t* browser, struct _cef_frame_t* frame, - const cef_string_t* message, int* retval); - - /// - // Called to run a JavaScript prompt request. Return false (0) to display the - // default prompt or true (1) if you displayed a custom prompt. If you handled - // the prompt set |retval| to true (1) if the user accepted the prompt and - // request and |result| to the resulting value. - /// - int (CEF_CALLBACK *on_jsprompt)(struct _cef_jsdialog_handler_t* self, - struct _cef_browser_t* browser, struct _cef_frame_t* frame, - const cef_string_t* message, const cef_string_t* defaultValue, - int* retval, cef_string_t* result); - -} cef_jsdialog_handler_t; - - -/// -// Implement this structure to handle V8 context events. The functions of this -// structure will be called on the UI thread. -/// -typedef struct _cef_v8context_handler_t -{ - // Base structure. - cef_base_t base; - - /// - // 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. - /// - void (CEF_CALLBACK *on_context_created)(struct _cef_v8context_handler_t* self, - struct _cef_browser_t* browser, struct _cef_frame_t* frame, - struct _cef_v8context_t* context); - - /// - // Called immediately before the V8 context for a frame is released. No - // references to the context should be kept after this function is called. - /// - void (CEF_CALLBACK *on_context_released)( - struct _cef_v8context_handler_t* self, struct _cef_browser_t* browser, - struct _cef_frame_t* frame, struct _cef_v8context_t* context); - -} cef_v8context_handler_t; - - -/// -// 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 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 simulated screen rectangle. Return true (1) if the - // rectangle was provided. - /// - int (CEF_CALLBACK *get_screen_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); - - /// - // 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; - - -/// -// Implement this structure to handle events related to dragging. The functions -// of this structure will be called on the UI thread. -/// -typedef struct _cef_drag_handler_t -{ - // Base structure. - cef_base_t base; - - /// - // Called when the browser window initiates a drag event. |dragData| contains - // the drag event data and |mask| represents the type of drag operation. - // Return false (0) for default drag handling behavior or true (1) to cancel - // the drag event. - /// - int (CEF_CALLBACK *on_drag_start)(struct _cef_drag_handler_t* self, - struct _cef_browser_t* browser, struct _cef_drag_data_t* dragData, - enum cef_drag_operations_mask_t mask); - - /// - // Called when an external drag event enters the browser window. |dragData| - // contains the drag event data and |mask| represents the type of drag - // operation. Return false (0) for default drag handling behavior or true (1) - // to cancel the drag event. - /// - int (CEF_CALLBACK *on_drag_enter)(struct _cef_drag_handler_t* self, - struct _cef_browser_t* browser, struct _cef_drag_data_t* dragData, - enum cef_drag_operations_mask_t mask); - -} cef_drag_handler_t; - - -/// -// Implement this structure to provide handler implementations. -/// -typedef struct _cef_client_t -{ - // Base structure. - cef_base_t base; - - /// - // Return the handler for browser life span events. - /// - struct _cef_life_span_handler_t* (CEF_CALLBACK *get_life_span_handler)( - struct _cef_client_t* self); - - /// - // Return the handler for browser load status events. - /// - struct _cef_load_handler_t* (CEF_CALLBACK *get_load_handler)( - struct _cef_client_t* self); - - /// - // Return the handler for browser request events. - /// - struct _cef_request_handler_t* (CEF_CALLBACK *get_request_handler)( - struct _cef_client_t* self); - - /// - // Return the handler for browser display state events. - /// - struct _cef_display_handler_t* (CEF_CALLBACK *get_display_handler)( - struct _cef_client_t* self); - - /// - // Return the handler for focus events. - /// - struct _cef_focus_handler_t* (CEF_CALLBACK *get_focus_handler)( - struct _cef_client_t* self); - - /// - // Return the handler for keyboard events. - /// - struct _cef_keyboard_handler_t* (CEF_CALLBACK *get_keyboard_handler)( - struct _cef_client_t* self); - - /// - // Return the handler for context menu events. - /// - struct _cef_menu_handler_t* (CEF_CALLBACK *get_menu_handler)( - struct _cef_client_t* self); - - /// - // Return the handler for printing events. - /// - struct _cef_print_handler_t* (CEF_CALLBACK *get_print_handler)( - struct _cef_client_t* self); - - /// - // Return the handler for find result events. - /// - struct _cef_find_handler_t* (CEF_CALLBACK *get_find_handler)( - struct _cef_client_t* self); - - /// - // Return the handler for JavaScript dialog events. - /// - struct _cef_jsdialog_handler_t* (CEF_CALLBACK *get_jsdialog_handler)( - struct _cef_client_t* self); - - /// - // Return the handler for V8 context events. - /// - struct _cef_v8context_handler_t* (CEF_CALLBACK *get_v8context_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 drag events. - /// - struct _cef_drag_handler_t* (CEF_CALLBACK *get_drag_handler)( - struct _cef_client_t* self); - -} cef_client_t; - - -/// -// Structure used to represent a web request. The functions of this structure -// may be called on any thread. -/// -typedef struct _cef_request_t -{ - // Base structure. - cef_base_t base; - - /// - // Get the fully qualified URL. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_url)(struct _cef_request_t* self); - - /// - // Set the fully qualified URL. - /// - void (CEF_CALLBACK *set_url)(struct _cef_request_t* self, - const cef_string_t* url); - - /// - // Get the request function type. The value will default to POST if post data - // is provided and GET otherwise. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_method)(struct _cef_request_t* self); - - /// - // Set the request function type. - /// - void (CEF_CALLBACK *set_method)(struct _cef_request_t* self, - const cef_string_t* method); - - /// - // Get the post data. - /// - struct _cef_post_data_t* (CEF_CALLBACK *get_post_data)( - struct _cef_request_t* self); - - /// - // Set the post data. - /// - void (CEF_CALLBACK *set_post_data)(struct _cef_request_t* self, - struct _cef_post_data_t* postData); - - /// - // Get the header values. - /// - void (CEF_CALLBACK *get_header_map)(struct _cef_request_t* self, - cef_string_multimap_t headerMap); - - /// - // Set the header values. - /// - void (CEF_CALLBACK *set_header_map)(struct _cef_request_t* self, - cef_string_multimap_t headerMap); - - /// - // Set all values at one time. - /// - void (CEF_CALLBACK *set)(struct _cef_request_t* self, const cef_string_t* url, - const cef_string_t* method, struct _cef_post_data_t* postData, - cef_string_multimap_t headerMap); - - /// - // Get the flags used in combination with cef_web_urlrequest_t. - /// - enum cef_weburlrequest_flags_t (CEF_CALLBACK *get_flags)( - struct _cef_request_t* self); - - /// - // Set the flags used in combination with cef_web_urlrequest_t. - /// - void (CEF_CALLBACK *set_flags)(struct _cef_request_t* self, - enum cef_weburlrequest_flags_t flags); - - /// - // Set the URL to the first party for cookies used in combination with - // cef_web_urlrequest_t. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_first_party_for_cookies)( - struct _cef_request_t* self); - - /// - // Get the URL to the first party for cookies used in combination with - // cef_web_urlrequest_t. - /// - void (CEF_CALLBACK *set_first_party_for_cookies)(struct _cef_request_t* self, - const cef_string_t* url); - -} cef_request_t; - - -/// -// Create a new cef_request_t object. -/// -CEF_EXPORT cef_request_t* cef_request_create(); - - -/// -// Structure used to represent post data for a web request. The functions of -// this structure may be called on any thread. -/// -typedef struct _cef_post_data_t -{ - // Base structure. - cef_base_t base; - - /// - // Returns the number of existing post data elements. - /// - size_t (CEF_CALLBACK *get_element_count)(struct _cef_post_data_t* self); - - /// - // Retrieve the post data elements. - /// - void (CEF_CALLBACK *get_elements)(struct _cef_post_data_t* self, - size_t* elementsCount, struct _cef_post_data_element_t** elements); - - /// - // Remove the specified post data element. Returns true (1) if the removal - // succeeds. - /// - int (CEF_CALLBACK *remove_element)(struct _cef_post_data_t* self, - struct _cef_post_data_element_t* element); - - /// - // Add the specified post data element. Returns true (1) if the add succeeds. - /// - int (CEF_CALLBACK *add_element)(struct _cef_post_data_t* self, - struct _cef_post_data_element_t* element); - - /// - // Remove all existing post data elements. - /// - void (CEF_CALLBACK *remove_elements)(struct _cef_post_data_t* self); - -} cef_post_data_t; - - -/// -// Create a new cef_post_data_t object. -/// -CEF_EXPORT cef_post_data_t* cef_post_data_create(); - - -/// -// Structure used to represent a single element in the request post data. The -// functions of this structure may be called on any thread. -/// -typedef struct _cef_post_data_element_t -{ - // Base structure. - cef_base_t base; - - /// - // Remove all contents from the post data element. - /// - void (CEF_CALLBACK *set_to_empty)(struct _cef_post_data_element_t* self); - - /// - // The post data element will represent a file. - /// - void (CEF_CALLBACK *set_to_file)(struct _cef_post_data_element_t* self, - const cef_string_t* fileName); - - /// - // The post data element will represent bytes. The bytes passed in will be - // copied. - /// - void (CEF_CALLBACK *set_to_bytes)(struct _cef_post_data_element_t* self, - size_t size, const void* bytes); - - /// - // Return the type of this post data element. - /// - enum cef_postdataelement_type_t (CEF_CALLBACK *get_type)( - struct _cef_post_data_element_t* self); - - /// - // Return the file name. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_file)( - struct _cef_post_data_element_t* self); - - /// - // Return the number of bytes. - /// - size_t (CEF_CALLBACK *get_bytes_count)(struct _cef_post_data_element_t* self); - - /// - // Read up to |size| bytes into |bytes| and return the number of bytes - // actually read. - /// - size_t (CEF_CALLBACK *get_bytes)(struct _cef_post_data_element_t* self, - size_t size, void* bytes); - -} cef_post_data_element_t; - - -/// -// Create a new cef_post_data_element_t object. -/// -CEF_EXPORT cef_post_data_element_t* cef_post_data_element_create(); - - -/// -// Structure used to represent a web response. The functions of this structure -// may be called on any thread. -/// -typedef struct _cef_response_t -{ - // Base structure. - cef_base_t base; - - /// - // Get the response status code. - /// - int (CEF_CALLBACK *get_status)(struct _cef_response_t* self); - - /// - // Set the response status code. - /// - void (CEF_CALLBACK *set_status)(struct _cef_response_t* self, int status); - - /// - // Get the response status text. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_status_text)( - struct _cef_response_t* self); - - /// - // Set the response status text. - /// - void (CEF_CALLBACK *set_status_text)(struct _cef_response_t* self, - const cef_string_t* statusText); - - /// - // Get the response mime type. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_mime_type)( - struct _cef_response_t* self); - - /// - // Set the response mime type. - /// - void (CEF_CALLBACK *set_mime_type)(struct _cef_response_t* self, - const cef_string_t* mimeType); - - /// - // Get the value for the specified response header field. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_header)(struct _cef_response_t* self, - const cef_string_t* name); - - /// - // Get all response header fields. - /// - void (CEF_CALLBACK *get_header_map)(struct _cef_response_t* self, - cef_string_multimap_t headerMap); - - /// - // Set all response header fields. - /// - void (CEF_CALLBACK *set_header_map)(struct _cef_response_t* self, - cef_string_multimap_t headerMap); - -} cef_response_t; - - -/// -// Structure the client can implement to provide a custom stream reader. The -// functions of this structure may be called on any thread. -/// -typedef struct _cef_read_handler_t -{ - // Base structure. - cef_base_t base; - - /// - // Read raw binary data. - /// - size_t (CEF_CALLBACK *read)(struct _cef_read_handler_t* self, void* ptr, - size_t size, size_t n); - - /// - // Seek to the specified offset position. |whence| may be any one of SEEK_CUR, - // SEEK_END or SEEK_SET. - /// - int (CEF_CALLBACK *seek)(struct _cef_read_handler_t* self, long offset, - int whence); - - /// - // Return the current offset position. - /// - long (CEF_CALLBACK *tell)(struct _cef_read_handler_t* self); - - /// - // Return non-zero if at end of file. - /// - int (CEF_CALLBACK *eof)(struct _cef_read_handler_t* self); - -} cef_read_handler_t; - - -/// -// Structure used to read data from a stream. The functions of this structure -// may be called on any thread. -/// -typedef struct _cef_stream_reader_t -{ - // Base structure. - cef_base_t base; - - /// - // Read raw binary data. - /// - size_t (CEF_CALLBACK *read)(struct _cef_stream_reader_t* self, void* ptr, - size_t size, size_t n); - - /// - // Seek to the specified offset position. |whence| may be any one of SEEK_CUR, - // SEEK_END or SEEK_SET. Returns zero on success and non-zero on failure. - /// - int (CEF_CALLBACK *seek)(struct _cef_stream_reader_t* self, long offset, - int whence); - - /// - // Return the current offset position. - /// - long (CEF_CALLBACK *tell)(struct _cef_stream_reader_t* self); - - /// - // Return non-zero if at end of file. - /// - int (CEF_CALLBACK *eof)(struct _cef_stream_reader_t* self); - -} cef_stream_reader_t; - - -/// -// Create a new cef_stream_reader_t object from a file. -/// -CEF_EXPORT cef_stream_reader_t* cef_stream_reader_create_for_file( - const cef_string_t* fileName); - -/// -// Create a new cef_stream_reader_t object from data. -/// -CEF_EXPORT cef_stream_reader_t* cef_stream_reader_create_for_data(void* data, - size_t size); - -/// -// Create a new cef_stream_reader_t object from a custom handler. -/// -CEF_EXPORT cef_stream_reader_t* cef_stream_reader_create_for_handler( - cef_read_handler_t* handler); - - -/// -// Structure the client can implement to provide a custom stream writer. The -// functions of this structure may be called on any thread. -/// -typedef struct _cef_write_handler_t -{ - // Base structure. - cef_base_t base; - - /// - // Write raw binary data. - /// - size_t (CEF_CALLBACK *write)(struct _cef_write_handler_t* self, - const void* ptr, size_t size, size_t n); - - /// - // Seek to the specified offset position. |whence| may be any one of SEEK_CUR, - // SEEK_END or SEEK_SET. - /// - int (CEF_CALLBACK *seek)(struct _cef_write_handler_t* self, long offset, - int whence); - - /// - // Return the current offset position. - /// - long (CEF_CALLBACK *tell)(struct _cef_write_handler_t* self); - - /// - // Flush the stream. - /// - int (CEF_CALLBACK *flush)(struct _cef_write_handler_t* self); - -} cef_write_handler_t; - - -/// -// Structure used to write data to a stream. The functions of this structure may -// be called on any thread. -/// -typedef struct _cef_stream_writer_t -{ - // Base structure. - cef_base_t base; - - /// - // Write raw binary data. - /// - size_t (CEF_CALLBACK *write)(struct _cef_stream_writer_t* self, - const void* ptr, size_t size, size_t n); - - /// - // Seek to the specified offset position. |whence| may be any one of SEEK_CUR, - // SEEK_END or SEEK_SET. - /// - int (CEF_CALLBACK *seek)(struct _cef_stream_writer_t* self, long offset, - int whence); - - /// - // Return the current offset position. - /// - long (CEF_CALLBACK *tell)(struct _cef_stream_writer_t* self); - - /// - // Flush the stream. - /// - int (CEF_CALLBACK *flush)(struct _cef_stream_writer_t* self); - -} cef_stream_writer_t; - - -/// -// Create a new cef_stream_writer_t object for a file. -/// -CEF_EXPORT cef_stream_writer_t* cef_stream_writer_create_for_file( - const cef_string_t* fileName); - -/// -// Create a new cef_stream_writer_t object for a custom handler. -/// -CEF_EXPORT cef_stream_writer_t* cef_stream_writer_create_for_handler( - cef_write_handler_t* handler); - - -/// -// Structure that encapsulates a V8 context handle. -/// -typedef struct _cef_v8context_t -{ - // Base structure. - cef_base_t base; - - /// - // Returns the browser for this context. - /// - struct _cef_browser_t* (CEF_CALLBACK *get_browser)( - struct _cef_v8context_t* self); - - /// - // Returns the frame for this context. - /// - struct _cef_frame_t* (CEF_CALLBACK *get_frame)(struct _cef_v8context_t* self); - - /// - // Returns the global object for this context. - /// - struct _cef_v8value_t* (CEF_CALLBACK *get_global)( - struct _cef_v8context_t* self); - - /// - // Enter this context. A context must be explicitly entered before creating a - // V8 Object, Array or Function asynchronously. exit() must be called the same - // number of times as enter() before releasing this context. V8 objects belong - // to the context in which they are created. Returns true (1) if the scope was - // entered successfully. - /// - int (CEF_CALLBACK *enter)(struct _cef_v8context_t* self); - - /// - // Exit this context. Call this function only after calling enter(). Returns - // true (1) if the scope was exited successfully. - /// - int (CEF_CALLBACK *exit)(struct _cef_v8context_t* self); - - /// - // Returns true (1) if this object is pointing to the same handle as |that| - // object. - /// - int (CEF_CALLBACK *is_same)(struct _cef_v8context_t* self, - struct _cef_v8context_t* that); - -} cef_v8context_t; - - -/// -// Returns the current (top) context object in the V8 context stack. -/// -CEF_EXPORT cef_v8context_t* cef_v8context_get_current_context(); - -/// -// Returns the entered (bottom) context object in the V8 context stack. -/// -CEF_EXPORT cef_v8context_t* cef_v8context_get_entered_context(); - -/// -// Returns true (1) if V8 is currently inside a context. -/// -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 UI thread. -/// -typedef struct _cef_v8handler_t -{ - // Base structure. - cef_base_t base; - - /// - // Handle execution of the function identified by |name|. |object| is the - // receiver ('this' object) of the function. |arguments| is the list of - // arguments passed to the function. If execution succeeds set |retval| to the - // function return value. If execution fails set |exception| to the exception - // that will be thrown. Return true (1) if execution was handled. - /// - int (CEF_CALLBACK *execute)(struct _cef_v8handler_t* self, - const cef_string_t* name, struct _cef_v8value_t* object, - size_t argumentsCount, struct _cef_v8value_t* const* arguments, - struct _cef_v8value_t** retval, cef_string_t* exception); - -} cef_v8handler_t; - - -/// -// Structure that should be implemented to handle V8 accessor calls. Accessor -// identifiers are registered by calling cef_v8value_t::set_value(). The -// functions of this structure will always be called on the UI thread. -/// -typedef struct _cef_v8accessor_t -{ - // Base structure. - cef_base_t base; - - /// - // Handle retrieval the accessor value identified by |name|. |object| is the - // receiver ('this' object) of the accessor. If retrieval succeeds set - // |retval| to the return value. If retrieval fails set |exception| to the - // exception that will be thrown. Return true (1) if accessor retrieval was - // handled. - /// - int (CEF_CALLBACK *get)(struct _cef_v8accessor_t* self, - const cef_string_t* name, struct _cef_v8value_t* object, - struct _cef_v8value_t** retval, cef_string_t* exception); - - /// - // Handle assignment of the accessor value identified by |name|. |object| is - // the receiver ('this' object) of the accessor. |value| is the new value - // being assigned to the accessor. If assignment fails set |exception| to the - // exception that will be thrown. Return true (1) if accessor assignment was - // handled. - /// - int (CEF_CALLBACK *set)(struct _cef_v8accessor_t* self, - const cef_string_t* name, struct _cef_v8value_t* object, - struct _cef_v8value_t* value, cef_string_t* exception); - -} cef_v8accessor_t; - - -/// -// Structure representing a V8 exception. -/// -typedef struct _cef_v8exception_t -{ - // Base structure. - cef_base_t base; - - /// - // Returns the exception message. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_message)( - struct _cef_v8exception_t* self); - - /// - // Returns the line of source code that the exception occurred within. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_source_line)( - struct _cef_v8exception_t* self); - - /// - // Returns the resource name for the script from where the function causing - // the error originates. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_script_resource_name)( - struct _cef_v8exception_t* self); - - /// - // Returns the 1-based number of the line where the error occurred or 0 if the - // line number is unknown. - /// - int (CEF_CALLBACK *get_line_number)(struct _cef_v8exception_t* self); - - /// - // Returns the index within the script of the first character where the error - // occurred. - /// - int (CEF_CALLBACK *get_start_position)(struct _cef_v8exception_t* self); - - /// - // Returns the index within the script of the last character where the error - // occurred. - /// - int (CEF_CALLBACK *get_end_position)(struct _cef_v8exception_t* self); - - /// - // Returns the index within the line of the first character where the error - // occurred. - /// - int (CEF_CALLBACK *get_start_column)(struct _cef_v8exception_t* self); - - /// - // Returns the index within the line of the last character where the error - // occurred. - /// - int (CEF_CALLBACK *get_end_column)(struct _cef_v8exception_t* self); - -} cef_v8exception_t; - - -/// -// Structure representing a V8 value. The functions of this structure should -// only be called on the UI thread. -/// -typedef struct _cef_v8value_t -{ - // Base structure. - cef_base_t base; - - /// - // True if the value type is undefined. - /// - int (CEF_CALLBACK *is_undefined)(struct _cef_v8value_t* self); - - /// - // True if the value type is null. - /// - int (CEF_CALLBACK *is_null)(struct _cef_v8value_t* self); - - /// - // True if the value type is bool. - /// - int (CEF_CALLBACK *is_bool)(struct _cef_v8value_t* self); - - /// - // True if the value type is int. - /// - int (CEF_CALLBACK *is_int)(struct _cef_v8value_t* self); - - /// - // True if the value type is double. - /// - int (CEF_CALLBACK *is_double)(struct _cef_v8value_t* self); - - /// - // True if the value type is Date. - /// - int (CEF_CALLBACK *is_date)(struct _cef_v8value_t* self); - - /// - // True if the value type is string. - /// - int (CEF_CALLBACK *is_string)(struct _cef_v8value_t* self); - - /// - // True if the value type is object. - /// - int (CEF_CALLBACK *is_object)(struct _cef_v8value_t* self); - - /// - // True if the value type is array. - /// - int (CEF_CALLBACK *is_array)(struct _cef_v8value_t* self); - - /// - // True if the value type is function. - /// - int (CEF_CALLBACK *is_function)(struct _cef_v8value_t* self); - - /// - // Returns true (1) if this object is pointing to the same handle as |that| - // object. - /// - int (CEF_CALLBACK *is_same)(struct _cef_v8value_t* self, - struct _cef_v8value_t* that); - - /// - // Return a bool value. The underlying data will be converted to if - // necessary. - /// - int (CEF_CALLBACK *get_bool_value)(struct _cef_v8value_t* self); - - /// - // Return an int value. The underlying data will be converted to if - // necessary. - /// - int (CEF_CALLBACK *get_int_value)(struct _cef_v8value_t* self); - - /// - // Return a double value. The underlying data will be converted to if - // necessary. - /// - double (CEF_CALLBACK *get_double_value)(struct _cef_v8value_t* self); - - /// - // Return a Date value. The underlying data will be converted to if - // necessary. - /// - cef_time_t (CEF_CALLBACK *get_date_value)(struct _cef_v8value_t* self); - - /// - // Return a string value. The underlying data will be converted to if - // necessary. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_string_value)( - struct _cef_v8value_t* self); - - - // OBJECT METHODS - These functions are only available on objects. Arrays and - // functions are also objects. String- and integer-based keys can be used - // interchangably with the framework converting between them as necessary. - - /// - // Returns true (1) if the object has a value with the specified identifier. - /// - int (CEF_CALLBACK *has_value_bykey)(struct _cef_v8value_t* self, - const cef_string_t* key); - - /// - // Returns true (1) if the object has a value with the specified identifier. - /// - int (CEF_CALLBACK *has_value_byindex)(struct _cef_v8value_t* self, int index); - - /// - // Delete the value with the specified identifier. - /// - int (CEF_CALLBACK *delete_value_bykey)(struct _cef_v8value_t* self, - const cef_string_t* key); - - /// - // Delete the value with the specified identifier. - /// - int (CEF_CALLBACK *delete_value_byindex)(struct _cef_v8value_t* self, - int index); - - /// - // Returns the value with the specified identifier. - /// - struct _cef_v8value_t* (CEF_CALLBACK *get_value_bykey)( - struct _cef_v8value_t* self, const cef_string_t* key); - - /// - // Returns the value with the specified identifier. - /// - struct _cef_v8value_t* (CEF_CALLBACK *get_value_byindex)( - struct _cef_v8value_t* self, int index); - - /// - // Associate a value with the specified identifier. - /// - int (CEF_CALLBACK *set_value_bykey)(struct _cef_v8value_t* self, - const cef_string_t* key, struct _cef_v8value_t* value, - enum cef_v8_propertyattribute_t attribute); - - /// - // Associate a value with the specified identifier. - /// - int (CEF_CALLBACK *set_value_byindex)(struct _cef_v8value_t* self, int index, - struct _cef_v8value_t* value); - - /// - // Register an identifier whose access will be forwarded to the - // cef_v8accessor_t instance passed to - // cef_v8value_t::cef_v8value_create_object_with_accessor(). - /// - int (CEF_CALLBACK *set_value_byaccessor)(struct _cef_v8value_t* self, - const cef_string_t* key, enum cef_v8_accesscontrol_t settings, - enum cef_v8_propertyattribute_t attribute); - - /// - // Read the keys for the object's values into the specified vector. Integer- - // based keys will also be returned as strings. - /// - int (CEF_CALLBACK *get_keys)(struct _cef_v8value_t* self, - cef_string_list_t keys); - - /// - // Returns the user data, if any, specified when the object was created. - /// - struct _cef_base_t* (CEF_CALLBACK *get_user_data)( - struct _cef_v8value_t* self); - - - // ARRAY METHODS - These functions are only available on arrays. - - /// - // Returns the number of elements in the array. - /// - int (CEF_CALLBACK *get_array_length)(struct _cef_v8value_t* self); - - - // FUNCTION METHODS - These functions are only available on functions. - - /// - // Returns the function name. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_function_name)( - struct _cef_v8value_t* self); - - /// - // Returns the function handler or NULL if not a CEF-created function. - /// - struct _cef_v8handler_t* (CEF_CALLBACK *get_function_handler)( - struct _cef_v8value_t* self); - - /// - // Execute the function using the current V8 context. This function should - // only be called from within the scope of a cef_v8handler_t or - // cef_v8accessor_t callback, or in combination with calling enter() and - // exit() on a stored cef_v8context_t reference. |object| is the receiver - // ('this' object) of the function. |arguments| is the list of arguments that - // will be passed to the function. If execution succeeds |retval| will be set - // to the function return value. If execution fails |exception| will be set to - // the exception that was thrown. If |rethrow_exception| is true (1) any - // exception will also be re- thrown. This function returns false (0) if - // called incorrectly. - /// - int (CEF_CALLBACK *execute_function)(struct _cef_v8value_t* self, - struct _cef_v8value_t* object, size_t argumentsCount, - struct _cef_v8value_t* const* arguments, struct _cef_v8value_t** retval, - struct _cef_v8exception_t** exception, int rethrow_exception); - - /// - // Execute the function using the specified V8 context. |object| is the - // receiver ('this' object) of the function. |arguments| is the list of - // arguments that will be passed to the function. If execution succeeds - // |retval| will be set to the function return value. If execution fails - // |exception| will be set to the exception that was thrown. If - // |rethrow_exception| is true (1) any exception will also be re-thrown. This - // function returns false (0) if called incorrectly. - /// - int (CEF_CALLBACK *execute_function_with_context)(struct _cef_v8value_t* self, - struct _cef_v8context_t* context, struct _cef_v8value_t* object, - size_t argumentsCount, struct _cef_v8value_t* const* arguments, - struct _cef_v8value_t** retval, struct _cef_v8exception_t** exception, - int rethrow_exception); - -} cef_v8value_t; - - -/// -// Create a new cef_v8value_t object of type undefined. -/// -CEF_EXPORT cef_v8value_t* cef_v8value_create_undefined(); - -/// -// Create a new cef_v8value_t object of type null. -/// -CEF_EXPORT cef_v8value_t* cef_v8value_create_null(); - -/// -// Create a new cef_v8value_t object of type bool. -/// -CEF_EXPORT cef_v8value_t* cef_v8value_create_bool(int value); - -/// -// Create a new cef_v8value_t object of type int. -/// -CEF_EXPORT cef_v8value_t* cef_v8value_create_int(int value); - -/// -// Create a new cef_v8value_t object of type double. -/// -CEF_EXPORT cef_v8value_t* cef_v8value_create_double(double value); - -/// -// Create a new cef_v8value_t object of type Date. -/// -CEF_EXPORT cef_v8value_t* cef_v8value_create_date(const cef_time_t* date); - -/// -// Create a new cef_v8value_t object of type string. -/// -CEF_EXPORT cef_v8value_t* cef_v8value_create_string(const cef_string_t* value); - -/// -// Create a new cef_v8value_t object of type object. This function should only -// be called from within the scope of a cef_v8context_tHandler, cef_v8handler_t -// or cef_v8accessor_t callback, or in combination with calling enter() and -// exit() on a stored cef_v8context_t reference. -/// -CEF_EXPORT cef_v8value_t* cef_v8value_create_object(cef_base_t* user_data); - -/// -// Create a new cef_v8value_t object of type object with accessors. This -// function should only be called from within the scope of a -// cef_v8context_tHandler, cef_v8handler_t or cef_v8accessor_t callback, or in -// combination with calling enter() and exit() on a stored cef_v8context_t -// reference. -/// -CEF_EXPORT cef_v8value_t* cef_v8value_create_object_with_accessor( - cef_base_t* user_data, cef_v8accessor_t* accessor); - -/// -// Create a new cef_v8value_t object of type array. This function should only be -// called from within the scope of a cef_v8context_tHandler, cef_v8handler_t or -// cef_v8accessor_t callback, or in combination with calling enter() and exit() -// on a stored cef_v8context_t reference. -/// -CEF_EXPORT cef_v8value_t* cef_v8value_create_array(); - -/// -// Create a new cef_v8value_t object of type function. This function should only -// be called from within the scope of a cef_v8context_tHandler, cef_v8handler_t -// or cef_v8accessor_t callback, or in combination with calling enter() and -// exit() on a stored cef_v8context_t reference. -/// -CEF_EXPORT cef_v8value_t* cef_v8value_create_function(const cef_string_t* name, - cef_v8handler_t* handler); - - -/// -// Structure that creates cef_scheme_handler_t instances. The functions of this -// structure will always be called on the IO thread. -/// -typedef struct _cef_scheme_handler_factory_t -{ - // Base structure. - cef_base_t base; - - /// - // Return a new scheme handler instance to handle the request. |browser| will - // be the browser window that initiated the request. If the request was - // initiated using the cef_web_urlrequest_t API |browser| will be NULL. - /// - struct _cef_scheme_handler_t* (CEF_CALLBACK *create)( - struct _cef_scheme_handler_factory_t* self, - struct _cef_browser_t* browser, const cef_string_t* scheme_name, - struct _cef_request_t* request); - -} cef_scheme_handler_factory_t; - - -/// -// Structure used to facilitate asynchronous responses to custom scheme handler -// requests. The functions of this structure may be called on any thread. -/// -typedef struct _cef_scheme_handler_callback_t -{ - // Base structure. - cef_base_t base; - - /// - // Notify that header information is now available for retrieval. - /// - void (CEF_CALLBACK *headers_available)( - struct _cef_scheme_handler_callback_t* self); - - /// - // Notify that response data is now available for reading. - /// - void (CEF_CALLBACK *bytes_available)( - struct _cef_scheme_handler_callback_t* self); - - /// - // Cancel processing of the request. - /// - void (CEF_CALLBACK *cancel)(struct _cef_scheme_handler_callback_t* self); - -} cef_scheme_handler_callback_t; - - -/// -// Structure used to implement a custom scheme handler structure. The functions -// of this structure will always be called on the IO thread. -/// -typedef struct _cef_scheme_handler_t -{ - // Base structure. - cef_base_t base; - - /// - // Begin processing the request. To handle the request return true (1) and - // call headers_available() once the response header information is available - // (headers_available() can also be called from inside this function if header - // information is available immediately). To cancel the request return false - // (0). - /// - int (CEF_CALLBACK *process_request)(struct _cef_scheme_handler_t* self, - struct _cef_request_t* request, - struct _cef_scheme_handler_callback_t* callback); - - /// - // Retrieve response header information. If the response length is not known - // set |response_length| to -1 and read_response() will be called until it - // returns false (0). If the response length is known set |response_length| to - // a positive value and read_response() will be called until it returns false - // (0) or the specified number of bytes have been read. Use the |response| - // object to set the mime type, http status code and other optional header - // values. To redirect the request to a new URL set |redirectUrl| to the new - // URL. - /// - void (CEF_CALLBACK *get_response_headers)(struct _cef_scheme_handler_t* self, - struct _cef_response_t* response, int64* response_length, - cef_string_t* redirectUrl); - - /// - // Read response data. If data is available immediately copy up to - // |bytes_to_read| bytes into |data_out|, set |bytes_read| to the number of - // bytes copied, and return true (1). To read the data at a later time set - // |bytes_read| to 0, return true (1) and call bytes_available() when the data - // is available. To indicate response completion return false (0). - /// - int (CEF_CALLBACK *read_response)(struct _cef_scheme_handler_t* self, - void* data_out, int bytes_to_read, int* bytes_read, - struct _cef_scheme_handler_callback_t* callback); - - /// - // Request processing has been canceled. - /// - void (CEF_CALLBACK *cancel)(struct _cef_scheme_handler_t* self); - -} cef_scheme_handler_t; - - -/// -// Structure used to handle file downloads. The functions of this structure will -// always be called on the UI thread. -/// -typedef struct _cef_download_handler_t -{ - // Base structure. - cef_base_t base; - - /// - // A portion of the file contents have been received. This function will be - // called multiple times until the download is complete. Return |true (1)| to - // continue receiving data and |false (0)| to cancel. - /// - int (CEF_CALLBACK *received_data)(struct _cef_download_handler_t* self, - void* data, int data_size); - - /// - // The download is complete. - /// - void (CEF_CALLBACK *complete)(struct _cef_download_handler_t* self); - -} cef_download_handler_t; - - -/// -// Structure used to make a Web URL request. Web URL requests are not associated -// with a browser instance so no cef_client_t callbacks will be executed. The -// functions of this structure may be called on any thread. -/// -typedef struct _cef_web_urlrequest_t -{ - // Base structure. - cef_base_t base; - - /// - // Cancels the request. - /// - void (CEF_CALLBACK *cancel)(struct _cef_web_urlrequest_t* self); - - /// - // Returns the current ready state of the request. - /// - enum cef_weburlrequest_state_t (CEF_CALLBACK *get_state)( - struct _cef_web_urlrequest_t* self); - -} cef_web_urlrequest_t; - - -/// -// Create a new CefWebUrlRequest object. -/// -CEF_EXPORT cef_web_urlrequest_t* cef_web_urlrequest_create( - cef_request_t* request, struct _cef_web_urlrequest_client_t* client); - - -/// -// Structure that should be implemented by the cef_web_urlrequest_t client. The -// functions of this structure will always be called on the UI thread. -/// -typedef struct _cef_web_urlrequest_client_t -{ - // Base structure. - cef_base_t base; - - /// - // Notifies the client that the request state has changed. State change - // notifications will always be sent before the below notification functions - // are called. - /// - void (CEF_CALLBACK *on_state_change)( - struct _cef_web_urlrequest_client_t* self, - struct _cef_web_urlrequest_t* requester, - enum cef_weburlrequest_state_t state); - - /// - // Notifies the client that the request has been redirected and provides a - // chance to change the request parameters. - /// - void (CEF_CALLBACK *on_redirect)(struct _cef_web_urlrequest_client_t* self, - struct _cef_web_urlrequest_t* requester, struct _cef_request_t* request, - struct _cef_response_t* response); - - /// - // Notifies the client of the response data. - /// - void (CEF_CALLBACK *on_headers_received)( - struct _cef_web_urlrequest_client_t* self, - struct _cef_web_urlrequest_t* requester, - struct _cef_response_t* response); - - /// - // Notifies the client of the upload progress. - /// - void (CEF_CALLBACK *on_progress)(struct _cef_web_urlrequest_client_t* self, - struct _cef_web_urlrequest_t* requester, uint64 bytesSent, - uint64 totalBytesToBeSent); - - /// - // Notifies the client that content has been received. - /// - void (CEF_CALLBACK *on_data)(struct _cef_web_urlrequest_client_t* self, - struct _cef_web_urlrequest_t* requester, const void* data, - int dataLength); - - /// - // Notifies the client that the request ended with an error. - /// - void (CEF_CALLBACK *on_error)(struct _cef_web_urlrequest_client_t* self, - struct _cef_web_urlrequest_t* requester, - enum cef_handler_errorcode_t errorCode); - -} cef_web_urlrequest_client_t; - - -/// -// Structure that supports the reading of XML data via the libxml streaming API. -// The functions of this structure should only be called on the thread that -// creates the object. -/// -typedef struct _cef_xml_reader_t -{ - // Base structure. - cef_base_t base; - - /// - // Moves the cursor to the next node in the document. This function must be - // called at least once to set the current cursor position. Returns true (1) - // if the cursor position was set successfully. - /// - int (CEF_CALLBACK *move_to_next_node)(struct _cef_xml_reader_t* self); - - /// - // Close the document. This should be called directly to ensure that cleanup - // occurs on the correct thread. - /// - int (CEF_CALLBACK *close)(struct _cef_xml_reader_t* self); - - /// - // Returns true (1) if an error has been reported by the XML parser. - /// - int (CEF_CALLBACK *has_error)(struct _cef_xml_reader_t* self); - - /// - // Returns the error string. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_error)( - struct _cef_xml_reader_t* self); - - - // The below functions retrieve data for the node at the current cursor - // position. - - /// - // Returns the node type. - /// - enum cef_xml_node_type_t (CEF_CALLBACK *get_type)( - struct _cef_xml_reader_t* self); - - /// - // Returns the node depth. Depth starts at 0 for the root node. - /// - int (CEF_CALLBACK *get_depth)(struct _cef_xml_reader_t* self); - - /// - // Returns the local name. See http://www.w3.org/TR/REC-xml-names/#NT- - // LocalPart for additional details. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_local_name)( - struct _cef_xml_reader_t* self); - - /// - // Returns the namespace prefix. See http://www.w3.org/TR/REC-xml-names/ for - // additional details. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_prefix)( - struct _cef_xml_reader_t* self); - - /// - // Returns the qualified name, equal to (Prefix:)LocalName. See - // http://www.w3.org/TR/REC-xml-names/#ns-qualnames for additional details. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_qualified_name)( - struct _cef_xml_reader_t* self); - - /// - // Returns the URI defining the namespace associated with the node. See - // http://www.w3.org/TR/REC-xml-names/ for additional details. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_namespace_uri)( - struct _cef_xml_reader_t* self); - - /// - // Returns the base URI of the node. See http://www.w3.org/TR/xmlbase/ for - // additional details. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_base_uri)( - struct _cef_xml_reader_t* self); - - /// - // Returns the xml:lang scope within which the node resides. See - // http://www.w3.org/TR/REC-xml/#sec-lang-tag for additional details. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_xml_lang)( - struct _cef_xml_reader_t* self); - - /// - // Returns true (1) if the node represents an NULL element. is considered - // NULL but is not. - /// - int (CEF_CALLBACK *is_empty_element)(struct _cef_xml_reader_t* self); - - /// - // Returns true (1) if the node has a text value. - /// - int (CEF_CALLBACK *has_value)(struct _cef_xml_reader_t* self); - - /// - // Returns the text value. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_value)( - struct _cef_xml_reader_t* self); - - /// - // Returns true (1) if the node has attributes. - /// - int (CEF_CALLBACK *has_attributes)(struct _cef_xml_reader_t* self); - - /// - // Returns the number of attributes. - /// - size_t (CEF_CALLBACK *get_attribute_count)(struct _cef_xml_reader_t* self); - - /// - // Returns the value of the attribute at the specified 0-based index. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_attribute_byindex)( - struct _cef_xml_reader_t* self, int index); - - /// - // Returns the value of the attribute with the specified qualified name. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_attribute_byqname)( - struct _cef_xml_reader_t* self, const cef_string_t* qualifiedName); - - /// - // Returns the value of the attribute with the specified local name and - // namespace URI. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_attribute_bylname)( - struct _cef_xml_reader_t* self, const cef_string_t* localName, - const cef_string_t* namespaceURI); - - /// - // Returns an XML representation of the current node's children. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_inner_xml)( - struct _cef_xml_reader_t* self); - - /// - // Returns an XML representation of the current node including its children. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_outer_xml)( - struct _cef_xml_reader_t* self); - - /// - // Returns the line number for the current node. - /// - int (CEF_CALLBACK *get_line_number)(struct _cef_xml_reader_t* self); - - - // Attribute nodes are not traversed by default. The below functions can be - // used to move the cursor to an attribute node. move_to_carrying_element() - // can be called afterwards to return the cursor to the carrying element. The - // depth of an attribute node will be 1 + the depth of the carrying element. - - /// - // Moves the cursor to the attribute at the specified 0-based index. Returns - // true (1) if the cursor position was set successfully. - /// - int (CEF_CALLBACK *move_to_attribute_byindex)(struct _cef_xml_reader_t* self, - int index); - - /// - // Moves the cursor to the attribute with the specified qualified name. - // Returns true (1) if the cursor position was set successfully. - /// - int (CEF_CALLBACK *move_to_attribute_byqname)(struct _cef_xml_reader_t* self, - const cef_string_t* qualifiedName); - - /// - // Moves the cursor to the attribute with the specified local name and - // namespace URI. Returns true (1) if the cursor position was set - // successfully. - /// - int (CEF_CALLBACK *move_to_attribute_bylname)(struct _cef_xml_reader_t* self, - const cef_string_t* localName, const cef_string_t* namespaceURI); - - /// - // Moves the cursor to the first attribute in the current element. Returns - // true (1) if the cursor position was set successfully. - /// - int (CEF_CALLBACK *move_to_first_attribute)(struct _cef_xml_reader_t* self); - - /// - // Moves the cursor to the next attribute in the current element. Returns true - // (1) if the cursor position was set successfully. - /// - int (CEF_CALLBACK *move_to_next_attribute)(struct _cef_xml_reader_t* self); - - /// - // Moves the cursor back to the carrying element. Returns true (1) if the - // cursor position was set successfully. - /// - int (CEF_CALLBACK *move_to_carrying_element)(struct _cef_xml_reader_t* self); - -} cef_xml_reader_t; - - -/// -// Create a new cef_xml_reader_t object. The returned object's functions can -// only be called from the thread that created the object. -/// -CEF_EXPORT cef_xml_reader_t* cef_xml_reader_create(cef_stream_reader_t* stream, - enum cef_xml_encoding_type_t encodingType, const cef_string_t* URI); - - -/// -// Structure that supports the reading of zip archives via the zlib unzip API. -// The functions of this structure should only be called on the thread that -// creates the object. -/// -typedef struct _cef_zip_reader_t -{ - // Base structure. - cef_base_t base; - - /// - // Moves the cursor to the first file in the archive. Returns true (1) if the - // cursor position was set successfully. - /// - int (CEF_CALLBACK *move_to_first_file)(struct _cef_zip_reader_t* self); - - /// - // Moves the cursor to the next file in the archive. Returns true (1) if the - // cursor position was set successfully. - /// - int (CEF_CALLBACK *move_to_next_file)(struct _cef_zip_reader_t* self); - - /// - // Moves the cursor to the specified file in the archive. If |caseSensitive| - // is true (1) then the search will be case sensitive. Returns true (1) if the - // cursor position was set successfully. - /// - int (CEF_CALLBACK *move_to_file)(struct _cef_zip_reader_t* self, - const cef_string_t* fileName, int caseSensitive); - - /// - // Closes the archive. This should be called directly to ensure that cleanup - // occurs on the correct thread. - /// - int (CEF_CALLBACK *close)(struct _cef_zip_reader_t* self); - - - // The below functions act on the file at the current cursor position. - - /// - // Returns the name of the file. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_file_name)( - struct _cef_zip_reader_t* self); - - /// - // Returns the uncompressed size of the file. - /// - long (CEF_CALLBACK *get_file_size)(struct _cef_zip_reader_t* self); - - /// - // Returns the last modified timestamp for the file. - /// - time_t (CEF_CALLBACK *get_file_last_modified)(struct _cef_zip_reader_t* self); - - /// - // Opens the file for reading of uncompressed data. A read password may - // optionally be specified. - /// - int (CEF_CALLBACK *open_file)(struct _cef_zip_reader_t* self, - const cef_string_t* password); - - /// - // Closes the file. - /// - int (CEF_CALLBACK *close_file)(struct _cef_zip_reader_t* self); - - /// - // Read uncompressed file contents into the specified buffer. Returns < 0 if - // an error occurred, 0 if at the end of file, or the number of bytes read. - /// - int (CEF_CALLBACK *read_file)(struct _cef_zip_reader_t* self, void* buffer, - size_t bufferSize); - - /// - // Returns the current offset in the uncompressed file contents. - /// - long (CEF_CALLBACK *tell)(struct _cef_zip_reader_t* self); - - /// - // Returns true (1) if at end of the file contents. - /// - int (CEF_CALLBACK *eof)(struct _cef_zip_reader_t* self); - -} cef_zip_reader_t; - - -/// -// Create a new cef_zip_reader_t object. The returned object's functions can -// only be called from the thread that created the object. -/// -CEF_EXPORT cef_zip_reader_t* cef_zip_reader_create(cef_stream_reader_t* stream); - - -/// -// Structure to implement for visiting the DOM. The functions of this structure -// will be called on the UI thread. -/// -typedef struct _cef_domvisitor_t -{ - // Base structure. - cef_base_t base; - - /// - // Method executed for visiting the DOM. The document object passed to this - // function represents a snapshot of the DOM at the time this function is - // executed. DOM objects are only valid for the scope of this function. Do not - // keep references to or attempt to access any DOM objects outside the scope - // of this function. - /// - void (CEF_CALLBACK *visit)(struct _cef_domvisitor_t* self, - struct _cef_domdocument_t* document); - -} cef_domvisitor_t; - - -/// -// Structure used to represent a DOM document. The functions of this structure -// should only be called on the UI thread. -/// -typedef struct _cef_domdocument_t -{ - // Base structure. - cef_base_t base; - - /// - // Returns the document type. - /// - enum cef_dom_document_type_t (CEF_CALLBACK *get_type)( - struct _cef_domdocument_t* self); - - /// - // Returns the root document node. - /// - struct _cef_domnode_t* (CEF_CALLBACK *get_document)( - struct _cef_domdocument_t* self); - - /// - // Returns the BODY node of an HTML document. - /// - struct _cef_domnode_t* (CEF_CALLBACK *get_body)( - struct _cef_domdocument_t* self); - - /// - // Returns the HEAD node of an HTML document. - /// - struct _cef_domnode_t* (CEF_CALLBACK *get_head)( - struct _cef_domdocument_t* self); - - /// - // Returns the title of an HTML document. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_title)( - struct _cef_domdocument_t* self); - - /// - // Returns the document element with the specified ID value. - /// - struct _cef_domnode_t* (CEF_CALLBACK *get_element_by_id)( - struct _cef_domdocument_t* self, const cef_string_t* id); - - /// - // Returns the node that currently has keyboard focus. - /// - struct _cef_domnode_t* (CEF_CALLBACK *get_focused_node)( - struct _cef_domdocument_t* self); - - /// - // Returns true (1) if a portion of the document is selected. - /// - int (CEF_CALLBACK *has_selection)(struct _cef_domdocument_t* self); - - /// - // Returns the selection start node. - /// - struct _cef_domnode_t* (CEF_CALLBACK *get_selection_start_node)( - struct _cef_domdocument_t* self); - - /// - // Returns the selection offset within the start node. - /// - int (CEF_CALLBACK *get_selection_start_offset)( - struct _cef_domdocument_t* self); - - /// - // Returns the selection end node. - /// - struct _cef_domnode_t* (CEF_CALLBACK *get_selection_end_node)( - struct _cef_domdocument_t* self); - - /// - // Returns the selection offset within the end node. - /// - int (CEF_CALLBACK *get_selection_end_offset)(struct _cef_domdocument_t* self); - - /// - // Returns the contents of this selection as markup. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_selection_as_markup)( - struct _cef_domdocument_t* self); - - /// - // Returns the contents of this selection as text. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_selection_as_text)( - struct _cef_domdocument_t* self); - - /// - // Returns the base URL for the document. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_base_url)( - struct _cef_domdocument_t* self); - - /// - // Returns a complete URL based on the document base URL and the specified - // partial URL. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_complete_url)( - struct _cef_domdocument_t* self, const cef_string_t* partialURL); - -} cef_domdocument_t; - - -/// -// Structure used to represent a DOM node. The functions of this structure -// should only be called on the UI thread. -/// -typedef struct _cef_domnode_t -{ - // Base structure. - cef_base_t base; - - /// - // Returns the type for this node. - /// - enum cef_dom_node_type_t (CEF_CALLBACK *get_type)( - struct _cef_domnode_t* self); - - /// - // Returns true (1) if this is a text node. - /// - int (CEF_CALLBACK *is_text)(struct _cef_domnode_t* self); - - /// - // Returns true (1) if this is an element node. - /// - int (CEF_CALLBACK *is_element)(struct _cef_domnode_t* self); - - /// - // Returns true (1) if this is a form control element node. - /// - int (CEF_CALLBACK *is_form_control_element)(struct _cef_domnode_t* self); - - /// - // Returns the type of this form control element node. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_form_control_element_type)( - struct _cef_domnode_t* self); - - /// - // Returns true (1) if this object is pointing to the same handle as |that| - // object. - /// - int (CEF_CALLBACK *is_same)(struct _cef_domnode_t* self, - struct _cef_domnode_t* that); - - /// - // Returns the name of this node. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_name)(struct _cef_domnode_t* self); - - /// - // Returns the value of this node. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_value)(struct _cef_domnode_t* self); - - /// - // Set the value of this node. Returns true (1) on success. - /// - int (CEF_CALLBACK *set_value)(struct _cef_domnode_t* self, - const cef_string_t* value); - - /// - // Returns the contents of this node as markup. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_as_markup)( - struct _cef_domnode_t* self); - - /// - // Returns the document associated with this node. - /// - struct _cef_domdocument_t* (CEF_CALLBACK *get_document)( - struct _cef_domnode_t* self); - - /// - // Returns the parent node. - /// - struct _cef_domnode_t* (CEF_CALLBACK *get_parent)( - struct _cef_domnode_t* self); - - /// - // Returns the previous sibling node. - /// - struct _cef_domnode_t* (CEF_CALLBACK *get_previous_sibling)( - struct _cef_domnode_t* self); - - /// - // Returns the next sibling node. - /// - struct _cef_domnode_t* (CEF_CALLBACK *get_next_sibling)( - struct _cef_domnode_t* self); - - /// - // Returns true (1) if this node has child nodes. - /// - int (CEF_CALLBACK *has_children)(struct _cef_domnode_t* self); - - /// - // Return the first child node. - /// - struct _cef_domnode_t* (CEF_CALLBACK *get_first_child)( - struct _cef_domnode_t* self); - - /// - // Returns the last child node. - /// - struct _cef_domnode_t* (CEF_CALLBACK *get_last_child)( - struct _cef_domnode_t* self); - - /// - // Add an event listener to this node for the specified event type. If - // |useCapture| is true (1) then this listener will be considered a capturing - // listener. Capturing listeners will recieve all events of the specified type - // before the events are dispatched to any other event targets beneath the - // current node in the tree. Events which are bubbling upwards through the - // tree will not trigger a capturing listener. Separate calls to this function - // can be used to register the same listener with and without capture. See - // WebCore/dom/EventNames.h for the list of supported event types. - /// - void (CEF_CALLBACK *add_event_listener)(struct _cef_domnode_t* self, - const cef_string_t* eventType, struct _cef_domevent_listener_t* listener, - int useCapture); - - - // The following functions are valid only for element nodes. - - /// - // Returns the tag name of this element. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_element_tag_name)( - struct _cef_domnode_t* self); - - /// - // Returns true (1) if this element has attributes. - /// - int (CEF_CALLBACK *has_element_attributes)(struct _cef_domnode_t* self); - - /// - // Returns true (1) if this element has an attribute named |attrName|. - /// - int (CEF_CALLBACK *has_element_attribute)(struct _cef_domnode_t* self, - const cef_string_t* attrName); - - /// - // Returns the element attribute named |attrName|. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_element_attribute)( - struct _cef_domnode_t* self, const cef_string_t* attrName); - - /// - // Returns a map of all element attributes. - /// - void (CEF_CALLBACK *get_element_attributes)(struct _cef_domnode_t* self, - cef_string_map_t attrMap); - - /// - // Set the value for the element attribute named |attrName|. Returns true (1) - // on success. - /// - int (CEF_CALLBACK *set_element_attribute)(struct _cef_domnode_t* self, - const cef_string_t* attrName, const cef_string_t* value); - - /// - // Returns the inner text of the element. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_element_inner_text)( - struct _cef_domnode_t* self); - -} cef_domnode_t; - - -/// -// Structure used to represent a DOM event. The functions of this structure -// should only be called on the UI thread. -/// -typedef struct _cef_domevent_t -{ - // Base structure. - cef_base_t base; - - /// - // Returns the event type. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_type)(struct _cef_domevent_t* self); - - /// - // Returns the event category. - /// - enum cef_dom_event_category_t (CEF_CALLBACK *get_category)( - struct _cef_domevent_t* self); - - /// - // Returns the event processing phase. - /// - enum cef_dom_event_phase_t (CEF_CALLBACK *get_phase)( - struct _cef_domevent_t* self); - - /// - // Returns true (1) if the event can bubble up the tree. - /// - int (CEF_CALLBACK *can_bubble)(struct _cef_domevent_t* self); - - /// - // Returns true (1) if the event can be canceled. - /// - int (CEF_CALLBACK *can_cancel)(struct _cef_domevent_t* self); - - /// - // Returns the document associated with this event. - /// - struct _cef_domdocument_t* (CEF_CALLBACK *get_document)( - struct _cef_domevent_t* self); - - /// - // Returns the target of the event. - /// - struct _cef_domnode_t* (CEF_CALLBACK *get_target)( - struct _cef_domevent_t* self); - - /// - // Returns the current target of the event. - /// - struct _cef_domnode_t* (CEF_CALLBACK *get_current_target)( - struct _cef_domevent_t* self); - -} cef_domevent_t; - - -/// -// Structure to implement for handling DOM events. The functions of this -// structure will be called on the UI thread. -/// -typedef struct _cef_domevent_listener_t -{ - // Base structure. - cef_base_t base; - - /// - // Called when an event is received. The event object passed to this function - // contains a snapshot of the DOM at the time this function is executed. DOM - // objects are only valid for the scope of this function. Do not keep - // references to or attempt to access any DOM objects outside the scope of - // this function. - /// - void (CEF_CALLBACK *handle_event)(struct _cef_domevent_listener_t* self, - struct _cef_domevent_t* event); - -} cef_domevent_listener_t; - - -/// -// Structure to implement for filtering response content. The functions of this -// structure will always be called on the UI thread. -/// -typedef struct _cef_content_filter_t -{ - // Base structure. - cef_base_t base; - - /// - // Set |substitute_data| to the replacement for the data in |data| if data - // should be modified. - /// - void (CEF_CALLBACK *process_data)(struct _cef_content_filter_t* self, - const void* data, int data_size, - struct _cef_stream_reader_t** substitute_data); - - /// - // Called when there is no more data to be processed. It is expected that - // whatever data was retained in the last process_data() call, it should be - // returned now by setting |remainder| if appropriate. - /// - void (CEF_CALLBACK *drain)(struct _cef_content_filter_t* self, - struct _cef_stream_reader_t** remainder); - -} cef_content_filter_t; - - -/// -// Structure used to represent drag data. The functions of this structure may be -// called on any thread. -/// -typedef struct _cef_drag_data_t -{ - // Base structure. - cef_base_t base; - - /// - // Returns true (1) if the drag data is a link. - /// - int (CEF_CALLBACK *is_link)(struct _cef_drag_data_t* self); - - /// - // Returns true (1) if the drag data is a text or html fragment. - /// - int (CEF_CALLBACK *is_fragment)(struct _cef_drag_data_t* self); - - /// - // Returns true (1) if the drag data is a file. - /// - int (CEF_CALLBACK *is_file)(struct _cef_drag_data_t* self); - - /// - // Return the link URL that is being dragged. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_link_url)( - struct _cef_drag_data_t* self); - - /// - // Return the title associated with the link being dragged. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_link_title)( - struct _cef_drag_data_t* self); - - /// - // Return the metadata, if any, associated with the link being dragged. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_link_metadata)( - struct _cef_drag_data_t* self); - - /// - // Return the plain text fragment that is being dragged. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_fragment_text)( - struct _cef_drag_data_t* self); - - /// - // Return the text/html fragment that is being dragged. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_fragment_html)( - struct _cef_drag_data_t* self); - - /// - // Return the base URL that the fragment came from. This value is used for - // resolving relative URLs and may be NULL. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_fragment_base_url)( - struct _cef_drag_data_t* self); - - /// - // Return the extension of the file being dragged out of the browser window. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_file_extension)( - struct _cef_drag_data_t* self); - - /// - // Return the name of the file being dragged out of the browser window. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_file_name)( - struct _cef_drag_data_t* self); - - /// - // Retrieve the list of file names that are being dragged into the browser - // window. - /// - int (CEF_CALLBACK *get_file_names)(struct _cef_drag_data_t* self, - cef_string_list_t names); - -} cef_drag_data_t; - - -/// -// Structure used to create and/or parse command line arguments. Arguments with -// '--', '-' and, on Windows, '/' prefixes are considered switches. Switches -// will always precede any arguments without switch prefixes. Switches can -// optionally have a value specified using the '=' delimiter (e.g. -// "-switch=value"). An argument of "--" will terminate switch parsing with all -// subsequent tokens, regardless of prefix, being interpreted as non-switch -// arguments. Switch names are considered case-insensitive. This structure can -// be used before cef_initialize() is called. -/// -typedef struct _cef_command_line_t -{ - // Base structure. - cef_base_t base; - - /// - // Initialize the command line with the specified |argc| and |argv| values. - // The first argument must be the name of the program. This function is only - // supported on non-Windows platforms. - /// - void (CEF_CALLBACK *init_from_argv)(struct _cef_command_line_t* self, - int argc, const char* const* argv); - - /// - // Initialize the command line with the string returned by calling - // GetCommandLineW(). This function is only supported on Windows. - /// - void (CEF_CALLBACK *init_from_string)(struct _cef_command_line_t* self, - const cef_string_t* command_line); - - /// - // Constructs and returns the represented command line string. Use this - // function cautiously because quoting behavior is unclear. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_command_line_string)( - struct _cef_command_line_t* self); - - /// - // Get the program part of the command line string (the first item). - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_program)( - struct _cef_command_line_t* self); - - /// - // Set the program part of the command line string (the first item). - /// - void (CEF_CALLBACK *set_program)(struct _cef_command_line_t* self, - const cef_string_t* program); - - /// - // Returns true (1) if the command line has switches. - /// - int (CEF_CALLBACK *has_switches)(struct _cef_command_line_t* self); - - /// - // Returns true (1) if the command line contains the given switch. - /// - int (CEF_CALLBACK *has_switch)(struct _cef_command_line_t* self, - const cef_string_t* name); - - /// - // Returns the value associated with the given switch. If the switch has no - // value or isn't present this function returns the NULL string. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t (CEF_CALLBACK *get_switch_value)( - struct _cef_command_line_t* self, const cef_string_t* name); - - /// - // Returns the map of switch names and values. If a switch has no value an - // NULL string is returned. - /// - void (CEF_CALLBACK *get_switches)(struct _cef_command_line_t* self, - cef_string_map_t switches); - - /// - // Add a switch to the end of the command line. If the switch has no value - // pass an NULL value string. - /// - void (CEF_CALLBACK *append_switch)(struct _cef_command_line_t* self, - const cef_string_t* name); - - /// - // Add a switch with the specified value to the end of the command line. - /// - void (CEF_CALLBACK *append_switch_with_value)( - struct _cef_command_line_t* self, const cef_string_t* name, - const cef_string_t* value); - - /// - // True if there are remaining command line arguments. - /// - int (CEF_CALLBACK *has_arguments)(struct _cef_command_line_t* self); - - /// - // Get the remaining command line arguments. - /// - void (CEF_CALLBACK *get_arguments)(struct _cef_command_line_t* self, - cef_string_list_t arguments); - - /// - // Add an argument to the end of the command line. - /// - void (CEF_CALLBACK *append_argument)(struct _cef_command_line_t* self, - const cef_string_t* argument); - -} cef_command_line_t; - - -/// -// Create a new cef_command_line_t instance. -/// -CEF_EXPORT cef_command_line_t* cef_command_line_create(); - - -#ifdef __cplusplus -} -#endif - -#endif // _CEF_CAPI_H diff --git a/cef/include/cef_nplugin.h b/cef/include/cef_nplugin.h old mode 100755 new mode 100644 index 59f314455..4b16fe91f --- a/cef/include/cef_nplugin.h +++ b/cef/include/cef_nplugin.h @@ -28,8 +28,9 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef _CEF_NPLUGIN_H -#define _CEF_NPLUGIN_H +#ifndef CEF_INCLUDE_CEF_NPLUGIN_H_ +#define CEF_INCLUDE_CEF_NPLUGIN_H_ +#pragma once #include "internal/cef_nplugin_types.h" @@ -44,31 +45,25 @@ // This class provides attribute information and entry point functions for a // plugin. /// -class CefPluginInfo : public cef_plugin_info_t -{ -public: - CefPluginInfo() - { +class CefPluginInfo : public cef_plugin_info_t { + public: + CefPluginInfo() { Init(); } - virtual ~CefPluginInfo() - { + virtual ~CefPluginInfo() { Reset(); } - CefPluginInfo(const CefPluginInfo& r) - { + CefPluginInfo(const CefPluginInfo& r) { // NOLINT(runtime/explicit) Init(); *this = r; } - CefPluginInfo(const cef_plugin_info_t& r) - { + CefPluginInfo(const cef_plugin_info_t& r) { // NOLINT(runtime/explicit) Init(); *this = r; } - void Reset() - { + void Reset() { cef_string_clear(&unique_name); cef_string_clear(&display_name); cef_string_clear(&version); @@ -79,24 +74,20 @@ public: Init(); } - void Attach(const cef_plugin_info_t& r) - { + void Attach(const cef_plugin_info_t& r) { Reset(); *static_cast(this) = r; } - void Detach() - { + void Detach() { Init(); } - CefPluginInfo& operator=(const CefPluginInfo& r) - { + CefPluginInfo& operator=(const CefPluginInfo& r) { return operator=(static_cast(r)); } - CefPluginInfo& operator=(const cef_plugin_info_t& r) - { + CefPluginInfo& operator=(const cef_plugin_info_t& r) { cef_string_copy(r.unique_name.str, r.unique_name.length, &unique_name); cef_string_copy(r.display_name.str, r.display_name.length, &display_name); cef_string_copy(r.version.str, r.version.length, &version); @@ -114,9 +105,8 @@ public: return *this; } -protected: - void Init() - { + protected: + void Init() { memset(static_cast(this), 0, sizeof(cef_plugin_info_t)); } }; @@ -126,4 +116,4 @@ protected: /// bool CefRegisterPlugin(const CefPluginInfo& plugin_info); -#endif // _CEF_NPLUGIN_H +#endif // CEF_INCLUDE_CEF_NPLUGIN_H_ diff --git a/cef/include/cef_nplugin_capi.h b/cef/include/cef_nplugin_capi.h deleted file mode 100755 index f3f46d080..000000000 --- a/cef/include/cef_nplugin_capi.h +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) 2011 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. - - -#ifndef _CEF_NPLUGIN_CAPI_H -#define _CEF_NPLUGIN_CAPI_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include "internal/cef_nplugin_types.h" - -/// -// Register a plugin with the system. Returns true (1) on success. -/// -CEF_EXPORT int cef_register_plugin(const cef_plugin_info_t* plugin_info); - -#ifdef __cplusplus -} -#endif - -#endif // _CEF_NPLUGIN_CAPI_H diff --git a/cef/include/cef_runnable.h b/cef/include/cef_runnable.h old mode 100755 new mode 100644 index a311f2cc1..826ddaa46 --- a/cef/include/cef_runnable.h +++ b/cef/include/cef_runnable.h @@ -30,11 +30,12 @@ // // The contents of this file are a modified extract of base/task.h -#ifndef _CEF_RUNNABLE_H -#define _CEF_RUNNABLE_H +#ifndef CEF_INCLUDE_CEF_RUNNABLE_H_ +#define CEF_INCLUDE_CEF_RUNNABLE_H_ #pragma once -#include "cef.h" +#include "include/cef_base.h" +#include "include/cef_task.h" #ifdef BUILDING_CEF_SHARED #include "base/tuple.h" #else @@ -342,4 +343,4 @@ inline CefRefPtr NewCefRunnableFunction(Function function, function, MakeTuple(a, b, c, d, e, f, g, h)); } -#endif // _CEF_RUNNABLE_H +#endif // CEF_INCLUDE_CEF_RUNNABLE_H_ diff --git a/cef/include/cef_version.h b/cef/include/cef_version.h old mode 100755 new mode 100644 index 0a008fb9b..ebff74321 --- a/cef/include/cef_version.h +++ b/cef/include/cef_version.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 Marshall A. Greenblatt. All rights reserved. +// 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 @@ -32,16 +32,16 @@ // This file is generated by the make_version_header.py tool. // -#ifndef _CEF_VERSION_H -#define _CEF_VERSION_H +#ifndef CEF_INCLUDE_CEF_VERSION_H_ +#define CEF_INCLUDE_CEF_VERSION_H_ -#define CEF_REVISION 439 -#define COPYRIGHT_YEAR 2011 +#define CEF_REVISION 607 +#define COPYRIGHT_YEAR 2012 -#define CHROME_VERSION_MAJOR 17 +#define CHROME_VERSION_MAJOR 18 #define CHROME_VERSION_MINOR 0 -#define CHROME_VERSION_BUILD 963 -#define CHROME_VERSION_PATCH 15 +#define CHROME_VERSION_BUILD 1025 +#define CHROME_VERSION_PATCH 166 #define DO_MAKE_STRING(p) #p #define MAKE_STRING(p) DO_MAKE_STRING(p) @@ -63,6 +63,6 @@ CEF_EXPORT int cef_build_revision(); } #endif -#endif // APSTUDIO_HIDDEN_SYMBOLS +#endif // APSTUDIO_HIDDEN_SYMBOLS -#endif // _CEF_VERSION_H +#endif // CEF_INCLUDE_CEF_VERSION_H_ diff --git a/cef/include/cef_wrapper.h b/cef/include/cef_wrapper.h deleted file mode 100755 index e455ce812..000000000 --- a/cef/include/cef_wrapper.h +++ /dev/null @@ -1,322 +0,0 @@ -// Copyright (c) 2010 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 are only available to applications that link -// against the libcef_dll_wrapper target. -// - -#ifndef _CEF_WRAPPER_H -#define _CEF_WRAPPER_H - -#include "cef.h" -#include -#include - -/// -// Thread safe class for representing XML data as a structured object. This -// class should not be used with large XML documents because all data will be -// resident in memory at the same time. This implementation supports a -// restricted set of XML features: -// 
-// (1) Processing instructions, whitespace and comments are ignored.
-// (2) Elements and attributes must always be referenced using the fully
-//     qualified name (ie, namespace:localname).
-// (3) Empty elements () and elements with zero-length values ()
-//     are considered the same.
-// (4) Element nodes are considered part of a value if:
-//     (a) The element node follows a non-element node at the same depth
-//         (see 5), or
-//     (b) The element node does not have a namespace and the parent node does.
-// (5) Mixed node types at the same depth are combined into a single element
-//     value as follows:
-//     (a) All node values are concatenated to form a single string value.
-//     (b) Entity reference nodes are resolved to the corresponding entity
-//         value.
-//     (c) Element nodes are represented by their outer XML string.
-//
-/// -class CefXmlObject : public CefBase -{ -public: - typedef std::vector > ObjectVector; - typedef std::map AttributeMap; - - /// - // Create a new object with the specified name. An object name must always be - // at least one character long. - /// - CefXmlObject(const CefString& name); - virtual ~CefXmlObject(); - - /// - // Load the contents of the specified XML stream into this object. The - // existing children and attributes, if any, will first be cleared. - /// - bool Load(CefRefPtr stream, - CefXmlReader::EncodingType encodingType, - const CefString& URI, CefString* loadError); - - /// - // Set the name, children and attributes of this object to a duplicate of the - // specified object's contents. The existing children and attributes, if any, - // will first be cleared. - /// - void Set(CefRefPtr object); - - /// - // Append a duplicate of the children and attributes of the specified object - // to this object. If |overwriteAttributes| is true then any attributes in - // this object that also exist in the specified object will be overwritten - // with the new values. The name of this object is not changed. - /// - void Append(CefRefPtr object, bool overwriteAttributes); - - /// - // Return a new object with the same name, children and attributes as this - // object. The parent of the new object will be NULL. - /// - CefRefPtr Duplicate(); - - /// - // Clears this object's children and attributes. The name and parenting of - // this object are not changed. - /// - void Clear(); - - /// - // Access the object's name. An object name must always be at least one - // character long. - /// - CefString GetName(); - bool SetName(const CefString& name); - - /// - // Access the object's parent. The parent can be NULL if this object has not - // been added as the child on another object. - /// - bool HasParent(); - CefRefPtr GetParent(); - - /// - // Access the object's value. An object cannot have a value if it also has - // children. Attempting to set the value while children exist will fail. - /// - bool HasValue(); - CefString GetValue(); - bool SetValue(const CefString& value); - - /// - // Access the object's attributes. Attributes must have unique names. - /// - bool HasAttributes(); - size_t GetAttributeCount(); - bool HasAttribute(const CefString& name); - CefString GetAttributeValue(const CefString& name); - bool SetAttributeValue(const CefString& name, const CefString& value); - size_t GetAttributes(AttributeMap& attributes); - void ClearAttributes(); - - /// - // Access the object's children. Each object can only have one parent so - // attempting to add an object that already has a parent will fail. Removing a - // child will set the child's parent to NULL. Adding a child will set the - // child's parent to this object. This object's value, if any, will be cleared - // if a child is added. - /// - bool HasChildren(); - size_t GetChildCount(); - bool HasChild(CefRefPtr child); - bool AddChild(CefRefPtr child); - bool RemoveChild(CefRefPtr child); - size_t GetChildren(ObjectVector& children); - void ClearChildren(); - - /// - // Find the first child with the specified name. - /// - CefRefPtr FindChild(const CefString& name); - - /// - // Find all children with the specified name. - /// - size_t FindChildren(const CefString& name, ObjectVector& children); - -private: - void SetParent(CefXmlObject* parent); - - CefString name_; - CefXmlObject* parent_; - CefString value_; - AttributeMap attributes_; - ObjectVector children_; - - IMPLEMENT_REFCOUNTING(CefXmlObject); - IMPLEMENT_LOCKING(CefXmlObject); -}; - - -/// -// Thread safe implementation of the CefReadHandler class for reading an -// in-memory array of bytes. -/// -class CefByteReadHandler : public CefReadHandler -{ -public: - /// - // Create a new object for reading an array of bytes. An optional |source| - // reference can be kept to keep the underlying data source from being - // released while the reader exists. - /// - CefByteReadHandler(const unsigned char* bytes, size_t size, - CefRefPtr source); - - /// - // Read raw binary data. - /// - virtual size_t Read(void* ptr, size_t size, size_t n); - - /// - // Seek to the specified offset position. |whence| may be any one of - // SEEK_CUR, SEEK_END or SEEK_SET. - /// - virtual int Seek(long offset, int whence); - - /// - // Return the current offset position. - /// - virtual long Tell(); - - /// - // Return non-zero if at end of file. - /// - virtual int Eof(); - -private: - const unsigned char* bytes_; - size_t size_; - size_t offset_; - CefRefPtr source_; - - IMPLEMENT_REFCOUNTING(CefByteReadHandler); - IMPLEMENT_LOCKING(CefByteReadHandler); -}; - - -/// -// Thread-safe class for accessing zip archive file contents. This class should -// not be used with large archive files because all data will be resident in -// memory at the same time. This implementation supports a restricted set of zip -// archive features: -// (1) Password-protected files are not supported. -// (2) All file names are stored and compared in lower case. -// (3) File ordering from the original zip archive is not maintained. This -// means that files from the same folder may not be located together in the -// file content map. -/// -class CefZipArchive : public CefBase -{ -public: - /// - // Class representing a file in the archive. Accessing the file data from - // multiple threads is safe provided a reference to the File object is kept. - /// - class File : public CefBase - { - public: - /// - // Returns the read-only data contained in the file. - /// - virtual const unsigned char* GetData() =0; - - /// - // Returns the size of the data in the file. - /// - virtual size_t GetDataSize() =0; - - /// - // Returns a CefStreamReader object for streaming the contents of the file. - /// - virtual CefRefPtr GetStreamReader() =0; - }; - typedef std::map > FileMap; - - /// - // Create a new object. - /// - CefZipArchive(); - virtual ~CefZipArchive(); - - /// - // Load the contents of the specified zip archive stream into this object. - // If |overwriteExisting| is true then any files in this object that also - // exist in the specified archive will be replaced with the new files. - // Returns the number of files successfully loaded. - /// - size_t Load(CefRefPtr stream, bool overwriteExisting); - - /// - // Clears the contents of this object. - /// - void Clear(); - - /// - // Returns the number of files in the archive. - /// - size_t GetFileCount(); - - /// - // Returns true if the specified file exists and has contents. - /// - bool HasFile(const CefString& fileName); - - /// - // Returns the specified file. - /// - CefRefPtr GetFile(const CefString& fileName); - - /// - // Removes the specified file. - /// - bool RemoveFile(const CefString& fileName); - - /// - // Returns the map of all files. - /// - size_t GetFiles(FileMap& map); - -private: - FileMap contents_; - - IMPLEMENT_REFCOUNTING(CefZipArchive); - IMPLEMENT_LOCKING(CefZipArchive); -}; - -#endif // _CEF_WRAPPER_H diff --git a/cef/include/internal/cef_build.h b/cef/include/internal/cef_build.h old mode 100755 new mode 100644 index 150751c96..4b8c54546 --- a/cef/include/internal/cef_build.h +++ b/cef/include/internal/cef_build.h @@ -28,21 +28,28 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef _CEF_BUILD_H -#define _CEF_BUILD_H +#ifndef CEF_INCLUDE_INTERNAL_CEF_BUILD_H_ +#define CEF_INCLUDE_INTERNAL_CEF_BUILD_H_ +#pragma once #if defined(BUILDING_CEF_SHARED) #include "base/compiler_specific.h" -#else // !BUILDING_CEF_SHARED +#else // !BUILDING_CEF_SHARED #if defined(_WIN32) +#ifndef OS_WIN #define OS_WIN 1 +#endif #elif defined(__APPLE__) +#ifndef OS_MACOSX #define OS_MACOSX 1 +#endif #elif defined(__linux__) +#ifndef OS_LINUX #define OS_LINUX 1 +#endif #else #error Please add support for your platform in cef_build.h #endif @@ -50,14 +57,20 @@ // For access to standard POSIXish features, use OS_POSIX instead of a // more specific macro. #if defined(OS_MACOSX) || defined(OS_LINUX) +#ifndef OS_POSIX #define OS_POSIX 1 #endif +#endif // Compiler detection. #if defined(__GNUC__) +#ifndef COMPILER_GCC #define COMPILER_GCC 1 +#endif #elif defined(_MSC_VER) +#ifndef COMPILER_MSVC #define COMPILER_MSVC 1 +#endif #else #error Please add support for your compiler in cef_build.h #endif @@ -66,6 +79,7 @@ // method in the parent class. // Use like: // virtual void foo() OVERRIDE; +#ifndef OVERRIDE #if defined(COMPILER_MSVC) #define OVERRIDE override #elif defined(__clang__) @@ -73,7 +87,9 @@ #else #define OVERRIDE #endif +#endif +#ifndef ALLOW_THIS_IN_INITIALIZER_LIST #if defined(COMPILER_MSVC) // MSVC_PUSH_DISABLE_WARNING pushes |n| onto a stack of warnings to be disabled. @@ -101,12 +117,13 @@ #define ALLOW_THIS_IN_INITIALIZER_LIST(code) MSVC_PUSH_DISABLE_WARNING(4355) \ code \ MSVC_POP_WARNING() -#else // !COMPILER_MSVC +#else // !COMPILER_MSVC #define ALLOW_THIS_IN_INITIALIZER_LIST(code) code -#endif // !COMPILER_MSVC +#endif // !COMPILER_MSVC +#endif -#endif // !BUILDING_CEF_SHARED +#endif // !BUILDING_CEF_SHARED -#endif // _CEF_BUILD_H +#endif // CEF_INCLUDE_INTERNAL_CEF_BUILD_H_ diff --git a/cef/include/internal/cef_export.h b/cef/include/internal/cef_export.h old mode 100755 new mode 100644 index 3a56adaf3..d333a5db8 --- a/cef/include/internal/cef_export.h +++ b/cef/include/internal/cef_export.h @@ -28,10 +28,11 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef _CEF_EXPORT_H -#define _CEF_EXPORT_H +#ifndef CEF_INCLUDE_INTERNAL_CEF_EXPORT_H_ +#define CEF_INCLUDE_INTERNAL_CEF_EXPORT_H_ +#pragma once -#include "cef_build.h" +#include "include/internal/cef_build.h" #if defined(COMPILER_MSVC) @@ -51,4 +52,4 @@ #endif // COMPILER_GCC -#endif // _CEF_EXPORT_H +#endif // CEF_INCLUDE_INTERNAL_CEF_EXPORT_H_ diff --git a/cef/include/internal/cef_mac.h b/cef/include/internal/cef_mac.h old mode 100755 new mode 100644 index b949343af..532ade4f9 --- a/cef/include/internal/cef_mac.h +++ b/cef/include/internal/cef_mac.h @@ -28,21 +28,20 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef _CEF_MAC_H -#define _CEF_MAC_H +#ifndef CEF_INCLUDE_INTERNAL_CEF_MAC_H_ +#define CEF_INCLUDE_INTERNAL_CEF_MAC_H_ +#pragma once #if defined(OS_MACOSX) #include -#include "cef_types_mac.h" -#include "cef_types_wrappers.h" +#include "include/internal/cef_types_mac.h" +#include "include/internal/cef_types_wrappers.h" // Atomic increment and decrement. -inline long CefAtomicIncrement(long volatile *pDest) -{ +inline long CefAtomicIncrement(long volatile *pDest) { // NOLINT(runtime/int) return __sync_add_and_fetch(pDest, 1); } -inline long CefAtomicDecrement(long volatile *pDest) -{ +inline long CefAtomicDecrement(long volatile *pDest) { // NOLINT(runtime/int) return __sync_sub_and_fetch(pDest, 1); } @@ -51,26 +50,21 @@ inline long CefAtomicDecrement(long volatile *pDest) #define CefCursorHandle cef_cursor_handle_t // Critical section wrapper. -class CefCriticalSection -{ -public: - CefCriticalSection() - { +class CefCriticalSection { + public: + CefCriticalSection() { pthread_mutexattr_init(&attr_); pthread_mutexattr_settype(&attr_, PTHREAD_MUTEX_RECURSIVE); pthread_mutex_init(&lock_, &attr_); } - virtual ~CefCriticalSection() - { + virtual ~CefCriticalSection() { pthread_mutex_destroy(&lock_); pthread_mutexattr_destroy(&attr_); } - void Lock() - { + void Lock() { pthread_mutex_lock(&lock_); } - void Unlock() - { + void Unlock() { pthread_mutex_unlock(&lock_); } @@ -83,13 +77,12 @@ struct CefWindowInfoTraits { static inline void init(struct_type* s) {} - static inline void clear(struct_type* s) - { + static inline void clear(struct_type* s) { cef_string_clear(&s->m_windowName); } - static inline void set(const struct_type* src, struct_type* target, bool copy) - { + static inline void set(const struct_type* src, struct_type* target, + bool copy) { target->m_View = src->m_View; target->m_ParentView = src->m_ParentView; cef_string_set(src->m_windowName.str, src->m_windowName.length, @@ -103,18 +96,16 @@ struct CefWindowInfoTraits { }; // Class representing window information. -class CefWindowInfo : public CefStructBase -{ -public: +class CefWindowInfo : public CefStructBase { + public: typedef CefStructBase parent; CefWindowInfo() : parent() {} - CefWindowInfo(const cef_window_info_t& r) : parent(r) {} - CefWindowInfo(const CefWindowInfo& r) : parent(r) {} - + explicit CefWindowInfo(const cef_window_info_t& r) : parent(r) {} + explicit CefWindowInfo(const CefWindowInfo& r) : parent(r) {} + void SetAsChild(CefWindowHandle ParentView, int x, int y, int width, - int height) - { + int height) { m_ParentView = ParentView; m_x = x; m_y = y; @@ -130,8 +121,8 @@ struct CefPrintInfoTraits { 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) - { + static inline void set(const struct_type* src, struct_type* target, + bool copy) { target->m_Scale = src->m_Scale; } }; @@ -139,6 +130,6 @@ struct CefPrintInfoTraits { // Class representing print context information. typedef CefStructBase CefPrintInfo; -#endif // OS_MACOSX +#endif // OS_MACOSX -#endif // _CEF_MAC_H +#endif // CEF_INCLUDE_INTERNAL_CEF_MAC_H_ diff --git a/cef/include/internal/cef_nplugin_types.h b/cef/include/internal/cef_nplugin_types.h old mode 100755 new mode 100644 index 50943ce00..47f6705eb --- a/cef/include/internal/cef_nplugin_types.h +++ b/cef/include/internal/cef_nplugin_types.h @@ -28,15 +28,16 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef _CEF_NPLUGIN_TYPES_H -#define _CEF_NPLUGIN_TYPES_H +#ifndef CEF_INCLUDE_INTERNAL_CEF_NPLUGIN_TYPES_H_ +#define CEF_INCLUDE_INTERNAL_CEF_NPLUGIN_TYPES_H_ +#pragma once -#include "cef_export.h" -#include "cef_string.h" +#include "include/internal/cef_export.h" +#include "include/internal/cef_string.h" // Include path modified for CEF Binary Distribution. -#include "npapi/npapi.h" +#include "include/internal/npapi/npapi.h" // Include path modified for CEF Binary Distribution. -#include "npapi/nphostapi.h" +#include "include/internal/npapi/nphostapi.h" #ifdef __cplusplus extern "C" { @@ -63,15 +64,15 @@ typedef struct _cef_plugin_info_t { // A description of the plugin. cef_string_t description; - + // A pipe (|) delimited list of mime type values that the plugin supports. cef_string_t mime_types; - + // A pipe (|) delimited list of extension values. Each value is associated // with the mime type value at the same position. Multiple file extensions // for the same mime type may be delimited with commas (,). cef_string_t file_extensions; - + // A pipe (|) delimited list of description values. Each value is associated // with the mime type value at the same position. cef_string_t type_descriptions; @@ -88,4 +89,4 @@ typedef struct _cef_plugin_info_t { } #endif -#endif // _CEF_NPLUGIN_TYPES_H +#endif // CEF_INCLUDE_INTERNAL_CEF_NPLUGIN_TYPES_H_ diff --git a/cef/include/internal/cef_ptr.h b/cef/include/internal/cef_ptr.h old mode 100755 new mode 100644 index 0aec0075f..fcbe69e5c --- a/cef/include/internal/cef_ptr.h +++ b/cef/include/internal/cef_ptr.h @@ -29,8 +29,11 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef _CEF_PTR_H -#define _CEF_PTR_H +#ifndef CEF_INCLUDE_INTERNAL_CEF_PTR_H_ +#define CEF_INCLUDE_INTERNAL_CEF_PTR_H_ +#pragma once + +#include /// // Smart pointer implementation borrowed from base/ref_counted.h @@ -146,7 +149,7 @@ class CefRefPtr { CefRefPtr() : ptr_(NULL) { } - CefRefPtr(T* p) : ptr_(p) { + CefRefPtr(T* p) : ptr_(p) { // NOLINT(runtime/explicit) if (ptr_) ptr_->AddRef(); } @@ -186,11 +189,11 @@ class CefRefPtr { } void swap(CefRefPtr& r) { - swap(&r.ptr_); + swap(&r.ptr_); // NOLINT(build/include_what_you_use) } private: T* ptr_; }; -#endif // _CEF_PTR_H +#endif // CEF_INCLUDE_INTERNAL_CEF_PTR_H_ diff --git a/cef/include/internal/cef_string.h b/cef/include/internal/cef_string.h old mode 100755 new mode 100644 index 75db22b5e..a7876fe56 --- a/cef/include/internal/cef_string.h +++ b/cef/include/internal/cef_string.h @@ -27,27 +27,28 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef _CEF_STRING_H -#define _CEF_STRING_H +#ifndef CEF_INCLUDE_INTERNAL_CEF_STRING_H_ +#define CEF_INCLUDE_INTERNAL_CEF_STRING_H_ +#pragma once // The CEF interface is built with one string type as the default. Comment out // all but one of the CEF_STRING_TYPE_* defines below to specify the default. // If you change the default you MUST recompile all of CEF. // Build with the UTF8 string type as default. -//#define CEF_STRING_TYPE_UTF8 1 +// #define CEF_STRING_TYPE_UTF8 1 // Build with the UTF16 string type as default. #define CEF_STRING_TYPE_UTF16 1 // Build with the wide string type as default. -//#define CEF_STRING_TYPE_WIDE 1 +// #define CEF_STRING_TYPE_WIDE 1 -#include "cef_string_types.h" +#include "include/internal/cef_string_types.h" #ifdef __cplusplus -#include "cef_string_wrappers.h" +#include "include/internal/cef_string_wrappers.h" #if defined(CEF_STRING_TYPE_UTF16) typedef CefStringUTF16 CefString; #elif defined(CEF_STRING_TYPE_UTF8) @@ -55,7 +56,7 @@ typedef CefStringUTF8 CefString; #elif defined(CEF_STRING_TYPE_WIDE) typedef CefStringWide CefString; #endif -#endif // __cplusplus +#endif // __cplusplus #if defined(CEF_STRING_TYPE_UTF8) typedef char cef_char_t; @@ -109,4 +110,4 @@ typedef cef_string_userfree_wide_t cef_string_userfree_t; #error Please choose a string type. #endif -#endif // _CEF_STRING_H +#endif // CEF_INCLUDE_INTERNAL_CEF_STRING_H_ diff --git a/cef/include/internal/cef_string_list.h b/cef/include/internal/cef_string_list.h old mode 100755 new mode 100644 index fef0a97cc..52a0abf2f --- a/cef/include/internal/cef_string_list.h +++ b/cef/include/internal/cef_string_list.h @@ -27,11 +27,12 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef _CEF_STRING_LIST_H -#define _CEF_STRING_LIST_H +#ifndef CEF_INCLUDE_INTERNAL_CEF_STRING_LIST_H_ +#define CEF_INCLUDE_INTERNAL_CEF_STRING_LIST_H_ +#pragma once -#include "cef_export.h" -#include "cef_string.h" +#include "include/internal/cef_export.h" +#include "include/internal/cef_string.h" #ifdef __cplusplus extern "C" { @@ -84,4 +85,4 @@ CEF_EXPORT cef_string_list_t cef_string_list_copy(cef_string_list_t list); } #endif -#endif // _CEF_STRING_LIST_H +#endif // CEF_INCLUDE_INTERNAL_CEF_STRING_LIST_H_ diff --git a/cef/include/internal/cef_string_map.h b/cef/include/internal/cef_string_map.h old mode 100755 new mode 100644 index e20f824a1..93eea2a55 --- a/cef/include/internal/cef_string_map.h +++ b/cef/include/internal/cef_string_map.h @@ -27,11 +27,12 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef _CEF_STRING_MAP_H -#define _CEF_STRING_MAP_H +#ifndef CEF_INCLUDE_INTERNAL_CEF_STRING_MAP_H_ +#define CEF_INCLUDE_INTERNAL_CEF_STRING_MAP_H_ +#pragma once -#include "cef_export.h" -#include "cef_string.h" +#include "include/internal/cef_export.h" +#include "include/internal/cef_string.h" #ifdef __cplusplus extern "C" { @@ -93,4 +94,4 @@ CEF_EXPORT void cef_string_map_free(cef_string_map_t map); } #endif -#endif // _CEF_STRING_MAP_H +#endif // CEF_INCLUDE_INTERNAL_CEF_STRING_MAP_H_ diff --git a/cef/include/internal/cef_string_multimap.h b/cef/include/internal/cef_string_multimap.h old mode 100755 new mode 100644 index e99ae9a48..cd3904244 --- a/cef/include/internal/cef_string_multimap.h +++ b/cef/include/internal/cef_string_multimap.h @@ -27,11 +27,12 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef _CEF_STRING_MULTIMAP_H -#define _CEF_STRING_MULTIMAP_H +#ifndef CEF_INCLUDE_INTERNAL_CEF_STRING_MULTIMAP_H_ +#define CEF_INCLUDE_INTERNAL_CEF_STRING_MULTIMAP_H_ +#pragma once -#include "cef_export.h" -#include "cef_string.h" +#include "include/internal/cef_export.h" +#include "include/internal/cef_string.h" #ifdef __cplusplus extern "C" { @@ -101,4 +102,4 @@ CEF_EXPORT void cef_string_multimap_free(cef_string_multimap_t map); } #endif -#endif // _CEF_STRING_MULTIMAP_H +#endif // CEF_INCLUDE_INTERNAL_CEF_STRING_MULTIMAP_H_ diff --git a/cef/include/internal/cef_string_types.h b/cef/include/internal/cef_string_types.h old mode 100755 new mode 100644 index f71ffed6c..7ab6671cb --- a/cef/include/internal/cef_string_types.h +++ b/cef/include/internal/cef_string_types.h @@ -27,8 +27,9 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef _CEF_STRING_TYPES_T -#define _CEF_STRING_TYPES_T +#ifndef CEF_INCLUDE_INTERNAL_CEF_STRING_TYPES_H_ +#define CEF_INCLUDE_INTERNAL_CEF_STRING_TYPES_H_ +#pragma once // CEF provides functions for converting between UTF-8, -16 and -32 strings. // CEF string types are safe for reading from multiple threads but not for @@ -39,8 +40,8 @@ extern "C" { #endif -#include "cef_build.h" -#include "cef_export.h" +#include "include/internal/cef_build.h" +#include "include/internal/cef_export.h" #include // CEF character type definitions. wchar_t is 2 bytes on Windows and 4 bytes on @@ -48,12 +49,12 @@ extern "C" { #if defined(OS_WIN) typedef wchar_t char16; -#else // !OS_WIN -typedef unsigned short char16; +#else // !OS_WIN +typedef unsigned short char16; // NOLINT (runtime/int) #ifndef WCHAR_T_IS_UTF32 #define WCHAR_T_IS_UTF32 -#endif // WCHAR_T_IS_UTF32 -#endif // !OS_WIN +#endif // WCHAR_T_IS_UTF32 +#endif // !OS_WIN // CEF string type definitions. Whomever allocates |str| is responsible for @@ -200,4 +201,4 @@ CEF_EXPORT void cef_string_userfree_utf16_free(cef_string_userfree_utf16_t str); } #endif -#endif // _CEF_STRING_TYPES_T +#endif // CEF_INCLUDE_INTERNAL_CEF_STRING_TYPES_H_ diff --git a/cef/include/internal/cef_string_wrappers.h b/cef/include/internal/cef_string_wrappers.h old mode 100755 new mode 100644 index 06fc42697..c0507c1cc --- a/cef/include/internal/cef_string_wrappers.h +++ b/cef/include/internal/cef_string_wrappers.h @@ -27,15 +27,18 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef _CEF_STRING_WRAPPERS_H -#define _CEF_STRING_WRAPPERS_H +#ifndef CEF_INCLUDE_INTERNAL_CEF_STRING_WRAPPERS_H_ +#define CEF_INCLUDE_INTERNAL_CEF_STRING_WRAPPERS_H_ +#pragma once + +#include +#include +#include "include/internal/cef_string_types.h" -#include "cef_string_types.h" #ifdef BUILDING_CEF_SHARED #include "base/string16.h" #endif -#include -#include + /// // Traits implementation for wide character strings. @@ -44,25 +47,27 @@ struct CefStringTraitsWide { typedef wchar_t char_type; typedef cef_string_wide_t struct_type; typedef cef_string_userfree_wide_t userfree_struct_type; - + static inline void clear(struct_type *s) { cef_string_wide_clear(s); } static inline int set(const char_type* src, size_t src_size, - struct_type *output, int copy) - { return cef_string_wide_set(src, src_size, output, copy); } - static inline int compare(const struct_type* s1, const struct_type* s2) - { return cef_string_wide_cmp(s1, s2); } - static inline userfree_struct_type userfree_alloc() - { return cef_string_userfree_wide_alloc(); } - static inline void userfree_free(userfree_struct_type ufs) - { return cef_string_userfree_wide_free(ufs); } + struct_type* output, int copy) { + return cef_string_wide_set(src, src_size, output, copy); + } + static inline int compare(const struct_type* s1, const struct_type* s2) { + return cef_string_wide_cmp(s1, s2); + } + static inline userfree_struct_type userfree_alloc() { + return cef_string_userfree_wide_alloc(); + } + static inline void userfree_free(userfree_struct_type ufs) { + return cef_string_userfree_wide_free(ufs); + } // Conversion methods. - static inline bool from_ascii(const char* str, size_t len, struct_type *s) - { + static inline bool from_ascii(const char* str, size_t len, struct_type *s) { return cef_string_ascii_to_wide(str, len, s) ? true : false; } - static inline std::string to_string(const struct_type *s) - { + static inline std::string to_string(const struct_type *s) { cef_string_utf8_t cstr; memset(&cstr, 0, sizeof(cstr)); cef_string_wide_to_utf8(s->str, s->length, &cstr); @@ -72,23 +77,19 @@ struct CefStringTraitsWide { cef_string_utf8_clear(&cstr); return str; } - static inline bool from_string(const std::string& str, struct_type *s) - { + static inline bool from_string(const std::string& str, struct_type *s) { return cef_string_utf8_to_wide(str.c_str(), str.length(), s) ? true : false; } - static inline std::wstring to_wstring(const struct_type *s) - { + static inline std::wstring to_wstring(const struct_type *s) { return std::wstring(s->str, s->length); } - static inline bool from_wstring(const std::wstring& str, struct_type *s) - { + static inline bool from_wstring(const std::wstring& str, struct_type *s) { return cef_string_wide_set(str.c_str(), str.length(), s, true) ? true : false; } #if defined(BUILDING_CEF_SHARED) #if defined(WCHAR_T_IS_UTF32) - static inline string16 to_string16(const struct_type *s) - { + static inline string16 to_string16(const struct_type *s) { cef_string_utf16_t cstr; memset(&cstr, 0, sizeof(cstr)); cef_string_wide_to_utf16(s->str, s->length, &cstr); @@ -98,23 +99,20 @@ struct CefStringTraitsWide { cef_string_utf16_clear(&cstr); return str; } - static inline bool from_string16(const string16& str, struct_type *s) - { + static inline bool from_string16(const string16& str, struct_type *s) { return cef_string_utf16_to_wide(str.c_str(), str.length(), s) ? true : false; } -#else // WCHAR_T_IS_UTF32 - static inline string16 to_string16(const struct_type *s) - { +#else // WCHAR_T_IS_UTF32 + static inline string16 to_string16(const struct_type *s) { return string16(s->str, s->length); } - static inline bool from_string16(const string16& str, struct_type *s) - { + static inline bool from_string16(const string16& str, struct_type *s) { return cef_string_wide_set(str.c_str(), str.length(), s, true) ? true : false; } -#endif // WCHAR_T_IS_UTF32 -#endif // BUILDING_CEF_SHARED +#endif // WCHAR_T_IS_UTF32 +#endif // BUILDING_CEF_SHARED }; /// @@ -124,33 +122,33 @@ struct CefStringTraitsUTF8 { typedef char char_type; typedef cef_string_utf8_t struct_type; typedef cef_string_userfree_utf8_t userfree_struct_type; - + static inline void clear(struct_type *s) { cef_string_utf8_clear(s); } static inline int set(const char_type* src, size_t src_size, - struct_type *output, int copy) - { return cef_string_utf8_set(src, src_size, output, copy); } - static inline int compare(const struct_type* s1, const struct_type* s2) - { return cef_string_utf8_cmp(s1, s2); } - static inline userfree_struct_type userfree_alloc() - { return cef_string_userfree_utf8_alloc(); } - static inline void userfree_free(userfree_struct_type ufs) - { return cef_string_userfree_utf8_free(ufs); } + struct_type* output, int copy) { + return cef_string_utf8_set(src, src_size, output, copy); + } + static inline int compare(const struct_type* s1, const struct_type* s2) { + return cef_string_utf8_cmp(s1, s2); + } + static inline userfree_struct_type userfree_alloc() { + return cef_string_userfree_utf8_alloc(); + } + static inline void userfree_free(userfree_struct_type ufs) { + return cef_string_userfree_utf8_free(ufs); + } // Conversion methods. - static inline bool from_ascii(const char* str, size_t len, struct_type* s) - { + static inline bool from_ascii(const char* str, size_t len, struct_type* s) { return cef_string_utf8_copy(str, len, s) ? true : false; } - static inline std::string to_string(const struct_type* s) - { + static inline std::string to_string(const struct_type* s) { return std::string(s->str, s->length); } - static inline bool from_string(const std::string& str, struct_type* s) - { + static inline bool from_string(const std::string& str, struct_type* s) { return cef_string_utf8_copy(str.c_str(), str.length(), s) ? true : false; } - static inline std::wstring to_wstring(const struct_type* s) - { + static inline std::wstring to_wstring(const struct_type* s) { cef_string_wide_t cstr; memset(&cstr, 0, sizeof(cstr)); cef_string_utf8_to_wide(s->str, s->length, &cstr); @@ -160,13 +158,11 @@ struct CefStringTraitsUTF8 { cef_string_wide_clear(&cstr); return str; } - static inline bool from_wstring(const std::wstring& str, struct_type* s) - { + static inline bool from_wstring(const std::wstring& str, struct_type* s) { return cef_string_wide_to_utf8(str.c_str(), str.length(), s) ? true : false; } #if defined(BUILDING_CEF_SHARED) - static inline string16 to_string16(const struct_type* s) - { + static inline string16 to_string16(const struct_type* s) { cef_string_utf16_t cstr; memset(&cstr, 0, sizeof(cstr)); cef_string_utf8_to_utf16(s->str, s->length, &cstr); @@ -176,12 +172,11 @@ struct CefStringTraitsUTF8 { cef_string_utf16_clear(&cstr); return str; } - static inline bool from_string16(const string16& str, struct_type* s) - { + static inline bool from_string16(const string16& str, struct_type* s) { return cef_string_utf16_to_utf8(str.c_str(), str.length(), s) ? true : false; } -#endif // BUILDING_CEF_SHARED +#endif // BUILDING_CEF_SHARED }; /// @@ -191,25 +186,27 @@ struct CefStringTraitsUTF16 { typedef char16 char_type; typedef cef_string_utf16_t struct_type; typedef cef_string_userfree_utf16_t userfree_struct_type; - + static inline void clear(struct_type *s) { cef_string_utf16_clear(s); } static inline int set(const char_type* src, size_t src_size, - struct_type *output, int copy) - { return cef_string_utf16_set(src, src_size, output, copy); } - static inline int compare(const struct_type* s1, const struct_type* s2) - { return cef_string_utf16_cmp(s1, s2); } - static inline userfree_struct_type userfree_alloc() - { return cef_string_userfree_utf16_alloc(); } - static inline void userfree_free(userfree_struct_type ufs) - { return cef_string_userfree_utf16_free(ufs); } + struct_type* output, int copy) { + return cef_string_utf16_set(src, src_size, output, copy); + } + static inline int compare(const struct_type* s1, const struct_type* s2) { + return cef_string_utf16_cmp(s1, s2); + } + static inline userfree_struct_type userfree_alloc() { + return cef_string_userfree_utf16_alloc(); + } + static inline void userfree_free(userfree_struct_type ufs) { + return cef_string_userfree_utf16_free(ufs); + } // Conversion methods. - static inline bool from_ascii(const char* str, size_t len, struct_type* s) - { + static inline bool from_ascii(const char* str, size_t len, struct_type* s) { return cef_string_ascii_to_utf16(str, len, s) ? true : false; } - static inline std::string to_string(const struct_type* s) - { + static inline std::string to_string(const struct_type* s) { cef_string_utf8_t cstr; memset(&cstr, 0, sizeof(cstr)); cef_string_utf16_to_utf8(s->str, s->length, &cstr); @@ -219,14 +216,12 @@ struct CefStringTraitsUTF16 { cef_string_utf8_clear(&cstr); return str; } - static inline bool from_string(const std::string& str, struct_type* s) - { + static inline bool from_string(const std::string& str, struct_type* s) { return cef_string_utf8_to_utf16(str.c_str(), str.length(), s) ? true : false; } #if defined(WCHAR_T_IS_UTF32) - static inline std::wstring to_wstring(const struct_type* s) - { + static inline std::wstring to_wstring(const struct_type* s) { cef_string_wide_t cstr; memset(&cstr, 0, sizeof(cstr)); cef_string_utf16_to_wide(s->str, s->length, &cstr); @@ -236,33 +231,28 @@ struct CefStringTraitsUTF16 { cef_string_wide_clear(&cstr); return str; } - static inline bool from_wstring(const std::wstring& str, struct_type* s) - { + static inline bool from_wstring(const std::wstring& str, struct_type* s) { return cef_string_wide_to_utf16(str.c_str(), str.length(), s) ? true : false; } -#else // WCHAR_T_IS_UTF32 - static inline std::wstring to_wstring(const struct_type* s) - { +#else // WCHAR_T_IS_UTF32 + static inline std::wstring to_wstring(const struct_type* s) { return std::wstring(s->str, s->length); } - static inline bool from_wstring(const std::wstring& str, struct_type* s) - { + static inline bool from_wstring(const std::wstring& str, struct_type* s) { return cef_string_utf16_set(str.c_str(), str.length(), s, true) ? true : false; } -#endif // WCHAR_T_IS_UTF32 +#endif // WCHAR_T_IS_UTF32 #if defined(BUILDING_CEF_SHARED) - static inline string16 to_string16(const struct_type* s) - { + static inline string16 to_string16(const struct_type* s) { return string16(s->str, s->length); } - static inline bool from_string16(const string16& str, struct_type* s) - { + static inline bool from_string16(const string16& str, struct_type* s) { return cef_string_utf16_set(str.c_str(), str.length(), s, true) ? true : false; } -#endif // BUILDING_CEF_SHARED +#endif // BUILDING_CEF_SHARED }; /// @@ -295,7 +285,7 @@ struct CefStringTraitsUTF16 { /// template class CefStringBase { -public: + public: typedef typename traits::char_type char_type; typedef typename traits::struct_type struct_type; typedef typename traits::userfree_struct_type userfree_struct_type; @@ -304,32 +294,42 @@ public: // Default constructor. /// CefStringBase() : string_(NULL), owner_(false) {} - + /// // Create a new string from an existing string. Data will always be copied. /// - CefStringBase(const CefStringBase& str) : string_(NULL), owner_(false) - { FromString(str.c_str(), str.length(), true); } - + CefStringBase(const CefStringBase& str) + : string_(NULL), owner_(false) { + FromString(str.c_str(), str.length(), true); + } + /// // Create a new string from an existing std::string. Data will be always // copied. Translation will occur if necessary based on the underlying string // type. /// - CefStringBase(const std::string& src) : string_(NULL), owner_(false) - { FromString(src); } - CefStringBase(const char* src) : string_(NULL), owner_(false) - { FromString(std::string(src)); } - + CefStringBase(const std::string& src) // NOLINT(runtime/explicit) + : string_(NULL), owner_(false) { + FromString(src); + } + CefStringBase(const char* src) // NOLINT(runtime/explicit) + : string_(NULL), owner_(false) { + FromString(std::string(src)); + } + /// // Create a new string from an existing std::wstring. Data will be always // copied. Translation will occur if necessary based on the underlying string // type. /// - CefStringBase(const std::wstring& src) : string_(NULL), owner_(false) - { FromWString(src); } - CefStringBase(const wchar_t* src) : string_(NULL), owner_(false) - { FromWString(std::wstring(src)); } + CefStringBase(const std::wstring& src) // NOLINT(runtime/explicit) + : string_(NULL), owner_(false) { + FromWString(src); + } + CefStringBase(const wchar_t* src) // NOLINT(runtime/explicit) + : string_(NULL), owner_(false) { + FromWString(std::wstring(src)); + } #if (defined(BUILDING_CEF_SHARED) && defined(WCHAR_T_IS_UTF32)) /// @@ -337,12 +337,16 @@ public: // copied. Translation will occur if necessary based on the underlying string // type. /// - CefStringBase(const string16& src) : string_(NULL), owner_(false) - { FromString16(src); } - CefStringBase(const char16* src) : string_(NULL), owner_(false) - { FromString16(string16(src)); } -#endif // BUILDING_CEF_SHARED && WCHAR_T_IS_UTF32 - + CefStringBase(const string16& src) // NOLINT(runtime/explicit) + : string_(NULL), owner_(false) { + FromString16(src); + } + CefStringBase(const char16* src) // NOLINT(runtime/explicit) + : string_(NULL), owner_(false) { + FromString16(string16(src)); + } +#endif // BUILDING_CEF_SHARED && WCHAR_T_IS_UTF32 + /// // Create a new string from an existing character array. If |copy| is true // this class will copy the data. Otherwise, this class will reference the @@ -350,16 +354,17 @@ public: // and will not be freed by this class. /// CefStringBase(const char_type* src, size_t src_len, bool copy) - : string_(NULL), owner_(false) - { FromString(src, src_len, copy); } - + : string_(NULL), owner_(false) { + FromString(src, src_len, copy); + } + /// // Create a new string referencing an existing string structure without taking // ownership. Referenced structures must exist for the lifetime of this class // and will not be freed by this class. /// - CefStringBase(const struct_type* src) : string_(NULL), owner_(false) - { + CefStringBase(const struct_type* src) // NOLINT(runtime/explicit) + : string_(NULL), owner_(false) { if (!src) return; // Reference the existing structure without taking ownership. @@ -376,17 +381,17 @@ public: // Return a read-only pointer to the string data. /// const char_type* c_str() const { return (string_ ? string_->str : NULL); } - + /// // Return the length of the string data. /// size_t length() const { return (string_ ? string_->length : 0); } - + /// // Return the length of the string data. /// inline size_t size() const { return length(); } - + /// // Returns true if the string is empty. /// @@ -395,8 +400,7 @@ public: /// // Compare this string to the specified string. /// - int compare(const CefStringBase& str) const - { + int compare(const CefStringBase& str) const { if (empty() && str.empty()) return 0; if (empty()) @@ -405,13 +409,12 @@ public: return 1; return traits::compare(string_, str.GetStruct()); } - + /// // Clear the string data. /// - void clear() - { - if (!empty()) + void clear() { + if (string_) traits::clear(string_); } @@ -422,29 +425,27 @@ public: // Returns true if this class owns the underlying string structure. /// bool IsOwner() const { return owner_; } - + /// // Returns a read-only pointer to the underlying string structure. May return // NULL if no structure is currently allocated. /// const struct_type* GetStruct() const { return string_; } - + /// // Returns a writable pointer to the underlying string structure. Will never // return NULL. /// - struct_type* GetWritableStruct() - { + struct_type* GetWritableStruct() { AllocIfNeeded(); return string_; } - + /// // Clear the state of this class. The underlying string structure and data // will be freed if this class owns the structure. /// - void ClearAndFree() - { + void ClearAndFree() { if (!string_) return; if (owner_) { @@ -459,11 +460,10 @@ public: // Attach to the specified string structure. If |owner| is true this class // will take ownership of the structure. /// - void Attach(struct_type* str, bool owner) - { + void Attach(struct_type* str, bool owner) { // Free the previous structure and data, if any. ClearAndFree(); - + string_ = str; owner_ = owner; } @@ -473,8 +473,7 @@ public: // userfree structure itself will be freed. Only use this method with userfree // structures. /// - void AttachToUserFree(userfree_struct_type str) - { + void AttachToUserFree(userfree_struct_type str) { // Free the previous structure and data, if any. ClearAndFree(); @@ -484,7 +483,7 @@ public: AllocIfNeeded(); owner_ = true; memcpy(string_, str, sizeof(struct_type)); - + // Free the |str| structure but not the data. memset(str, 0, sizeof(struct_type)); traits::userfree_free(str); @@ -495,8 +494,7 @@ public: // this method if you already hold a pointer to the underlying string // structure. /// - void Detach() - { + void Detach() { string_ = NULL; owner_ = false; } @@ -506,14 +504,13 @@ public: // data. This class will be disassociated from the data. May return NULL if // this string class currently contains no data. /// - userfree_struct_type DetachToUserFree() - { + userfree_struct_type DetachToUserFree() { if (empty()) return NULL; - + userfree_struct_type str = traits::userfree_alloc(); memcpy(str, string_, sizeof(struct_type)); - + // Free this class' structure but not the data. memset(string_, 0, sizeof(struct_type)); ClearAndFree(); @@ -527,8 +524,7 @@ public: // existing data. Referenced data must exist for the lifetime of this class // and will not be freed by this class. /// - bool FromString(const char_type* src, size_t src_len, bool copy) - { + bool FromString(const char_type* src, size_t src_len, bool copy) { if (src == NULL || src_len == 0) { clear(); return true; @@ -536,14 +532,13 @@ public: AllocIfNeeded(); return traits::set(src, src_len, string_, copy) ? true : false; } - + /// // Set this string's data from an existing ASCII string. Data will be always // copied. Translation will occur if necessary based on the underlying string // type. /// - bool FromASCII(const char* str) - { + bool FromASCII(const char* str) { size_t len = str ? strlen(str) : 0; if (len == 0) { clear(); @@ -552,25 +547,23 @@ public: AllocIfNeeded(); return traits::from_ascii(str, len, string_); } - + /// // Return this string's data as a std::string. Translation will occur if // necessary based on the underlying string type. /// - std::string ToString() const - { + std::string ToString() const { if (empty()) return std::string(); return traits::to_string(string_); } - + /// // Set this string's data from an existing std::string. Data will be always // copied. Translation will occur if necessary based on the underlying string // type. /// - bool FromString(const std::string& str) - { + bool FromString(const std::string& str) { if (str.empty()) { clear(); return true; @@ -578,25 +571,23 @@ public: AllocIfNeeded(); return traits::from_string(str, string_); } - + /// // Return this string's data as a std::wstring. Translation will occur if // necessary based on the underlying string type. /// - std::wstring ToWString() const - { + std::wstring ToWString() const { if (empty()) return std::wstring(); return traits::to_wstring(string_); } - + /// // Set this string's data from an existing std::wstring. Data will be always // copied. Translation will occur if necessary based on the underlying string // type. /// - bool FromWString(const std::wstring& str) - { + bool FromWString(const std::wstring& str) { if (str.empty()) { clear(); return true; @@ -609,20 +600,18 @@ public: // Return this string's data as a string16. Translation will occur if // necessary based on the underlying string type. /// - string16 ToString16() const - { + string16 ToString16() const { if (empty()) return string16(); return traits::to_string16(string_); } - + /// // Set this string's data from an existing string16. Data will be always // copied. Translation will occur if necessary based on the underlying string // type. /// - bool FromString16(const string16& str) - { + bool FromString16(const string16& str) { if (str.empty()) { clear(); return true; @@ -630,51 +619,76 @@ public: AllocIfNeeded(); return traits::from_string16(str, string_); } -#endif // BUILDING_CEF_SHARED +#endif // BUILDING_CEF_SHARED /// // Comparison operator overloads. /// - bool operator<(const CefStringBase& str) const - { return (compare(str) < 0); } - bool operator<=(const CefStringBase& str) const - { return (compare(str) <= 0); } - bool operator>(const CefStringBase& str) const - { return (compare(str) > 0); } - bool operator>=(const CefStringBase& str) const - { return (compare(str) >= 0); } - bool operator==(const CefStringBase& str) const - { return (compare(str) == 0); } - bool operator!=(const CefStringBase& str) const - { return (compare(str) != 0); } - + bool operator<(const CefStringBase& str) const { + return (compare(str) < 0); + } + bool operator<=(const CefStringBase& str) const { + return (compare(str) <= 0); + } + bool operator>(const CefStringBase& str) const { + return (compare(str) > 0); + } + bool operator>=(const CefStringBase& str) const { + return (compare(str) >= 0); + } + bool operator==(const CefStringBase& str) const { + return (compare(str) == 0); + } + bool operator!=(const CefStringBase& str) const { + return (compare(str) != 0); + } + /// // Assignment operator overloads. /// - CefStringBase& operator=(const CefStringBase& str) - { FromString(str.c_str(), str.length(), true); return *this; } - operator std::string() const { return ToString(); } - CefStringBase& operator=(const std::string& str) - { FromString(str); return *this; } - CefStringBase& operator=(const char* str) - { FromString(std::string(str)); return *this; } - operator std::wstring() const { return ToWString(); } - CefStringBase& operator=(const std::wstring& str) - { FromWString(str); return *this; } - CefStringBase& operator=(const wchar_t* str) - { FromWString(std::wstring(str)); return *this; } + CefStringBase& operator=(const CefStringBase& str) { + FromString(str.c_str(), str.length(), true); + return *this; + } + operator std::string() const { + return ToString(); + } + CefStringBase& operator=(const std::string& str) { + FromString(str); + return *this; + } + CefStringBase& operator=(const char* str) { + FromString(std::string(str)); + return *this; + } + operator std::wstring() const { + return ToWString(); + } + CefStringBase& operator=(const std::wstring& str) { + FromWString(str); + return *this; + } + CefStringBase& operator=(const wchar_t* str) { + FromWString(std::wstring(str)); + return *this; + } #if (defined(BUILDING_CEF_SHARED) && defined(WCHAR_T_IS_UTF32)) - operator string16() const { return ToString16(); } - CefStringBase& operator=(const string16& str) - { FromString16(str); return *this; } - CefStringBase& operator=(const char16* str) - { FromString16(string16(str)); return *this; } -#endif // BUILDING_CEF_SHARED && WCHAR_T_IS_UTF32 + operator string16() const { + return ToString16(); + } + CefStringBase& operator=(const string16& str) { + FromString16(str); + return *this; + } + CefStringBase& operator=(const char16* str) { + FromString16(string16(str)); + return *this; + } +#endif // BUILDING_CEF_SHARED && WCHAR_T_IS_UTF32 -private: + private: // Allocate the string structure if it doesn't already exist. - void AllocIfNeeded() - { + void AllocIfNeeded() { if (string_ == NULL) { string_ = new struct_type; memset(string_, 0, sizeof(struct_type)); @@ -691,4 +705,4 @@ typedef CefStringBase CefStringWide; typedef CefStringBase CefStringUTF8; typedef CefStringBase CefStringUTF16; -#endif // _CEF_STRING_WRAPPERS_H +#endif // CEF_INCLUDE_INTERNAL_CEF_STRING_WRAPPERS_H_ diff --git a/cef/include/internal/cef_time.h b/cef/include/internal/cef_time.h old mode 100755 new mode 100644 index 11235792c..5d38cf7bc --- a/cef/include/internal/cef_time.h +++ b/cef/include/internal/cef_time.h @@ -27,24 +27,26 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef _CEF_TIME_H -#define _CEF_TIME_H +#ifndef CEF_INCLUDE_INTERNAL_CEF_TIME_H_ +#define CEF_INCLUDE_INTERNAL_CEF_TIME_H_ +#pragma once #ifdef __cplusplus extern "C" { #endif -#include "cef_export.h" +#include "include/internal/cef_export.h" #include /// // Time information. Values should always be in UTC. /// -typedef struct _cef_time_t -{ +typedef struct _cef_time_t { int year; // Four digit year "2007" int month; // 1-based month (values 1 = January, etc.) +#if !defined(OS_MACOSX) int day_of_week; // 0-based day of week (0 = Sunday, etc.) +#endif int day_of_month; // 1-based day of month (1-31) int hour; // Hour within the current day (0-23) int minute; // Minute within the current hour (0-59) @@ -73,4 +75,4 @@ CEF_EXPORT int cef_time_from_doublet(double time, cef_time_t* cef_time); } #endif -#endif // _CEF_TIME_H +#endif // CEF_INCLUDE_INTERNAL_CEF_TIME_H_ diff --git a/cef/include/internal/cef_tuple.h b/cef/include/internal/cef_tuple.h old mode 100755 new mode 100644 index da71441de..d9a1a2c96 --- a/cef/include/internal/cef_tuple.h +++ b/cef/include/internal/cef_tuple.h @@ -53,8 +53,8 @@ // DispatchToMethod(&foo, &Foo::SomeMeth, MakeTuple(1, 2, 3)); // // foo->SomeMeth(1, 2, 3); -#ifndef BASE_TUPLE_H__ -#define BASE_TUPLE_H__ +#ifndef CEF_INCLUDE_INTERNAL_CEF_TUPLE_H_ +#define CEF_INCLUDE_INTERNAL_CEF_TUPLE_H_ #pragma once #if defined(OS_CHROMEOS) @@ -144,7 +144,7 @@ struct Tuple3 { Tuple3(typename TupleTraits::ParamType a, typename TupleTraits::ParamType b, typename TupleTraits::ParamType c) - : a(a), b(b), c(c){ + : a(a), b(b), c(c) { } A a; @@ -575,7 +575,6 @@ inline void DispatchToMethod(ObjT* obj, Method method, const A& arg) { template inline void DispatchToMethod(ObjT* obj, Method method, const Tuple1& arg) { - #if defined(OS_CHROMEOS) // To troubleshoot crosbug.com/7327. CHECK(obj); @@ -1080,4 +1079,4 @@ inline void DispatchToMethod(ObjT* obj, Method method, &out->a, &out->b, &out->c, &out->d, &out->e); } -#endif // BASE_TUPLE_H__ +#endif // CEF_INCLUDE_INTERNAL_CEF_TUPLE_H_ diff --git a/cef/include/internal/cef_types.h b/cef/include/internal/cef_types.h old mode 100755 new mode 100644 index 933f462c4..951bd79a7 --- a/cef/include/internal/cef_types.h +++ b/cef/include/internal/cef_types.h @@ -28,31 +28,37 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef _CEF_TYPES_H -#define _CEF_TYPES_H +#ifndef CEF_INCLUDE_INTERNAL_CEF_TYPES_H_ +#define CEF_INCLUDE_INTERNAL_CEF_TYPES_H_ +#pragma once -#include "cef_build.h" -#include "cef_string.h" -#include "cef_string_list.h" -#include "cef_time.h" +#include "include/internal/cef_build.h" +#include "include/internal/cef_string.h" +#include "include/internal/cef_string_list.h" +#include "include/internal/cef_time.h" // Bring in platform-specific definitions. #if defined(OS_WIN) -#include "cef_types_win.h" +#include "include/internal/cef_types_win.h" #elif defined(OS_MACOSX) -#include "cef_types_mac.h" +#include "include/internal/cef_types_mac.h" #elif defined(OS_LINUX) -#include "cef_types_linux.h" +#include "include/internal/cef_types_linux.h" #endif -// The NSPR system headers define 64-bit as |long| when possible. In order to -// not have typedef mismatches, we do the same on LP64. -#if __LP64__ -typedef long int64; -typedef unsigned long uint64; +#include // For size_t + +// The NSPR system headers define 64-bit as |long| when possible, except on +// Mac OS X. In order to not have typedef mismatches, we do the same on LP64. +// +// On Mac OS X, |long long| is used for 64-bit types for compatibility with +// format macros even in the LP64 model. +#if defined(__LP64__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) +typedef long int64; // NOLINT(runtime/int) +typedef unsigned long uint64; // NOLINT(runtime/int) #else -typedef long long int64; -typedef unsigned long long uint64; +typedef long long int64; // NOLINT(runtime/int) +typedef unsigned long long uint64; // NOLINT(runtime/int) #endif #ifdef __cplusplus @@ -62,8 +68,7 @@ extern "C" { /// // Log severity levels. /// -enum cef_log_severity_t -{ +enum cef_log_severity_t { LOGSEVERITY_VERBOSE = -1, LOGSEVERITY_INFO, LOGSEVERITY_WARNING, @@ -77,8 +82,7 @@ enum cef_log_severity_t // Initialization settings. Specify NULL or 0 to get the recommended default // values. /// -typedef struct _cef_settings_t -{ +typedef struct _cef_settings_t { /// // Size of this structure. /// @@ -90,14 +94,14 @@ typedef struct _cef_settings_t // your application message loop. /// bool multi_threaded_message_loop; - + /// // The location where cache data will be stored on disk. If empty an // in-memory cache will be used. HTML5 databases such as localStorage will // only persist across sessions if a cache path is specified. /// cef_string_t cache_path; - + /// // Value that will be returned as the User-Agent HTTP header. If empty the // default User-Agent string will be used. @@ -113,7 +117,9 @@ typedef struct _cef_settings_t /// // The locale string that will be passed to WebKit. If empty the default - // locale of "en-US" will be used. + // locale of "en-US" will be used. This value is ignored on Linux where locale + // is determined using environment variable parsing with the precedence order: + // LANGUAGE, LC_ALL, LC_MESSAGES and LANG. /// cef_string_t locale; @@ -160,12 +166,36 @@ typedef struct _cef_settings_t #if defined(OS_WIN) /// - // Set to true (1) to use the system proxy resolver on Windows when + // Set to true (1) to use the system proxy resolver on Windows when // "Automatically detect settings" is checked. This setting is disabled // by default for performance reasons. /// bool auto_detect_proxy_settings_enabled; #endif + + /// + // The fully qualified path for the cef.pak file. If this value is empty + // the cef.pak file must be located in the module directory. This value is + // ignored on Mac OS X where pack files are always loaded from the app bundle + // resource directory. + /// + cef_string_t pack_file_path; + + /// + // The fully qualified path for the locales directory. If this value is empty + // the locales directory must be located in the module directory. This value + // is ignored on Mac OS X where pack files are always loaded from the app + // bundle resource directory. + /// + cef_string_t locales_dir_path; + + /// + // Set to true (1) to disable loading of pack files for resources and locales. + // A resource bundle handler must be provided for the browser and renderer + // processes via CefApp::GetResourceBundleHandler() if loading of pack files + // is disabled. + /// + bool pack_loading_disabled; } cef_settings_t; /// @@ -173,8 +203,7 @@ typedef struct _cef_settings_t // default values. The consequences of using custom values may not be well // tested. /// -typedef struct _cef_browser_settings_t -{ +typedef struct _cef_browser_settings_t { /// // Size of this structure. /// @@ -328,7 +357,7 @@ typedef struct _cef_browser_settings_t // Set to true (1) to enable the user style sheet for all pages. /// bool user_style_sheet_enabled; - + /// // Location of the user style sheet. This must be a data URL of the form // "data:text/css;charset=utf-8;base64,csscontent" where "csscontent" is the @@ -391,9 +420,14 @@ typedef struct _cef_browser_settings_t bool accelerated_2d_canvas_disabled; /// - // Set to true (1) to disable accelerated drawing. + // Set to true (1) to disable accelerated painting. /// - bool accelerated_drawing_disabled; + bool accelerated_painting_disabled; + + /// + // Set to true (1) to disable accelerated filters. + /// + bool accelerated_filters_disabled; /// // Set to true (1) to disable accelerated plugins. @@ -414,8 +448,7 @@ typedef struct _cef_browser_settings_t /// // URL component parts. /// -typedef struct _cef_urlparts_t -{ +typedef struct _cef_urlparts_t { /// // The complete URL specification. /// @@ -461,8 +494,7 @@ typedef struct _cef_urlparts_t /// // Cookie information. /// -typedef struct _cef_cookie_t -{ +typedef struct _cef_cookie_t { /// // The cookie name. /// @@ -501,7 +533,7 @@ typedef struct _cef_cookie_t // cookie creation. /// cef_time_t creation; - + /// // The cookie last access date. This is automatically populated by the system // on access. @@ -518,8 +550,7 @@ typedef struct _cef_cookie_t /// // Storage types. /// -enum cef_storage_type_t -{ +enum cef_storage_type_t { ST_LOCALSTORAGE = 0, ST_SESSIONSTORAGE, }; @@ -527,8 +558,7 @@ enum cef_storage_type_t /// // Mouse button types. /// -enum cef_mouse_button_type_t -{ +enum cef_mouse_button_type_t { MBT_LEFT = 0, MBT_MIDDLE, MBT_RIGHT, @@ -537,8 +567,7 @@ enum cef_mouse_button_type_t /// // Key types. /// -enum cef_key_type_t -{ +enum cef_key_type_t { KT_KEYUP = 0, KT_KEYDOWN, KT_CHAR, @@ -547,8 +576,7 @@ enum cef_key_type_t /// // Various browser navigation types supported by chrome. /// -enum cef_handler_navtype_t -{ +enum cef_handler_navtype_t { NAVTYPE_LINKCLICKED = 0, NAVTYPE_FORMSUBMITTED, NAVTYPE_BACKFORWARD, @@ -562,8 +590,7 @@ enum cef_handler_navtype_t // Supported error code values. See net\base\net_error_list.h for complete // descriptions of the error codes. /// -enum cef_handler_errorcode_t -{ +enum cef_handler_errorcode_t { ERR_FAILED = -2, ERR_ABORTED = -3, ERR_INVALID_ARGUMENT = -4, @@ -619,8 +646,7 @@ enum cef_handler_errorcode_t // destination. These constants match their equivalents in WebCore's // DragActions.h and should not be renumbered. /// -enum cef_drag_operations_mask_t -{ +enum cef_drag_operations_mask_t { DRAG_OPERATION_NONE = 0, DRAG_OPERATION_COPY = 1, DRAG_OPERATION_LINK = 2, @@ -634,8 +660,7 @@ enum cef_drag_operations_mask_t /// // V8 access control values. /// -enum cef_v8_accesscontrol_t -{ +enum cef_v8_accesscontrol_t { V8_ACCESS_CONTROL_DEFAULT = 0, V8_ACCESS_CONTROL_ALL_CAN_READ = 1, V8_ACCESS_CONTROL_ALL_CAN_WRITE = 1 << 1, @@ -645,9 +670,8 @@ enum cef_v8_accesscontrol_t /// // V8 property attribute values. /// -enum cef_v8_propertyattribute_t -{ - V8_PROPERTY_ATTRIBUTE_NONE = 0, // Writeable, Enumerable, +enum cef_v8_propertyattribute_t { + V8_PROPERTY_ATTRIBUTE_NONE = 0, // Writeable, Enumerable, // Configurable V8_PROPERTY_ATTRIBUTE_READONLY = 1 << 0, // Not writeable V8_PROPERTY_ATTRIBUTE_DONTENUM = 1 << 1, // Not enumerable @@ -657,8 +681,7 @@ enum cef_v8_propertyattribute_t /// // Structure representing menu information. /// -typedef struct _cef_menu_info_t -{ +typedef struct _cef_menu_info_t { /// // Values from the cef_handler_menutypebits_t enumeration. /// @@ -690,8 +713,7 @@ typedef struct _cef_menu_info_t // The cef_menu_info_t typeFlags value will be a combination of the // following values. /// -enum cef_menu_typebits_t -{ +enum cef_menu_typebits_t { /// // No node is selected /// @@ -738,8 +760,7 @@ enum cef_menu_typebits_t // The cef_menu_info_t editFlags value will be a combination of the // following values. /// -enum cef_menu_capabilitybits_t -{ +enum cef_menu_capabilitybits_t { // Values from WebContextMenuData::EditFlags in WebContextMenuData.h MENU_CAN_DO_NONE = 0x0, MENU_CAN_UNDO = 0x1, @@ -758,8 +779,7 @@ enum cef_menu_capabilitybits_t /// // Supported menu ID values. /// -enum cef_menu_id_t -{ +enum cef_menu_id_t { MENU_ID_NAV_BACK = 10, MENU_ID_NAV_FORWARD = 11, MENU_ID_NAV_RELOAD = 12, @@ -776,8 +796,7 @@ enum cef_menu_id_t MENU_ID_VIEWSOURCE = 31, }; -enum cef_paint_element_type_t -{ +enum cef_paint_element_type_t { PET_VIEW = 0, PET_POPUP, }; @@ -785,15 +804,13 @@ enum cef_paint_element_type_t /// // Post data elements may represent either bytes or files. /// -enum cef_postdataelement_type_t -{ +enum cef_postdataelement_type_t { PDE_TYPE_EMPTY = 0, PDE_TYPE_BYTES, PDE_TYPE_FILE, }; -enum cef_weburlrequest_flags_t -{ +enum cef_weburlrequest_flags_t { WUR_FLAG_NONE = 0, WUR_FLAG_SKIP_CACHE = 0x1, WUR_FLAG_ALLOW_CACHED_CREDENTIALS = 0x2, @@ -803,8 +820,7 @@ enum cef_weburlrequest_flags_t WUR_FLAG_REPORT_RAW_HEADERS = 0x20 }; -enum cef_weburlrequest_state_t -{ +enum cef_weburlrequest_state_t { WUR_STATE_UNSENT = 0, WUR_STATE_STARTED = 1, WUR_STATE_HEADERS_RECEIVED = 2, @@ -817,8 +833,7 @@ enum cef_weburlrequest_state_t /// // Focus sources. /// -enum cef_handler_focus_source_t -{ +enum cef_handler_focus_source_t { /// // The source is explicit navigation via the API (LoadURL(), etc). /// @@ -836,8 +851,7 @@ enum cef_handler_focus_source_t /// // Key event types. /// -enum cef_handler_keyevent_type_t -{ +enum cef_handler_keyevent_type_t { KEYEVENT_RAWKEYDOWN = 0, KEYEVENT_KEYDOWN, KEYEVENT_KEYUP, @@ -847,8 +861,7 @@ enum cef_handler_keyevent_type_t /// // Key event modifiers. /// -enum cef_handler_keyevent_modifiers_t -{ +enum cef_handler_keyevent_modifiers_t { KEY_SHIFT = 1 << 0, KEY_CTRL = 1 << 1, KEY_ALT = 1 << 2, @@ -858,8 +871,7 @@ enum cef_handler_keyevent_modifiers_t /// // Structure representing a rectangle. /// -typedef struct _cef_rect_t -{ +typedef struct _cef_rect_t { int x; int y; int width; @@ -869,8 +881,7 @@ typedef struct _cef_rect_t /// // Existing thread IDs. /// -enum cef_thread_id_t -{ +enum cef_thread_id_t { TID_UI = 0, TID_IO = 1, TID_FILE = 2, @@ -879,8 +890,7 @@ enum cef_thread_id_t /// // Paper type for printing. /// -enum cef_paper_type_t -{ +enum cef_paper_type_t { PT_LETTER = 0, PT_LEGAL, PT_EXECUTIVE, @@ -892,11 +902,10 @@ enum cef_paper_type_t /// // Paper metric information for printing. /// -struct cef_paper_metrics -{ +struct cef_paper_metrics { enum cef_paper_type_t paper_type; - //Length and width needed if paper_type is custom_size - //Units are in inches. + // Length and width needed if paper_type is custom_size + // Units are in inches. double length; double width; }; @@ -904,14 +913,13 @@ struct cef_paper_metrics /// // Paper print margins. /// -struct cef_print_margins -{ - //Margin size in inches for left/right/top/bottom (this is content margins). +struct cef_print_margins { + // Margin size in inches for left/right/top/bottom (this is content margins). double left; double right; double top; double bottom; - //Margin size (top/bottom) in inches for header/footer. + // Margin size (top/bottom) in inches for header/footer. double header; double footer; }; @@ -919,8 +927,7 @@ struct cef_print_margins /// // Page orientation for printing. /// -enum cef_page_orientation -{ +enum cef_page_orientation { PORTRAIT = 0, LANDSCAPE }; @@ -928,8 +935,7 @@ enum cef_page_orientation /// // Printing options. /// -typedef struct _cef_print_options_t -{ +typedef struct _cef_print_options_t { enum cef_page_orientation page_orientation; struct cef_paper_metrics paper_metrics; struct cef_print_margins paper_margins; @@ -941,8 +947,7 @@ typedef struct _cef_print_options_t // before being passed to the parser. If a BOM is detected and the correct // decoder is available then that decoder will be used automatically. /// -enum cef_xml_encoding_type_t -{ +enum cef_xml_encoding_type_t { XML_ENCODING_NONE = 0, XML_ENCODING_UTF8, XML_ENCODING_UTF16LE, @@ -953,8 +958,7 @@ enum cef_xml_encoding_type_t /// // XML node types. /// -enum cef_xml_node_type_t -{ +enum cef_xml_node_type_t { XML_NODE_UNSUPPORTED = 0, XML_NODE_PROCESSING_INSTRUCTION, XML_NODE_DOCUMENT_TYPE, @@ -971,8 +975,7 @@ enum cef_xml_node_type_t /// // Status message types. /// -enum cef_handler_statustype_t -{ +enum cef_handler_statustype_t { STATUSTYPE_TEXT = 0, STATUSTYPE_MOUSEOVER_URL, STATUSTYPE_KEYBOARD_FOCUS_URL, @@ -981,8 +984,7 @@ enum cef_handler_statustype_t /// // Popup window features. /// -typedef struct _cef_popup_features_t -{ +typedef struct _cef_popup_features_t { int x; bool xSet; int y; @@ -1007,8 +1009,7 @@ typedef struct _cef_popup_features_t /// // DOM document types. /// -enum cef_dom_document_type_t -{ +enum cef_dom_document_type_t { DOM_DOCUMENT_TYPE_UNKNOWN = 0, DOM_DOCUMENT_TYPE_HTML, DOM_DOCUMENT_TYPE_XHTML, @@ -1018,8 +1019,7 @@ enum cef_dom_document_type_t /// // DOM event category flags. /// -enum cef_dom_event_category_t -{ +enum cef_dom_event_category_t { DOM_EVENT_CATEGORY_UNKNOWN = 0x0, DOM_EVENT_CATEGORY_UI = 0x1, DOM_EVENT_CATEGORY_MOUSE = 0x2, @@ -1045,8 +1045,7 @@ enum cef_dom_event_category_t /// // DOM event processing phases. /// -enum cef_dom_event_phase_t -{ +enum cef_dom_event_phase_t { DOM_EVENT_PHASE_UNKNOWN = 0, DOM_EVENT_PHASE_CAPTURING, DOM_EVENT_PHASE_AT_TARGET, @@ -1056,8 +1055,7 @@ enum cef_dom_event_phase_t /// // DOM node types. /// -enum cef_dom_node_type_t -{ +enum cef_dom_node_type_t { DOM_NODE_TYPE_UNSUPPORTED = 0, DOM_NODE_TYPE_ELEMENT, DOM_NODE_TYPE_ATTRIBUTE, @@ -1077,8 +1075,7 @@ enum cef_dom_node_type_t /// // Proxy types. /// -enum cef_proxy_type_t -{ +enum cef_proxy_type_t { PROXY_TYPE_DIRECT = 0, PROXY_TYPE_NAMED, PROXY_TYPE_PAC_STRING, @@ -1087,8 +1084,7 @@ enum cef_proxy_type_t /// // Proxy information. /// -typedef struct _cef_proxy_info_t -{ +typedef struct _cef_proxy_info_t { enum cef_proxy_type_t proxyType; cef_string_t proxyList; } cef_proxy_info_t; @@ -1097,4 +1093,4 @@ typedef struct _cef_proxy_info_t } #endif -#endif // _CEF_TYPES_H +#endif // CEF_INCLUDE_INTERNAL_CEF_TYPES_H_ diff --git a/cef/include/internal/cef_types_mac.h b/cef/include/internal/cef_types_mac.h old mode 100755 new mode 100644 index 0773a9772..b04d23c78 --- a/cef/include/internal/cef_types_mac.h +++ b/cef/include/internal/cef_types_mac.h @@ -28,11 +28,14 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef _CEF_TYPES_MAC_H -#define _CEF_TYPES_MAC_H +#ifndef CEF_INCLUDE_INTERNAL_CEF_TYPES_MAC_H_ +#define CEF_INCLUDE_INTERNAL_CEF_TYPES_MAC_H_ +#pragma once + +#include "include/internal/cef_build.h" #if defined(OS_MACOSX) -#include "cef_string.h" +#include "include/internal/cef_string.h" // Window handle. #ifdef __cplusplus @@ -54,8 +57,7 @@ extern "C" { /// // Supported graphics implementations. /// -enum cef_graphics_implementation_t -{ +enum cef_graphics_implementation_t { DESKTOP_IN_PROCESS = 0, DESKTOP_IN_PROCESS_COMMAND_BUFFER, }; @@ -63,8 +65,7 @@ enum cef_graphics_implementation_t /// // Class representing window information. /// -typedef struct _cef_window_info_t -{ +typedef struct _cef_window_info_t { cef_string_t m_windowName; int m_x; int m_y; @@ -74,7 +75,7 @@ typedef struct _cef_window_info_t // NSView pointer for the parent view. cef_window_handle_t m_ParentView; - + // NSView pointer for the new browser view. cef_window_handle_t m_View; } cef_window_info_t; @@ -82,8 +83,7 @@ typedef struct _cef_window_info_t /// // Class representing print context information. /// -typedef struct _cef_print_info_t -{ +typedef struct _cef_print_info_t { double m_Scale; } cef_print_info_t; @@ -91,6 +91,6 @@ typedef struct _cef_print_info_t } #endif -#endif // OS_MACOSX +#endif // OS_MACOSX -#endif // _CEF_TYPES_MAC_H +#endif // CEF_INCLUDE_INTERNAL_CEF_TYPES_MAC_H_ diff --git a/cef/include/internal/cef_types_wrappers.h b/cef/include/internal/cef_types_wrappers.h old mode 100755 new mode 100644 index fa73fa2d9..2f1cbd9c5 --- a/cef/include/internal/cef_types_wrappers.h +++ b/cef/include/internal/cef_types_wrappers.h @@ -27,40 +27,37 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef _CEF_TYPES_WRAPPERS_H -#define _CEF_TYPES_WRAPPERS_H +#ifndef CEF_INCLUDE_INTERNAL_CEF_TYPES_WRAPPERS_H_ +#define CEF_INCLUDE_INTERNAL_CEF_TYPES_WRAPPERS_H_ +#pragma once -#include "cef_string.h" -#include "cef_string_list.h" -#include "cef_types.h" +#include "include/internal/cef_string.h" +#include "include/internal/cef_string_list.h" +#include "include/internal/cef_types.h" /// // Template class that provides common functionality for CEF structure wrapping. /// template class CefStructBase : public traits::struct_type { -public: + public: typedef typename traits::struct_type struct_type; - CefStructBase() : attached_to_(NULL) - { + CefStructBase() : attached_to_(NULL) { Init(); } - virtual ~CefStructBase() - { + virtual ~CefStructBase() { // Only clear this object's data if it isn't currently attached to a // structure. if (!attached_to_) - Clear(this); + Clear(this); } - CefStructBase(const CefStructBase& r) - { + CefStructBase(const CefStructBase& r) { Init(); *this = r; } - CefStructBase(const struct_type& r) - { + CefStructBase(const struct_type& r) { // NOLINT(runtime/explicit) Init(); *this = r; } @@ -68,8 +65,7 @@ public: /// // Clear this object's values. /// - void Reset() - { + void Reset() { Clear(this); Init(); } @@ -78,16 +74,15 @@ public: // Attach to the source structure's existing values. DetachTo() can be called // to insert the values back into the existing structure. /// - void AttachTo(struct_type& source) - { + void AttachTo(struct_type& source) { // Only clear this object's data if it isn't currently attached to a // structure. if (!attached_to_) Clear(this); - + // This object is now attached to the new structure. attached_to_ = &source; - + // Transfer ownership of the values from the source structure. memcpy(static_cast(this), &source, sizeof(struct_type)); } @@ -95,8 +90,7 @@ public: /// // Relinquish ownership of values to the target structure. /// - void DetachTo(struct_type& target) - { + void DetachTo(struct_type& target) { if (attached_to_ != &target) { // Clear the target structure's values only if we are not currently // attached to that structure. @@ -114,25 +108,21 @@ public: // Set this object's values. If |copy| is true the source structure's values // will be copied instead of referenced. /// - void Set(const struct_type& source, bool copy) - { + void Set(const struct_type& source, bool copy) { traits::set(&source, this, copy); } - CefStructBase& operator=(const CefStructBase& s) - { + CefStructBase& operator=(const CefStructBase& s) { return operator=(static_cast(s)); } - CefStructBase& operator=(const struct_type& s) - { + CefStructBase& operator=(const struct_type& s) { Set(s, true); return *this; } -protected: - void Init() - { + protected: + void Init() { memset(static_cast(this), 0, sizeof(struct_type)); attached_to_ = NULL; traits::init(this); @@ -150,8 +140,8 @@ struct CefRectTraits { 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) - { + static inline void set(const struct_type* src, struct_type* target, + bool copy) { *target = *src; } }; @@ -159,33 +149,28 @@ struct CefRectTraits { /// // Class representing a rectangle. /// -class CefRect : public CefStructBase -{ -public: +class CefRect : public CefStructBase { + public: typedef CefStructBase parent; CefRect() : parent() {} - CefRect(const cef_rect_t& r) : parent(r) {} - CefRect(const CefRect& r) : parent(r) {} - CefRect(int x, int y, int width, int height) : parent() - { + CefRect(const cef_rect_t& r) : parent(r) {} // NOLINT(runtime/explicit) + CefRect(const CefRect& r) : parent(r) {} // NOLINT(runtime/explicit) + CefRect(int x, int y, int width, int height) : parent() { Set(x, y, width, height); } bool IsEmpty() const { return width <= 0 || height <= 0; } - void Set(int x, int y, int width, int height) - { + void Set(int x, int y, int width, int height) { this->x = x, this->y = y, this->width = width, this->height = height; } }; -inline bool operator==(const CefRect& a, const CefRect& b) -{ +inline bool operator==(const CefRect& a, const CefRect& b) { return a.x == b.x && a.y == b.y && a.width == b.width && a.height == b.height; } -inline bool operator!=(const CefRect& a, const CefRect& b) -{ +inline bool operator!=(const CefRect& a, const CefRect& b) { return !(a == b); } @@ -196,8 +181,8 @@ struct CefPrintOptionsTraits { 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) - { + static inline void set(const struct_type* src, struct_type* target, + bool copy) { *target = *src; } }; @@ -212,8 +197,7 @@ typedef CefStructBase CefPrintOptions; struct CefPopupFeaturesTraits { typedef cef_popup_features_t struct_type; - static inline void init(struct_type* s) - { + static inline void init(struct_type* s) { s->menuBarVisible = true; s->statusBarVisible = true; s->toolBarVisible = true; @@ -221,16 +205,15 @@ struct CefPopupFeaturesTraits { s->scrollbarsVisible = true; s->resizable = true; } - - static inline void clear(struct_type* s) - { - if(s->additionalFeatures) + + static inline void clear(struct_type* s) { + if (s->additionalFeatures) cef_string_list_free(s->additionalFeatures); } - static inline void set(const struct_type* src, struct_type* target, bool copy) - { - if(target->additionalFeatures) + static inline void set(const struct_type* src, struct_type* target, + bool copy) { + if (target->additionalFeatures) cef_string_list_free(target->additionalFeatures); target->additionalFeatures = src->additionalFeatures ? cef_string_list_copy(src->additionalFeatures) : NULL; @@ -263,25 +246,25 @@ typedef CefStructBase CefPopupFeatures; struct CefSettingsTraits { typedef cef_settings_t struct_type; - static inline void init(struct_type* s) - { + static inline void init(struct_type* s) { s->size = sizeof(struct_type); } - - static inline void clear(struct_type* s) - { + + static inline void clear(struct_type* s) { cef_string_clear(&s->cache_path); cef_string_clear(&s->user_agent); cef_string_clear(&s->product_version); cef_string_clear(&s->locale); - if(s->extra_plugin_paths) + if (s->extra_plugin_paths) cef_string_list_free(s->extra_plugin_paths); cef_string_clear(&s->log_file); cef_string_clear(&s->javascript_flags); + cef_string_clear(&s->pack_file_path); + cef_string_clear(&s->locales_dir_path); } - static inline void set(const struct_type* src, struct_type* target, bool copy) - { + static inline void set(const struct_type* src, struct_type* target, + bool copy) { target->multi_threaded_message_loop = src->multi_threaded_message_loop; cef_string_set(src->cache_path.str, src->cache_path.length, @@ -292,7 +275,7 @@ struct CefSettingsTraits { &target->product_version, copy); cef_string_set(src->locale.str, src->locale.length, &target->locale, copy); - if(target->extra_plugin_paths) + if (target->extra_plugin_paths) cef_string_list_free(target->extra_plugin_paths); target->extra_plugin_paths = src->extra_plugin_paths ? cef_string_list_copy(src->extra_plugin_paths) : NULL; @@ -310,6 +293,12 @@ struct CefSettingsTraits { target->auto_detect_proxy_settings_enabled = src->auto_detect_proxy_settings_enabled; #endif + + cef_string_set(src->pack_file_path.str, src->pack_file_path.length, + &target->pack_file_path, copy); + cef_string_set(src->locales_dir_path.str, src->locales_dir_path.length, + &target->locales_dir_path, copy); + target->pack_loading_disabled = src->pack_loading_disabled; } }; @@ -322,13 +311,11 @@ typedef CefStructBase CefSettings; struct CefBrowserSettingsTraits { typedef cef_browser_settings_t struct_type; - static inline void init(struct_type* s) - { + static inline void init(struct_type* s) { s->size = sizeof(struct_type); } - - static inline void clear(struct_type* s) - { + + static inline void clear(struct_type* s) { cef_string_clear(&s->standard_font_family); cef_string_clear(&s->fixed_font_family); cef_string_clear(&s->serif_font_family); @@ -339,8 +326,8 @@ struct CefBrowserSettingsTraits { cef_string_clear(&s->user_style_sheet_location); } - static inline void set(const struct_type* src, struct_type* target, bool copy) - { + static inline void set(const struct_type* src, struct_type* target, + bool copy) { target->drag_drop_disabled = src->drag_drop_disabled; target->load_drops_disabled = src->load_drops_disabled; target->history_disabled = src->history_disabled; @@ -413,7 +400,8 @@ struct CefBrowserSettingsTraits { target->accelerated_video_disabled = src->accelerated_video_disabled; target->accelerated_2d_canvas_disabled = src->accelerated_2d_canvas_disabled; - target->accelerated_drawing_disabled = src->accelerated_drawing_disabled; + target->accelerated_painting_disabled = src->accelerated_painting_disabled; + target->accelerated_filters_disabled = src->accelerated_filters_disabled; target->accelerated_plugins_disabled = src->accelerated_plugins_disabled; target->developer_tools_disabled = src->developer_tools_disabled; target->fullscreen_enabled = src->fullscreen_enabled; @@ -430,9 +418,8 @@ struct CefURLPartsTraits { typedef cef_urlparts_t struct_type; static inline void init(struct_type* s) {} - - static inline void clear(struct_type* s) - { + + static inline void clear(struct_type* s) { cef_string_clear(&s->spec); cef_string_clear(&s->scheme); cef_string_clear(&s->username); @@ -443,8 +430,8 @@ struct CefURLPartsTraits { cef_string_clear(&s->query); } - static inline void set(const struct_type* src, struct_type* target, bool copy) - { + static inline void set(const struct_type* src, struct_type* target, + bool copy) { cef_string_set(src->spec.str, src->spec.length, &target->spec, copy); cef_string_set(src->scheme.str, src->scheme.length, &target->scheme, copy); cef_string_set(src->username.str, src->username.length, &target->username, @@ -468,11 +455,11 @@ struct CefTimeTraits { typedef cef_time_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) - { + static inline void set(const struct_type* src, struct_type* target, + bool copy) { *target = *src; } }; @@ -480,15 +467,15 @@ struct CefTimeTraits { /// // Class representing a time. /// -class CefTime : public CefStructBase -{ -public: +class CefTime : public CefStructBase { + public: typedef CefStructBase parent; CefTime() : parent() {} - CefTime(const cef_time_t& r) : parent(r) {} - CefTime(time_t r) : parent() { SetTimeT(r); } - CefTime(double r) : parent() { SetDoubleT(r); } + CefTime(const cef_time_t& r) : parent(r) {} // NOLINT(runtime/explicit) + CefTime(const CefTime& r) : parent(r) {} // NOLINT(runtime/explicit) + explicit CefTime(time_t r) : parent() { SetTimeT(r); } + explicit CefTime(double r) : parent() { SetDoubleT(r); } // Converts to/from time_t. void SetTimeT(time_t r) { @@ -518,17 +505,16 @@ struct CefCookieTraits { typedef cef_cookie_t struct_type; static inline void init(struct_type* s) {} - - static inline void clear(struct_type* s) - { + + static inline void clear(struct_type* s) { cef_string_clear(&s->name); cef_string_clear(&s->value); cef_string_clear(&s->domain); cef_string_clear(&s->path); } - static inline void set(const struct_type* src, struct_type* target, bool copy) - { + static inline void set(const struct_type* src, struct_type* target, + bool copy) { cef_string_set(src->name.str, src->name.length, &target->name, copy); cef_string_set(src->value.str, src->value.length, &target->value, copy); cef_string_set(src->domain.str, src->domain.length, &target->domain, copy); @@ -553,8 +539,7 @@ struct CefMenuInfoTraits { static inline void init(struct_type* s) {} - static inline void clear(struct_type* s) - { + static inline void clear(struct_type* s) { cef_string_clear(&s->linkUrl); cef_string_clear(&s->imageUrl); cef_string_clear(&s->pageUrl); @@ -564,8 +549,8 @@ struct CefMenuInfoTraits { cef_string_clear(&s->securityInfo); } - static inline void set(const struct_type* src, struct_type* target, bool copy) - { + static inline void set(const struct_type* src, struct_type* target, + bool copy) { target->typeFlags = src->typeFlags; target->x = src->x; target->y = src->y; @@ -599,14 +584,13 @@ struct CefProxyInfoTraits { typedef cef_proxy_info_t struct_type; static inline void init(struct_type* s) {} - - static inline void clear(struct_type* s) - { + + static inline void clear(struct_type* s) { cef_string_clear(&s->proxyList); } - static inline void set(const struct_type* src, struct_type* target, bool copy) - { + static inline void set(const struct_type* src, struct_type* target, + bool copy) { target->proxyType = src->proxyType; cef_string_set(src->proxyList.str, src->proxyList.length, &target->proxyList, copy); @@ -616,14 +600,12 @@ struct CefProxyInfoTraits { /// // Class representing the results of proxy resolution. /// -class CefProxyInfo : public CefStructBase -{ -public: +class CefProxyInfo : public CefStructBase { + public: /// // Use a direction connection instead of a proxy. /// - void UseDirect() - { + void UseDirect() { proxyType = PROXY_TYPE_DIRECT; } @@ -636,8 +618,7 @@ public: // Multiple values may be separated by semicolons or whitespace. For example, // "foo1:80;foo2:80". /// - void UseNamedProxy(const CefString& proxy_uri_list) - { + void UseNamedProxy(const CefString& proxy_uri_list) { proxyType = PROXY_TYPE_NAMED; (CefString(&proxyList)) = proxy_uri_list; } @@ -646,8 +627,7 @@ public: // Use one or more named proxy servers specified in PAC script format. For // example, "PROXY foobar:99; SOCKS fml:2; DIRECT". /// - void UsePacString(const CefString& pac_string) - { + void UsePacString(const CefString& pac_string) { proxyType = PROXY_TYPE_PAC_STRING; (CefString(&proxyList)) = pac_string; } @@ -659,4 +639,4 @@ public: CefString ProxyList() const { return CefString(&proxyList); } }; -#endif // _CEF_TYPES_WRAPPERS_H +#endif // CEF_INCLUDE_INTERNAL_CEF_TYPES_WRAPPERS_H_ diff --git a/cef/include/internal/npapi/README-TRANSFER.txt b/cef/include/internal/npapi/README-TRANSFER.txt old mode 100755 new mode 100644 diff --git a/cef/include/internal/npapi/basictypes.h b/cef/include/internal/npapi/basictypes.h old mode 100755 new mode 100644 diff --git a/cef/include/internal/npapi/build_config.h b/cef/include/internal/npapi/build_config.h old mode 100755 new mode 100644 index 97b0b5aa9..7784bb628 --- a/cef/include/internal/npapi/build_config.h +++ b/cef/include/internal/npapi/build_config.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -71,11 +71,6 @@ #define USE_TCMALLOC 1 #endif -// Use heapchecker. -#if defined(OS_LINUX) && !defined(NO_HEAPCHECKER) -#define USE_HEAPCHECKER 1 -#endif - // Compiler detection. #if defined(__GNUC__) #define COMPILER_GCC 1 diff --git a/cef/include/internal/npapi/npapi.h b/cef/include/internal/npapi/npapi.h old mode 100755 new mode 100644 index b50824374..16045aad1 --- a/cef/include/internal/npapi/npapi.h +++ b/cef/include/internal/npapi/npapi.h @@ -404,7 +404,7 @@ typedef enum { , NPPVpluginCoreAnimationLayer = 1003 #endif -#if (MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6) +#if defined(MOZ_PLATFORM_MAEMO) && ((MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6)) , NPPVpluginWindowlessLocalBool = 2002 #endif } NPPVariable; @@ -436,7 +436,9 @@ typedef enum { NPNVprivateModeBool = 18, - NPNVsupportsAdvancedKeyHandling = 21 + NPNVsupportsAdvancedKeyHandling = 21, + + NPNVdocumentOrigin = 22 #if defined(XP_MACOSX) /* Used for negotiating drawing models */ @@ -454,8 +456,10 @@ typedef enum { , NPNVsupportsCocoaBool = 3001 /* TRUE if the browser supports the Cocoa event model */ , NPNVsupportsUpdatedCocoaTextInputBool = 3002 /* TRUE if the browser supports the updated Cocoa text input specification. */ + , NPNVsupportsCompositingCoreAnimationPluginsBool = 74656 /* TRUE if the browser supports + CA model compositing */ #endif -#if (MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6) +#if defined(MOZ_PLATFORM_MAEMO) && ((MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6)) , NPNVSupportsWindowlessLocal = 2002 #endif } NPNVariable; diff --git a/cef/include/internal/npapi/npapi_extensions.h b/cef/include/internal/npapi/npapi_extensions.h old mode 100755 new mode 100644 diff --git a/cef/include/internal/npapi/npfunctions.h b/cef/include/internal/npapi/npfunctions.h old mode 100755 new mode 100644 index 9f9188512..02a54be1b --- a/cef/include/internal/npapi/npfunctions.h +++ b/cef/include/internal/npapi/npfunctions.h @@ -217,7 +217,7 @@ typedef struct _NPNetscapeFuncs { * These can be called to retreive MIME information from the plugin dynamically * * Note: For compatibility with Quicktime, BPSupportedMIMEtypes is another way - * to get mime info from the plugin only on OSX and may not be supported + * to get mime info from the plugin only on OSX and may not be supported * in furture version -- use NP_GetMIMEDescription instead */ enum diff --git a/cef/include/internal/npapi/nphostapi.h b/cef/include/internal/npapi/nphostapi.h old mode 100755 new mode 100644 diff --git a/cef/include/internal/npapi/npruntime.h b/cef/include/internal/npapi/npruntime.h old mode 100755 new mode 100644 index 8c4b3dfaa..9f7848c63 --- a/cef/include/internal/npapi/npruntime.h +++ b/cef/include/internal/npapi/npruntime.h @@ -1,12 +1,12 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Copyright (c) 2004, Apple Computer, Inc. and The Mozilla Foundation. + * Copyright (c) 2004, Apple Computer, Inc. and The Mozilla Foundation. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: - * + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright @@ -16,7 +16,7 @@ * Foundation ("Mozilla") nor the names of their contributors may be used * to endorse or promote products derived from this software without * specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY APPLE, MOZILLA AND THEIR CONTRIBUTORS "AS * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A @@ -48,7 +48,7 @@ extern "C" { objects. The API in this header does not assume the presence of a user agent. That is, it can be used to bind C code to scripting environments outside of the context of a user agent. - + However, the normal use of the this API is in the context of a scripting environment running in a browser or other user agent. In particular it is used to support the extended Netscape @@ -359,7 +359,7 @@ void NPN_ReleaseObject(NPObject *npobj); value, it will be supplied via the result NPVariant argument. Successful calls will return true, false will be returned in case of an error. - + Calls made from plugin code to script must be made from the thread on which the plugin was initialized. */ diff --git a/cef/include/internal/npapi/nptypes.h b/cef/include/internal/npapi/nptypes.h old mode 100755 new mode 100644 index 300128885..abcc96be0 --- a/cef/include/internal/npapi/nptypes.h +++ b/cef/include/internal/npapi/nptypes.h @@ -69,7 +69,7 @@ #endif #elif defined(bsdi) || defined(FREEBSD) || defined(OPENBSD) /* - * BSD/OS, FreeBSD, and OpenBSD ship sys/types.h that define int32_t and + * BSD/OS, FreeBSD, and OpenBSD ship sys/types.h that define int32_t and * u_int32_t. */ #include diff --git a/cef/include/internal/npapi/port.h b/cef/include/internal/npapi/port.h old mode 100755 new mode 100644 diff --git a/cef/libcef_dll/cef_logging.h b/cef/libcef_dll/cef_logging.h old mode 100755 new mode 100644 index 67fc109ac..5d28a004e --- a/cef/libcef_dll/cef_logging.h +++ b/cef/libcef_dll/cef_logging.h @@ -2,14 +2,21 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#ifndef _CEF_LOGGING_H -#define _CEF_LOGGING_H +#ifndef CEF_LIBCEF_DLL_CEF_LOGGING_H_ +#define CEF_LIBCEF_DLL_CEF_LOGGING_H_ +#pragma once #ifdef BUILDING_CEF_SHARED #include "base/logging.h" #else -#include +#include // NOLINT(build/include_order) #define DCHECK(condition) assert(condition) +#define DCHECK_EQ(val1, val2) DCHECK(val1 == val2) +#define DCHECK_NE(val1, val2) DCHECK(val1 != val2) +#define DCHECK_LE(val1, val2) DCHECK(val1 <= val2) +#define DCHECK_LT(val1, val2) DCHECK(val1 < val2) +#define DCHECK_GE(val1, val2) DCHECK(val1 >= val2) +#define DCHECK_GT(val1, val2) DCHECK(val1 > val2) #endif -#endif // _CEF_LOGGING_H +#endif // CEF_LIBCEF_DLL_CEF_LOGGING_H_ diff --git a/cef/libcef_dll/cpptoc/app_cpptoc.cc b/cef/libcef_dll/cpptoc/app_cpptoc.cc old mode 100755 new mode 100644 index d9ba6e693..4b1045a42 --- a/cef/libcef_dll/cpptoc/app_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/app_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -12,12 +12,29 @@ #include "libcef_dll/cpptoc/app_cpptoc.h" #include "libcef_dll/cpptoc/proxy_handler_cpptoc.h" +#include "libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h" // MEMBER FUNCTIONS - Body may be edited by hand. -cef_proxy_handler_t* CEF_CALLBACK app_get_proxy_handler(struct _cef_app_t* self) -{ +struct _cef_resource_bundle_handler_t* CEF_CALLBACK app_get_resource_bundle_handler( + struct _cef_app_t* self) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) + return NULL; + + // Execute + CefRefPtr _retval = CefAppCppToC::Get( + self)->GetResourceBundleHandler(); + + // Return type: refptr_same + return CefResourceBundleHandlerCppToC::Wrap(_retval); +} + +struct _cef_proxy_handler_t* CEF_CALLBACK app_get_proxy_handler( + struct _cef_app_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -33,12 +50,11 @@ cef_proxy_handler_t* CEF_CALLBACK app_get_proxy_handler(struct _cef_app_t* self) } - // CONSTRUCTOR - Do not edit by hand. CefAppCppToC::CefAppCppToC(CefApp* cls) - : CefCppToC(cls) -{ + : CefCppToC(cls) { + struct_.struct_.get_resource_bundle_handler = app_get_resource_bundle_handler; struct_.struct_.get_proxy_handler = app_get_proxy_handler; } diff --git a/cef/libcef_dll/cpptoc/app_cpptoc.h b/cef/libcef_dll/cpptoc/app_cpptoc.h old mode 100755 new mode 100644 index 3d24fb955..0809df8b4 --- a/cef/libcef_dll/cpptoc/app_cpptoc.h +++ b/cef/libcef_dll/cpptoc/app_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,27 +10,27 @@ // for more information. // -#ifndef _APP_CPPTOC_H -#define _APP_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_APP_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_APP_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_app.h" +#include "include/capi/cef_app_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 CefAppCppToC - : public CefCppToC -{ -public: - CefAppCppToC(CefApp* cls); + : public CefCppToC { + public: + explicit CefAppCppToC(CefApp* cls); virtual ~CefAppCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _APP_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_APP_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/base_cpptoc.h b/cef/libcef_dll/cpptoc/base_cpptoc.h old mode 100755 new mode 100644 index 2206eeeaa..1184d718a --- a/cef/libcef_dll/cpptoc/base_cpptoc.h +++ b/cef/libcef_dll/cpptoc/base_cpptoc.h @@ -2,24 +2,23 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#ifndef _BASE_CPPTOC_H -#define _BASE_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_BASE_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_BASE_CPPTOC_H_ +#pragma once -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_base.h" +#include "include/capi/cef_base_capi.h" #include "libcef_dll/cef_logging.h" // CefCppToC implementation for CefBase. -class CefBaseCppToC : public CefBase -{ -public: +class CefBaseCppToC : public CefBase { + public: // Use this method to retrieve the underlying class instance from our // own structure when the structure is passed as the required first // parameter of a C API function call. No explicit reference counting // is done in this case. - static CefRefPtr Get(cef_base_t* s) - { + static CefRefPtr Get(cef_base_t* s) { DCHECK(s); // Cast our structure to the wrapper structure type. @@ -28,11 +27,10 @@ public: // Return the underlying object instance. return wrapperStruct->class_->GetClass(); } - + // Use this method to create a wrapper structure for passing our class // instance to the other side. - static cef_base_t* Wrap(CefRefPtr c) - { + static cef_base_t* Wrap(CefRefPtr c) { if (!c.get()) return NULL; @@ -47,8 +45,7 @@ public: // Use this method to retrieve the underlying class instance when receiving // our wrapper structure back from the other side. - static CefRefPtr Unwrap(cef_base_t* s) - { + static CefRefPtr Unwrap(cef_base_t* s) { if (!s) return NULL; @@ -65,19 +62,17 @@ public: } // Structure representation with pointer to the C++ class. - struct Struct - { + struct Struct { cef_base_t struct_; CefBaseCppToC* class_; }; - CefBaseCppToC(CefBase* cls) - : class_(cls) - { + explicit CefBaseCppToC(CefBase* cls) + : class_(cls) { DCHECK(cls); struct_.class_ = this; - + // zero the underlying structure and set base members memset(&struct_.struct_, 0, sizeof(cef_base_t)); struct_.struct_.size = sizeof(cef_base_t); @@ -96,13 +91,11 @@ public: // CefBase methods increment/decrement reference counts on both this object // and the underlying wrapper class. - int AddRef() - { + int AddRef() { UnderlyingAddRef(); return refct_.AddRef(); } - int Release() - { + int Release() { UnderlyingRelease(); int retval = refct_.Release(); if (retval == 0) @@ -116,41 +109,38 @@ public: int UnderlyingRelease() { return class_->Release(); } int UnderlyingGetRefCt() { return class_->GetRefCt(); } -private: - static int CEF_CALLBACK struct_add_ref(struct _cef_base_t* base) - { + private: + static int CEF_CALLBACK struct_add_ref(struct _cef_base_t* base) { DCHECK(base); - if(!base) + if (!base) return 0; Struct* impl = reinterpret_cast(base); return impl->class_->AddRef(); } - static int CEF_CALLBACK struct_release(struct _cef_base_t* base) - { + static int CEF_CALLBACK struct_release(struct _cef_base_t* base) { DCHECK(base); - if(!base) + if (!base) return 0; Struct* impl = reinterpret_cast(base); return impl->class_->Release(); } - static int CEF_CALLBACK struct_get_refct(struct _cef_base_t* base) - { + static int CEF_CALLBACK struct_get_refct(struct _cef_base_t* base) { DCHECK(base); - if(!base) + if (!base) return 0; Struct* impl = reinterpret_cast(base); return impl->class_->GetRefCt(); } -protected: + protected: CefRefCount refct_; Struct struct_; CefBase* class_; }; -#endif // _BASE_CPPTOC_H +#endif // CEF_LIBCEF_DLL_CPPTOC_BASE_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/client_cpptoc.cc b/cef/libcef_dll/cpptoc/client_cpptoc.cc old mode 100755 new mode 100644 index e1f217a44..6ce7df474 --- a/cef/libcef_dll/cpptoc/client_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/client_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -20,6 +20,7 @@ #include "libcef_dll/cpptoc/life_span_handler_cpptoc.h" #include "libcef_dll/cpptoc/load_handler_cpptoc.h" #include "libcef_dll/cpptoc/menu_handler_cpptoc.h" +#include "libcef_dll/cpptoc/permission_handler_cpptoc.h" #include "libcef_dll/cpptoc/print_handler_cpptoc.h" #include "libcef_dll/cpptoc/render_handler_cpptoc.h" #include "libcef_dll/cpptoc/request_handler_cpptoc.h" @@ -28,9 +29,8 @@ // MEMBER FUNCTIONS - Body may be edited by hand. -cef_life_span_handler_t* CEF_CALLBACK client_get_life_span_handler( - struct _cef_client_t* self) -{ +struct _cef_life_span_handler_t* CEF_CALLBACK client_get_life_span_handler( + struct _cef_client_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -45,10 +45,8 @@ cef_life_span_handler_t* CEF_CALLBACK client_get_life_span_handler( return CefLifeSpanHandlerCppToC::Wrap(_retval); } - -cef_load_handler_t* CEF_CALLBACK client_get_load_handler( - struct _cef_client_t* self) -{ +struct _cef_load_handler_t* CEF_CALLBACK client_get_load_handler( + struct _cef_client_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -63,10 +61,8 @@ cef_load_handler_t* CEF_CALLBACK client_get_load_handler( return CefLoadHandlerCppToC::Wrap(_retval); } - -cef_request_handler_t* CEF_CALLBACK client_get_request_handler( - struct _cef_client_t* self) -{ +struct _cef_request_handler_t* CEF_CALLBACK client_get_request_handler( + struct _cef_client_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -81,10 +77,8 @@ cef_request_handler_t* CEF_CALLBACK client_get_request_handler( return CefRequestHandlerCppToC::Wrap(_retval); } - -cef_display_handler_t* CEF_CALLBACK client_get_display_handler( - struct _cef_client_t* self) -{ +struct _cef_display_handler_t* CEF_CALLBACK client_get_display_handler( + struct _cef_client_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -99,10 +93,8 @@ cef_display_handler_t* CEF_CALLBACK client_get_display_handler( return CefDisplayHandlerCppToC::Wrap(_retval); } - -cef_focus_handler_t* CEF_CALLBACK client_get_focus_handler( - struct _cef_client_t* self) -{ +struct _cef_focus_handler_t* CEF_CALLBACK client_get_focus_handler( + struct _cef_client_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -117,10 +109,8 @@ cef_focus_handler_t* CEF_CALLBACK client_get_focus_handler( return CefFocusHandlerCppToC::Wrap(_retval); } - -cef_keyboard_handler_t* CEF_CALLBACK client_get_keyboard_handler( - struct _cef_client_t* self) -{ +struct _cef_keyboard_handler_t* CEF_CALLBACK client_get_keyboard_handler( + struct _cef_client_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -135,10 +125,8 @@ cef_keyboard_handler_t* CEF_CALLBACK client_get_keyboard_handler( return CefKeyboardHandlerCppToC::Wrap(_retval); } - -cef_menu_handler_t* CEF_CALLBACK client_get_menu_handler( - struct _cef_client_t* self) -{ +struct _cef_menu_handler_t* CEF_CALLBACK client_get_menu_handler( + struct _cef_client_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -153,10 +141,24 @@ cef_menu_handler_t* CEF_CALLBACK client_get_menu_handler( return CefMenuHandlerCppToC::Wrap(_retval); } +struct _cef_permission_handler_t* CEF_CALLBACK client_get_permission_handler( + struct _cef_client_t* self) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING -cef_print_handler_t* CEF_CALLBACK client_get_print_handler( - struct _cef_client_t* self) -{ + DCHECK(self); + if (!self) + return NULL; + + // Execute + CefRefPtr _retval = CefClientCppToC::Get( + self)->GetPermissionHandler(); + + // Return type: refptr_same + return CefPermissionHandlerCppToC::Wrap(_retval); +} + +struct _cef_print_handler_t* CEF_CALLBACK client_get_print_handler( + struct _cef_client_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -171,10 +173,8 @@ cef_print_handler_t* CEF_CALLBACK client_get_print_handler( return CefPrintHandlerCppToC::Wrap(_retval); } - -cef_find_handler_t* CEF_CALLBACK client_get_find_handler( - struct _cef_client_t* self) -{ +struct _cef_find_handler_t* CEF_CALLBACK client_get_find_handler( + struct _cef_client_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -189,10 +189,8 @@ cef_find_handler_t* CEF_CALLBACK client_get_find_handler( return CefFindHandlerCppToC::Wrap(_retval); } - -cef_jsdialog_handler_t* CEF_CALLBACK client_get_jsdialog_handler( - struct _cef_client_t* self) -{ +struct _cef_jsdialog_handler_t* CEF_CALLBACK client_get_jsdialog_handler( + struct _cef_client_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -207,10 +205,8 @@ cef_jsdialog_handler_t* CEF_CALLBACK client_get_jsdialog_handler( return CefJSDialogHandlerCppToC::Wrap(_retval); } - -cef_v8context_handler_t* CEF_CALLBACK client_get_v8context_handler( - struct _cef_client_t* self) -{ +struct _cef_v8context_handler_t* CEF_CALLBACK client_get_v8context_handler( + struct _cef_client_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -225,10 +221,8 @@ cef_v8context_handler_t* CEF_CALLBACK client_get_v8context_handler( return CefV8ContextHandlerCppToC::Wrap(_retval); } - -cef_render_handler_t* CEF_CALLBACK client_get_render_handler( - struct _cef_client_t* self) -{ +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); @@ -243,10 +237,8 @@ cef_render_handler_t* CEF_CALLBACK client_get_render_handler( return CefRenderHandlerCppToC::Wrap(_retval); } - -cef_drag_handler_t* CEF_CALLBACK client_get_drag_handler( - struct _cef_client_t* self) -{ +struct _cef_drag_handler_t* CEF_CALLBACK client_get_drag_handler( + struct _cef_client_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -262,12 +254,10 @@ cef_drag_handler_t* CEF_CALLBACK client_get_drag_handler( } - // CONSTRUCTOR - Do not edit by hand. CefClientCppToC::CefClientCppToC(CefClient* cls) - : CefCppToC(cls) -{ + : CefCppToC(cls) { struct_.struct_.get_life_span_handler = client_get_life_span_handler; struct_.struct_.get_load_handler = client_get_load_handler; struct_.struct_.get_request_handler = client_get_request_handler; @@ -275,6 +265,7 @@ CefClientCppToC::CefClientCppToC(CefClient* cls) struct_.struct_.get_focus_handler = client_get_focus_handler; struct_.struct_.get_keyboard_handler = client_get_keyboard_handler; struct_.struct_.get_menu_handler = client_get_menu_handler; + struct_.struct_.get_permission_handler = client_get_permission_handler; struct_.struct_.get_print_handler = client_get_print_handler; struct_.struct_.get_find_handler = client_get_find_handler; struct_.struct_.get_jsdialog_handler = client_get_jsdialog_handler; diff --git a/cef/libcef_dll/cpptoc/client_cpptoc.h b/cef/libcef_dll/cpptoc/client_cpptoc.h old mode 100755 new mode 100644 index c04d5d5b7..1db8e5b12 --- a/cef/libcef_dll/cpptoc/client_cpptoc.h +++ b/cef/libcef_dll/cpptoc/client_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,27 +10,27 @@ // for more information. // -#ifndef _CLIENT_CPPTOC_H -#define _CLIENT_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_CLIENT_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_CLIENT_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_client.h" +#include "include/capi/cef_client_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 CefClientCppToC - : public CefCppToC -{ -public: - CefClientCppToC(CefClient* cls); + : public CefCppToC { + public: + explicit CefClientCppToC(CefClient* cls); virtual ~CefClientCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _CLIENT_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_CLIENT_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/content_filter_cpptoc.cc b/cef/libcef_dll/cpptoc/content_filter_cpptoc.cc old mode 100755 new mode 100644 index 5fd8db816..1284f3ad3 --- a/cef/libcef_dll/cpptoc/content_filter_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/content_filter_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -18,8 +18,7 @@ void CEF_CALLBACK content_filter_process_data( struct _cef_content_filter_t* self, const void* data, int data_size, - cef_stream_reader_t** substitute_data) -{ + struct _cef_stream_reader_t** substitute_data) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -58,10 +57,8 @@ void CEF_CALLBACK content_filter_process_data( } } - void CEF_CALLBACK content_filter_drain(struct _cef_content_filter_t* self, - cef_stream_reader_t** remainder) -{ + struct _cef_stream_reader_t** remainder) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -95,13 +92,11 @@ void CEF_CALLBACK content_filter_drain(struct _cef_content_filter_t* self, } - // CONSTRUCTOR - Do not edit by hand. CefContentFilterCppToC::CefContentFilterCppToC(CefContentFilter* cls) : CefCppToC( - cls) -{ + cls) { struct_.struct_.process_data = content_filter_process_data; struct_.struct_.drain = content_filter_drain; } diff --git a/cef/libcef_dll/cpptoc/content_filter_cpptoc.h b/cef/libcef_dll/cpptoc/content_filter_cpptoc.h old mode 100755 new mode 100644 index 6f4582a34..a1af009ca --- a/cef/libcef_dll/cpptoc/content_filter_cpptoc.h +++ b/cef/libcef_dll/cpptoc/content_filter_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,28 +10,28 @@ // for more information. // -#ifndef _CONTENTFILTER_CPPTOC_H -#define _CONTENTFILTER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_CONTENT_FILTER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_CONTENT_FILTER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_content_filter.h" +#include "include/capi/cef_content_filter_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 CefContentFilterCppToC : public CefCppToC -{ -public: - CefContentFilterCppToC(CefContentFilter* cls); + cef_content_filter_t> { + public: + explicit CefContentFilterCppToC(CefContentFilter* cls); virtual ~CefContentFilterCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _CONTENTFILTER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_CONTENT_FILTER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc b/cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc old mode 100755 new mode 100644 index 3de5d482c..fa61fe6c1 --- a/cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -17,8 +17,7 @@ int CEF_CALLBACK cookie_visitor_visit(struct _cef_cookie_visitor_t* self, const struct _cef_cookie_t* cookie, int count, int total, - int* deleteCookie) -{ + int* deleteCookie) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -56,13 +55,11 @@ int CEF_CALLBACK cookie_visitor_visit(struct _cef_cookie_visitor_t* self, } - // CONSTRUCTOR - Do not edit by hand. CefCookieVisitorCppToC::CefCookieVisitorCppToC(CefCookieVisitor* cls) : CefCppToC( - cls) -{ + cls) { struct_.struct_.visit = cookie_visitor_visit; } diff --git a/cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.h b/cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.h old mode 100755 new mode 100644 index e92f7b513..6473a2309 --- a/cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.h +++ b/cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,28 +10,28 @@ // for more information. // -#ifndef _COOKIEVISITOR_CPPTOC_H -#define _COOKIEVISITOR_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_COOKIE_VISITOR_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_COOKIE_VISITOR_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_cookie.h" +#include "include/capi/cef_cookie_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 CefCookieVisitorCppToC : public CefCppToC -{ -public: - CefCookieVisitorCppToC(CefCookieVisitor* cls); + cef_cookie_visitor_t> { + public: + explicit CefCookieVisitorCppToC(CefCookieVisitor* cls); virtual ~CefCookieVisitorCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _COOKIEVISITOR_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_COOKIE_VISITOR_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/cpptoc.h b/cef/libcef_dll/cpptoc/cpptoc.h old mode 100755 new mode 100644 index ce7f8876a..3449264f9 --- a/cef/libcef_dll/cpptoc/cpptoc.h +++ b/cef/libcef_dll/cpptoc/cpptoc.h @@ -2,11 +2,12 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#ifndef _CPPTOC_H -#define _CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_CPPTOC_H_ +#pragma once -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_base.h" +#include "include/capi/cef_base_capi.h" #include "libcef_dll/cef_logging.h" @@ -14,22 +15,19 @@ // implementation exists on this side of the DLL boundary but will have methods // called from the other side of the DLL boundary. template -class CefCppToC : public CefBase -{ -public: +class CefCppToC : public CefBase { + public: // Structure representation with pointer to the C++ class. - struct Struct - { + struct Struct { StructName struct_; - CefCppToC* class_; + CefCppToC* class_; }; - + // Use this method to retrieve the underlying class instance from our // own structure when the structure is passed as the required first // parameter of a C API function call. No explicit reference counting // is done in this case. - static CefRefPtr Get(StructName* s) - { + static CefRefPtr Get(StructName* s) { DCHECK(s); // Cast our structure to the wrapper structure type. @@ -37,11 +35,10 @@ public: // Return the underlying object instance. return wrapperStruct->class_->GetClass(); } - + // Use this method to create a wrapper structure for passing our class // instance to the other side. - static StructName* Wrap(CefRefPtr c) - { + static StructName* Wrap(CefRefPtr c) { if (!c.get()) return NULL; @@ -56,8 +53,7 @@ public: // Use this method to retrieve the underlying class instance when receiving // our wrapper structure back from the other side. - static CefRefPtr Unwrap(StructName* s) - { + static CefRefPtr Unwrap(StructName* s) { if (!s) return NULL; @@ -72,13 +68,12 @@ public: return objectPtr; } - CefCppToC(BaseName* cls) - : class_(cls) - { + explicit CefCppToC(BaseName* cls) + : class_(cls) { DCHECK(cls); struct_.class_ = this; - + // zero the underlying structure and set base members memset(&struct_.struct_, 0, sizeof(StructName)); struct_.struct_.base.size = sizeof(StructName); @@ -90,8 +85,7 @@ public: CefAtomicIncrement(&DebugObjCt); #endif } - virtual ~CefCppToC() - { + virtual ~CefCppToC() { #ifndef NDEBUG CefAtomicDecrement(&DebugObjCt); #endif @@ -106,13 +100,11 @@ public: // CefBase methods increment/decrement reference counts on both this object // and the underlying wrapper class. - int AddRef() - { + int AddRef() { UnderlyingAddRef(); return refct_.AddRef(); } - int Release() - { + int Release() { UnderlyingRelease(); int retval = refct_.Release(); if (retval == 0) @@ -128,44 +120,41 @@ public: #ifndef NDEBUG // Simple tracking of allocated objects. - static long DebugObjCt; + static long DebugObjCt; // NOLINT(runtime/int) #endif -private: - static int CEF_CALLBACK struct_add_ref(struct _cef_base_t* base) - { + private: + static int CEF_CALLBACK struct_add_ref(struct _cef_base_t* base) { DCHECK(base); - if(!base) + if (!base) return 0; Struct* impl = reinterpret_cast(base); return impl->class_->AddRef(); } - static int CEF_CALLBACK struct_release(struct _cef_base_t* base) - { + static int CEF_CALLBACK struct_release(struct _cef_base_t* base) { DCHECK(base); - if(!base) + if (!base) return 0; Struct* impl = reinterpret_cast(base); return impl->class_->Release(); } - static int CEF_CALLBACK struct_get_refct(struct _cef_base_t* base) - { + static int CEF_CALLBACK struct_get_refct(struct _cef_base_t* base) { DCHECK(base); - if(!base) + if (!base) return 0; Struct* impl = reinterpret_cast(base); return impl->class_->GetRefCt(); } -protected: + protected: CefRefCount refct_; Struct struct_; BaseName* class_; }; -#endif // _CPPTOC_H +#endif // CEF_LIBCEF_DLL_CPPTOC_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/display_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/display_handler_cpptoc.cc old mode 100755 new mode 100644 index b385419c3..5b6f6ef51 --- a/cef/libcef_dll/cpptoc/display_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/display_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -19,8 +19,7 @@ void CEF_CALLBACK display_handler_on_nav_state_change( struct _cef_display_handler_t* self, cef_browser_t* browser, int canGoBack, - int canGoForward) -{ + int canGoForward) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -38,11 +37,9 @@ void CEF_CALLBACK display_handler_on_nav_state_change( canGoForward?true:false); } - void CEF_CALLBACK display_handler_on_address_change( struct _cef_display_handler_t* self, cef_browser_t* browser, - cef_frame_t* frame, const cef_string_t* url) -{ + struct _cef_frame_t* frame, const cef_string_t* url) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -68,11 +65,9 @@ void CEF_CALLBACK display_handler_on_address_change( CefString(url)); } - void CEF_CALLBACK display_handler_on_contents_size_change( struct _cef_display_handler_t* self, cef_browser_t* browser, - cef_frame_t* frame, int width, int height) -{ + struct _cef_frame_t* frame, int width, int height) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -95,11 +90,9 @@ void CEF_CALLBACK display_handler_on_contents_size_change( height); } - void CEF_CALLBACK display_handler_on_title_change( struct _cef_display_handler_t* self, cef_browser_t* browser, - const cef_string_t* title) -{ + const cef_string_t* title) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -117,10 +110,8 @@ void CEF_CALLBACK display_handler_on_title_change( CefString(title)); } - int CEF_CALLBACK display_handler_on_tooltip(struct _cef_display_handler_t* self, - cef_browser_t* browser, cef_string_t* text) -{ + cef_browser_t* browser, cef_string_t* text) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -144,11 +135,9 @@ int CEF_CALLBACK display_handler_on_tooltip(struct _cef_display_handler_t* self, return _retval; } - void CEF_CALLBACK display_handler_on_status_message( struct _cef_display_handler_t* self, cef_browser_t* browser, - const cef_string_t* value, enum cef_handler_statustype_t type) -{ + const cef_string_t* value, enum cef_handler_statustype_t type) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -167,11 +156,9 @@ void CEF_CALLBACK display_handler_on_status_message( type); } - int CEF_CALLBACK display_handler_on_console_message( struct _cef_display_handler_t* self, cef_browser_t* browser, - const cef_string_t* message, const cef_string_t* source, int line) -{ + const cef_string_t* message, const cef_string_t* source, int line) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -195,13 +182,11 @@ int CEF_CALLBACK display_handler_on_console_message( } - // CONSTRUCTOR - Do not edit by hand. CefDisplayHandlerCppToC::CefDisplayHandlerCppToC(CefDisplayHandler* cls) : CefCppToC(cls) -{ + cef_display_handler_t>(cls) { struct_.struct_.on_nav_state_change = display_handler_on_nav_state_change; struct_.struct_.on_address_change = display_handler_on_address_change; struct_.struct_.on_contents_size_change = diff --git a/cef/libcef_dll/cpptoc/display_handler_cpptoc.h b/cef/libcef_dll/cpptoc/display_handler_cpptoc.h old mode 100755 new mode 100644 index 1dc36ea81..0622ced14 --- a/cef/libcef_dll/cpptoc/display_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/display_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,28 +10,28 @@ // for more information. // -#ifndef _DISPLAYHANDLER_CPPTOC_H -#define _DISPLAYHANDLER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_DISPLAY_HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_DISPLAY_HANDLER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_display_handler.h" +#include "include/capi/cef_display_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 CefDisplayHandlerCppToC : public CefCppToC -{ -public: - CefDisplayHandlerCppToC(CefDisplayHandler* cls); + cef_display_handler_t> { + public: + explicit CefDisplayHandlerCppToC(CefDisplayHandler* cls); virtual ~CefDisplayHandlerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _DISPLAYHANDLER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_DISPLAY_HANDLER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/domevent_listener_cpptoc.cc b/cef/libcef_dll/cpptoc/domevent_listener_cpptoc.cc old mode 100755 new mode 100644 index 688f93f6b..59e22c653 --- a/cef/libcef_dll/cpptoc/domevent_listener_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/domevent_listener_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -17,8 +17,7 @@ // MEMBER FUNCTIONS - Body may be edited by hand. void CEF_CALLBACK domevent_listener_handle_event( - struct _cef_domevent_listener_t* self, cef_domevent_t* event) -{ + struct _cef_domevent_listener_t* self, cef_domevent_t* event) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -35,13 +34,11 @@ void CEF_CALLBACK domevent_listener_handle_event( } - // CONSTRUCTOR - Do not edit by hand. CefDOMEventListenerCppToC::CefDOMEventListenerCppToC(CefDOMEventListener* cls) : CefCppToC(cls) -{ + cef_domevent_listener_t>(cls) { struct_.struct_.handle_event = domevent_listener_handle_event; } diff --git a/cef/libcef_dll/cpptoc/domevent_listener_cpptoc.h b/cef/libcef_dll/cpptoc/domevent_listener_cpptoc.h old mode 100755 new mode 100644 index 8b6ee09f6..562882f3e --- a/cef/libcef_dll/cpptoc/domevent_listener_cpptoc.h +++ b/cef/libcef_dll/cpptoc/domevent_listener_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,28 +10,28 @@ // for more information. // -#ifndef _DOMEVENTLISTENER_CPPTOC_H -#define _DOMEVENTLISTENER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_DOMEVENT_LISTENER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_DOMEVENT_LISTENER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_dom.h" +#include "include/capi/cef_dom_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 CefDOMEventListenerCppToC : public CefCppToC -{ -public: - CefDOMEventListenerCppToC(CefDOMEventListener* cls); + cef_domevent_listener_t> { + public: + explicit CefDOMEventListenerCppToC(CefDOMEventListener* cls); virtual ~CefDOMEventListenerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _DOMEVENTLISTENER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_DOMEVENT_LISTENER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/domvisitor_cpptoc.cc b/cef/libcef_dll/cpptoc/domvisitor_cpptoc.cc old mode 100755 new mode 100644 index 4133665a0..aefbe1c92 --- a/cef/libcef_dll/cpptoc/domvisitor_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/domvisitor_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -17,8 +17,7 @@ // MEMBER FUNCTIONS - Body may be edited by hand. void CEF_CALLBACK domvisitor_visit(struct _cef_domvisitor_t* self, - struct _cef_domdocument_t* document) -{ + struct _cef_domdocument_t* document) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -35,12 +34,10 @@ void CEF_CALLBACK domvisitor_visit(struct _cef_domvisitor_t* self, } - // CONSTRUCTOR - Do not edit by hand. CefDOMVisitorCppToC::CefDOMVisitorCppToC(CefDOMVisitor* cls) - : CefCppToC(cls) -{ + : CefCppToC(cls) { struct_.struct_.visit = domvisitor_visit; } diff --git a/cef/libcef_dll/cpptoc/domvisitor_cpptoc.h b/cef/libcef_dll/cpptoc/domvisitor_cpptoc.h old mode 100755 new mode 100644 index 86c937ec0..0f09b0b60 --- a/cef/libcef_dll/cpptoc/domvisitor_cpptoc.h +++ b/cef/libcef_dll/cpptoc/domvisitor_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,27 +10,27 @@ // for more information. // -#ifndef _DOMVISITOR_CPPTOC_H -#define _DOMVISITOR_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_DOMVISITOR_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_DOMVISITOR_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_dom.h" +#include "include/capi/cef_dom_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 CefDOMVisitorCppToC - : public CefCppToC -{ -public: - CefDOMVisitorCppToC(CefDOMVisitor* cls); + : public CefCppToC { + public: + explicit CefDOMVisitorCppToC(CefDOMVisitor* cls); virtual ~CefDOMVisitorCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _DOMVISITOR_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_DOMVISITOR_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/download_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/download_handler_cpptoc.cc old mode 100755 new mode 100644 index 61152dddc..a868039ec --- a/cef/libcef_dll/cpptoc/download_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/download_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -16,8 +16,7 @@ // MEMBER FUNCTIONS - Body may be edited by hand. int CEF_CALLBACK download_handler_received_data( - struct _cef_download_handler_t* self, void* data, int data_size) -{ + struct _cef_download_handler_t* self, void* data, int data_size) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -37,10 +36,8 @@ int CEF_CALLBACK download_handler_received_data( return _retval; } - void CEF_CALLBACK download_handler_complete( - struct _cef_download_handler_t* self) -{ + struct _cef_download_handler_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -52,13 +49,11 @@ void CEF_CALLBACK download_handler_complete( } - // CONSTRUCTOR - Do not edit by hand. CefDownloadHandlerCppToC::CefDownloadHandlerCppToC(CefDownloadHandler* cls) : CefCppToC(cls) -{ + cef_download_handler_t>(cls) { struct_.struct_.received_data = download_handler_received_data; struct_.struct_.complete = download_handler_complete; } diff --git a/cef/libcef_dll/cpptoc/download_handler_cpptoc.h b/cef/libcef_dll/cpptoc/download_handler_cpptoc.h old mode 100755 new mode 100644 index afb0cde81..f659d613d --- a/cef/libcef_dll/cpptoc/download_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/download_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,28 +10,28 @@ // for more information. // -#ifndef _DOWNLOADHANDLER_CPPTOC_H -#define _DOWNLOADHANDLER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_HANDLER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_download_handler.h" +#include "include/capi/cef_download_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 CefDownloadHandlerCppToC : public CefCppToC -{ -public: - CefDownloadHandlerCppToC(CefDownloadHandler* cls); + cef_download_handler_t> { + public: + explicit CefDownloadHandlerCppToC(CefDownloadHandler* cls); virtual ~CefDownloadHandlerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _DOWNLOADHANDLER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_HANDLER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/drag_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/drag_handler_cpptoc.cc old mode 100755 new mode 100644 index e36e94ada..927caeeb5 --- a/cef/libcef_dll/cpptoc/drag_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/drag_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -18,9 +18,8 @@ // MEMBER FUNCTIONS - Body may be edited by hand. int CEF_CALLBACK drag_handler_on_drag_start(struct _cef_drag_handler_t* self, - cef_browser_t* browser, struct _cef_drag_data_t* dragData, - enum cef_drag_operations_mask_t mask) -{ + cef_browser_t* browser, cef_drag_data_t* dragData, + enum cef_drag_operations_mask_t mask) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -45,11 +44,9 @@ int CEF_CALLBACK drag_handler_on_drag_start(struct _cef_drag_handler_t* self, return _retval; } - int CEF_CALLBACK drag_handler_on_drag_enter(struct _cef_drag_handler_t* self, - cef_browser_t* browser, struct _cef_drag_data_t* dragData, - enum cef_drag_operations_mask_t mask) -{ + cef_browser_t* browser, cef_drag_data_t* dragData, + enum cef_drag_operations_mask_t mask) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -75,12 +72,10 @@ int CEF_CALLBACK drag_handler_on_drag_enter(struct _cef_drag_handler_t* self, } - // CONSTRUCTOR - Do not edit by hand. CefDragHandlerCppToC::CefDragHandlerCppToC(CefDragHandler* cls) - : CefCppToC(cls) -{ + : CefCppToC(cls) { struct_.struct_.on_drag_start = drag_handler_on_drag_start; struct_.struct_.on_drag_enter = drag_handler_on_drag_enter; } diff --git a/cef/libcef_dll/cpptoc/drag_handler_cpptoc.h b/cef/libcef_dll/cpptoc/drag_handler_cpptoc.h old mode 100755 new mode 100644 index cb42b2439..94138f843 --- a/cef/libcef_dll/cpptoc/drag_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/drag_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,27 +10,28 @@ // for more information. // -#ifndef _DRAGHANDLER_CPPTOC_H -#define _DRAGHANDLER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_DRAG_HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_DRAG_HANDLER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_drag_handler.h" +#include "include/capi/cef_drag_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 CefDragHandlerCppToC - : public CefCppToC -{ -public: - CefDragHandlerCppToC(CefDragHandler* cls); + : public CefCppToC { + public: + explicit CefDragHandlerCppToC(CefDragHandler* cls); virtual ~CefDragHandlerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _DRAGHANDLER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_DRAG_HANDLER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/find_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/find_handler_cpptoc.cc old mode 100755 new mode 100644 index 1b562a62a..e96273377 --- a/cef/libcef_dll/cpptoc/find_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/find_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -18,8 +18,8 @@ void CEF_CALLBACK find_handler_on_find_result(struct _cef_find_handler_t* self, cef_browser_t* browser, int identifier, int count, - const cef_rect_t* selectionRect, int activeMatchOrdinal, int finalUpdate) -{ + const cef_rect_t* selectionRect, int activeMatchOrdinal, + int finalUpdate) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -48,12 +48,10 @@ void CEF_CALLBACK find_handler_on_find_result(struct _cef_find_handler_t* self, } - // CONSTRUCTOR - Do not edit by hand. CefFindHandlerCppToC::CefFindHandlerCppToC(CefFindHandler* cls) - : CefCppToC(cls) -{ + : CefCppToC(cls) { struct_.struct_.on_find_result = find_handler_on_find_result; } diff --git a/cef/libcef_dll/cpptoc/find_handler_cpptoc.h b/cef/libcef_dll/cpptoc/find_handler_cpptoc.h old mode 100755 new mode 100644 index 0d5f90601..9bb2c68b0 --- a/cef/libcef_dll/cpptoc/find_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/find_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,27 +10,28 @@ // for more information. // -#ifndef _FINDHANDLER_CPPTOC_H -#define _FINDHANDLER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_FIND_HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_FIND_HANDLER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_find_handler.h" +#include "include/capi/cef_find_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 CefFindHandlerCppToC - : public CefCppToC -{ -public: - CefFindHandlerCppToC(CefFindHandler* cls); + : public CefCppToC { + public: + explicit CefFindHandlerCppToC(CefFindHandler* cls); virtual ~CefFindHandlerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _FINDHANDLER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_FIND_HANDLER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/focus_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/focus_handler_cpptoc.cc old mode 100755 new mode 100644 index 4358486eb..bffe00bb5 --- a/cef/libcef_dll/cpptoc/focus_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/focus_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -19,8 +19,7 @@ // MEMBER FUNCTIONS - Body may be edited by hand. void CEF_CALLBACK focus_handler_on_take_focus(struct _cef_focus_handler_t* self, - cef_browser_t* browser, int next) -{ + cef_browser_t* browser, int next) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -37,10 +36,8 @@ void CEF_CALLBACK focus_handler_on_take_focus(struct _cef_focus_handler_t* self, next?true:false); } - int CEF_CALLBACK focus_handler_on_set_focus(struct _cef_focus_handler_t* self, - cef_browser_t* browser, enum cef_handler_focus_source_t source) -{ + cef_browser_t* browser, enum cef_handler_focus_source_t source) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -60,11 +57,9 @@ int CEF_CALLBACK focus_handler_on_set_focus(struct _cef_focus_handler_t* self, return _retval; } - void CEF_CALLBACK focus_handler_on_focused_node_changed( struct _cef_focus_handler_t* self, cef_browser_t* browser, - cef_frame_t* frame, struct _cef_domnode_t* node) -{ + struct _cef_frame_t* frame, cef_domnode_t* node) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -84,13 +79,11 @@ void CEF_CALLBACK focus_handler_on_focused_node_changed( } - // CONSTRUCTOR - Do not edit by hand. CefFocusHandlerCppToC::CefFocusHandlerCppToC(CefFocusHandler* cls) : CefCppToC( - cls) -{ + cls) { struct_.struct_.on_take_focus = focus_handler_on_take_focus; struct_.struct_.on_set_focus = focus_handler_on_set_focus; struct_.struct_.on_focused_node_changed = diff --git a/cef/libcef_dll/cpptoc/focus_handler_cpptoc.h b/cef/libcef_dll/cpptoc/focus_handler_cpptoc.h old mode 100755 new mode 100644 index 377b3ad6e..b88e246ec --- a/cef/libcef_dll/cpptoc/focus_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/focus_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,28 +10,28 @@ // for more information. // -#ifndef _FOCUSHANDLER_CPPTOC_H -#define _FOCUSHANDLER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_FOCUS_HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_FOCUS_HANDLER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_focus_handler.h" +#include "include/capi/cef_focus_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 CefFocusHandlerCppToC : public CefCppToC -{ -public: - CefFocusHandlerCppToC(CefFocusHandler* cls); + cef_focus_handler_t> { + public: + explicit CefFocusHandlerCppToC(CefFocusHandler* cls); virtual ~CefFocusHandlerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _FOCUSHANDLER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_FOCUS_HANDLER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc old mode 100755 new mode 100644 index cce925780..d87d94d7e --- a/cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -19,8 +19,7 @@ int CEF_CALLBACK jsdialog_handler_on_jsalert( struct _cef_jsdialog_handler_t* self, cef_browser_t* browser, - cef_frame_t* frame, const cef_string_t* message) -{ + cef_frame_t* frame, const cef_string_t* message) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -49,11 +48,9 @@ int CEF_CALLBACK jsdialog_handler_on_jsalert( return _retval; } - int CEF_CALLBACK jsdialog_handler_on_jsconfirm( struct _cef_jsdialog_handler_t* self, cef_browser_t* browser, - cef_frame_t* frame, const cef_string_t* message, int* retval) -{ + cef_frame_t* frame, const cef_string_t* message, int* retval) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -94,12 +91,10 @@ int CEF_CALLBACK jsdialog_handler_on_jsconfirm( return _retval; } - int CEF_CALLBACK jsdialog_handler_on_jsprompt( struct _cef_jsdialog_handler_t* self, cef_browser_t* browser, cef_frame_t* frame, const cef_string_t* message, - const cef_string_t* defaultValue, int* retval, cef_string_t* result) -{ + const cef_string_t* defaultValue, int* retval, cef_string_t* result) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -153,13 +148,11 @@ int CEF_CALLBACK jsdialog_handler_on_jsprompt( } - // CONSTRUCTOR - Do not edit by hand. CefJSDialogHandlerCppToC::CefJSDialogHandlerCppToC(CefJSDialogHandler* cls) : CefCppToC(cls) -{ + cef_jsdialog_handler_t>(cls) { struct_.struct_.on_jsalert = jsdialog_handler_on_jsalert; struct_.struct_.on_jsconfirm = jsdialog_handler_on_jsconfirm; struct_.struct_.on_jsprompt = jsdialog_handler_on_jsprompt; diff --git a/cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h b/cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h old mode 100755 new mode 100644 index a1fdb66f3..af58e7049 --- a/cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,28 +10,28 @@ // for more information. // -#ifndef _JSDIALOGHANDLER_CPPTOC_H -#define _JSDIALOGHANDLER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_JSDIALOG_HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_JSDIALOG_HANDLER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_jsdialog_handler.h" +#include "include/capi/cef_jsdialog_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 CefJSDialogHandlerCppToC : public CefCppToC -{ -public: - CefJSDialogHandlerCppToC(CefJSDialogHandler* cls); + cef_jsdialog_handler_t> { + public: + explicit CefJSDialogHandlerCppToC(CefJSDialogHandler* cls); virtual ~CefJSDialogHandlerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _JSDIALOGHANDLER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_JSDIALOG_HANDLER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc old mode 100755 new mode 100644 index ad2e6f340..dbced2bed --- a/cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -19,8 +19,7 @@ int CEF_CALLBACK keyboard_handler_on_key_event( struct _cef_keyboard_handler_t* self, cef_browser_t* browser, enum cef_handler_keyevent_type_t type, int code, int modifiers, - int isSystemKey, int isAfterJavaScript) -{ + int isSystemKey, int isAfterJavaScript) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -45,13 +44,11 @@ int CEF_CALLBACK keyboard_handler_on_key_event( } - // CONSTRUCTOR - Do not edit by hand. CefKeyboardHandlerCppToC::CefKeyboardHandlerCppToC(CefKeyboardHandler* cls) : CefCppToC(cls) -{ + cef_keyboard_handler_t>(cls) { struct_.struct_.on_key_event = keyboard_handler_on_key_event; } diff --git a/cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.h b/cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.h old mode 100755 new mode 100644 index 0d1dbc3b4..4685a74ea --- a/cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,28 +10,28 @@ // for more information. // -#ifndef _KEYBOARDHANDLER_CPPTOC_H -#define _KEYBOARDHANDLER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_KEYBOARD_HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_KEYBOARD_HANDLER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_keyboard_handler.h" +#include "include/capi/cef_keyboard_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 CefKeyboardHandlerCppToC : public CefCppToC -{ -public: - CefKeyboardHandlerCppToC(CefKeyboardHandler* cls); + cef_keyboard_handler_t> { + public: + explicit CefKeyboardHandlerCppToC(CefKeyboardHandler* cls); virtual ~CefKeyboardHandlerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _KEYBOARDHANDLER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_KEYBOARD_HANDLER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/life_span_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/life_span_handler_cpptoc.cc old mode 100755 new mode 100644 index ea2a6a8b0..85b1e2708 --- 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) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -21,8 +21,7 @@ int CEF_CALLBACK life_span_handler_on_before_popup( struct _cef_life_span_handler_t* self, cef_browser_t* parentBrowser, const struct _cef_popup_features_t* popupFeatures, cef_window_info_t* windowInfo, const cef_string_t* url, - struct _cef_client_t** client, struct _cef_browser_settings_t* settings) -{ + cef_client_t** client, struct _cef_browser_settings_t* settings) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -98,10 +97,8 @@ int CEF_CALLBACK life_span_handler_on_before_popup( return _retval; } - void CEF_CALLBACK life_span_handler_on_after_created( - struct _cef_life_span_handler_t* self, cef_browser_t* browser) -{ + struct _cef_life_span_handler_t* self, cef_browser_t* browser) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -117,10 +114,8 @@ void CEF_CALLBACK life_span_handler_on_after_created( CefBrowserCToCpp::Wrap(browser)); } - int CEF_CALLBACK life_span_handler_run_modal( - struct _cef_life_span_handler_t* self, cef_browser_t* browser) -{ + struct _cef_life_span_handler_t* self, cef_browser_t* browser) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -139,10 +134,8 @@ int CEF_CALLBACK life_span_handler_run_modal( return _retval; } - int CEF_CALLBACK life_span_handler_do_close( - struct _cef_life_span_handler_t* self, cef_browser_t* browser) -{ + struct _cef_life_span_handler_t* self, cef_browser_t* browser) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -161,10 +154,8 @@ int CEF_CALLBACK life_span_handler_do_close( return _retval; } - void CEF_CALLBACK life_span_handler_on_before_close( - struct _cef_life_span_handler_t* self, cef_browser_t* browser) -{ + struct _cef_life_span_handler_t* self, cef_browser_t* browser) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -181,13 +172,11 @@ void CEF_CALLBACK life_span_handler_on_before_close( } - // CONSTRUCTOR - Do not edit by hand. CefLifeSpanHandlerCppToC::CefLifeSpanHandlerCppToC(CefLifeSpanHandler* cls) : CefCppToC(cls) -{ + cef_life_span_handler_t>(cls) { struct_.struct_.on_before_popup = life_span_handler_on_before_popup; struct_.struct_.on_after_created = life_span_handler_on_after_created; struct_.struct_.run_modal = life_span_handler_run_modal; diff --git a/cef/libcef_dll/cpptoc/life_span_handler_cpptoc.h b/cef/libcef_dll/cpptoc/life_span_handler_cpptoc.h old mode 100755 new mode 100644 index 722bf967b..247d131bc --- 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) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,28 +10,30 @@ // for more information. // -#ifndef _LIFESPANHANDLER_CPPTOC_H -#define _LIFESPANHANDLER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_LIFE_SPAN_HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_LIFE_SPAN_HANDLER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_life_span_handler.h" +#include "include/capi/cef_life_span_handler_capi.h" +#include "include/cef_client.h" +#include "include/capi/cef_client_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 CefLifeSpanHandlerCppToC : public CefCppToC -{ -public: - CefLifeSpanHandlerCppToC(CefLifeSpanHandler* cls); + cef_life_span_handler_t> { + public: + explicit CefLifeSpanHandlerCppToC(CefLifeSpanHandler* cls); virtual ~CefLifeSpanHandlerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _LIFESPANHANDLER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_LIFE_SPAN_HANDLER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/load_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/load_handler_cpptoc.cc old mode 100755 new mode 100644 index 2f7ca596c..14c31cfa3 --- a/cef/libcef_dll/cpptoc/load_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/load_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -18,8 +18,7 @@ // MEMBER FUNCTIONS - Body may be edited by hand. void CEF_CALLBACK load_handler_on_load_start(struct _cef_load_handler_t* self, - cef_browser_t* browser, cef_frame_t* frame) -{ + cef_browser_t* browser, cef_frame_t* frame) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -40,10 +39,8 @@ void CEF_CALLBACK load_handler_on_load_start(struct _cef_load_handler_t* self, CefFrameCToCpp::Wrap(frame)); } - void CEF_CALLBACK load_handler_on_load_end(struct _cef_load_handler_t* self, - cef_browser_t* browser, cef_frame_t* frame, int httpStatusCode) -{ + cef_browser_t* browser, cef_frame_t* frame, int httpStatusCode) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -65,12 +62,10 @@ void CEF_CALLBACK load_handler_on_load_end(struct _cef_load_handler_t* self, httpStatusCode); } - int CEF_CALLBACK load_handler_on_load_error(struct _cef_load_handler_t* self, cef_browser_t* browser, cef_frame_t* frame, enum cef_handler_errorcode_t errorCode, const cef_string_t* failedUrl, - cef_string_t* errorText) -{ + cef_string_t* errorText) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -109,12 +104,10 @@ int CEF_CALLBACK load_handler_on_load_error(struct _cef_load_handler_t* self, } - // CONSTRUCTOR - Do not edit by hand. CefLoadHandlerCppToC::CefLoadHandlerCppToC(CefLoadHandler* cls) - : CefCppToC(cls) -{ + : CefCppToC(cls) { struct_.struct_.on_load_start = load_handler_on_load_start; struct_.struct_.on_load_end = load_handler_on_load_end; struct_.struct_.on_load_error = load_handler_on_load_error; diff --git a/cef/libcef_dll/cpptoc/load_handler_cpptoc.h b/cef/libcef_dll/cpptoc/load_handler_cpptoc.h old mode 100755 new mode 100644 index c4f56c92d..f5af7e734 --- a/cef/libcef_dll/cpptoc/load_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/load_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,27 +10,28 @@ // for more information. // -#ifndef _LOADHANDLER_CPPTOC_H -#define _LOADHANDLER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_LOAD_HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_LOAD_HANDLER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_load_handler.h" +#include "include/capi/cef_load_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 CefLoadHandlerCppToC - : public CefCppToC -{ -public: - CefLoadHandlerCppToC(CefLoadHandler* cls); + : public CefCppToC { + public: + explicit CefLoadHandlerCppToC(CefLoadHandler* cls); virtual ~CefLoadHandlerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _LOADHANDLER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_LOAD_HANDLER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/menu_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/menu_handler_cpptoc.cc old mode 100755 new mode 100644 index 491b77e3a..d1c000f90 --- a/cef/libcef_dll/cpptoc/menu_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/menu_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -17,8 +17,7 @@ // MEMBER FUNCTIONS - Body may be edited by hand. int CEF_CALLBACK menu_handler_on_before_menu(struct _cef_menu_handler_t* self, - cef_browser_t* browser, const struct _cef_menu_info_t* menuInfo) -{ + cef_browser_t* browser, const struct _cef_menu_info_t* menuInfo) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -47,10 +46,8 @@ int CEF_CALLBACK menu_handler_on_before_menu(struct _cef_menu_handler_t* self, return _retval; } - void CEF_CALLBACK menu_handler_get_menu_label(struct _cef_menu_handler_t* self, - cef_browser_t* browser, enum cef_menu_id_t menuId, cef_string_t* label) -{ + cef_browser_t* browser, enum cef_menu_id_t menuId, cef_string_t* label) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -75,10 +72,8 @@ void CEF_CALLBACK menu_handler_get_menu_label(struct _cef_menu_handler_t* self, labelStr); } - int CEF_CALLBACK menu_handler_on_menu_action(struct _cef_menu_handler_t* self, - cef_browser_t* browser, enum cef_menu_id_t menuId) -{ + cef_browser_t* browser, enum cef_menu_id_t menuId) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -99,12 +94,10 @@ int CEF_CALLBACK menu_handler_on_menu_action(struct _cef_menu_handler_t* self, } - // CONSTRUCTOR - Do not edit by hand. CefMenuHandlerCppToC::CefMenuHandlerCppToC(CefMenuHandler* cls) - : CefCppToC(cls) -{ + : CefCppToC(cls) { struct_.struct_.on_before_menu = menu_handler_on_before_menu; struct_.struct_.get_menu_label = menu_handler_get_menu_label; struct_.struct_.on_menu_action = menu_handler_on_menu_action; diff --git a/cef/libcef_dll/cpptoc/menu_handler_cpptoc.h b/cef/libcef_dll/cpptoc/menu_handler_cpptoc.h old mode 100755 new mode 100644 index e50f11d54..20086f438 --- a/cef/libcef_dll/cpptoc/menu_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/menu_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,27 +10,28 @@ // for more information. // -#ifndef _MENUHANDLER_CPPTOC_H -#define _MENUHANDLER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_MENU_HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_MENU_HANDLER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_menu_handler.h" +#include "include/capi/cef_menu_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 CefMenuHandlerCppToC - : public CefCppToC -{ -public: - CefMenuHandlerCppToC(CefMenuHandler* cls); + : public CefCppToC { + public: + explicit CefMenuHandlerCppToC(CefMenuHandler* cls); virtual ~CefMenuHandlerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _MENUHANDLER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_MENU_HANDLER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/print_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/print_handler_cpptoc.cc old mode 100755 new mode 100644 index 60b4417ef..d72e151ff --- a/cef/libcef_dll/cpptoc/print_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/print_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -19,8 +19,7 @@ int CEF_CALLBACK print_handler_get_print_options( struct _cef_print_handler_t* self, cef_browser_t* browser, - struct _cef_print_options_t* printOptions) -{ + struct _cef_print_options_t* printOptions) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -53,15 +52,13 @@ int CEF_CALLBACK print_handler_get_print_options( return _retval; } - int CEF_CALLBACK print_handler_get_print_header_footer( struct _cef_print_handler_t* self, cef_browser_t* browser, cef_frame_t* frame, const cef_print_info_t* printInfo, const cef_string_t* url, const cef_string_t* title, int currentPage, int maxPages, cef_string_t* topLeft, cef_string_t* topCenter, cef_string_t* topRight, cef_string_t* bottomLeft, - cef_string_t* bottomCenter, cef_string_t* bottomRight) -{ + cef_string_t* bottomCenter, cef_string_t* bottomRight) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -150,13 +147,11 @@ int CEF_CALLBACK print_handler_get_print_header_footer( } - // CONSTRUCTOR - Do not edit by hand. CefPrintHandlerCppToC::CefPrintHandlerCppToC(CefPrintHandler* cls) : CefCppToC( - cls) -{ + cls) { struct_.struct_.get_print_options = print_handler_get_print_options; struct_.struct_.get_print_header_footer = print_handler_get_print_header_footer; diff --git a/cef/libcef_dll/cpptoc/print_handler_cpptoc.h b/cef/libcef_dll/cpptoc/print_handler_cpptoc.h old mode 100755 new mode 100644 index 35717bf65..9289aa503 --- a/cef/libcef_dll/cpptoc/print_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/print_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,28 +10,28 @@ // for more information. // -#ifndef _PRINTHANDLER_CPPTOC_H -#define _PRINTHANDLER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_PRINT_HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_PRINT_HANDLER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_print_handler.h" +#include "include/capi/cef_print_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 CefPrintHandlerCppToC : public CefCppToC -{ -public: - CefPrintHandlerCppToC(CefPrintHandler* cls); + cef_print_handler_t> { + public: + explicit CefPrintHandlerCppToC(CefPrintHandler* cls); virtual ~CefPrintHandlerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _PRINTHANDLER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_PRINT_HANDLER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/proxy_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/proxy_handler_cpptoc.cc old mode 100755 new mode 100644 index 6cec9f11c..2243abd5b --- a/cef/libcef_dll/cpptoc/proxy_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/proxy_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -17,8 +17,7 @@ void CEF_CALLBACK proxy_handler_get_proxy_for_url( struct _cef_proxy_handler_t* self, const cef_string_t* url, - struct _cef_proxy_info_t* proxy_info) -{ + struct _cef_proxy_info_t* proxy_info) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -49,13 +48,11 @@ void CEF_CALLBACK proxy_handler_get_proxy_for_url( } - // CONSTRUCTOR - Do not edit by hand. CefProxyHandlerCppToC::CefProxyHandlerCppToC(CefProxyHandler* cls) : CefCppToC( - cls) -{ + cls) { struct_.struct_.get_proxy_for_url = proxy_handler_get_proxy_for_url; } diff --git a/cef/libcef_dll/cpptoc/proxy_handler_cpptoc.h b/cef/libcef_dll/cpptoc/proxy_handler_cpptoc.h old mode 100755 new mode 100644 index edeb12440..7dd0b64ad --- a/cef/libcef_dll/cpptoc/proxy_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/proxy_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,28 +10,28 @@ // for more information. // -#ifndef _PROXYHANDLER_CPPTOC_H -#define _PROXYHANDLER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_PROXY_HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_PROXY_HANDLER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_proxy_handler.h" +#include "include/capi/cef_proxy_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 CefProxyHandlerCppToC : public CefCppToC -{ -public: - CefProxyHandlerCppToC(CefProxyHandler* cls); + cef_proxy_handler_t> { + public: + explicit CefProxyHandlerCppToC(CefProxyHandler* cls); virtual ~CefProxyHandlerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _PROXYHANDLER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_PROXY_HANDLER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/read_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/read_handler_cpptoc.cc old mode 100755 new mode 100644 index 80ac42639..6ac89f694 --- a/cef/libcef_dll/cpptoc/read_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/read_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -16,8 +16,7 @@ // MEMBER FUNCTIONS - Body may be edited by hand. size_t CEF_CALLBACK read_handler_read(struct _cef_read_handler_t* self, - void* ptr, size_t size, size_t n) -{ + void* ptr, size_t size, size_t n) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -38,10 +37,8 @@ size_t CEF_CALLBACK read_handler_read(struct _cef_read_handler_t* self, return _retval; } - int CEF_CALLBACK read_handler_seek(struct _cef_read_handler_t* self, - long offset, int whence) -{ + int64 offset, int whence) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -57,9 +54,7 @@ int CEF_CALLBACK read_handler_seek(struct _cef_read_handler_t* self, return _retval; } - -long CEF_CALLBACK read_handler_tell(struct _cef_read_handler_t* self) -{ +int64 CEF_CALLBACK read_handler_tell(struct _cef_read_handler_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -67,15 +62,13 @@ long CEF_CALLBACK read_handler_tell(struct _cef_read_handler_t* self) return 0; // Execute - long _retval = CefReadHandlerCppToC::Get(self)->Tell(); + int64 _retval = CefReadHandlerCppToC::Get(self)->Tell(); // Return type: simple return _retval; } - -int CEF_CALLBACK read_handler_eof(struct _cef_read_handler_t* self) -{ +int CEF_CALLBACK read_handler_eof(struct _cef_read_handler_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -90,12 +83,10 @@ int CEF_CALLBACK read_handler_eof(struct _cef_read_handler_t* self) } - // CONSTRUCTOR - Do not edit by hand. CefReadHandlerCppToC::CefReadHandlerCppToC(CefReadHandler* cls) - : CefCppToC(cls) -{ + : CefCppToC(cls) { struct_.struct_.read = read_handler_read; struct_.struct_.seek = read_handler_seek; struct_.struct_.tell = read_handler_tell; diff --git a/cef/libcef_dll/cpptoc/read_handler_cpptoc.h b/cef/libcef_dll/cpptoc/read_handler_cpptoc.h old mode 100755 new mode 100644 index f45ca0db7..b4ca3c0c3 --- a/cef/libcef_dll/cpptoc/read_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/read_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,27 +10,28 @@ // for more information. // -#ifndef _READHANDLER_CPPTOC_H -#define _READHANDLER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_READ_HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_READ_HANDLER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_stream.h" +#include "include/capi/cef_stream_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 CefReadHandlerCppToC - : public CefCppToC -{ -public: - CefReadHandlerCppToC(CefReadHandler* cls); + : public CefCppToC { + public: + explicit CefReadHandlerCppToC(CefReadHandler* cls); virtual ~CefReadHandlerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _READHANDLER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_READ_HANDLER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/render_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/render_handler_cpptoc.cc old mode 100755 new mode 100644 index 01d53d346..1aec01198 --- a/cef/libcef_dll/cpptoc/render_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/render_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -18,8 +18,7 @@ int CEF_CALLBACK render_handler_get_view_rect( struct _cef_render_handler_t* self, cef_browser_t* browser, - cef_rect_t* rect) -{ + cef_rect_t* rect) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -50,11 +49,9 @@ int CEF_CALLBACK render_handler_get_view_rect( return _retval; } - int CEF_CALLBACK render_handler_get_screen_rect( struct _cef_render_handler_t* self, cef_browser_t* browser, - cef_rect_t* rect) -{ + cef_rect_t* rect) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -85,11 +82,9 @@ int CEF_CALLBACK render_handler_get_screen_rect( 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) -{ + int viewY, int* screenX, int* screenY) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -132,10 +127,8 @@ int CEF_CALLBACK render_handler_get_screen_point( return _retval; } - void CEF_CALLBACK render_handler_on_popup_show( - struct _cef_render_handler_t* self, cef_browser_t* browser, int show) -{ + struct _cef_render_handler_t* self, cef_browser_t* browser, int show) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -152,11 +145,9 @@ void CEF_CALLBACK render_handler_on_popup_show( 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) -{ + const cef_rect_t* rect) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -180,11 +171,10 @@ void CEF_CALLBACK render_handler_on_popup_size( 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) -{ + size_t dirtyRectsCount, cef_rect_t const* dirtyRects, + const void* buffer) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -219,11 +209,9 @@ void CEF_CALLBACK render_handler_on_paint(struct _cef_render_handler_t* self, buffer); } - void CEF_CALLBACK render_handler_on_cursor_change( struct _cef_render_handler_t* self, cef_browser_t* browser, - cef_cursor_handle_t cursor) -{ + cef_cursor_handle_t cursor) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -241,13 +229,11 @@ void CEF_CALLBACK render_handler_on_cursor_change( } - // CONSTRUCTOR - Do not edit by hand. CefRenderHandlerCppToC::CefRenderHandlerCppToC(CefRenderHandler* cls) : CefCppToC( - cls) -{ + cls) { struct_.struct_.get_view_rect = render_handler_get_view_rect; struct_.struct_.get_screen_rect = render_handler_get_screen_rect; struct_.struct_.get_screen_point = render_handler_get_screen_point; diff --git a/cef/libcef_dll/cpptoc/render_handler_cpptoc.h b/cef/libcef_dll/cpptoc/render_handler_cpptoc.h old mode 100755 new mode 100644 index 1304e1198..8c9b65c2a --- a/cef/libcef_dll/cpptoc/render_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/render_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,28 +10,28 @@ // for more information. // -#ifndef _RENDERHANDLER_CPPTOC_H -#define _RENDERHANDLER_CPPTOC_H +#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 +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#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: - CefRenderHandlerCppToC(CefRenderHandler* cls); + cef_render_handler_t> { + public: + explicit CefRenderHandlerCppToC(CefRenderHandler* cls); virtual ~CefRenderHandlerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _RENDERHANDLER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_RENDER_HANDLER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/request_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/request_handler_cpptoc.cc old mode 100755 new mode 100644 index 4fe94fe21..9dfe7aed7 --- a/cef/libcef_dll/cpptoc/request_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/request_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -14,6 +14,7 @@ #include "libcef_dll/cpptoc/download_handler_cpptoc.h" #include "libcef_dll/cpptoc/request_handler_cpptoc.h" #include "libcef_dll/ctocpp/browser_ctocpp.h" +#include "libcef_dll/ctocpp/cookie_manager_ctocpp.h" #include "libcef_dll/ctocpp/frame_ctocpp.h" #include "libcef_dll/ctocpp/request_ctocpp.h" #include "libcef_dll/ctocpp/response_ctocpp.h" @@ -24,9 +25,8 @@ int CEF_CALLBACK request_handler_on_before_browse( struct _cef_request_handler_t* self, cef_browser_t* browser, - cef_frame_t* frame, struct _cef_request_t* request, - enum cef_handler_navtype_t navType, int isRedirect) -{ + cef_frame_t* frame, cef_request_t* request, + enum cef_handler_navtype_t navType, int isRedirect) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -57,13 +57,11 @@ int CEF_CALLBACK request_handler_on_before_browse( return _retval; } - int CEF_CALLBACK request_handler_on_before_resource_load( struct _cef_request_handler_t* self, cef_browser_t* browser, - struct _cef_request_t* request, cef_string_t* redirectUrl, + cef_request_t* request, cef_string_t* redirectUrl, struct _cef_stream_reader_t** resourceStream, - struct _cef_response_t* response, int loadFlags) -{ + struct _cef_response_t* response, int loadFlags) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -122,11 +120,9 @@ int CEF_CALLBACK request_handler_on_before_resource_load( return _retval; } - void CEF_CALLBACK request_handler_on_resource_redirect( struct _cef_request_handler_t* self, cef_browser_t* browser, - const cef_string_t* old_url, cef_string_t* new_url) -{ + const cef_string_t* old_url, cef_string_t* new_url) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -155,12 +151,10 @@ void CEF_CALLBACK request_handler_on_resource_redirect( new_urlStr); } - void CEF_CALLBACK request_handler_on_resource_response( struct _cef_request_handler_t* self, cef_browser_t* browser, const cef_string_t* url, struct _cef_response_t* response, - struct _cef_content_filter_t** filter) -{ + cef_content_filter_t** filter) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -208,11 +202,9 @@ void CEF_CALLBACK request_handler_on_resource_response( } } - int CEF_CALLBACK request_handler_on_protocol_execution( struct _cef_request_handler_t* self, cef_browser_t* browser, - const cef_string_t* url, int* allowOSExecution) -{ + const cef_string_t* url, int* allowOSExecution) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -249,12 +241,10 @@ int CEF_CALLBACK request_handler_on_protocol_execution( return _retval; } - int CEF_CALLBACK request_handler_get_download_handler( struct _cef_request_handler_t* self, cef_browser_t* browser, const cef_string_t* mimeType, const cef_string_t* fileName, - int64 contentLength, struct _cef_download_handler_t** handler) -{ + int64 contentLength, cef_download_handler_t** handler) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -306,13 +296,11 @@ int CEF_CALLBACK request_handler_get_download_handler( return _retval; } - int CEF_CALLBACK request_handler_get_auth_credentials( struct _cef_request_handler_t* self, cef_browser_t* browser, int isProxy, const cef_string_t* host, int port, const cef_string_t* realm, const cef_string_t* scheme, cef_string_t* username, - cef_string_t* password) -{ + cef_string_t* password) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -360,14 +348,39 @@ int CEF_CALLBACK request_handler_get_auth_credentials( return _retval; } +cef_cookie_manager_t* CEF_CALLBACK request_handler_get_cookie_manager( + struct _cef_request_handler_t* self, cef_browser_t* browser, + const cef_string_t* main_url) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) + return NULL; + // Verify param: browser; type: refptr_diff + DCHECK(browser); + if (!browser) + return NULL; + // Verify param: main_url; type: string_byref_const + DCHECK(main_url); + if (!main_url) + return NULL; + + // Execute + CefRefPtr _retval = CefRequestHandlerCppToC::Get( + self)->GetCookieManager( + CefBrowserCToCpp::Wrap(browser), + CefString(main_url)); + + // Return type: refptr_diff + return CefCookieManagerCToCpp::Unwrap(_retval); +} // CONSTRUCTOR - Do not edit by hand. CefRequestHandlerCppToC::CefRequestHandlerCppToC(CefRequestHandler* cls) : CefCppToC(cls) -{ + cef_request_handler_t>(cls) { struct_.struct_.on_before_browse = request_handler_on_before_browse; struct_.struct_.on_before_resource_load = request_handler_on_before_resource_load; @@ -376,6 +389,7 @@ CefRequestHandlerCppToC::CefRequestHandlerCppToC(CefRequestHandler* cls) struct_.struct_.on_protocol_execution = request_handler_on_protocol_execution; struct_.struct_.get_download_handler = request_handler_get_download_handler; struct_.struct_.get_auth_credentials = request_handler_get_auth_credentials; + struct_.struct_.get_cookie_manager = request_handler_get_cookie_manager; } #ifndef NDEBUG diff --git a/cef/libcef_dll/cpptoc/request_handler_cpptoc.h b/cef/libcef_dll/cpptoc/request_handler_cpptoc.h old mode 100755 new mode 100644 index d61d80a53..1b4c79160 --- a/cef/libcef_dll/cpptoc/request_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/request_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,28 +10,28 @@ // for more information. // -#ifndef _REQUESTHANDLER_CPPTOC_H -#define _REQUESTHANDLER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_REQUEST_HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_REQUEST_HANDLER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_request_handler.h" +#include "include/capi/cef_request_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 CefRequestHandlerCppToC : public CefCppToC -{ -public: - CefRequestHandlerCppToC(CefRequestHandler* cls); + cef_request_handler_t> { + public: + explicit CefRequestHandlerCppToC(CefRequestHandler* cls); virtual ~CefRequestHandlerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _REQUESTHANDLER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_REQUEST_HANDLER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/scheme_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/scheme_handler_cpptoc.cc old mode 100755 new mode 100644 index 9746185c3..a613a3cf0 --- a/cef/libcef_dll/cpptoc/scheme_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/scheme_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -20,8 +20,7 @@ int CEF_CALLBACK scheme_handler_process_request( struct _cef_scheme_handler_t* self, cef_request_t* request, - cef_scheme_handler_callback_t* callback) -{ + cef_scheme_handler_callback_t* callback) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -45,11 +44,9 @@ int CEF_CALLBACK scheme_handler_process_request( return _retval; } - void CEF_CALLBACK scheme_handler_get_response_headers( struct _cef_scheme_handler_t* self, cef_response_t* response, - int64* response_length, cef_string_t* redirectUrl) -{ + int64* response_length, cef_string_t* redirectUrl) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -84,11 +81,9 @@ void CEF_CALLBACK scheme_handler_get_response_headers( *response_length = response_lengthVal; } - int CEF_CALLBACK scheme_handler_read_response( struct _cef_scheme_handler_t* self, void* data_out, int bytes_to_read, - int* bytes_read, cef_scheme_handler_callback_t* callback) -{ + int* bytes_read, cef_scheme_handler_callback_t* callback) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -125,9 +120,7 @@ int CEF_CALLBACK scheme_handler_read_response( return _retval; } - -void CEF_CALLBACK scheme_handler_cancel(struct _cef_scheme_handler_t* self) -{ +void CEF_CALLBACK scheme_handler_cancel(struct _cef_scheme_handler_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -139,13 +132,11 @@ void CEF_CALLBACK scheme_handler_cancel(struct _cef_scheme_handler_t* self) } - // CONSTRUCTOR - Do not edit by hand. CefSchemeHandlerCppToC::CefSchemeHandlerCppToC(CefSchemeHandler* cls) : CefCppToC( - cls) -{ + cls) { struct_.struct_.process_request = scheme_handler_process_request; struct_.struct_.get_response_headers = scheme_handler_get_response_headers; struct_.struct_.read_response = scheme_handler_read_response; diff --git a/cef/libcef_dll/cpptoc/scheme_handler_cpptoc.h b/cef/libcef_dll/cpptoc/scheme_handler_cpptoc.h old mode 100755 new mode 100644 index 3dc7f55e4..e38e705f1 --- a/cef/libcef_dll/cpptoc/scheme_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/scheme_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,28 +10,28 @@ // for more information. // -#ifndef _SCHEMEHANDLER_CPPTOC_H -#define _SCHEMEHANDLER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_SCHEME_HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_SCHEME_HANDLER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_scheme.h" +#include "include/capi/cef_scheme_capi.h" #include "libcef_dll/cpptoc/cpptoc.h" // Wrap a C++ class with a C structure. // This class may be instantiated and accessed wrapper-side only. class CefSchemeHandlerCppToC : public CefCppToC -{ -public: - CefSchemeHandlerCppToC(CefSchemeHandler* cls); + cef_scheme_handler_t> { + public: + explicit CefSchemeHandlerCppToC(CefSchemeHandler* cls); virtual ~CefSchemeHandlerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _SCHEMEHANDLER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_SCHEME_HANDLER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc b/cef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc old mode 100755 new mode 100644 index cb18538e7..258543110 --- 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) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -20,8 +20,7 @@ struct _cef_scheme_handler_t* CEF_CALLBACK scheme_handler_factory_create( struct _cef_scheme_handler_factory_t* self, cef_browser_t* browser, - const cef_string_t* scheme_name, cef_request_t* request) -{ + const cef_string_t* scheme_name, cef_request_t* request) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -52,14 +51,12 @@ struct _cef_scheme_handler_t* CEF_CALLBACK scheme_handler_factory_create( } - // CONSTRUCTOR - Do not edit by hand. CefSchemeHandlerFactoryCppToC::CefSchemeHandlerFactoryCppToC( CefSchemeHandlerFactory* cls) : CefCppToC(cls) -{ + cef_scheme_handler_factory_t>(cls) { struct_.struct_.create = scheme_handler_factory_create; } diff --git a/cef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h b/cef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h old mode 100755 new mode 100644 index f2d8fcc5d..c47b338da --- 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) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,28 +10,28 @@ // for more information. // -#ifndef _SCHEMEHANDLERFACTORY_CPPTOC_H -#define _SCHEMEHANDLERFACTORY_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_SCHEME_HANDLER_FACTORY_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_SCHEME_HANDLER_FACTORY_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_scheme.h" +#include "include/capi/cef_scheme_capi.h" #include "libcef_dll/cpptoc/cpptoc.h" // Wrap a C++ class with a C structure. // This class may be instantiated and accessed wrapper-side only. class CefSchemeHandlerFactoryCppToC : public CefCppToC -{ -public: - CefSchemeHandlerFactoryCppToC(CefSchemeHandlerFactory* cls); + cef_scheme_handler_factory_t> { + public: + explicit CefSchemeHandlerFactoryCppToC(CefSchemeHandlerFactory* cls); virtual ~CefSchemeHandlerFactoryCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _SCHEMEHANDLERFACTORY_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_SCHEME_HANDLER_FACTORY_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/storage_visitor_cpptoc.cc b/cef/libcef_dll/cpptoc/storage_visitor_cpptoc.cc old mode 100755 new mode 100644 index ca2f5b4d2..b5c4a42ac --- a/cef/libcef_dll/cpptoc/storage_visitor_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/storage_visitor_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -18,8 +18,7 @@ int CEF_CALLBACK storage_visitor_visit(struct _cef_storage_visitor_t* self, enum cef_storage_type_t type, const cef_string_t* origin, const cef_string_t* key, const cef_string_t* value, int count, int total, - int* deleteData) -{ + int* deleteData) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -64,13 +63,11 @@ int CEF_CALLBACK storage_visitor_visit(struct _cef_storage_visitor_t* self, } - // CONSTRUCTOR - Do not edit by hand. CefStorageVisitorCppToC::CefStorageVisitorCppToC(CefStorageVisitor* cls) : CefCppToC(cls) -{ + cef_storage_visitor_t>(cls) { struct_.struct_.visit = storage_visitor_visit; } diff --git a/cef/libcef_dll/cpptoc/storage_visitor_cpptoc.h b/cef/libcef_dll/cpptoc/storage_visitor_cpptoc.h old mode 100755 new mode 100644 index a90b23830..af8569853 --- a/cef/libcef_dll/cpptoc/storage_visitor_cpptoc.h +++ b/cef/libcef_dll/cpptoc/storage_visitor_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,28 +10,28 @@ // for more information. // -#ifndef _STORAGEVISITOR_CPPTOC_H -#define _STORAGEVISITOR_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_STORAGE_VISITOR_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_STORAGE_VISITOR_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_storage.h" +#include "include/capi/cef_storage_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 CefStorageVisitorCppToC : public CefCppToC -{ -public: - CefStorageVisitorCppToC(CefStorageVisitor* cls); + cef_storage_visitor_t> { + public: + explicit CefStorageVisitorCppToC(CefStorageVisitor* cls); virtual ~CefStorageVisitorCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _STORAGEVISITOR_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_STORAGE_VISITOR_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/task_cpptoc.cc b/cef/libcef_dll/cpptoc/task_cpptoc.cc old mode 100755 new mode 100644 index 3b6c6051d..a5e31e6b1 --- a/cef/libcef_dll/cpptoc/task_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/task_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -16,8 +16,7 @@ // MEMBER FUNCTIONS - Body may be edited by hand. void CEF_CALLBACK task_execute(struct _cef_task_t* self, - cef_thread_id_t threadId) -{ + cef_thread_id_t threadId) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -30,12 +29,10 @@ void CEF_CALLBACK task_execute(struct _cef_task_t* self, } - // CONSTRUCTOR - Do not edit by hand. CefTaskCppToC::CefTaskCppToC(CefTask* cls) - : CefCppToC(cls) -{ + : CefCppToC(cls) { struct_.struct_.execute = task_execute; } diff --git a/cef/libcef_dll/cpptoc/task_cpptoc.h b/cef/libcef_dll/cpptoc/task_cpptoc.h old mode 100755 new mode 100644 index d29d8ec9e..8f2e2fc2e --- a/cef/libcef_dll/cpptoc/task_cpptoc.h +++ b/cef/libcef_dll/cpptoc/task_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,27 +10,27 @@ // for more information. // -#ifndef _TASK_CPPTOC_H -#define _TASK_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_TASK_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_TASK_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_task.h" +#include "include/capi/cef_task_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 CefTaskCppToC - : public CefCppToC -{ -public: - CefTaskCppToC(CefTask* cls); + : public CefCppToC { + public: + explicit CefTaskCppToC(CefTask* cls); virtual ~CefTaskCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _TASK_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_TASK_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/v8accessor_cpptoc.cc b/cef/libcef_dll/cpptoc/v8accessor_cpptoc.cc old mode 100755 new mode 100644 index 4186ecd66..d533fcf06 --- a/cef/libcef_dll/cpptoc/v8accessor_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/v8accessor_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -18,8 +18,7 @@ int CEF_CALLBACK v8accessor_get(struct _cef_v8accessor_t* self, const cef_string_t* name, struct _cef_v8value_t* object, - struct _cef_v8value_t** retval, cef_string_t* exception) -{ + struct _cef_v8value_t** retval, cef_string_t* exception) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -72,11 +71,9 @@ int CEF_CALLBACK v8accessor_get(struct _cef_v8accessor_t* self, return _retval; } - int CEF_CALLBACK v8accessor_set(struct _cef_v8accessor_t* self, const cef_string_t* name, struct _cef_v8value_t* object, - struct _cef_v8value_t* value, cef_string_t* exception) -{ + struct _cef_v8value_t* value, cef_string_t* exception) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -114,12 +111,10 @@ int CEF_CALLBACK v8accessor_set(struct _cef_v8accessor_t* self, } - // CONSTRUCTOR - Do not edit by hand. CefV8AccessorCppToC::CefV8AccessorCppToC(CefV8Accessor* cls) - : CefCppToC(cls) -{ + : CefCppToC(cls) { struct_.struct_.get = v8accessor_get; struct_.struct_.set = v8accessor_set; } diff --git a/cef/libcef_dll/cpptoc/v8accessor_cpptoc.h b/cef/libcef_dll/cpptoc/v8accessor_cpptoc.h old mode 100755 new mode 100644 index fe8a09422..b0dbb8ebd --- a/cef/libcef_dll/cpptoc/v8accessor_cpptoc.h +++ b/cef/libcef_dll/cpptoc/v8accessor_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,27 +10,27 @@ // for more information. // -#ifndef _V8ACCESSOR_CPPTOC_H -#define _V8ACCESSOR_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_V8ACCESSOR_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_V8ACCESSOR_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_v8.h" +#include "include/capi/cef_v8_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 CefV8AccessorCppToC - : public CefCppToC -{ -public: - CefV8AccessorCppToC(CefV8Accessor* cls); + : public CefCppToC { + public: + explicit CefV8AccessorCppToC(CefV8Accessor* cls); virtual ~CefV8AccessorCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _V8ACCESSOR_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_V8ACCESSOR_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/v8context_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/v8context_handler_cpptoc.cc old mode 100755 new mode 100644 index 6b5a3617e..2c426834c --- a/cef/libcef_dll/cpptoc/v8context_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/v8context_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -20,8 +20,7 @@ void CEF_CALLBACK v8context_handler_on_context_created( struct _cef_v8context_handler_t* self, cef_browser_t* browser, - cef_frame_t* frame, struct _cef_v8context_t* context) -{ + cef_frame_t* frame, cef_v8context_t* context) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -47,11 +46,9 @@ void CEF_CALLBACK v8context_handler_on_context_created( CefV8ContextCToCpp::Wrap(context)); } - void CEF_CALLBACK v8context_handler_on_context_released( struct _cef_v8context_handler_t* self, cef_browser_t* browser, - cef_frame_t* frame, struct _cef_v8context_t* context) -{ + cef_frame_t* frame, cef_v8context_t* context) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -78,13 +75,11 @@ void CEF_CALLBACK v8context_handler_on_context_released( } - // CONSTRUCTOR - Do not edit by hand. CefV8ContextHandlerCppToC::CefV8ContextHandlerCppToC(CefV8ContextHandler* cls) : CefCppToC(cls) -{ + cef_v8context_handler_t>(cls) { struct_.struct_.on_context_created = v8context_handler_on_context_created; struct_.struct_.on_context_released = v8context_handler_on_context_released; } diff --git a/cef/libcef_dll/cpptoc/v8context_handler_cpptoc.h b/cef/libcef_dll/cpptoc/v8context_handler_cpptoc.h old mode 100755 new mode 100644 index e5c862890..d77b908e2 --- a/cef/libcef_dll/cpptoc/v8context_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/v8context_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,28 +10,28 @@ // for more information. // -#ifndef _V8CONTEXTHANDLER_CPPTOC_H -#define _V8CONTEXTHANDLER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_V8CONTEXT_HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_V8CONTEXT_HANDLER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_v8context_handler.h" +#include "include/capi/cef_v8context_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 CefV8ContextHandlerCppToC : public CefCppToC -{ -public: - CefV8ContextHandlerCppToC(CefV8ContextHandler* cls); + cef_v8context_handler_t> { + public: + explicit CefV8ContextHandlerCppToC(CefV8ContextHandler* cls); virtual ~CefV8ContextHandlerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _V8CONTEXTHANDLER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_V8CONTEXT_HANDLER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/v8handler_cpptoc.cc b/cef/libcef_dll/cpptoc/v8handler_cpptoc.cc old mode 100755 new mode 100644 index d19a271de..08f003247 --- a/cef/libcef_dll/cpptoc/v8handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/v8handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -19,8 +19,7 @@ int CEF_CALLBACK v8handler_execute(struct _cef_v8handler_t* self, const cef_string_t* name, struct _cef_v8value_t* object, size_t argumentsCount, struct _cef_v8value_t* const* arguments, - struct _cef_v8value_t** retval, cef_string_t* exception) -{ + struct _cef_v8value_t** retval, cef_string_t* exception) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -86,12 +85,10 @@ int CEF_CALLBACK v8handler_execute(struct _cef_v8handler_t* self, } - // CONSTRUCTOR - Do not edit by hand. CefV8HandlerCppToC::CefV8HandlerCppToC(CefV8Handler* cls) - : CefCppToC(cls) -{ + : CefCppToC(cls) { struct_.struct_.execute = v8handler_execute; } diff --git a/cef/libcef_dll/cpptoc/v8handler_cpptoc.h b/cef/libcef_dll/cpptoc/v8handler_cpptoc.h old mode 100755 new mode 100644 index 995232229..1dd0886e9 --- a/cef/libcef_dll/cpptoc/v8handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/v8handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,27 +10,27 @@ // for more information. // -#ifndef _V8HANDLER_CPPTOC_H -#define _V8HANDLER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_V8HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_V8HANDLER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_v8.h" +#include "include/capi/cef_v8_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 CefV8HandlerCppToC - : public CefCppToC -{ -public: - CefV8HandlerCppToC(CefV8Handler* cls); + : public CefCppToC { + public: + explicit CefV8HandlerCppToC(CefV8Handler* cls); virtual ~CefV8HandlerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _V8HANDLER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_V8HANDLER_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/web_urlrequest_client_cpptoc.cc b/cef/libcef_dll/cpptoc/web_urlrequest_client_cpptoc.cc old mode 100755 new mode 100644 index 377d1a194..d576345e0 --- a/cef/libcef_dll/cpptoc/web_urlrequest_client_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/web_urlrequest_client_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -20,8 +20,7 @@ void CEF_CALLBACK web_urlrequest_client_on_state_change( struct _cef_web_urlrequest_client_t* self, cef_web_urlrequest_t* requester, - enum cef_weburlrequest_state_t state) -{ + enum cef_weburlrequest_state_t state) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -38,11 +37,9 @@ void CEF_CALLBACK web_urlrequest_client_on_state_change( state); } - void CEF_CALLBACK web_urlrequest_client_on_redirect( struct _cef_web_urlrequest_client_t* self, cef_web_urlrequest_t* requester, - cef_request_t* request, cef_response_t* response) -{ + cef_request_t* request, cef_response_t* response) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -68,11 +65,9 @@ void CEF_CALLBACK web_urlrequest_client_on_redirect( CefResponseCToCpp::Wrap(response)); } - void CEF_CALLBACK web_urlrequest_client_on_headers_received( struct _cef_web_urlrequest_client_t* self, cef_web_urlrequest_t* requester, - cef_response_t* response) -{ + cef_response_t* response) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -93,11 +88,9 @@ void CEF_CALLBACK web_urlrequest_client_on_headers_received( CefResponseCToCpp::Wrap(response)); } - void CEF_CALLBACK web_urlrequest_client_on_progress( struct _cef_web_urlrequest_client_t* self, cef_web_urlrequest_t* requester, - uint64 bytesSent, uint64 totalBytesToBeSent) -{ + uint64 bytesSent, uint64 totalBytesToBeSent) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -115,11 +108,9 @@ void CEF_CALLBACK web_urlrequest_client_on_progress( totalBytesToBeSent); } - void CEF_CALLBACK web_urlrequest_client_on_data( struct _cef_web_urlrequest_client_t* self, cef_web_urlrequest_t* requester, - const void* data, int dataLength) -{ + const void* data, int dataLength) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -141,11 +132,9 @@ void CEF_CALLBACK web_urlrequest_client_on_data( dataLength); } - void CEF_CALLBACK web_urlrequest_client_on_error( struct _cef_web_urlrequest_client_t* self, cef_web_urlrequest_t* requester, - enum cef_handler_errorcode_t errorCode) -{ + enum cef_handler_errorcode_t errorCode) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -163,14 +152,12 @@ void CEF_CALLBACK web_urlrequest_client_on_error( } - // CONSTRUCTOR - Do not edit by hand. CefWebURLRequestClientCppToC::CefWebURLRequestClientCppToC( CefWebURLRequestClient* cls) : CefCppToC(cls) -{ + cef_web_urlrequest_client_t>(cls) { struct_.struct_.on_state_change = web_urlrequest_client_on_state_change; struct_.struct_.on_redirect = web_urlrequest_client_on_redirect; struct_.struct_.on_headers_received = diff --git a/cef/libcef_dll/cpptoc/web_urlrequest_client_cpptoc.h b/cef/libcef_dll/cpptoc/web_urlrequest_client_cpptoc.h old mode 100755 new mode 100644 index 7d891b0d8..1aca5c15a --- a/cef/libcef_dll/cpptoc/web_urlrequest_client_cpptoc.h +++ b/cef/libcef_dll/cpptoc/web_urlrequest_client_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,28 +10,28 @@ // for more information. // -#ifndef _WEBURLREQUESTCLIENT_CPPTOC_H -#define _WEBURLREQUESTCLIENT_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_WEB_URLREQUEST_CLIENT_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_WEB_URLREQUEST_CLIENT_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_web_urlrequest.h" +#include "include/capi/cef_web_urlrequest_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 CefWebURLRequestClientCppToC : public CefCppToC -{ -public: - CefWebURLRequestClientCppToC(CefWebURLRequestClient* cls); + cef_web_urlrequest_client_t> { + public: + explicit CefWebURLRequestClientCppToC(CefWebURLRequestClient* cls); virtual ~CefWebURLRequestClientCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _WEBURLREQUESTCLIENT_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_WEB_URLREQUEST_CLIENT_CPPTOC_H_ diff --git a/cef/libcef_dll/cpptoc/write_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/write_handler_cpptoc.cc old mode 100755 new mode 100644 index 901db462b..07df04525 --- a/cef/libcef_dll/cpptoc/write_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/write_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -16,8 +16,7 @@ // MEMBER FUNCTIONS - Body may be edited by hand. size_t CEF_CALLBACK write_handler_write(struct _cef_write_handler_t* self, - const void* ptr, size_t size, size_t n) -{ + const void* ptr, size_t size, size_t n) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -38,10 +37,8 @@ size_t CEF_CALLBACK write_handler_write(struct _cef_write_handler_t* self, return _retval; } - int CEF_CALLBACK write_handler_seek(struct _cef_write_handler_t* self, - long offset, int whence) -{ + int64 offset, int whence) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -57,9 +54,7 @@ int CEF_CALLBACK write_handler_seek(struct _cef_write_handler_t* self, return _retval; } - -long CEF_CALLBACK write_handler_tell(struct _cef_write_handler_t* self) -{ +int64 CEF_CALLBACK write_handler_tell(struct _cef_write_handler_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -67,15 +62,13 @@ long CEF_CALLBACK write_handler_tell(struct _cef_write_handler_t* self) return 0; // Execute - long _retval = CefWriteHandlerCppToC::Get(self)->Tell(); + int64 _retval = CefWriteHandlerCppToC::Get(self)->Tell(); // Return type: simple return _retval; } - -int CEF_CALLBACK write_handler_flush(struct _cef_write_handler_t* self) -{ +int CEF_CALLBACK write_handler_flush(struct _cef_write_handler_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -90,13 +83,11 @@ int CEF_CALLBACK write_handler_flush(struct _cef_write_handler_t* self) } - // CONSTRUCTOR - Do not edit by hand. CefWriteHandlerCppToC::CefWriteHandlerCppToC(CefWriteHandler* cls) : CefCppToC( - cls) -{ + cls) { struct_.struct_.write = write_handler_write; struct_.struct_.seek = write_handler_seek; struct_.struct_.tell = write_handler_tell; diff --git a/cef/libcef_dll/cpptoc/write_handler_cpptoc.h b/cef/libcef_dll/cpptoc/write_handler_cpptoc.h old mode 100755 new mode 100644 index 30e032e8b..f0e75a9f6 --- a/cef/libcef_dll/cpptoc/write_handler_cpptoc.h +++ b/cef/libcef_dll/cpptoc/write_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,28 +10,28 @@ // for more information. // -#ifndef _WRITEHANDLER_CPPTOC_H -#define _WRITEHANDLER_CPPTOC_H +#ifndef CEF_LIBCEF_DLL_CPPTOC_WRITE_HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_WRITE_HANDLER_CPPTOC_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_stream.h" +#include "include/capi/cef_stream_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 CefWriteHandlerCppToC : public CefCppToC -{ -public: - CefWriteHandlerCppToC(CefWriteHandler* cls); + cef_write_handler_t> { + public: + explicit CefWriteHandlerCppToC(CefWriteHandler* cls); virtual ~CefWriteHandlerCppToC() {} }; -#endif // USING_CEF_SHARED -#endif // _WRITEHANDLER_CPPTOC_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CPPTOC_WRITE_HANDLER_CPPTOC_H_ diff --git a/cef/libcef_dll/ctocpp/base_ctocpp.h b/cef/libcef_dll/ctocpp/base_ctocpp.h old mode 100755 new mode 100644 index 8a7de871e..650c08e33 --- a/cef/libcef_dll/ctocpp/base_ctocpp.h +++ b/cef/libcef_dll/ctocpp/base_ctocpp.h @@ -2,22 +2,21 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#ifndef _BASE_CTOCPP_H -#define _BASE_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_BASE_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_BASE_CTOCPP_H_ +#pragma once -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_base.h" +#include "include/capi/cef_base_capi.h" #include "libcef_dll/cef_logging.h" // CefCToCpp implementation for CefBase. -class CefBaseCToCpp : public CefBase -{ -public: +class CefBaseCToCpp : public CefBase { + public: // Use this method to create a wrapper class instance for a structure // received from the other side. - static CefRefPtr Wrap(cef_base_t* s) - { + static CefRefPtr Wrap(cef_base_t* s) { if (!s) return NULL; @@ -34,8 +33,7 @@ public: // Use this method to retrieve the underlying structure from a wrapper class // instance for return back to the other side. - static cef_base_t* Unwrap(CefRefPtr c) - { + static cef_base_t* Unwrap(CefRefPtr c) { if (!c.get()) return NULL; @@ -48,9 +46,8 @@ public: return wrapper->GetStruct(); } - CefBaseCToCpp(cef_base_t* str) - : struct_(str) - { + explicit CefBaseCToCpp(cef_base_t* str) + : struct_(str) { DCHECK(str); } virtual ~CefBaseCToCpp() {} @@ -62,13 +59,11 @@ public: // CefBase methods increment/decrement reference counts on both this object // and the underlying wrapped structure. - int AddRef() - { + int AddRef() { UnderlyingAddRef(); return refct_.AddRef(); } - int Release() - { + int Release() { UnderlyingRelease(); int retval = refct_.Release(); if (retval == 0) @@ -78,29 +73,26 @@ public: int GetRefCt() { return refct_.GetRefCt(); } // Increment/decrement reference counts on only the underlying class. - int UnderlyingAddRef() - { - if(!struct_->add_ref) + int UnderlyingAddRef() { + if (!struct_->add_ref) return 0; return struct_->add_ref(struct_); } - int UnderlyingRelease() - { - if(!struct_->release) + int UnderlyingRelease() { + if (!struct_->release) return 0; return struct_->release(struct_); } - int UnderlyingGetRefCt() - { - if(!struct_->get_refct) + int UnderlyingGetRefCt() { + if (!struct_->get_refct) return 0; return struct_->get_refct(struct_); } -protected: + protected: CefRefCount refct_; cef_base_t* struct_; }; -#endif // _BASE_CTOCPP_H +#endif // CEF_LIBCEF_DLL_CTOCPP_BASE_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/browser_ctocpp.cc b/cef/libcef_dll/ctocpp/browser_ctocpp.cc old mode 100755 new mode 100644 index aad112c7d..c37bf1798 --- a/cef/libcef_dll/ctocpp/browser_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/browser_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -20,8 +20,7 @@ bool CefBrowser::CreateBrowser(CefWindowInfo& windowInfo, CefRefPtr client, const CefString& url, - const CefBrowserSettings& settings) -{ + const CefBrowserSettings& settings) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: client; type: refptr_diff @@ -41,11 +40,9 @@ bool CefBrowser::CreateBrowser(CefWindowInfo& windowInfo, return _retval?true:false; } - CefRefPtr CefBrowser::CreateBrowserSync(CefWindowInfo& windowInfo, CefRefPtr client, const CefString& url, - const CefBrowserSettings& settings) -{ + const CefBrowserSettings& settings) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: client; type: refptr_diff @@ -66,11 +63,9 @@ CefRefPtr CefBrowser::CreateBrowserSync(CefWindowInfo& windowInfo, } - // VIRTUAL METHODS - Body may be edited by hand. -void CefBrowserCToCpp::ParentWindowWillClose() -{ +void CefBrowserCToCpp::ParentWindowWillClose() { if (CEF_MEMBER_MISSING(struct_, parent_window_will_close)) return; @@ -80,9 +75,7 @@ void CefBrowserCToCpp::ParentWindowWillClose() struct_->parent_window_will_close(struct_); } - -void CefBrowserCToCpp::CloseBrowser() -{ +void CefBrowserCToCpp::CloseBrowser() { if (CEF_MEMBER_MISSING(struct_, close_browser)) return; @@ -92,9 +85,7 @@ void CefBrowserCToCpp::CloseBrowser() struct_->close_browser(struct_); } - -bool CefBrowserCToCpp::CanGoBack() -{ +bool CefBrowserCToCpp::CanGoBack() { if (CEF_MEMBER_MISSING(struct_, can_go_back)) return false; @@ -107,9 +98,7 @@ bool CefBrowserCToCpp::CanGoBack() return _retval?true:false; } - -void CefBrowserCToCpp::GoBack() -{ +void CefBrowserCToCpp::GoBack() { if (CEF_MEMBER_MISSING(struct_, go_back)) return; @@ -119,9 +108,7 @@ void CefBrowserCToCpp::GoBack() struct_->go_back(struct_); } - -bool CefBrowserCToCpp::CanGoForward() -{ +bool CefBrowserCToCpp::CanGoForward() { if (CEF_MEMBER_MISSING(struct_, can_go_forward)) return false; @@ -134,9 +121,7 @@ bool CefBrowserCToCpp::CanGoForward() return _retval?true:false; } - -void CefBrowserCToCpp::GoForward() -{ +void CefBrowserCToCpp::GoForward() { if (CEF_MEMBER_MISSING(struct_, go_forward)) return; @@ -146,9 +131,7 @@ void CefBrowserCToCpp::GoForward() struct_->go_forward(struct_); } - -void CefBrowserCToCpp::Reload() -{ +void CefBrowserCToCpp::Reload() { if (CEF_MEMBER_MISSING(struct_, reload)) return; @@ -158,9 +141,7 @@ void CefBrowserCToCpp::Reload() struct_->reload(struct_); } - -void CefBrowserCToCpp::ReloadIgnoreCache() -{ +void CefBrowserCToCpp::ReloadIgnoreCache() { if (CEF_MEMBER_MISSING(struct_, reload_ignore_cache)) return; @@ -170,9 +151,7 @@ void CefBrowserCToCpp::ReloadIgnoreCache() struct_->reload_ignore_cache(struct_); } - -void CefBrowserCToCpp::StopLoad() -{ +void CefBrowserCToCpp::StopLoad() { if (CEF_MEMBER_MISSING(struct_, stop_load)) return; @@ -182,9 +161,7 @@ void CefBrowserCToCpp::StopLoad() struct_->stop_load(struct_); } - -void CefBrowserCToCpp::SetFocus(bool enable) -{ +void CefBrowserCToCpp::SetFocus(bool enable) { if (CEF_MEMBER_MISSING(struct_, set_focus)) return; @@ -195,9 +172,7 @@ void CefBrowserCToCpp::SetFocus(bool enable) enable); } - -CefWindowHandle CefBrowserCToCpp::GetWindowHandle() -{ +CefWindowHandle CefBrowserCToCpp::GetWindowHandle() { if (CEF_MEMBER_MISSING(struct_, get_window_handle)) return NULL; @@ -210,9 +185,7 @@ CefWindowHandle CefBrowserCToCpp::GetWindowHandle() return _retval; } - -CefWindowHandle CefBrowserCToCpp::GetOpenerWindowHandle() -{ +CefWindowHandle CefBrowserCToCpp::GetOpenerWindowHandle() { if (CEF_MEMBER_MISSING(struct_, get_opener_window_handle)) return NULL; @@ -225,9 +198,7 @@ CefWindowHandle CefBrowserCToCpp::GetOpenerWindowHandle() return _retval; } - -bool CefBrowserCToCpp::IsPopup() -{ +bool CefBrowserCToCpp::IsPopup() { if (CEF_MEMBER_MISSING(struct_, is_popup)) return false; @@ -240,9 +211,7 @@ bool CefBrowserCToCpp::IsPopup() return _retval?true:false; } - -bool CefBrowserCToCpp::HasDocument() -{ +bool CefBrowserCToCpp::HasDocument() { if (CEF_MEMBER_MISSING(struct_, has_document)) return false; @@ -255,9 +224,7 @@ bool CefBrowserCToCpp::HasDocument() return _retval?true:false; } - -CefRefPtr CefBrowserCToCpp::GetClient() -{ +CefRefPtr CefBrowserCToCpp::GetClient() { if (CEF_MEMBER_MISSING(struct_, get_client)) return NULL; @@ -270,9 +237,7 @@ CefRefPtr CefBrowserCToCpp::GetClient() return CefClientCppToC::Unwrap(_retval); } - -CefRefPtr CefBrowserCToCpp::GetMainFrame() -{ +CefRefPtr CefBrowserCToCpp::GetMainFrame() { if (CEF_MEMBER_MISSING(struct_, get_main_frame)) return NULL; @@ -285,9 +250,7 @@ CefRefPtr CefBrowserCToCpp::GetMainFrame() return CefFrameCToCpp::Wrap(_retval); } - -CefRefPtr CefBrowserCToCpp::GetFocusedFrame() -{ +CefRefPtr CefBrowserCToCpp::GetFocusedFrame() { if (CEF_MEMBER_MISSING(struct_, get_focused_frame)) return NULL; @@ -300,9 +263,7 @@ CefRefPtr CefBrowserCToCpp::GetFocusedFrame() return CefFrameCToCpp::Wrap(_retval); } - -CefRefPtr CefBrowserCToCpp::GetFrame(const CefString& name) -{ +CefRefPtr CefBrowserCToCpp::GetFrame(const CefString& name) { if (CEF_MEMBER_MISSING(struct_, get_frame)) return NULL; @@ -321,9 +282,7 @@ CefRefPtr CefBrowserCToCpp::GetFrame(const CefString& name) return CefFrameCToCpp::Wrap(_retval); } - -void CefBrowserCToCpp::GetFrameNames(std::vector& names) -{ +void CefBrowserCToCpp::GetFrameNames(std::vector& names) { if (CEF_MEMBER_MISSING(struct_, get_frame_names)) return; @@ -347,10 +306,8 @@ void CefBrowserCToCpp::GetFrameNames(std::vector& names) } } - void CefBrowserCToCpp::Find(int identifier, const CefString& searchText, - bool forward, bool matchCase, bool findNext) -{ + bool forward, bool matchCase, bool findNext) { if (CEF_MEMBER_MISSING(struct_, find)) return; @@ -370,9 +327,7 @@ void CefBrowserCToCpp::Find(int identifier, const CefString& searchText, findNext); } - -void CefBrowserCToCpp::StopFinding(bool clearSelection) -{ +void CefBrowserCToCpp::StopFinding(bool clearSelection) { if (CEF_MEMBER_MISSING(struct_, stop_finding)) return; @@ -383,9 +338,7 @@ void CefBrowserCToCpp::StopFinding(bool clearSelection) clearSelection); } - -double CefBrowserCToCpp::GetZoomLevel() -{ +double CefBrowserCToCpp::GetZoomLevel() { if (CEF_MEMBER_MISSING(struct_, get_zoom_level)) return 0; @@ -398,9 +351,7 @@ double CefBrowserCToCpp::GetZoomLevel() return _retval; } - -void CefBrowserCToCpp::SetZoomLevel(double zoomLevel) -{ +void CefBrowserCToCpp::SetZoomLevel(double zoomLevel) { if (CEF_MEMBER_MISSING(struct_, set_zoom_level)) return; @@ -411,9 +362,7 @@ void CefBrowserCToCpp::SetZoomLevel(double zoomLevel) zoomLevel); } - -void CefBrowserCToCpp::ClearHistory() -{ +void CefBrowserCToCpp::ClearHistory() { if (CEF_MEMBER_MISSING(struct_, clear_history)) return; @@ -423,9 +372,7 @@ void CefBrowserCToCpp::ClearHistory() struct_->clear_history(struct_); } - -void CefBrowserCToCpp::ShowDevTools() -{ +void CefBrowserCToCpp::ShowDevTools() { if (CEF_MEMBER_MISSING(struct_, show_dev_tools)) return; @@ -435,9 +382,7 @@ void CefBrowserCToCpp::ShowDevTools() struct_->show_dev_tools(struct_); } - -void CefBrowserCToCpp::CloseDevTools() -{ +void CefBrowserCToCpp::CloseDevTools() { if (CEF_MEMBER_MISSING(struct_, close_dev_tools)) return; @@ -447,9 +392,7 @@ void CefBrowserCToCpp::CloseDevTools() struct_->close_dev_tools(struct_); } - -bool CefBrowserCToCpp::IsWindowRenderingDisabled() -{ +bool CefBrowserCToCpp::IsWindowRenderingDisabled() { if (CEF_MEMBER_MISSING(struct_, is_window_rendering_disabled)) return false; @@ -462,9 +405,7 @@ bool CefBrowserCToCpp::IsWindowRenderingDisabled() return _retval?true:false; } - -bool CefBrowserCToCpp::GetSize(PaintElementType type, int& width, int& height) -{ +bool CefBrowserCToCpp::GetSize(PaintElementType type, int& width, int& height) { if (CEF_MEMBER_MISSING(struct_, get_size)) return false; @@ -480,9 +421,7 @@ bool CefBrowserCToCpp::GetSize(PaintElementType type, int& width, int& height) return _retval?true:false; } - -void CefBrowserCToCpp::SetSize(PaintElementType type, int width, int height) -{ +void CefBrowserCToCpp::SetSize(PaintElementType type, int width, int height) { if (CEF_MEMBER_MISSING(struct_, set_size)) return; @@ -495,9 +434,7 @@ void CefBrowserCToCpp::SetSize(PaintElementType type, int width, int height) height); } - -bool CefBrowserCToCpp::IsPopupVisible() -{ +bool CefBrowserCToCpp::IsPopupVisible() { if (CEF_MEMBER_MISSING(struct_, is_popup_visible)) return false; @@ -510,9 +447,7 @@ bool CefBrowserCToCpp::IsPopupVisible() return _retval?true:false; } - -void CefBrowserCToCpp::HidePopup() -{ +void CefBrowserCToCpp::HidePopup() { if (CEF_MEMBER_MISSING(struct_, hide_popup)) return; @@ -522,9 +457,7 @@ void CefBrowserCToCpp::HidePopup() struct_->hide_popup(struct_); } - -void CefBrowserCToCpp::Invalidate(const CefRect& dirtyRect) -{ +void CefBrowserCToCpp::Invalidate(const CefRect& dirtyRect) { if (CEF_MEMBER_MISSING(struct_, invalidate)) return; @@ -535,10 +468,8 @@ void CefBrowserCToCpp::Invalidate(const CefRect& dirtyRect) &dirtyRect); } - bool CefBrowserCToCpp::GetImage(PaintElementType type, int width, int height, - void* buffer) -{ + void* buffer) { if (CEF_MEMBER_MISSING(struct_, get_image)) return false; @@ -560,10 +491,8 @@ bool CefBrowserCToCpp::GetImage(PaintElementType type, int width, int height, return _retval?true:false; } - void CefBrowserCToCpp::SendKeyEvent(KeyType type, int key, int modifiers, - bool sysChar, bool imeChar) -{ + bool sysChar, bool imeChar) { if (CEF_MEMBER_MISSING(struct_, send_key_event)) return; @@ -578,10 +507,8 @@ void CefBrowserCToCpp::SendKeyEvent(KeyType type, int key, int modifiers, imeChar); } - void CefBrowserCToCpp::SendMouseClickEvent(int x, int y, MouseButtonType type, - bool mouseUp, int clickCount) -{ + bool mouseUp, int clickCount) { if (CEF_MEMBER_MISSING(struct_, send_mouse_click_event)) return; @@ -596,9 +523,7 @@ void CefBrowserCToCpp::SendMouseClickEvent(int x, int y, MouseButtonType type, clickCount); } - -void CefBrowserCToCpp::SendMouseMoveEvent(int x, int y, bool mouseLeave) -{ +void CefBrowserCToCpp::SendMouseMoveEvent(int x, int y, bool mouseLeave) { if (CEF_MEMBER_MISSING(struct_, send_mouse_move_event)) return; @@ -611,9 +536,7 @@ void CefBrowserCToCpp::SendMouseMoveEvent(int x, int y, bool mouseLeave) mouseLeave); } - -void CefBrowserCToCpp::SendMouseWheelEvent(int x, int y, int delta) -{ +void CefBrowserCToCpp::SendMouseWheelEvent(int x, int y, int delta) { if (CEF_MEMBER_MISSING(struct_, send_mouse_wheel_event)) return; @@ -626,9 +549,7 @@ void CefBrowserCToCpp::SendMouseWheelEvent(int x, int y, int delta) delta); } - -void CefBrowserCToCpp::SendFocusEvent(bool setFocus) -{ +void CefBrowserCToCpp::SendFocusEvent(bool setFocus) { if (CEF_MEMBER_MISSING(struct_, send_focus_event)) return; @@ -639,9 +560,7 @@ void CefBrowserCToCpp::SendFocusEvent(bool setFocus) setFocus); } - -void CefBrowserCToCpp::SendCaptureLostEvent() -{ +void CefBrowserCToCpp::SendCaptureLostEvent() { if (CEF_MEMBER_MISSING(struct_, send_capture_lost_event)) return; @@ -652,7 +571,6 @@ void CefBrowserCToCpp::SendCaptureLostEvent() } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/browser_ctocpp.h b/cef/libcef_dll/ctocpp/browser_ctocpp.h old mode 100755 new mode 100644 index de9739b20..8c917e1c8 --- a/cef/libcef_dll/ctocpp/browser_ctocpp.h +++ b/cef/libcef_dll/ctocpp/browser_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,24 +10,27 @@ // for more information. // -#ifndef _BROWSER_CTOCPP_H -#define _BROWSER_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_BROWSER_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_BROWSER_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include +#include "include/cef_browser.h" +#include "include/capi/cef_browser_capi.h" +#include "include/cef_client.h" +#include "include/capi/cef_client_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 CefBrowserCToCpp - : public CefCToCpp -{ -public: - CefBrowserCToCpp(cef_browser_t* str) + : public CefCToCpp { + public: + explicit CefBrowserCToCpp(cef_browser_t* str) : CefCToCpp(str) {} virtual ~CefBrowserCToCpp() {} @@ -77,6 +80,6 @@ public: virtual void SendCaptureLostEvent() OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _BROWSER_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_BROWSER_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/command_line_ctocpp.cc b/cef/libcef_dll/ctocpp/command_line_ctocpp.cc old mode 100755 new mode 100644 index c66e8542c..7bbc1d313 --- a/cef/libcef_dll/ctocpp/command_line_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/command_line_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -17,8 +17,7 @@ // STATIC METHODS - Body may be edited by hand. -CefRefPtr CefCommandLine::CreateCommandLine() -{ +CefRefPtr CefCommandLine::CreateCommandLine() { int build_revision = cef_build_revision(); if (build_revision != CEF_REVISION) { // The libcef build revision does not match the CEF API revision. @@ -36,11 +35,9 @@ CefRefPtr CefCommandLine::CreateCommandLine() } - // VIRTUAL METHODS - Body may be edited by hand. -void CefCommandLineCToCpp::InitFromArgv(int argc, const char* const* argv) -{ +void CefCommandLineCToCpp::InitFromArgv(int argc, const char* const* argv) { if (CEF_MEMBER_MISSING(struct_, init_from_argv)) return; @@ -57,9 +54,7 @@ void CefCommandLineCToCpp::InitFromArgv(int argc, const char* const* argv) argv); } - -void CefCommandLineCToCpp::InitFromString(const CefString& command_line) -{ +void CefCommandLineCToCpp::InitFromString(const CefString& command_line) { if (CEF_MEMBER_MISSING(struct_, init_from_string)) return; @@ -75,9 +70,7 @@ void CefCommandLineCToCpp::InitFromString(const CefString& command_line) command_line.GetStruct()); } - -CefString CefCommandLineCToCpp::GetCommandLineString() -{ +CefString CefCommandLineCToCpp::GetCommandLineString() { if (CEF_MEMBER_MISSING(struct_, get_command_line_string)) return CefString(); @@ -92,9 +85,7 @@ CefString CefCommandLineCToCpp::GetCommandLineString() return _retvalStr; } - -CefString CefCommandLineCToCpp::GetProgram() -{ +CefString CefCommandLineCToCpp::GetProgram() { if (CEF_MEMBER_MISSING(struct_, get_program)) return CefString(); @@ -109,9 +100,7 @@ CefString CefCommandLineCToCpp::GetProgram() return _retvalStr; } - -void CefCommandLineCToCpp::SetProgram(const CefString& program) -{ +void CefCommandLineCToCpp::SetProgram(const CefString& program) { if (CEF_MEMBER_MISSING(struct_, set_program)) return; @@ -127,9 +116,7 @@ void CefCommandLineCToCpp::SetProgram(const CefString& program) program.GetStruct()); } - -bool CefCommandLineCToCpp::HasSwitches() -{ +bool CefCommandLineCToCpp::HasSwitches() { if (CEF_MEMBER_MISSING(struct_, has_switches)) return false; @@ -142,9 +129,7 @@ bool CefCommandLineCToCpp::HasSwitches() return _retval?true:false; } - -bool CefCommandLineCToCpp::HasSwitch(const CefString& name) -{ +bool CefCommandLineCToCpp::HasSwitch(const CefString& name) { if (CEF_MEMBER_MISSING(struct_, has_switch)) return false; @@ -163,9 +148,7 @@ bool CefCommandLineCToCpp::HasSwitch(const CefString& name) return _retval?true:false; } - -CefString CefCommandLineCToCpp::GetSwitchValue(const CefString& name) -{ +CefString CefCommandLineCToCpp::GetSwitchValue(const CefString& name) { if (CEF_MEMBER_MISSING(struct_, get_switch_value)) return CefString(); @@ -186,9 +169,7 @@ CefString CefCommandLineCToCpp::GetSwitchValue(const CefString& name) return _retvalStr; } - -void CefCommandLineCToCpp::GetSwitches(SwitchMap& switches) -{ +void CefCommandLineCToCpp::GetSwitches(SwitchMap& switches) { if (CEF_MEMBER_MISSING(struct_, get_switches)) return; @@ -212,9 +193,7 @@ void CefCommandLineCToCpp::GetSwitches(SwitchMap& switches) } } - -void CefCommandLineCToCpp::AppendSwitch(const CefString& name) -{ +void CefCommandLineCToCpp::AppendSwitch(const CefString& name) { if (CEF_MEMBER_MISSING(struct_, append_switch)) return; @@ -230,10 +209,8 @@ void CefCommandLineCToCpp::AppendSwitch(const CefString& name) name.GetStruct()); } - void CefCommandLineCToCpp::AppendSwitchWithValue(const CefString& name, - const CefString& value) -{ + const CefString& value) { if (CEF_MEMBER_MISSING(struct_, append_switch_with_value)) return; @@ -254,9 +231,7 @@ void CefCommandLineCToCpp::AppendSwitchWithValue(const CefString& name, value.GetStruct()); } - -bool CefCommandLineCToCpp::HasArguments() -{ +bool CefCommandLineCToCpp::HasArguments() { if (CEF_MEMBER_MISSING(struct_, has_arguments)) return false; @@ -269,9 +244,7 @@ bool CefCommandLineCToCpp::HasArguments() return _retval?true:false; } - -void CefCommandLineCToCpp::GetArguments(ArgumentList& arguments) -{ +void CefCommandLineCToCpp::GetArguments(ArgumentList& arguments) { if (CEF_MEMBER_MISSING(struct_, get_arguments)) return; @@ -295,9 +268,7 @@ void CefCommandLineCToCpp::GetArguments(ArgumentList& arguments) } } - -void CefCommandLineCToCpp::AppendArgument(const CefString& argument) -{ +void CefCommandLineCToCpp::AppendArgument(const CefString& argument) { if (CEF_MEMBER_MISSING(struct_, append_argument)) return; @@ -314,7 +285,6 @@ void CefCommandLineCToCpp::AppendArgument(const CefString& argument) } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/command_line_ctocpp.h b/cef/libcef_dll/ctocpp/command_line_ctocpp.h old mode 100755 new mode 100644 index cc8b6778c..f66c7be1f --- a/cef/libcef_dll/ctocpp/command_line_ctocpp.h +++ b/cef/libcef_dll/ctocpp/command_line_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,24 +10,25 @@ // for more information. // -#ifndef _COMMANDLINE_CTOCPP_H -#define _COMMANDLINE_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_COMMAND_LINE_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_COMMAND_LINE_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_command_line.h" +#include "include/capi/cef_command_line_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 CefCommandLineCToCpp - : public CefCToCpp -{ -public: - CefCommandLineCToCpp(cef_command_line_t* str) + : public CefCToCpp { + public: + explicit CefCommandLineCToCpp(cef_command_line_t* str) : CefCToCpp( str) {} virtual ~CefCommandLineCToCpp() {} @@ -50,6 +51,6 @@ public: virtual void AppendArgument(const CefString& argument) OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _COMMANDLINE_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_COMMAND_LINE_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/ctocpp.h b/cef/libcef_dll/ctocpp/ctocpp.h old mode 100755 new mode 100644 index ba2e01c2a..3697647c4 --- a/cef/libcef_dll/ctocpp/ctocpp.h +++ b/cef/libcef_dll/ctocpp/ctocpp.h @@ -2,11 +2,12 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#ifndef _CTOCPP_H -#define _CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_CTOCPP_H_ +#pragma once -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_base.h" +#include "include/capi/cef_base_capi.h" #include "libcef_dll/cef_logging.h" @@ -14,13 +15,11 @@ // exists on the other side of the DLL boundary but will have methods called on // this side of the DLL boundary. template -class CefCToCpp : public BaseName -{ -public: +class CefCToCpp : public BaseName { + public: // Use this method to create a wrapper class instance for a structure // received from the other side. - static CefRefPtr Wrap(StructName* s) - { + static CefRefPtr Wrap(StructName* s) { if (!s) return NULL; @@ -37,8 +36,7 @@ public: // Use this method to retrieve the underlying structure from a wrapper class // instance for return back to the other side. - static StructName* Unwrap(CefRefPtr c) - { + static StructName* Unwrap(CefRefPtr c) { if (!c.get()) return NULL; @@ -51,17 +49,15 @@ public: return wrapper->GetStruct(); } - CefCToCpp(StructName* str) - : struct_(str) - { + explicit CefCToCpp(StructName* str) + : struct_(str) { DCHECK(str); #ifndef NDEBUG CefAtomicIncrement(&DebugObjCt); #endif } - virtual ~CefCToCpp() - { + virtual ~CefCToCpp() { #ifndef NDEBUG CefAtomicDecrement(&DebugObjCt); #endif @@ -74,13 +70,11 @@ public: // CefBase methods increment/decrement reference counts on both this object // and the underlying wrapped structure. - int AddRef() - { + int AddRef() { UnderlyingAddRef(); return refct_.AddRef(); } - int Release() - { + int Release() { UnderlyingRelease(); int retval = refct_.Release(); if (retval == 0) @@ -90,33 +84,30 @@ public: int GetRefCt() { return refct_.GetRefCt(); } // Increment/decrement reference counts on only the underlying class. - int UnderlyingAddRef() - { - if(!struct_->base.add_ref) + int UnderlyingAddRef() { + if (!struct_->base.add_ref) return 0; return struct_->base.add_ref(&struct_->base); } - int UnderlyingRelease() - { - if(!struct_->base.release) + int UnderlyingRelease() { + if (!struct_->base.release) return 0; return struct_->base.release(&struct_->base); } - int UnderlyingGetRefCt() - { - if(!struct_->base.get_refct) + int UnderlyingGetRefCt() { + if (!struct_->base.get_refct) return 0; return struct_->base.get_refct(&struct_->base); } #ifndef NDEBUG // Simple tracking of allocated objects. - static long DebugObjCt; + static long DebugObjCt; // NOLINT(runtime/int) #endif -protected: + protected: CefRefCount refct_; StructName* struct_; }; -#endif // _CTOCPP_H +#endif // CEF_LIBCEF_DLL_CTOCPP_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/domdocument_ctocpp.cc b/cef/libcef_dll/ctocpp/domdocument_ctocpp.cc old mode 100755 new mode 100644 index e784f572e..63aeafb67 --- a/cef/libcef_dll/ctocpp/domdocument_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/domdocument_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -16,8 +16,7 @@ // VIRTUAL METHODS - Body may be edited by hand. -CefDOMDocument::Type CefDOMDocumentCToCpp::GetType() -{ +CefDOMDocument::Type CefDOMDocumentCToCpp::GetType() { if (CEF_MEMBER_MISSING(struct_, get_type)) return DOM_DOCUMENT_TYPE_UNKNOWN; @@ -30,9 +29,7 @@ CefDOMDocument::Type CefDOMDocumentCToCpp::GetType() return _retval; } - -CefRefPtr CefDOMDocumentCToCpp::GetDocument() -{ +CefRefPtr CefDOMDocumentCToCpp::GetDocument() { if (CEF_MEMBER_MISSING(struct_, get_document)) return NULL; @@ -45,9 +42,7 @@ CefRefPtr CefDOMDocumentCToCpp::GetDocument() return CefDOMNodeCToCpp::Wrap(_retval); } - -CefRefPtr CefDOMDocumentCToCpp::GetBody() -{ +CefRefPtr CefDOMDocumentCToCpp::GetBody() { if (CEF_MEMBER_MISSING(struct_, get_body)) return NULL; @@ -60,9 +55,7 @@ CefRefPtr CefDOMDocumentCToCpp::GetBody() return CefDOMNodeCToCpp::Wrap(_retval); } - -CefRefPtr CefDOMDocumentCToCpp::GetHead() -{ +CefRefPtr CefDOMDocumentCToCpp::GetHead() { if (CEF_MEMBER_MISSING(struct_, get_head)) return NULL; @@ -75,9 +68,7 @@ CefRefPtr CefDOMDocumentCToCpp::GetHead() return CefDOMNodeCToCpp::Wrap(_retval); } - -CefString CefDOMDocumentCToCpp::GetTitle() -{ +CefString CefDOMDocumentCToCpp::GetTitle() { if (CEF_MEMBER_MISSING(struct_, get_title)) return CefString(); @@ -92,9 +83,8 @@ CefString CefDOMDocumentCToCpp::GetTitle() return _retvalStr; } - -CefRefPtr CefDOMDocumentCToCpp::GetElementById(const CefString& id) -{ +CefRefPtr CefDOMDocumentCToCpp::GetElementById( + const CefString& id) { if (CEF_MEMBER_MISSING(struct_, get_element_by_id)) return NULL; @@ -113,9 +103,7 @@ CefRefPtr CefDOMDocumentCToCpp::GetElementById(const CefString& id) return CefDOMNodeCToCpp::Wrap(_retval); } - -CefRefPtr CefDOMDocumentCToCpp::GetFocusedNode() -{ +CefRefPtr CefDOMDocumentCToCpp::GetFocusedNode() { if (CEF_MEMBER_MISSING(struct_, get_focused_node)) return NULL; @@ -128,9 +116,7 @@ CefRefPtr CefDOMDocumentCToCpp::GetFocusedNode() return CefDOMNodeCToCpp::Wrap(_retval); } - -bool CefDOMDocumentCToCpp::HasSelection() -{ +bool CefDOMDocumentCToCpp::HasSelection() { if (CEF_MEMBER_MISSING(struct_, has_selection)) return false; @@ -143,9 +129,7 @@ bool CefDOMDocumentCToCpp::HasSelection() return _retval?true:false; } - -CefRefPtr CefDOMDocumentCToCpp::GetSelectionStartNode() -{ +CefRefPtr CefDOMDocumentCToCpp::GetSelectionStartNode() { if (CEF_MEMBER_MISSING(struct_, get_selection_start_node)) return NULL; @@ -158,9 +142,7 @@ CefRefPtr CefDOMDocumentCToCpp::GetSelectionStartNode() return CefDOMNodeCToCpp::Wrap(_retval); } - -int CefDOMDocumentCToCpp::GetSelectionStartOffset() -{ +int CefDOMDocumentCToCpp::GetSelectionStartOffset() { if (CEF_MEMBER_MISSING(struct_, get_selection_start_offset)) return 0; @@ -173,9 +155,7 @@ int CefDOMDocumentCToCpp::GetSelectionStartOffset() return _retval; } - -CefRefPtr CefDOMDocumentCToCpp::GetSelectionEndNode() -{ +CefRefPtr CefDOMDocumentCToCpp::GetSelectionEndNode() { if (CEF_MEMBER_MISSING(struct_, get_selection_end_node)) return NULL; @@ -188,9 +168,7 @@ CefRefPtr CefDOMDocumentCToCpp::GetSelectionEndNode() return CefDOMNodeCToCpp::Wrap(_retval); } - -int CefDOMDocumentCToCpp::GetSelectionEndOffset() -{ +int CefDOMDocumentCToCpp::GetSelectionEndOffset() { if (CEF_MEMBER_MISSING(struct_, get_selection_end_offset)) return 0; @@ -203,9 +181,7 @@ int CefDOMDocumentCToCpp::GetSelectionEndOffset() return _retval; } - -CefString CefDOMDocumentCToCpp::GetSelectionAsMarkup() -{ +CefString CefDOMDocumentCToCpp::GetSelectionAsMarkup() { if (CEF_MEMBER_MISSING(struct_, get_selection_as_markup)) return CefString(); @@ -220,9 +196,7 @@ CefString CefDOMDocumentCToCpp::GetSelectionAsMarkup() return _retvalStr; } - -CefString CefDOMDocumentCToCpp::GetSelectionAsText() -{ +CefString CefDOMDocumentCToCpp::GetSelectionAsText() { if (CEF_MEMBER_MISSING(struct_, get_selection_as_text)) return CefString(); @@ -237,9 +211,7 @@ CefString CefDOMDocumentCToCpp::GetSelectionAsText() return _retvalStr; } - -CefString CefDOMDocumentCToCpp::GetBaseURL() -{ +CefString CefDOMDocumentCToCpp::GetBaseURL() { if (CEF_MEMBER_MISSING(struct_, get_base_url)) return CefString(); @@ -254,9 +226,7 @@ CefString CefDOMDocumentCToCpp::GetBaseURL() return _retvalStr; } - -CefString CefDOMDocumentCToCpp::GetCompleteURL(const CefString& partialURL) -{ +CefString CefDOMDocumentCToCpp::GetCompleteURL(const CefString& partialURL) { if (CEF_MEMBER_MISSING(struct_, get_complete_url)) return CefString(); @@ -278,7 +248,6 @@ CefString CefDOMDocumentCToCpp::GetCompleteURL(const CefString& partialURL) } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/domdocument_ctocpp.h b/cef/libcef_dll/ctocpp/domdocument_ctocpp.h old mode 100755 new mode 100644 index c448a83a4..92fc5957d --- a/cef/libcef_dll/ctocpp/domdocument_ctocpp.h +++ b/cef/libcef_dll/ctocpp/domdocument_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,24 +10,25 @@ // for more information. // -#ifndef _DOMDOCUMENT_CTOCPP_H -#define _DOMDOCUMENT_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_DOMDOCUMENT_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_DOMDOCUMENT_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_dom.h" +#include "include/capi/cef_dom_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 CefDOMDocumentCToCpp - : public CefCToCpp -{ -public: - CefDOMDocumentCToCpp(cef_domdocument_t* str) + : public CefCToCpp { + public: + explicit CefDOMDocumentCToCpp(cef_domdocument_t* str) : CefCToCpp( str) {} virtual ~CefDOMDocumentCToCpp() {} @@ -51,6 +52,6 @@ public: virtual CefString GetCompleteURL(const CefString& partialURL) OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _DOMDOCUMENT_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_DOMDOCUMENT_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/domevent_ctocpp.cc b/cef/libcef_dll/ctocpp/domevent_ctocpp.cc old mode 100755 new mode 100644 index a02cdb946..d812312f2 --- a/cef/libcef_dll/ctocpp/domevent_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/domevent_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -17,8 +17,7 @@ // VIRTUAL METHODS - Body may be edited by hand. -CefString CefDOMEventCToCpp::GetType() -{ +CefString CefDOMEventCToCpp::GetType() { if (CEF_MEMBER_MISSING(struct_, get_type)) return CefString(); @@ -33,9 +32,7 @@ CefString CefDOMEventCToCpp::GetType() return _retvalStr; } - -CefDOMEvent::Category CefDOMEventCToCpp::GetCategory() -{ +CefDOMEvent::Category CefDOMEventCToCpp::GetCategory() { if (CEF_MEMBER_MISSING(struct_, get_category)) return DOM_EVENT_CATEGORY_UNKNOWN; @@ -48,9 +45,7 @@ CefDOMEvent::Category CefDOMEventCToCpp::GetCategory() return _retval; } - -CefDOMEvent::Phase CefDOMEventCToCpp::GetPhase() -{ +CefDOMEvent::Phase CefDOMEventCToCpp::GetPhase() { if (CEF_MEMBER_MISSING(struct_, get_phase)) return DOM_EVENT_PHASE_UNKNOWN; @@ -63,9 +58,7 @@ CefDOMEvent::Phase CefDOMEventCToCpp::GetPhase() return _retval; } - -bool CefDOMEventCToCpp::CanBubble() -{ +bool CefDOMEventCToCpp::CanBubble() { if (CEF_MEMBER_MISSING(struct_, can_bubble)) return false; @@ -78,9 +71,7 @@ bool CefDOMEventCToCpp::CanBubble() return _retval?true:false; } - -bool CefDOMEventCToCpp::CanCancel() -{ +bool CefDOMEventCToCpp::CanCancel() { if (CEF_MEMBER_MISSING(struct_, can_cancel)) return false; @@ -93,9 +84,7 @@ bool CefDOMEventCToCpp::CanCancel() return _retval?true:false; } - -CefRefPtr CefDOMEventCToCpp::GetDocument() -{ +CefRefPtr CefDOMEventCToCpp::GetDocument() { if (CEF_MEMBER_MISSING(struct_, get_document)) return NULL; @@ -108,9 +97,7 @@ CefRefPtr CefDOMEventCToCpp::GetDocument() return CefDOMDocumentCToCpp::Wrap(_retval); } - -CefRefPtr CefDOMEventCToCpp::GetTarget() -{ +CefRefPtr CefDOMEventCToCpp::GetTarget() { if (CEF_MEMBER_MISSING(struct_, get_target)) return NULL; @@ -123,9 +110,7 @@ CefRefPtr CefDOMEventCToCpp::GetTarget() return CefDOMNodeCToCpp::Wrap(_retval); } - -CefRefPtr CefDOMEventCToCpp::GetCurrentTarget() -{ +CefRefPtr CefDOMEventCToCpp::GetCurrentTarget() { if (CEF_MEMBER_MISSING(struct_, get_current_target)) return NULL; @@ -139,7 +124,6 @@ CefRefPtr CefDOMEventCToCpp::GetCurrentTarget() } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/domevent_ctocpp.h b/cef/libcef_dll/ctocpp/domevent_ctocpp.h old mode 100755 new mode 100644 index 75136b753..64b05c62a --- a/cef/libcef_dll/ctocpp/domevent_ctocpp.h +++ b/cef/libcef_dll/ctocpp/domevent_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,24 +10,24 @@ // for more information. // -#ifndef _DOMEVENT_CTOCPP_H -#define _DOMEVENT_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_DOMEVENT_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_DOMEVENT_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_dom.h" +#include "include/capi/cef_dom_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 CefDOMEventCToCpp - : public CefCToCpp -{ -public: - CefDOMEventCToCpp(cef_domevent_t* str) + : public CefCToCpp { + public: + explicit CefDOMEventCToCpp(cef_domevent_t* str) : CefCToCpp(str) {} virtual ~CefDOMEventCToCpp() {} @@ -42,6 +42,6 @@ public: virtual CefRefPtr GetCurrentTarget() OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _DOMEVENT_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_DOMEVENT_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/domnode_ctocpp.cc b/cef/libcef_dll/ctocpp/domnode_ctocpp.cc old mode 100755 new mode 100644 index 783818660..1dfb6a90c --- a/cef/libcef_dll/ctocpp/domnode_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/domnode_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -18,8 +18,7 @@ // VIRTUAL METHODS - Body may be edited by hand. -CefDOMNode::Type CefDOMNodeCToCpp::GetType() -{ +CefDOMNode::Type CefDOMNodeCToCpp::GetType() { if (CEF_MEMBER_MISSING(struct_, get_type)) return DOM_NODE_TYPE_UNSUPPORTED; @@ -32,9 +31,7 @@ CefDOMNode::Type CefDOMNodeCToCpp::GetType() return _retval; } - -bool CefDOMNodeCToCpp::IsText() -{ +bool CefDOMNodeCToCpp::IsText() { if (CEF_MEMBER_MISSING(struct_, is_text)) return false; @@ -47,9 +44,7 @@ bool CefDOMNodeCToCpp::IsText() return _retval?true:false; } - -bool CefDOMNodeCToCpp::IsElement() -{ +bool CefDOMNodeCToCpp::IsElement() { if (CEF_MEMBER_MISSING(struct_, is_element)) return false; @@ -62,9 +57,7 @@ bool CefDOMNodeCToCpp::IsElement() return _retval?true:false; } - -bool CefDOMNodeCToCpp::IsFormControlElement() -{ +bool CefDOMNodeCToCpp::IsFormControlElement() { if (CEF_MEMBER_MISSING(struct_, is_form_control_element)) return false; @@ -77,9 +70,7 @@ bool CefDOMNodeCToCpp::IsFormControlElement() return _retval?true:false; } - -CefString CefDOMNodeCToCpp::GetFormControlElementType() -{ +CefString CefDOMNodeCToCpp::GetFormControlElementType() { if (CEF_MEMBER_MISSING(struct_, get_form_control_element_type)) return CefString(); @@ -95,9 +86,7 @@ CefString CefDOMNodeCToCpp::GetFormControlElementType() return _retvalStr; } - -bool CefDOMNodeCToCpp::IsSame(CefRefPtr that) -{ +bool CefDOMNodeCToCpp::IsSame(CefRefPtr that) { if (CEF_MEMBER_MISSING(struct_, is_same)) return false; @@ -116,9 +105,7 @@ bool CefDOMNodeCToCpp::IsSame(CefRefPtr that) return _retval?true:false; } - -CefString CefDOMNodeCToCpp::GetName() -{ +CefString CefDOMNodeCToCpp::GetName() { if (CEF_MEMBER_MISSING(struct_, get_name)) return CefString(); @@ -133,9 +120,7 @@ CefString CefDOMNodeCToCpp::GetName() return _retvalStr; } - -CefString CefDOMNodeCToCpp::GetValue() -{ +CefString CefDOMNodeCToCpp::GetValue() { if (CEF_MEMBER_MISSING(struct_, get_value)) return CefString(); @@ -150,9 +135,7 @@ CefString CefDOMNodeCToCpp::GetValue() return _retvalStr; } - -bool CefDOMNodeCToCpp::SetValue(const CefString& value) -{ +bool CefDOMNodeCToCpp::SetValue(const CefString& value) { if (CEF_MEMBER_MISSING(struct_, set_value)) return false; @@ -171,9 +154,7 @@ bool CefDOMNodeCToCpp::SetValue(const CefString& value) return _retval?true:false; } - -CefString CefDOMNodeCToCpp::GetAsMarkup() -{ +CefString CefDOMNodeCToCpp::GetAsMarkup() { if (CEF_MEMBER_MISSING(struct_, get_as_markup)) return CefString(); @@ -188,9 +169,7 @@ CefString CefDOMNodeCToCpp::GetAsMarkup() return _retvalStr; } - -CefRefPtr CefDOMNodeCToCpp::GetDocument() -{ +CefRefPtr CefDOMNodeCToCpp::GetDocument() { if (CEF_MEMBER_MISSING(struct_, get_document)) return NULL; @@ -203,9 +182,7 @@ CefRefPtr CefDOMNodeCToCpp::GetDocument() return CefDOMDocumentCToCpp::Wrap(_retval); } - -CefRefPtr CefDOMNodeCToCpp::GetParent() -{ +CefRefPtr CefDOMNodeCToCpp::GetParent() { if (CEF_MEMBER_MISSING(struct_, get_parent)) return NULL; @@ -218,9 +195,7 @@ CefRefPtr CefDOMNodeCToCpp::GetParent() return CefDOMNodeCToCpp::Wrap(_retval); } - -CefRefPtr CefDOMNodeCToCpp::GetPreviousSibling() -{ +CefRefPtr CefDOMNodeCToCpp::GetPreviousSibling() { if (CEF_MEMBER_MISSING(struct_, get_previous_sibling)) return NULL; @@ -233,9 +208,7 @@ CefRefPtr CefDOMNodeCToCpp::GetPreviousSibling() return CefDOMNodeCToCpp::Wrap(_retval); } - -CefRefPtr CefDOMNodeCToCpp::GetNextSibling() -{ +CefRefPtr CefDOMNodeCToCpp::GetNextSibling() { if (CEF_MEMBER_MISSING(struct_, get_next_sibling)) return NULL; @@ -248,9 +221,7 @@ CefRefPtr CefDOMNodeCToCpp::GetNextSibling() return CefDOMNodeCToCpp::Wrap(_retval); } - -bool CefDOMNodeCToCpp::HasChildren() -{ +bool CefDOMNodeCToCpp::HasChildren() { if (CEF_MEMBER_MISSING(struct_, has_children)) return false; @@ -263,9 +234,7 @@ bool CefDOMNodeCToCpp::HasChildren() return _retval?true:false; } - -CefRefPtr CefDOMNodeCToCpp::GetFirstChild() -{ +CefRefPtr CefDOMNodeCToCpp::GetFirstChild() { if (CEF_MEMBER_MISSING(struct_, get_first_child)) return NULL; @@ -278,9 +247,7 @@ CefRefPtr CefDOMNodeCToCpp::GetFirstChild() return CefDOMNodeCToCpp::Wrap(_retval); } - -CefRefPtr CefDOMNodeCToCpp::GetLastChild() -{ +CefRefPtr CefDOMNodeCToCpp::GetLastChild() { if (CEF_MEMBER_MISSING(struct_, get_last_child)) return NULL; @@ -293,10 +260,8 @@ CefRefPtr CefDOMNodeCToCpp::GetLastChild() return CefDOMNodeCToCpp::Wrap(_retval); } - void CefDOMNodeCToCpp::AddEventListener(const CefString& eventType, - CefRefPtr listener, bool useCapture) -{ + CefRefPtr listener, bool useCapture) { if (CEF_MEMBER_MISSING(struct_, add_event_listener)) return; @@ -318,9 +283,7 @@ void CefDOMNodeCToCpp::AddEventListener(const CefString& eventType, useCapture); } - -CefString CefDOMNodeCToCpp::GetElementTagName() -{ +CefString CefDOMNodeCToCpp::GetElementTagName() { if (CEF_MEMBER_MISSING(struct_, get_element_tag_name)) return CefString(); @@ -335,9 +298,7 @@ CefString CefDOMNodeCToCpp::GetElementTagName() return _retvalStr; } - -bool CefDOMNodeCToCpp::HasElementAttributes() -{ +bool CefDOMNodeCToCpp::HasElementAttributes() { if (CEF_MEMBER_MISSING(struct_, has_element_attributes)) return false; @@ -350,9 +311,7 @@ bool CefDOMNodeCToCpp::HasElementAttributes() return _retval?true:false; } - -bool CefDOMNodeCToCpp::HasElementAttribute(const CefString& attrName) -{ +bool CefDOMNodeCToCpp::HasElementAttribute(const CefString& attrName) { if (CEF_MEMBER_MISSING(struct_, has_element_attribute)) return false; @@ -371,9 +330,7 @@ bool CefDOMNodeCToCpp::HasElementAttribute(const CefString& attrName) return _retval?true:false; } - -CefString CefDOMNodeCToCpp::GetElementAttribute(const CefString& attrName) -{ +CefString CefDOMNodeCToCpp::GetElementAttribute(const CefString& attrName) { if (CEF_MEMBER_MISSING(struct_, get_element_attribute)) return CefString(); @@ -394,9 +351,7 @@ CefString CefDOMNodeCToCpp::GetElementAttribute(const CefString& attrName) return _retvalStr; } - -void CefDOMNodeCToCpp::GetElementAttributes(AttributeMap& attrMap) -{ +void CefDOMNodeCToCpp::GetElementAttributes(AttributeMap& attrMap) { if (CEF_MEMBER_MISSING(struct_, get_element_attributes)) return; @@ -420,10 +375,8 @@ void CefDOMNodeCToCpp::GetElementAttributes(AttributeMap& attrMap) } } - bool CefDOMNodeCToCpp::SetElementAttribute(const CefString& attrName, - const CefString& value) -{ + const CefString& value) { if (CEF_MEMBER_MISSING(struct_, set_element_attribute)) return false; @@ -447,9 +400,7 @@ bool CefDOMNodeCToCpp::SetElementAttribute(const CefString& attrName, return _retval?true:false; } - -CefString CefDOMNodeCToCpp::GetElementInnerText() -{ +CefString CefDOMNodeCToCpp::GetElementInnerText() { if (CEF_MEMBER_MISSING(struct_, get_element_inner_text)) return CefString(); @@ -465,7 +416,6 @@ CefString CefDOMNodeCToCpp::GetElementInnerText() } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/domnode_ctocpp.h b/cef/libcef_dll/ctocpp/domnode_ctocpp.h old mode 100755 new mode 100644 index 5c8d50c12..90311251d --- a/cef/libcef_dll/ctocpp/domnode_ctocpp.h +++ b/cef/libcef_dll/ctocpp/domnode_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,24 +10,24 @@ // for more information. // -#ifndef _DOMNODE_CTOCPP_H -#define _DOMNODE_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_DOMNODE_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_DOMNODE_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_dom.h" +#include "include/capi/cef_dom_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 CefDOMNodeCToCpp - : public CefCToCpp -{ -public: - CefDOMNodeCToCpp(cef_domnode_t* str) + : public CefCToCpp { + public: + explicit CefDOMNodeCToCpp(cef_domnode_t* str) : CefCToCpp(str) {} virtual ~CefDOMNodeCToCpp() {} @@ -61,6 +61,6 @@ public: virtual CefString GetElementInnerText() OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _DOMNODE_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_DOMNODE_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/drag_data_ctocpp.cc b/cef/libcef_dll/ctocpp/drag_data_ctocpp.cc old mode 100755 new mode 100644 index b6179b24d..f73d18f1d --- a/cef/libcef_dll/ctocpp/drag_data_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/drag_data_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -16,8 +16,7 @@ // VIRTUAL METHODS - Body may be edited by hand. -bool CefDragDataCToCpp::IsLink() -{ +bool CefDragDataCToCpp::IsLink() { if (CEF_MEMBER_MISSING(struct_, is_link)) return false; @@ -30,9 +29,7 @@ bool CefDragDataCToCpp::IsLink() return _retval?true:false; } - -bool CefDragDataCToCpp::IsFragment() -{ +bool CefDragDataCToCpp::IsFragment() { if (CEF_MEMBER_MISSING(struct_, is_fragment)) return false; @@ -45,9 +42,7 @@ bool CefDragDataCToCpp::IsFragment() return _retval?true:false; } - -bool CefDragDataCToCpp::IsFile() -{ +bool CefDragDataCToCpp::IsFile() { if (CEF_MEMBER_MISSING(struct_, is_file)) return false; @@ -60,9 +55,7 @@ bool CefDragDataCToCpp::IsFile() return _retval?true:false; } - -CefString CefDragDataCToCpp::GetLinkURL() -{ +CefString CefDragDataCToCpp::GetLinkURL() { if (CEF_MEMBER_MISSING(struct_, get_link_url)) return CefString(); @@ -77,9 +70,7 @@ CefString CefDragDataCToCpp::GetLinkURL() return _retvalStr; } - -CefString CefDragDataCToCpp::GetLinkTitle() -{ +CefString CefDragDataCToCpp::GetLinkTitle() { if (CEF_MEMBER_MISSING(struct_, get_link_title)) return CefString(); @@ -94,9 +85,7 @@ CefString CefDragDataCToCpp::GetLinkTitle() return _retvalStr; } - -CefString CefDragDataCToCpp::GetLinkMetadata() -{ +CefString CefDragDataCToCpp::GetLinkMetadata() { if (CEF_MEMBER_MISSING(struct_, get_link_metadata)) return CefString(); @@ -111,9 +100,7 @@ CefString CefDragDataCToCpp::GetLinkMetadata() return _retvalStr; } - -CefString CefDragDataCToCpp::GetFragmentText() -{ +CefString CefDragDataCToCpp::GetFragmentText() { if (CEF_MEMBER_MISSING(struct_, get_fragment_text)) return CefString(); @@ -128,9 +115,7 @@ CefString CefDragDataCToCpp::GetFragmentText() return _retvalStr; } - -CefString CefDragDataCToCpp::GetFragmentHtml() -{ +CefString CefDragDataCToCpp::GetFragmentHtml() { if (CEF_MEMBER_MISSING(struct_, get_fragment_html)) return CefString(); @@ -145,9 +130,7 @@ CefString CefDragDataCToCpp::GetFragmentHtml() return _retvalStr; } - -CefString CefDragDataCToCpp::GetFragmentBaseURL() -{ +CefString CefDragDataCToCpp::GetFragmentBaseURL() { if (CEF_MEMBER_MISSING(struct_, get_fragment_base_url)) return CefString(); @@ -162,9 +145,7 @@ CefString CefDragDataCToCpp::GetFragmentBaseURL() return _retvalStr; } - -CefString CefDragDataCToCpp::GetFileExtension() -{ +CefString CefDragDataCToCpp::GetFileExtension() { if (CEF_MEMBER_MISSING(struct_, get_file_extension)) return CefString(); @@ -179,9 +160,7 @@ CefString CefDragDataCToCpp::GetFileExtension() return _retvalStr; } - -CefString CefDragDataCToCpp::GetFileName() -{ +CefString CefDragDataCToCpp::GetFileName() { if (CEF_MEMBER_MISSING(struct_, get_file_name)) return CefString(); @@ -196,9 +175,7 @@ CefString CefDragDataCToCpp::GetFileName() return _retvalStr; } - -bool CefDragDataCToCpp::GetFileNames(std::vector& names) -{ +bool CefDragDataCToCpp::GetFileNames(std::vector& names) { if (CEF_MEMBER_MISSING(struct_, get_file_names)) return false; @@ -226,7 +203,6 @@ bool CefDragDataCToCpp::GetFileNames(std::vector& names) } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/drag_data_ctocpp.h b/cef/libcef_dll/ctocpp/drag_data_ctocpp.h old mode 100755 new mode 100644 index 9b867d967..d97f1cafd --- a/cef/libcef_dll/ctocpp/drag_data_ctocpp.h +++ b/cef/libcef_dll/ctocpp/drag_data_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,24 +10,25 @@ // for more information. // -#ifndef _DRAGDATA_CTOCPP_H -#define _DRAGDATA_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_DRAG_DATA_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_DRAG_DATA_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include +#include "include/cef_drag_data.h" +#include "include/capi/cef_drag_data_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 CefDragDataCToCpp - : public CefCToCpp -{ -public: - CefDragDataCToCpp(cef_drag_data_t* str) + : public CefCToCpp { + public: + explicit CefDragDataCToCpp(cef_drag_data_t* str) : CefCToCpp(str) {} virtual ~CefDragDataCToCpp() {} @@ -46,6 +47,6 @@ public: virtual bool GetFileNames(std::vector& names) OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _DRAGDATA_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_DRAG_DATA_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/frame_ctocpp.cc b/cef/libcef_dll/ctocpp/frame_ctocpp.cc old mode 100755 new mode 100644 index 8836b9876..59c47cafa --- a/cef/libcef_dll/ctocpp/frame_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/frame_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -20,8 +20,7 @@ // VIRTUAL METHODS - Body may be edited by hand. -void CefFrameCToCpp::Undo() -{ +void CefFrameCToCpp::Undo() { if (CEF_MEMBER_MISSING(struct_, undo)) return; @@ -31,9 +30,7 @@ void CefFrameCToCpp::Undo() struct_->undo(struct_); } - -void CefFrameCToCpp::Redo() -{ +void CefFrameCToCpp::Redo() { if (CEF_MEMBER_MISSING(struct_, redo)) return; @@ -43,9 +40,7 @@ void CefFrameCToCpp::Redo() struct_->redo(struct_); } - -void CefFrameCToCpp::Cut() -{ +void CefFrameCToCpp::Cut() { if (CEF_MEMBER_MISSING(struct_, cut)) return; @@ -55,9 +50,7 @@ void CefFrameCToCpp::Cut() struct_->cut(struct_); } - -void CefFrameCToCpp::Copy() -{ +void CefFrameCToCpp::Copy() { if (CEF_MEMBER_MISSING(struct_, copy)) return; @@ -67,9 +60,7 @@ void CefFrameCToCpp::Copy() struct_->copy(struct_); } - -void CefFrameCToCpp::Paste() -{ +void CefFrameCToCpp::Paste() { if (CEF_MEMBER_MISSING(struct_, paste)) return; @@ -79,9 +70,7 @@ void CefFrameCToCpp::Paste() struct_->paste(struct_); } - -void CefFrameCToCpp::Delete() -{ +void CefFrameCToCpp::Delete() { if (CEF_MEMBER_MISSING(struct_, del)) return; @@ -91,9 +80,7 @@ void CefFrameCToCpp::Delete() struct_->del(struct_); } - -void CefFrameCToCpp::SelectAll() -{ +void CefFrameCToCpp::SelectAll() { if (CEF_MEMBER_MISSING(struct_, select_all)) return; @@ -103,9 +90,7 @@ void CefFrameCToCpp::SelectAll() struct_->select_all(struct_); } - -void CefFrameCToCpp::Print() -{ +void CefFrameCToCpp::Print() { if (CEF_MEMBER_MISSING(struct_, print)) return; @@ -115,9 +100,7 @@ void CefFrameCToCpp::Print() struct_->print(struct_); } - -void CefFrameCToCpp::ViewSource() -{ +void CefFrameCToCpp::ViewSource() { if (CEF_MEMBER_MISSING(struct_, view_source)) return; @@ -127,9 +110,7 @@ void CefFrameCToCpp::ViewSource() struct_->view_source(struct_); } - -CefString CefFrameCToCpp::GetSource() -{ +CefString CefFrameCToCpp::GetSource() { if (CEF_MEMBER_MISSING(struct_, get_source)) return CefString(); @@ -144,9 +125,7 @@ CefString CefFrameCToCpp::GetSource() return _retvalStr; } - -CefString CefFrameCToCpp::GetText() -{ +CefString CefFrameCToCpp::GetText() { if (CEF_MEMBER_MISSING(struct_, get_text)) return CefString(); @@ -161,9 +140,7 @@ CefString CefFrameCToCpp::GetText() return _retvalStr; } - -void CefFrameCToCpp::LoadRequest(CefRefPtr request) -{ +void CefFrameCToCpp::LoadRequest(CefRefPtr request) { if (CEF_MEMBER_MISSING(struct_, load_request)) return; @@ -179,9 +156,7 @@ void CefFrameCToCpp::LoadRequest(CefRefPtr request) CefRequestCToCpp::Unwrap(request)); } - -void CefFrameCToCpp::LoadURL(const CefString& url) -{ +void CefFrameCToCpp::LoadURL(const CefString& url) { if (CEF_MEMBER_MISSING(struct_, load_url)) return; @@ -197,17 +172,16 @@ void CefFrameCToCpp::LoadURL(const CefString& url) url.GetStruct()); } - -void CefFrameCToCpp::LoadString(const CefString& string, const CefString& url) -{ +void CefFrameCToCpp::LoadString(const CefString& string_val, + const CefString& url) { if (CEF_MEMBER_MISSING(struct_, load_string)) return; // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - // Verify param: string; type: string_byref_const - DCHECK(!string.empty()); - if (string.empty()) + // Verify param: string_val; type: string_byref_const + DCHECK(!string_val.empty()); + if (string_val.empty()) return; // Verify param: url; type: string_byref_const DCHECK(!url.empty()); @@ -216,14 +190,12 @@ void CefFrameCToCpp::LoadString(const CefString& string, const CefString& url) // Execute struct_->load_string(struct_, - string.GetStruct(), + string_val.GetStruct(), url.GetStruct()); } - void CefFrameCToCpp::LoadStream(CefRefPtr stream, - const CefString& url) -{ + const CefString& url) { if (CEF_MEMBER_MISSING(struct_, load_stream)) return; @@ -244,10 +216,8 @@ void CefFrameCToCpp::LoadStream(CefRefPtr stream, url.GetStruct()); } - void CefFrameCToCpp::ExecuteJavaScript(const CefString& jsCode, - const CefString& scriptUrl, int startLine) -{ + const CefString& scriptUrl, int startLine) { if (CEF_MEMBER_MISSING(struct_, execute_java_script)) return; @@ -266,9 +236,7 @@ void CefFrameCToCpp::ExecuteJavaScript(const CefString& jsCode, startLine); } - -bool CefFrameCToCpp::IsMain() -{ +bool CefFrameCToCpp::IsMain() { if (CEF_MEMBER_MISSING(struct_, is_main)) return false; @@ -281,9 +249,7 @@ bool CefFrameCToCpp::IsMain() return _retval?true:false; } - -bool CefFrameCToCpp::IsFocused() -{ +bool CefFrameCToCpp::IsFocused() { if (CEF_MEMBER_MISSING(struct_, is_focused)) return false; @@ -296,9 +262,7 @@ bool CefFrameCToCpp::IsFocused() return _retval?true:false; } - -CefString CefFrameCToCpp::GetName() -{ +CefString CefFrameCToCpp::GetName() { if (CEF_MEMBER_MISSING(struct_, get_name)) return CefString(); @@ -313,24 +277,20 @@ CefString CefFrameCToCpp::GetName() return _retvalStr; } - -long long CefFrameCToCpp::GetIdentifier() -{ +int64 CefFrameCToCpp::GetIdentifier() { if (CEF_MEMBER_MISSING(struct_, get_identifier)) return 0; // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - long long _retval = struct_->get_identifier(struct_); + int64 _retval = struct_->get_identifier(struct_); // Return type: simple return _retval; } - -CefRefPtr CefFrameCToCpp::GetParent() -{ +CefRefPtr CefFrameCToCpp::GetParent() { if (CEF_MEMBER_MISSING(struct_, get_parent)) return NULL; @@ -343,9 +303,7 @@ CefRefPtr CefFrameCToCpp::GetParent() return CefFrameCToCpp::Wrap(_retval); } - -CefString CefFrameCToCpp::GetURL() -{ +CefString CefFrameCToCpp::GetURL() { if (CEF_MEMBER_MISSING(struct_, get_url)) return CefString(); @@ -360,9 +318,7 @@ CefString CefFrameCToCpp::GetURL() return _retvalStr; } - -CefRefPtr CefFrameCToCpp::GetBrowser() -{ +CefRefPtr CefFrameCToCpp::GetBrowser() { if (CEF_MEMBER_MISSING(struct_, get_browser)) return NULL; @@ -375,9 +331,7 @@ CefRefPtr CefFrameCToCpp::GetBrowser() return CefBrowserCToCpp::Wrap(_retval); } - -void CefFrameCToCpp::VisitDOM(CefRefPtr visitor) -{ +void CefFrameCToCpp::VisitDOM(CefRefPtr visitor) { if (CEF_MEMBER_MISSING(struct_, visit_dom)) return; @@ -393,9 +347,7 @@ void CefFrameCToCpp::VisitDOM(CefRefPtr visitor) CefDOMVisitorCppToC::Wrap(visitor)); } - -CefRefPtr CefFrameCToCpp::GetV8Context() -{ +CefRefPtr CefFrameCToCpp::GetV8Context() { if (CEF_MEMBER_MISSING(struct_, get_v8context)) return NULL; @@ -409,7 +361,6 @@ CefRefPtr CefFrameCToCpp::GetV8Context() } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/frame_ctocpp.h b/cef/libcef_dll/ctocpp/frame_ctocpp.h old mode 100755 new mode 100644 index 87310be79..091d85cad --- a/cef/libcef_dll/ctocpp/frame_ctocpp.h +++ b/cef/libcef_dll/ctocpp/frame_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,24 +10,28 @@ // for more information. // -#ifndef _FRAME_CTOCPP_H -#define _FRAME_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_FRAME_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_FRAME_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_frame.h" +#include "include/capi/cef_frame_capi.h" +#include "include/cef_browser.h" +#include "include/capi/cef_browser_capi.h" +#include "include/cef_v8.h" +#include "include/capi/cef_v8_capi.h" #include "libcef_dll/ctocpp/ctocpp.h" // Wrap a C structure with a C++ class. // This class may be instantiated and accessed wrapper-side only. class CefFrameCToCpp - : public CefCToCpp -{ -public: - CefFrameCToCpp(cef_frame_t* str) + : public CefCToCpp { + public: + explicit CefFrameCToCpp(cef_frame_t* str) : CefCToCpp(str) {} virtual ~CefFrameCToCpp() {} @@ -45,7 +49,7 @@ public: virtual CefString GetText() OVERRIDE; virtual void LoadRequest(CefRefPtr request) OVERRIDE; virtual void LoadURL(const CefString& url) OVERRIDE; - virtual void LoadString(const CefString& string, + virtual void LoadString(const CefString& string_val, const CefString& url) OVERRIDE; virtual void LoadStream(CefRefPtr stream, const CefString& url) OVERRIDE; @@ -54,7 +58,7 @@ public: virtual bool IsMain() OVERRIDE; virtual bool IsFocused() OVERRIDE; virtual CefString GetName() OVERRIDE; - virtual long long GetIdentifier() OVERRIDE; + virtual int64 GetIdentifier() OVERRIDE; virtual CefRefPtr GetParent() OVERRIDE; virtual CefString GetURL() OVERRIDE; virtual CefRefPtr GetBrowser() OVERRIDE; @@ -62,6 +66,6 @@ public: virtual CefRefPtr GetV8Context() OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _FRAME_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_FRAME_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/post_data_ctocpp.cc b/cef/libcef_dll/ctocpp/post_data_ctocpp.cc old mode 100755 new mode 100644 index 7c6fe1dde..0a0c593cf --- a/cef/libcef_dll/ctocpp/post_data_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/post_data_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -16,8 +16,7 @@ // STATIC METHODS - Body may be edited by hand. -CefRefPtr CefPostData::CreatePostData() -{ +CefRefPtr CefPostData::CreatePostData() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute @@ -28,11 +27,9 @@ CefRefPtr CefPostData::CreatePostData() } - // VIRTUAL METHODS - Body may be edited by hand. -size_t CefPostDataCToCpp::GetElementCount() -{ +size_t CefPostDataCToCpp::GetElementCount() { if (CEF_MEMBER_MISSING(struct_, get_element_count)) return 0; @@ -45,9 +42,7 @@ size_t CefPostDataCToCpp::GetElementCount() return _retval; } - -void CefPostDataCToCpp::GetElements(ElementVector& elements) -{ +void CefPostDataCToCpp::GetElements(ElementVector& elements) { if (CEF_MEMBER_MISSING(struct_, get_elements)) return; @@ -85,9 +80,7 @@ void CefPostDataCToCpp::GetElements(ElementVector& elements) } } - -bool CefPostDataCToCpp::RemoveElement(CefRefPtr element) -{ +bool CefPostDataCToCpp::RemoveElement(CefRefPtr element) { if (CEF_MEMBER_MISSING(struct_, remove_element)) return false; @@ -106,9 +99,7 @@ bool CefPostDataCToCpp::RemoveElement(CefRefPtr element) return _retval?true:false; } - -bool CefPostDataCToCpp::AddElement(CefRefPtr element) -{ +bool CefPostDataCToCpp::AddElement(CefRefPtr element) { if (CEF_MEMBER_MISSING(struct_, add_element)) return false; @@ -127,9 +118,7 @@ bool CefPostDataCToCpp::AddElement(CefRefPtr element) return _retval?true:false; } - -void CefPostDataCToCpp::RemoveElements() -{ +void CefPostDataCToCpp::RemoveElements() { if (CEF_MEMBER_MISSING(struct_, remove_elements)) return; @@ -140,7 +129,6 @@ void CefPostDataCToCpp::RemoveElements() } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/post_data_ctocpp.h b/cef/libcef_dll/ctocpp/post_data_ctocpp.h old mode 100755 new mode 100644 index 1cc115158..505980dfd --- a/cef/libcef_dll/ctocpp/post_data_ctocpp.h +++ b/cef/libcef_dll/ctocpp/post_data_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,24 +10,24 @@ // for more information. // -#ifndef _POSTDATA_CTOCPP_H -#define _POSTDATA_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_POST_DATA_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_POST_DATA_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_request.h" +#include "include/capi/cef_request_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 CefPostDataCToCpp - : public CefCToCpp -{ -public: - CefPostDataCToCpp(cef_post_data_t* str) + : public CefCToCpp { + public: + explicit CefPostDataCToCpp(cef_post_data_t* str) : CefCToCpp(str) {} virtual ~CefPostDataCToCpp() {} @@ -39,6 +39,6 @@ public: virtual void RemoveElements() OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _POSTDATA_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_POST_DATA_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/post_data_element_ctocpp.cc b/cef/libcef_dll/ctocpp/post_data_element_ctocpp.cc old mode 100755 new mode 100644 index 848c6067f..b931ecbca --- a/cef/libcef_dll/ctocpp/post_data_element_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/post_data_element_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -15,8 +15,7 @@ // STATIC METHODS - Body may be edited by hand. -CefRefPtr CefPostDataElement::CreatePostDataElement() -{ +CefRefPtr CefPostDataElement::CreatePostDataElement() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute @@ -27,11 +26,9 @@ CefRefPtr CefPostDataElement::CreatePostDataElement() } - // VIRTUAL METHODS - Body may be edited by hand. -void CefPostDataElementCToCpp::SetToEmpty() -{ +void CefPostDataElementCToCpp::SetToEmpty() { if (CEF_MEMBER_MISSING(struct_, set_to_empty)) return; @@ -41,9 +38,7 @@ void CefPostDataElementCToCpp::SetToEmpty() struct_->set_to_empty(struct_); } - -void CefPostDataElementCToCpp::SetToFile(const CefString& fileName) -{ +void CefPostDataElementCToCpp::SetToFile(const CefString& fileName) { if (CEF_MEMBER_MISSING(struct_, set_to_file)) return; @@ -59,9 +54,7 @@ void CefPostDataElementCToCpp::SetToFile(const CefString& fileName) fileName.GetStruct()); } - -void CefPostDataElementCToCpp::SetToBytes(size_t size, const void* bytes) -{ +void CefPostDataElementCToCpp::SetToBytes(size_t size, const void* bytes) { if (CEF_MEMBER_MISSING(struct_, set_to_bytes)) return; @@ -78,9 +71,7 @@ void CefPostDataElementCToCpp::SetToBytes(size_t size, const void* bytes) bytes); } - -CefPostDataElement::Type CefPostDataElementCToCpp::GetType() -{ +CefPostDataElement::Type CefPostDataElementCToCpp::GetType() { if (CEF_MEMBER_MISSING(struct_, get_type)) return PDE_TYPE_EMPTY; @@ -93,9 +84,7 @@ CefPostDataElement::Type CefPostDataElementCToCpp::GetType() return _retval; } - -CefString CefPostDataElementCToCpp::GetFile() -{ +CefString CefPostDataElementCToCpp::GetFile() { if (CEF_MEMBER_MISSING(struct_, get_file)) return CefString(); @@ -110,9 +99,7 @@ CefString CefPostDataElementCToCpp::GetFile() return _retvalStr; } - -size_t CefPostDataElementCToCpp::GetBytesCount() -{ +size_t CefPostDataElementCToCpp::GetBytesCount() { if (CEF_MEMBER_MISSING(struct_, get_bytes_count)) return 0; @@ -125,9 +112,7 @@ size_t CefPostDataElementCToCpp::GetBytesCount() return _retval; } - -size_t CefPostDataElementCToCpp::GetBytes(size_t size, void* bytes) -{ +size_t CefPostDataElementCToCpp::GetBytes(size_t size, void* bytes) { if (CEF_MEMBER_MISSING(struct_, get_bytes)) return 0; @@ -148,7 +133,6 @@ size_t CefPostDataElementCToCpp::GetBytes(size_t size, void* bytes) } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/post_data_element_ctocpp.h b/cef/libcef_dll/ctocpp/post_data_element_ctocpp.h old mode 100755 new mode 100644 index 13186689a..2840dbdbd --- a/cef/libcef_dll/ctocpp/post_data_element_ctocpp.h +++ b/cef/libcef_dll/ctocpp/post_data_element_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,25 +10,25 @@ // for more information. // -#ifndef _POSTDATAELEMENT_CTOCPP_H -#define _POSTDATAELEMENT_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_POST_DATA_ELEMENT_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_POST_DATA_ELEMENT_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_request.h" +#include "include/capi/cef_request_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 CefPostDataElementCToCpp : public CefCToCpp -{ -public: - CefPostDataElementCToCpp(cef_post_data_element_t* str) + cef_post_data_element_t> { + public: + explicit CefPostDataElementCToCpp(cef_post_data_element_t* str) : CefCToCpp(str) {} virtual ~CefPostDataElementCToCpp() {} @@ -43,6 +43,6 @@ public: virtual size_t GetBytes(size_t size, void* bytes) OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _POSTDATAELEMENT_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_POST_DATA_ELEMENT_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/request_ctocpp.cc b/cef/libcef_dll/ctocpp/request_ctocpp.cc old mode 100755 new mode 100644 index b307f4e3f..e34c508ea --- a/cef/libcef_dll/ctocpp/request_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/request_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -17,8 +17,7 @@ // STATIC METHODS - Body may be edited by hand. -CefRefPtr CefRequest::CreateRequest() -{ +CefRefPtr CefRequest::CreateRequest() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute @@ -29,11 +28,9 @@ CefRefPtr CefRequest::CreateRequest() } - // VIRTUAL METHODS - Body may be edited by hand. -CefString CefRequestCToCpp::GetURL() -{ +CefString CefRequestCToCpp::GetURL() { if (CEF_MEMBER_MISSING(struct_, get_url)) return CefString(); @@ -48,9 +45,7 @@ CefString CefRequestCToCpp::GetURL() return _retvalStr; } - -void CefRequestCToCpp::SetURL(const CefString& url) -{ +void CefRequestCToCpp::SetURL(const CefString& url) { if (CEF_MEMBER_MISSING(struct_, set_url)) return; @@ -66,9 +61,7 @@ void CefRequestCToCpp::SetURL(const CefString& url) url.GetStruct()); } - -CefString CefRequestCToCpp::GetMethod() -{ +CefString CefRequestCToCpp::GetMethod() { if (CEF_MEMBER_MISSING(struct_, get_method)) return CefString(); @@ -83,9 +76,7 @@ CefString CefRequestCToCpp::GetMethod() return _retvalStr; } - -void CefRequestCToCpp::SetMethod(const CefString& method) -{ +void CefRequestCToCpp::SetMethod(const CefString& method) { if (CEF_MEMBER_MISSING(struct_, set_method)) return; @@ -101,9 +92,7 @@ void CefRequestCToCpp::SetMethod(const CefString& method) method.GetStruct()); } - -CefRefPtr CefRequestCToCpp::GetPostData() -{ +CefRefPtr CefRequestCToCpp::GetPostData() { if (CEF_MEMBER_MISSING(struct_, get_post_data)) return NULL; @@ -116,9 +105,7 @@ CefRefPtr CefRequestCToCpp::GetPostData() return CefPostDataCToCpp::Wrap(_retval); } - -void CefRequestCToCpp::SetPostData(CefRefPtr postData) -{ +void CefRequestCToCpp::SetPostData(CefRefPtr postData) { if (CEF_MEMBER_MISSING(struct_, set_post_data)) return; @@ -134,9 +121,7 @@ void CefRequestCToCpp::SetPostData(CefRefPtr postData) CefPostDataCToCpp::Unwrap(postData)); } - -void CefRequestCToCpp::GetHeaderMap(HeaderMap& headerMap) -{ +void CefRequestCToCpp::GetHeaderMap(HeaderMap& headerMap) { if (CEF_MEMBER_MISSING(struct_, get_header_map)) return; @@ -160,9 +145,7 @@ void CefRequestCToCpp::GetHeaderMap(HeaderMap& headerMap) } } - -void CefRequestCToCpp::SetHeaderMap(const HeaderMap& headerMap) -{ +void CefRequestCToCpp::SetHeaderMap(const HeaderMap& headerMap) { if (CEF_MEMBER_MISSING(struct_, set_header_map)) return; @@ -183,10 +166,8 @@ void CefRequestCToCpp::SetHeaderMap(const HeaderMap& headerMap) cef_string_multimap_free(headerMapMultimap); } - void CefRequestCToCpp::Set(const CefString& url, const CefString& method, - CefRefPtr postData, const HeaderMap& headerMap) -{ + CefRefPtr postData, const HeaderMap& headerMap) { if (CEF_MEMBER_MISSING(struct_, set)) return; @@ -220,9 +201,7 @@ void CefRequestCToCpp::Set(const CefString& url, const CefString& method, cef_string_multimap_free(headerMapMultimap); } - -CefRequest::RequestFlags CefRequestCToCpp::GetFlags() -{ +CefRequest::RequestFlags CefRequestCToCpp::GetFlags() { if (CEF_MEMBER_MISSING(struct_, get_flags)) return WUR_FLAG_NONE; @@ -235,9 +214,7 @@ CefRequest::RequestFlags CefRequestCToCpp::GetFlags() return _retval; } - -void CefRequestCToCpp::SetFlags(RequestFlags flags) -{ +void CefRequestCToCpp::SetFlags(RequestFlags flags) { if (CEF_MEMBER_MISSING(struct_, set_flags)) return; @@ -248,9 +225,7 @@ void CefRequestCToCpp::SetFlags(RequestFlags flags) flags); } - -CefString CefRequestCToCpp::GetFirstPartyForCookies() -{ +CefString CefRequestCToCpp::GetFirstPartyForCookies() { if (CEF_MEMBER_MISSING(struct_, get_first_party_for_cookies)) return CefString(); @@ -265,9 +240,7 @@ CefString CefRequestCToCpp::GetFirstPartyForCookies() return _retvalStr; } - -void CefRequestCToCpp::SetFirstPartyForCookies(const CefString& url) -{ +void CefRequestCToCpp::SetFirstPartyForCookies(const CefString& url) { if (CEF_MEMBER_MISSING(struct_, set_first_party_for_cookies)) return; @@ -284,7 +257,6 @@ void CefRequestCToCpp::SetFirstPartyForCookies(const CefString& url) } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/request_ctocpp.h b/cef/libcef_dll/ctocpp/request_ctocpp.h old mode 100755 new mode 100644 index c156c2e35..77be93ba2 --- a/cef/libcef_dll/ctocpp/request_ctocpp.h +++ b/cef/libcef_dll/ctocpp/request_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,24 +10,24 @@ // for more information. // -#ifndef _REQUEST_CTOCPP_H -#define _REQUEST_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_REQUEST_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_REQUEST_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_request.h" +#include "include/capi/cef_request_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 CefRequestCToCpp - : public CefCToCpp -{ -public: - CefRequestCToCpp(cef_request_t* str) + : public CefCToCpp { + public: + explicit CefRequestCToCpp(cef_request_t* str) : CefCToCpp(str) {} virtual ~CefRequestCToCpp() {} @@ -48,6 +48,6 @@ public: virtual void SetFirstPartyForCookies(const CefString& url) OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _REQUEST_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_REQUEST_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/response_ctocpp.cc b/cef/libcef_dll/ctocpp/response_ctocpp.cc old mode 100755 new mode 100644 index 500abc12e..e5bfc0286 --- a/cef/libcef_dll/ctocpp/response_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/response_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -16,8 +16,7 @@ // VIRTUAL METHODS - Body may be edited by hand. -int CefResponseCToCpp::GetStatus() -{ +int CefResponseCToCpp::GetStatus() { if (CEF_MEMBER_MISSING(struct_, get_status)) return 0; @@ -30,9 +29,7 @@ int CefResponseCToCpp::GetStatus() return _retval; } - -void CefResponseCToCpp::SetStatus(int status) -{ +void CefResponseCToCpp::SetStatus(int status) { if (CEF_MEMBER_MISSING(struct_, set_status)) return; @@ -43,9 +40,7 @@ void CefResponseCToCpp::SetStatus(int status) status); } - -CefString CefResponseCToCpp::GetStatusText() -{ +CefString CefResponseCToCpp::GetStatusText() { if (CEF_MEMBER_MISSING(struct_, get_status_text)) return CefString(); @@ -60,9 +55,7 @@ CefString CefResponseCToCpp::GetStatusText() return _retvalStr; } - -void CefResponseCToCpp::SetStatusText(const CefString& statusText) -{ +void CefResponseCToCpp::SetStatusText(const CefString& statusText) { if (CEF_MEMBER_MISSING(struct_, set_status_text)) return; @@ -78,9 +71,7 @@ void CefResponseCToCpp::SetStatusText(const CefString& statusText) statusText.GetStruct()); } - -CefString CefResponseCToCpp::GetMimeType() -{ +CefString CefResponseCToCpp::GetMimeType() { if (CEF_MEMBER_MISSING(struct_, get_mime_type)) return CefString(); @@ -95,9 +86,7 @@ CefString CefResponseCToCpp::GetMimeType() return _retvalStr; } - -void CefResponseCToCpp::SetMimeType(const CefString& mimeType) -{ +void CefResponseCToCpp::SetMimeType(const CefString& mimeType) { if (CEF_MEMBER_MISSING(struct_, set_mime_type)) return; @@ -113,9 +102,7 @@ void CefResponseCToCpp::SetMimeType(const CefString& mimeType) mimeType.GetStruct()); } - -CefString CefResponseCToCpp::GetHeader(const CefString& name) -{ +CefString CefResponseCToCpp::GetHeader(const CefString& name) { if (CEF_MEMBER_MISSING(struct_, get_header)) return CefString(); @@ -136,9 +123,7 @@ CefString CefResponseCToCpp::GetHeader(const CefString& name) return _retvalStr; } - -void CefResponseCToCpp::GetHeaderMap(HeaderMap& headerMap) -{ +void CefResponseCToCpp::GetHeaderMap(HeaderMap& headerMap) { if (CEF_MEMBER_MISSING(struct_, get_header_map)) return; @@ -162,9 +147,7 @@ void CefResponseCToCpp::GetHeaderMap(HeaderMap& headerMap) } } - -void CefResponseCToCpp::SetHeaderMap(const HeaderMap& headerMap) -{ +void CefResponseCToCpp::SetHeaderMap(const HeaderMap& headerMap) { if (CEF_MEMBER_MISSING(struct_, set_header_map)) return; @@ -186,7 +169,6 @@ void CefResponseCToCpp::SetHeaderMap(const HeaderMap& headerMap) } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/response_ctocpp.h b/cef/libcef_dll/ctocpp/response_ctocpp.h old mode 100755 new mode 100644 index cd1225616..8ec8a1fc2 --- a/cef/libcef_dll/ctocpp/response_ctocpp.h +++ b/cef/libcef_dll/ctocpp/response_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,24 +10,24 @@ // for more information. // -#ifndef _RESPONSE_CTOCPP_H -#define _RESPONSE_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_RESPONSE_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_RESPONSE_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_response.h" +#include "include/capi/cef_response_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 CefResponseCToCpp - : public CefCToCpp -{ -public: - CefResponseCToCpp(cef_response_t* str) + : public CefCToCpp { + public: + explicit CefResponseCToCpp(cef_response_t* str) : CefCToCpp(str) {} virtual ~CefResponseCToCpp() {} @@ -43,6 +43,6 @@ public: virtual void SetHeaderMap(const HeaderMap& headerMap) OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _RESPONSE_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_RESPONSE_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/scheme_handler_callback_ctocpp.cc b/cef/libcef_dll/ctocpp/scheme_handler_callback_ctocpp.cc old mode 100755 new mode 100644 index 9c1e7fd6d..37773d592 --- a/cef/libcef_dll/ctocpp/scheme_handler_callback_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/scheme_handler_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -15,8 +15,7 @@ // VIRTUAL METHODS - Body may be edited by hand. -void CefSchemeHandlerCallbackCToCpp::HeadersAvailable() -{ +void CefSchemeHandlerCallbackCToCpp::HeadersAvailable() { if (CEF_MEMBER_MISSING(struct_, headers_available)) return; @@ -26,9 +25,7 @@ void CefSchemeHandlerCallbackCToCpp::HeadersAvailable() struct_->headers_available(struct_); } - -void CefSchemeHandlerCallbackCToCpp::BytesAvailable() -{ +void CefSchemeHandlerCallbackCToCpp::BytesAvailable() { if (CEF_MEMBER_MISSING(struct_, bytes_available)) return; @@ -38,9 +35,7 @@ void CefSchemeHandlerCallbackCToCpp::BytesAvailable() struct_->bytes_available(struct_); } - -void CefSchemeHandlerCallbackCToCpp::Cancel() -{ +void CefSchemeHandlerCallbackCToCpp::Cancel() { if (CEF_MEMBER_MISSING(struct_, cancel)) return; @@ -51,7 +46,6 @@ void CefSchemeHandlerCallbackCToCpp::Cancel() } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/scheme_handler_callback_ctocpp.h b/cef/libcef_dll/ctocpp/scheme_handler_callback_ctocpp.h old mode 100755 new mode 100644 index 1514cdf9a..27f069086 --- a/cef/libcef_dll/ctocpp/scheme_handler_callback_ctocpp.h +++ b/cef/libcef_dll/ctocpp/scheme_handler_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,25 +10,25 @@ // for more information. // -#ifndef _SCHEMEHANDLERCALLBACK_CTOCPP_H -#define _SCHEMEHANDLERCALLBACK_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_SCHEME_HANDLER_CALLBACK_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_SCHEME_HANDLER_CALLBACK_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_scheme.h" +#include "include/capi/cef_scheme_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 CefSchemeHandlerCallbackCToCpp : public CefCToCpp -{ -public: - CefSchemeHandlerCallbackCToCpp(cef_scheme_handler_callback_t* str) + cef_scheme_handler_callback_t> { + public: + explicit CefSchemeHandlerCallbackCToCpp(cef_scheme_handler_callback_t* str) : CefCToCpp(str) {} virtual ~CefSchemeHandlerCallbackCToCpp() {} @@ -39,6 +39,6 @@ public: virtual void Cancel() OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _SCHEMEHANDLERCALLBACK_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_SCHEME_HANDLER_CALLBACK_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/stream_reader_ctocpp.cc b/cef/libcef_dll/ctocpp/stream_reader_ctocpp.cc old mode 100755 new mode 100644 index 98c73e515..239d5c215 --- a/cef/libcef_dll/ctocpp/stream_reader_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/stream_reader_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -17,8 +17,7 @@ // STATIC METHODS - Body may be edited by hand. CefRefPtr CefStreamReader::CreateForFile( - const CefString& fileName) -{ + const CefString& fileName) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: fileName; type: string_byref_const @@ -34,10 +33,8 @@ CefRefPtr CefStreamReader::CreateForFile( return CefStreamReaderCToCpp::Wrap(_retval); } - CefRefPtr CefStreamReader::CreateForData(void* data, - size_t size) -{ + size_t size) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: data; type: simple_byaddr @@ -54,10 +51,8 @@ CefRefPtr CefStreamReader::CreateForData(void* data, return CefStreamReaderCToCpp::Wrap(_retval); } - CefRefPtr CefStreamReader::CreateForHandler( - CefRefPtr handler) -{ + CefRefPtr handler) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: handler; type: refptr_diff @@ -74,11 +69,9 @@ CefRefPtr CefStreamReader::CreateForHandler( } - // VIRTUAL METHODS - Body may be edited by hand. -size_t CefStreamReaderCToCpp::Read(void* ptr, size_t size, size_t n) -{ +size_t CefStreamReaderCToCpp::Read(void* ptr, size_t size, size_t n) { if (CEF_MEMBER_MISSING(struct_, read)) return 0; @@ -99,9 +92,7 @@ size_t CefStreamReaderCToCpp::Read(void* ptr, size_t size, size_t n) return _retval; } - -int CefStreamReaderCToCpp::Seek(long offset, int whence) -{ +int CefStreamReaderCToCpp::Seek(int64 offset, int whence) { if (CEF_MEMBER_MISSING(struct_, seek)) return 0; @@ -116,24 +107,20 @@ int CefStreamReaderCToCpp::Seek(long offset, int whence) return _retval; } - -long CefStreamReaderCToCpp::Tell() -{ +int64 CefStreamReaderCToCpp::Tell() { if (CEF_MEMBER_MISSING(struct_, tell)) return 0; // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - long _retval = struct_->tell(struct_); + int64 _retval = struct_->tell(struct_); // Return type: simple return _retval; } - -int CefStreamReaderCToCpp::Eof() -{ +int CefStreamReaderCToCpp::Eof() { if (CEF_MEMBER_MISSING(struct_, eof)) return 0; @@ -147,7 +134,6 @@ int CefStreamReaderCToCpp::Eof() } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/stream_reader_ctocpp.h b/cef/libcef_dll/ctocpp/stream_reader_ctocpp.h old mode 100755 new mode 100644 index e9f0b7bc1..a153b2642 --- a/cef/libcef_dll/ctocpp/stream_reader_ctocpp.h +++ b/cef/libcef_dll/ctocpp/stream_reader_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,36 +10,36 @@ // for more information. // -#ifndef _STREAMREADER_CTOCPP_H -#define _STREAMREADER_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_STREAM_READER_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_STREAM_READER_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_stream.h" +#include "include/capi/cef_stream_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 CefStreamReaderCToCpp : public CefCToCpp -{ -public: - CefStreamReaderCToCpp(cef_stream_reader_t* str) + cef_stream_reader_t> { + public: + explicit CefStreamReaderCToCpp(cef_stream_reader_t* str) : CefCToCpp( str) {} virtual ~CefStreamReaderCToCpp() {} // CefStreamReader methods virtual size_t Read(void* ptr, size_t size, size_t n) OVERRIDE; - virtual int Seek(long offset, int whence) OVERRIDE; - virtual long Tell() OVERRIDE; + virtual int Seek(int64 offset, int whence) OVERRIDE; + virtual int64 Tell() OVERRIDE; virtual int Eof() OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _STREAMREADER_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_STREAM_READER_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/stream_writer_ctocpp.cc b/cef/libcef_dll/ctocpp/stream_writer_ctocpp.cc old mode 100755 new mode 100644 index 39911f21a..a520d99a3 --- a/cef/libcef_dll/ctocpp/stream_writer_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/stream_writer_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -17,8 +17,7 @@ // STATIC METHODS - Body may be edited by hand. CefRefPtr CefStreamWriter::CreateForFile( - const CefString& fileName) -{ + const CefString& fileName) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: fileName; type: string_byref_const @@ -34,10 +33,8 @@ CefRefPtr CefStreamWriter::CreateForFile( return CefStreamWriterCToCpp::Wrap(_retval); } - CefRefPtr CefStreamWriter::CreateForHandler( - CefRefPtr handler) -{ + CefRefPtr handler) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: handler; type: refptr_diff @@ -54,11 +51,9 @@ CefRefPtr CefStreamWriter::CreateForHandler( } - // VIRTUAL METHODS - Body may be edited by hand. -size_t CefStreamWriterCToCpp::Write(const void* ptr, size_t size, size_t n) -{ +size_t CefStreamWriterCToCpp::Write(const void* ptr, size_t size, size_t n) { if (CEF_MEMBER_MISSING(struct_, write)) return 0; @@ -79,9 +74,7 @@ size_t CefStreamWriterCToCpp::Write(const void* ptr, size_t size, size_t n) return _retval; } - -int CefStreamWriterCToCpp::Seek(long offset, int whence) -{ +int CefStreamWriterCToCpp::Seek(int64 offset, int whence) { if (CEF_MEMBER_MISSING(struct_, seek)) return 0; @@ -96,24 +89,20 @@ int CefStreamWriterCToCpp::Seek(long offset, int whence) return _retval; } - -long CefStreamWriterCToCpp::Tell() -{ +int64 CefStreamWriterCToCpp::Tell() { if (CEF_MEMBER_MISSING(struct_, tell)) return 0; // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - long _retval = struct_->tell(struct_); + int64 _retval = struct_->tell(struct_); // Return type: simple return _retval; } - -int CefStreamWriterCToCpp::Flush() -{ +int CefStreamWriterCToCpp::Flush() { if (CEF_MEMBER_MISSING(struct_, flush)) return 0; @@ -127,7 +116,6 @@ int CefStreamWriterCToCpp::Flush() } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/stream_writer_ctocpp.h b/cef/libcef_dll/ctocpp/stream_writer_ctocpp.h old mode 100755 new mode 100644 index 12083c320..a764b01ad --- a/cef/libcef_dll/ctocpp/stream_writer_ctocpp.h +++ b/cef/libcef_dll/ctocpp/stream_writer_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,36 +10,36 @@ // for more information. // -#ifndef _STREAMWRITER_CTOCPP_H -#define _STREAMWRITER_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_STREAM_WRITER_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_STREAM_WRITER_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_stream.h" +#include "include/capi/cef_stream_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 CefStreamWriterCToCpp : public CefCToCpp -{ -public: - CefStreamWriterCToCpp(cef_stream_writer_t* str) + cef_stream_writer_t> { + public: + explicit CefStreamWriterCToCpp(cef_stream_writer_t* str) : CefCToCpp( str) {} virtual ~CefStreamWriterCToCpp() {} // CefStreamWriter methods virtual size_t Write(const void* ptr, size_t size, size_t n) OVERRIDE; - virtual int Seek(long offset, int whence) OVERRIDE; - virtual long Tell() OVERRIDE; + virtual int Seek(int64 offset, int whence) OVERRIDE; + virtual int64 Tell() OVERRIDE; virtual int Flush() OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _STREAMWRITER_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_STREAM_WRITER_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/v8context_ctocpp.cc b/cef/libcef_dll/ctocpp/v8context_ctocpp.cc old mode 100755 new mode 100644 index 930f1312d..ec2eca20b --- a/cef/libcef_dll/ctocpp/v8context_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/v8context_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -18,8 +18,7 @@ // STATIC METHODS - Body may be edited by hand. -CefRefPtr CefV8Context::GetCurrentContext() -{ +CefRefPtr CefV8Context::GetCurrentContext() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute @@ -29,9 +28,7 @@ CefRefPtr CefV8Context::GetCurrentContext() return CefV8ContextCToCpp::Wrap(_retval); } - -CefRefPtr CefV8Context::GetEnteredContext() -{ +CefRefPtr CefV8Context::GetEnteredContext() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute @@ -41,9 +38,7 @@ CefRefPtr CefV8Context::GetEnteredContext() return CefV8ContextCToCpp::Wrap(_retval); } - -bool CefV8Context::InContext() -{ +bool CefV8Context::InContext() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute @@ -54,11 +49,9 @@ bool CefV8Context::InContext() } - // VIRTUAL METHODS - Body may be edited by hand. -CefRefPtr CefV8ContextCToCpp::GetBrowser() -{ +CefRefPtr CefV8ContextCToCpp::GetBrowser() { if (CEF_MEMBER_MISSING(struct_, get_browser)) return NULL; @@ -71,9 +64,7 @@ CefRefPtr CefV8ContextCToCpp::GetBrowser() return CefBrowserCToCpp::Wrap(_retval); } - -CefRefPtr CefV8ContextCToCpp::GetFrame() -{ +CefRefPtr CefV8ContextCToCpp::GetFrame() { if (CEF_MEMBER_MISSING(struct_, get_frame)) return NULL; @@ -86,9 +77,7 @@ CefRefPtr CefV8ContextCToCpp::GetFrame() return CefFrameCToCpp::Wrap(_retval); } - -CefRefPtr CefV8ContextCToCpp::GetGlobal() -{ +CefRefPtr CefV8ContextCToCpp::GetGlobal() { if (CEF_MEMBER_MISSING(struct_, get_global)) return NULL; @@ -101,9 +90,7 @@ CefRefPtr CefV8ContextCToCpp::GetGlobal() return CefV8ValueCToCpp::Wrap(_retval); } - -bool CefV8ContextCToCpp::Enter() -{ +bool CefV8ContextCToCpp::Enter() { if (CEF_MEMBER_MISSING(struct_, enter)) return false; @@ -116,9 +103,7 @@ bool CefV8ContextCToCpp::Enter() return _retval?true:false; } - -bool CefV8ContextCToCpp::Exit() -{ +bool CefV8ContextCToCpp::Exit() { if (CEF_MEMBER_MISSING(struct_, exit)) return false; @@ -131,9 +116,7 @@ bool CefV8ContextCToCpp::Exit() return _retval?true:false; } - -bool CefV8ContextCToCpp::IsSame(CefRefPtr that) -{ +bool CefV8ContextCToCpp::IsSame(CefRefPtr that) { if (CEF_MEMBER_MISSING(struct_, is_same)) return false; @@ -153,7 +136,6 @@ bool CefV8ContextCToCpp::IsSame(CefRefPtr that) } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/v8context_ctocpp.h b/cef/libcef_dll/ctocpp/v8context_ctocpp.h old mode 100755 new mode 100644 index 6bb23f8e9..a128e7fd6 --- a/cef/libcef_dll/ctocpp/v8context_ctocpp.h +++ b/cef/libcef_dll/ctocpp/v8context_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,24 +10,24 @@ // for more information. // -#ifndef _V8CONTEXT_CTOCPP_H -#define _V8CONTEXT_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_V8CONTEXT_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_V8CONTEXT_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_v8.h" +#include "include/capi/cef_v8_capi.h" #include "libcef_dll/ctocpp/ctocpp.h" // Wrap a C structure with a C++ class. // This class may be instantiated and accessed wrapper-side only. class CefV8ContextCToCpp - : public CefCToCpp -{ -public: - CefV8ContextCToCpp(cef_v8context_t* str) + : public CefCToCpp { + public: + explicit CefV8ContextCToCpp(cef_v8context_t* str) : CefCToCpp(str) {} virtual ~CefV8ContextCToCpp() {} @@ -40,6 +40,6 @@ public: virtual bool IsSame(CefRefPtr that) OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _V8CONTEXT_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_V8CONTEXT_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/v8exception_ctocpp.cc b/cef/libcef_dll/ctocpp/v8exception_ctocpp.cc old mode 100755 new mode 100644 index 0e3241d97..277f24f01 --- a/cef/libcef_dll/ctocpp/v8exception_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/v8exception_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -15,8 +15,7 @@ // VIRTUAL METHODS - Body may be edited by hand. -CefString CefV8ExceptionCToCpp::GetMessage() -{ +CefString CefV8ExceptionCToCpp::GetMessage() { if (CEF_MEMBER_MISSING(struct_, get_message)) return CefString(); @@ -31,9 +30,7 @@ CefString CefV8ExceptionCToCpp::GetMessage() return _retvalStr; } - -CefString CefV8ExceptionCToCpp::GetSourceLine() -{ +CefString CefV8ExceptionCToCpp::GetSourceLine() { if (CEF_MEMBER_MISSING(struct_, get_source_line)) return CefString(); @@ -48,9 +45,7 @@ CefString CefV8ExceptionCToCpp::GetSourceLine() return _retvalStr; } - -CefString CefV8ExceptionCToCpp::GetScriptResourceName() -{ +CefString CefV8ExceptionCToCpp::GetScriptResourceName() { if (CEF_MEMBER_MISSING(struct_, get_script_resource_name)) return CefString(); @@ -65,9 +60,7 @@ CefString CefV8ExceptionCToCpp::GetScriptResourceName() return _retvalStr; } - -int CefV8ExceptionCToCpp::GetLineNumber() -{ +int CefV8ExceptionCToCpp::GetLineNumber() { if (CEF_MEMBER_MISSING(struct_, get_line_number)) return 0; @@ -80,9 +73,7 @@ int CefV8ExceptionCToCpp::GetLineNumber() return _retval; } - -int CefV8ExceptionCToCpp::GetStartPosition() -{ +int CefV8ExceptionCToCpp::GetStartPosition() { if (CEF_MEMBER_MISSING(struct_, get_start_position)) return 0; @@ -95,9 +86,7 @@ int CefV8ExceptionCToCpp::GetStartPosition() return _retval; } - -int CefV8ExceptionCToCpp::GetEndPosition() -{ +int CefV8ExceptionCToCpp::GetEndPosition() { if (CEF_MEMBER_MISSING(struct_, get_end_position)) return 0; @@ -110,9 +99,7 @@ int CefV8ExceptionCToCpp::GetEndPosition() return _retval; } - -int CefV8ExceptionCToCpp::GetStartColumn() -{ +int CefV8ExceptionCToCpp::GetStartColumn() { if (CEF_MEMBER_MISSING(struct_, get_start_column)) return 0; @@ -125,9 +112,7 @@ int CefV8ExceptionCToCpp::GetStartColumn() return _retval; } - -int CefV8ExceptionCToCpp::GetEndColumn() -{ +int CefV8ExceptionCToCpp::GetEndColumn() { if (CEF_MEMBER_MISSING(struct_, get_end_column)) return 0; @@ -141,7 +126,6 @@ int CefV8ExceptionCToCpp::GetEndColumn() } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/v8exception_ctocpp.h b/cef/libcef_dll/ctocpp/v8exception_ctocpp.h old mode 100755 new mode 100644 index 991888af8..8966e61a2 --- a/cef/libcef_dll/ctocpp/v8exception_ctocpp.h +++ b/cef/libcef_dll/ctocpp/v8exception_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,24 +10,25 @@ // for more information. // -#ifndef _V8EXCEPTION_CTOCPP_H -#define _V8EXCEPTION_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_V8EXCEPTION_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_V8EXCEPTION_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_v8.h" +#include "include/capi/cef_v8_capi.h" #include "libcef_dll/ctocpp/ctocpp.h" // Wrap a C structure with a C++ class. // This class may be instantiated and accessed wrapper-side only. class CefV8ExceptionCToCpp - : public CefCToCpp -{ -public: - CefV8ExceptionCToCpp(cef_v8exception_t* str) + : public CefCToCpp { + public: + explicit CefV8ExceptionCToCpp(cef_v8exception_t* str) : CefCToCpp( str) {} virtual ~CefV8ExceptionCToCpp() {} @@ -43,6 +44,6 @@ public: virtual int GetEndColumn() OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _V8EXCEPTION_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_V8EXCEPTION_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/v8value_ctocpp.cc b/cef/libcef_dll/ctocpp/v8value_ctocpp.cc old mode 100755 new mode 100644 index 78adb9d9e..a1ea37c4a --- a/cef/libcef_dll/ctocpp/v8value_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/v8value_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -21,8 +21,7 @@ // STATIC METHODS - Body may be edited by hand. -CefRefPtr CefV8Value::CreateUndefined() -{ +CefRefPtr CefV8Value::CreateUndefined() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute @@ -32,9 +31,7 @@ CefRefPtr CefV8Value::CreateUndefined() return CefV8ValueCToCpp::Wrap(_retval); } - -CefRefPtr CefV8Value::CreateNull() -{ +CefRefPtr CefV8Value::CreateNull() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute @@ -44,9 +41,7 @@ CefRefPtr CefV8Value::CreateNull() return CefV8ValueCToCpp::Wrap(_retval); } - -CefRefPtr CefV8Value::CreateBool(bool value) -{ +CefRefPtr CefV8Value::CreateBool(bool value) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute @@ -57,9 +52,7 @@ CefRefPtr CefV8Value::CreateBool(bool value) return CefV8ValueCToCpp::Wrap(_retval); } - -CefRefPtr CefV8Value::CreateInt(int value) -{ +CefRefPtr CefV8Value::CreateInt(int value) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute @@ -70,9 +63,7 @@ CefRefPtr CefV8Value::CreateInt(int value) return CefV8ValueCToCpp::Wrap(_retval); } - -CefRefPtr CefV8Value::CreateDouble(double value) -{ +CefRefPtr CefV8Value::CreateDouble(double value) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute @@ -83,9 +74,7 @@ CefRefPtr CefV8Value::CreateDouble(double value) return CefV8ValueCToCpp::Wrap(_retval); } - -CefRefPtr CefV8Value::CreateDate(const CefTime& date) -{ +CefRefPtr CefV8Value::CreateDate(const CefTime& date) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute @@ -96,9 +85,7 @@ CefRefPtr CefV8Value::CreateDate(const CefTime& date) return CefV8ValueCToCpp::Wrap(_retval); } - -CefRefPtr CefV8Value::CreateString(const CefString& value) -{ +CefRefPtr CefV8Value::CreateString(const CefString& value) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Unverified params: value @@ -111,25 +98,8 @@ CefRefPtr CefV8Value::CreateString(const CefString& value) return CefV8ValueCToCpp::Wrap(_retval); } - -CefRefPtr CefV8Value::CreateObject(CefRefPtr user_data) -{ - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Unverified params: user_data - - // Execute - cef_v8value_t* _retval = cef_v8value_create_object( - CefBaseCppToC::Wrap(user_data)); - - // Return type: refptr_same - return CefV8ValueCToCpp::Wrap(_retval); -} - - CefRefPtr CefV8Value::CreateObject(CefRefPtr user_data, - CefRefPtr accessor) -{ + CefRefPtr accessor) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Unverified params: user_data, accessor @@ -143,9 +113,7 @@ CefRefPtr CefV8Value::CreateObject(CefRefPtr user_data, return CefV8ValueCToCpp::Wrap(_retval); } - -CefRefPtr CefV8Value::CreateArray() -{ +CefRefPtr CefV8Value::CreateArray() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute @@ -155,10 +123,8 @@ CefRefPtr CefV8Value::CreateArray() return CefV8ValueCToCpp::Wrap(_retval); } - CefRefPtr CefV8Value::CreateFunction(const CefString& name, - CefRefPtr handler) -{ + CefRefPtr handler) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: name; type: string_byref_const @@ -180,11 +146,9 @@ CefRefPtr CefV8Value::CreateFunction(const CefString& name, } - // VIRTUAL METHODS - Body may be edited by hand. -bool CefV8ValueCToCpp::IsUndefined() -{ +bool CefV8ValueCToCpp::IsUndefined() { if (CEF_MEMBER_MISSING(struct_, is_undefined)) return false; @@ -197,9 +161,7 @@ bool CefV8ValueCToCpp::IsUndefined() return _retval?true:false; } - -bool CefV8ValueCToCpp::IsNull() -{ +bool CefV8ValueCToCpp::IsNull() { if (CEF_MEMBER_MISSING(struct_, is_null)) return false; @@ -212,9 +174,7 @@ bool CefV8ValueCToCpp::IsNull() return _retval?true:false; } - -bool CefV8ValueCToCpp::IsBool() -{ +bool CefV8ValueCToCpp::IsBool() { if (CEF_MEMBER_MISSING(struct_, is_bool)) return false; @@ -227,9 +187,7 @@ bool CefV8ValueCToCpp::IsBool() return _retval?true:false; } - -bool CefV8ValueCToCpp::IsInt() -{ +bool CefV8ValueCToCpp::IsInt() { if (CEF_MEMBER_MISSING(struct_, is_int)) return false; @@ -242,9 +200,7 @@ bool CefV8ValueCToCpp::IsInt() return _retval?true:false; } - -bool CefV8ValueCToCpp::IsDouble() -{ +bool CefV8ValueCToCpp::IsDouble() { if (CEF_MEMBER_MISSING(struct_, is_double)) return false; @@ -257,9 +213,7 @@ bool CefV8ValueCToCpp::IsDouble() return _retval?true:false; } - -bool CefV8ValueCToCpp::IsDate() -{ +bool CefV8ValueCToCpp::IsDate() { if (CEF_MEMBER_MISSING(struct_, is_date)) return false; @@ -272,9 +226,7 @@ bool CefV8ValueCToCpp::IsDate() return _retval?true:false; } - -bool CefV8ValueCToCpp::IsString() -{ +bool CefV8ValueCToCpp::IsString() { if (CEF_MEMBER_MISSING(struct_, is_string)) return false; @@ -287,9 +239,7 @@ bool CefV8ValueCToCpp::IsString() return _retval?true:false; } - -bool CefV8ValueCToCpp::IsObject() -{ +bool CefV8ValueCToCpp::IsObject() { if (CEF_MEMBER_MISSING(struct_, is_object)) return false; @@ -302,9 +252,7 @@ bool CefV8ValueCToCpp::IsObject() return _retval?true:false; } - -bool CefV8ValueCToCpp::IsArray() -{ +bool CefV8ValueCToCpp::IsArray() { if (CEF_MEMBER_MISSING(struct_, is_array)) return false; @@ -317,9 +265,7 @@ bool CefV8ValueCToCpp::IsArray() return _retval?true:false; } - -bool CefV8ValueCToCpp::IsFunction() -{ +bool CefV8ValueCToCpp::IsFunction() { if (CEF_MEMBER_MISSING(struct_, is_function)) return false; @@ -332,9 +278,7 @@ bool CefV8ValueCToCpp::IsFunction() return _retval?true:false; } - -bool CefV8ValueCToCpp::IsSame(CefRefPtr that) -{ +bool CefV8ValueCToCpp::IsSame(CefRefPtr that) { if (CEF_MEMBER_MISSING(struct_, is_same)) return false; @@ -353,9 +297,7 @@ bool CefV8ValueCToCpp::IsSame(CefRefPtr that) return _retval?true:false; } - -bool CefV8ValueCToCpp::GetBoolValue() -{ +bool CefV8ValueCToCpp::GetBoolValue() { if (CEF_MEMBER_MISSING(struct_, get_bool_value)) return false; @@ -368,9 +310,7 @@ bool CefV8ValueCToCpp::GetBoolValue() return _retval?true:false; } - -int CefV8ValueCToCpp::GetIntValue() -{ +int CefV8ValueCToCpp::GetIntValue() { if (CEF_MEMBER_MISSING(struct_, get_int_value)) return 0; @@ -383,9 +323,7 @@ int CefV8ValueCToCpp::GetIntValue() return _retval; } - -double CefV8ValueCToCpp::GetDoubleValue() -{ +double CefV8ValueCToCpp::GetDoubleValue() { if (CEF_MEMBER_MISSING(struct_, get_double_value)) return 0; @@ -398,9 +336,7 @@ double CefV8ValueCToCpp::GetDoubleValue() return _retval; } - -CefTime CefV8ValueCToCpp::GetDateValue() -{ +CefTime CefV8ValueCToCpp::GetDateValue() { if (CEF_MEMBER_MISSING(struct_, get_date_value)) return CefTime(); @@ -413,9 +349,7 @@ CefTime CefV8ValueCToCpp::GetDateValue() return _retval; } - -CefString CefV8ValueCToCpp::GetStringValue() -{ +CefString CefV8ValueCToCpp::GetStringValue() { if (CEF_MEMBER_MISSING(struct_, get_string_value)) return CefString(); @@ -430,9 +364,7 @@ CefString CefV8ValueCToCpp::GetStringValue() return _retvalStr; } - -bool CefV8ValueCToCpp::HasValue(const CefString& key) -{ +bool CefV8ValueCToCpp::HasValue(const CefString& key) { if (CEF_MEMBER_MISSING(struct_, has_value_bykey)) return false; @@ -451,16 +383,14 @@ bool CefV8ValueCToCpp::HasValue(const CefString& key) return _retval?true:false; } - -bool CefV8ValueCToCpp::HasValue(int index) -{ +bool CefV8ValueCToCpp::HasValue(int index) { if (CEF_MEMBER_MISSING(struct_, has_value_byindex)) return false; // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: index; type: simple_byval - DCHECK(index >= 0); + DCHECK_GE(index, 0); if (index < 0) return false; @@ -472,9 +402,7 @@ bool CefV8ValueCToCpp::HasValue(int index) return _retval?true:false; } - -bool CefV8ValueCToCpp::DeleteValue(const CefString& key) -{ +bool CefV8ValueCToCpp::DeleteValue(const CefString& key) { if (CEF_MEMBER_MISSING(struct_, delete_value_bykey)) return false; @@ -493,16 +421,14 @@ bool CefV8ValueCToCpp::DeleteValue(const CefString& key) return _retval?true:false; } - -bool CefV8ValueCToCpp::DeleteValue(int index) -{ +bool CefV8ValueCToCpp::DeleteValue(int index) { if (CEF_MEMBER_MISSING(struct_, delete_value_byindex)) return false; // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: index; type: simple_byval - DCHECK(index >= 0); + DCHECK_GE(index, 0); if (index < 0) return false; @@ -514,9 +440,7 @@ bool CefV8ValueCToCpp::DeleteValue(int index) return _retval?true:false; } - -CefRefPtr CefV8ValueCToCpp::GetValue(const CefString& key) -{ +CefRefPtr CefV8ValueCToCpp::GetValue(const CefString& key) { if (CEF_MEMBER_MISSING(struct_, get_value_bykey)) return NULL; @@ -535,16 +459,14 @@ CefRefPtr CefV8ValueCToCpp::GetValue(const CefString& key) return CefV8ValueCToCpp::Wrap(_retval); } - -CefRefPtr CefV8ValueCToCpp::GetValue(int index) -{ +CefRefPtr CefV8ValueCToCpp::GetValue(int index) { if (CEF_MEMBER_MISSING(struct_, get_value_byindex)) return NULL; // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: index; type: simple_byval - DCHECK(index >= 0); + DCHECK_GE(index, 0); if (index < 0) return NULL; @@ -556,10 +478,8 @@ CefRefPtr CefV8ValueCToCpp::GetValue(int index) return CefV8ValueCToCpp::Wrap(_retval); } - bool CefV8ValueCToCpp::SetValue(const CefString& key, - CefRefPtr value, PropertyAttribute attribute) -{ + CefRefPtr value, PropertyAttribute attribute) { if (CEF_MEMBER_MISSING(struct_, set_value_bykey)) return false; @@ -584,16 +504,14 @@ bool CefV8ValueCToCpp::SetValue(const CefString& key, return _retval?true:false; } - -bool CefV8ValueCToCpp::SetValue(int index, CefRefPtr value) -{ +bool CefV8ValueCToCpp::SetValue(int index, CefRefPtr value) { if (CEF_MEMBER_MISSING(struct_, set_value_byindex)) return false; // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: index; type: simple_byval - DCHECK(index >= 0); + DCHECK_GE(index, 0); if (index < 0) return false; // Verify param: value; type: refptr_same @@ -610,10 +528,8 @@ bool CefV8ValueCToCpp::SetValue(int index, CefRefPtr value) return _retval?true:false; } - bool CefV8ValueCToCpp::SetValue(const CefString& key, AccessControl settings, - PropertyAttribute attribute) -{ + PropertyAttribute attribute) { if (CEF_MEMBER_MISSING(struct_, set_value_byaccessor)) return false; @@ -634,9 +550,7 @@ bool CefV8ValueCToCpp::SetValue(const CefString& key, AccessControl settings, return _retval?true:false; } - -bool CefV8ValueCToCpp::GetKeys(std::vector& keys) -{ +bool CefV8ValueCToCpp::GetKeys(std::vector& keys) { if (CEF_MEMBER_MISSING(struct_, get_keys)) return false; @@ -663,9 +577,7 @@ bool CefV8ValueCToCpp::GetKeys(std::vector& keys) return _retval?true:false; } - -CefRefPtr CefV8ValueCToCpp::GetUserData() -{ +CefRefPtr CefV8ValueCToCpp::GetUserData() { if (CEF_MEMBER_MISSING(struct_, get_user_data)) return NULL; @@ -678,9 +590,34 @@ CefRefPtr CefV8ValueCToCpp::GetUserData() return CefBaseCppToC::Unwrap(_retval); } +int CefV8ValueCToCpp::GetExternallyAllocatedMemory() { + if (CEF_MEMBER_MISSING(struct_, get_externally_allocated_memory)) + return 0; -int CefV8ValueCToCpp::GetArrayLength() -{ + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = struct_->get_externally_allocated_memory(struct_); + + // Return type: simple + return _retval; +} + +int CefV8ValueCToCpp::AdjustExternallyAllocatedMemory(int change_in_bytes) { + if (CEF_MEMBER_MISSING(struct_, adjust_externally_allocated_memory)) + return 0; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = struct_->adjust_externally_allocated_memory(struct_, + change_in_bytes); + + // Return type: simple + return _retval; +} + +int CefV8ValueCToCpp::GetArrayLength() { if (CEF_MEMBER_MISSING(struct_, get_array_length)) return 0; @@ -693,9 +630,7 @@ int CefV8ValueCToCpp::GetArrayLength() return _retval; } - -CefString CefV8ValueCToCpp::GetFunctionName() -{ +CefString CefV8ValueCToCpp::GetFunctionName() { if (CEF_MEMBER_MISSING(struct_, get_function_name)) return CefString(); @@ -710,9 +645,7 @@ CefString CefV8ValueCToCpp::GetFunctionName() return _retvalStr; } - -CefRefPtr CefV8ValueCToCpp::GetFunctionHandler() -{ +CefRefPtr CefV8ValueCToCpp::GetFunctionHandler() { if (CEF_MEMBER_MISSING(struct_, get_function_handler)) return NULL; @@ -725,11 +658,9 @@ CefRefPtr CefV8ValueCToCpp::GetFunctionHandler() return CefV8HandlerCppToC::Unwrap(_retval); } - bool CefV8ValueCToCpp::ExecuteFunction(CefRefPtr object, const CefV8ValueList& arguments, CefRefPtr& retval, - CefRefPtr& exception, bool rethrow_exception) -{ + CefRefPtr& exception, bool rethrow_exception) { if (CEF_MEMBER_MISSING(struct_, execute_function)) return false; @@ -751,12 +682,12 @@ bool CefV8ValueCToCpp::ExecuteFunction(CefRefPtr object, } // Translate param: retval; type: refptr_same_byref cef_v8value_t* retvalStruct = NULL; - if(retval.get()) + if (retval.get()) retvalStruct = CefV8ValueCToCpp::Unwrap(retval); cef_v8value_t* retvalOrig = retvalStruct; // Translate param: exception; type: refptr_same_byref cef_v8exception_t* exceptionStruct = NULL; - if(exception.get()) + if (exception.get()) exceptionStruct = CefV8ExceptionCToCpp::Unwrap(exception); cef_v8exception_t* exceptionOrig = exceptionStruct; @@ -769,6 +700,9 @@ bool CefV8ValueCToCpp::ExecuteFunction(CefRefPtr object, &exceptionStruct, rethrow_exception); + // Restore param:arguments; type: refptr_vec_same_byref_const + if (argumentsList) + delete [] argumentsList; // Restore param:retval; type: refptr_same_byref if (retvalStruct) { if (retvalStruct != retvalOrig) { @@ -790,12 +724,10 @@ bool CefV8ValueCToCpp::ExecuteFunction(CefRefPtr object, return _retval?true:false; } - bool CefV8ValueCToCpp::ExecuteFunctionWithContext( CefRefPtr context, CefRefPtr object, const CefV8ValueList& arguments, CefRefPtr& retval, - CefRefPtr& exception, bool rethrow_exception) -{ + CefRefPtr& exception, bool rethrow_exception) { if (CEF_MEMBER_MISSING(struct_, execute_function_with_context)) return false; @@ -821,12 +753,12 @@ bool CefV8ValueCToCpp::ExecuteFunctionWithContext( } // Translate param: retval; type: refptr_same_byref cef_v8value_t* retvalStruct = NULL; - if(retval.get()) + if (retval.get()) retvalStruct = CefV8ValueCToCpp::Unwrap(retval); cef_v8value_t* retvalOrig = retvalStruct; // Translate param: exception; type: refptr_same_byref cef_v8exception_t* exceptionStruct = NULL; - if(exception.get()) + if (exception.get()) exceptionStruct = CefV8ExceptionCToCpp::Unwrap(exception); cef_v8exception_t* exceptionOrig = exceptionStruct; @@ -840,6 +772,9 @@ bool CefV8ValueCToCpp::ExecuteFunctionWithContext( &exceptionStruct, rethrow_exception); + // Restore param:arguments; type: refptr_vec_same_byref_const + if (argumentsList) + delete [] argumentsList; // Restore param:retval; type: refptr_same_byref if (retvalStruct) { if (retvalStruct != retvalOrig) { @@ -862,7 +797,6 @@ bool CefV8ValueCToCpp::ExecuteFunctionWithContext( } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/v8value_ctocpp.h b/cef/libcef_dll/ctocpp/v8value_ctocpp.h old mode 100755 new mode 100644 index c824d03d5..80766b72a --- a/cef/libcef_dll/ctocpp/v8value_ctocpp.h +++ b/cef/libcef_dll/ctocpp/v8value_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,24 +10,25 @@ // for more information. // -#ifndef _V8VALUE_CTOCPP_H -#define _V8VALUE_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_V8VALUE_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_V8VALUE_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include +#include "include/cef_v8.h" +#include "include/capi/cef_v8_capi.h" #include "libcef_dll/ctocpp/ctocpp.h" // Wrap a C structure with a C++ class. // This class may be instantiated and accessed wrapper-side only. class CefV8ValueCToCpp - : public CefCToCpp -{ -public: - CefV8ValueCToCpp(cef_v8value_t* str) + : public CefCToCpp { + public: + explicit CefV8ValueCToCpp(cef_v8value_t* str) : CefCToCpp(str) {} virtual ~CefV8ValueCToCpp() {} @@ -61,6 +62,8 @@ public: PropertyAttribute attribute) OVERRIDE; virtual bool GetKeys(std::vector& keys) OVERRIDE; virtual CefRefPtr GetUserData() OVERRIDE; + virtual int GetExternallyAllocatedMemory() OVERRIDE; + virtual int AdjustExternallyAllocatedMemory(int change_in_bytes) OVERRIDE; virtual int GetArrayLength() OVERRIDE; virtual CefString GetFunctionName() OVERRIDE; virtual CefRefPtr GetFunctionHandler() OVERRIDE; @@ -73,6 +76,6 @@ public: bool rethrow_exception) OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _V8VALUE_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_V8VALUE_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/web_urlrequest_ctocpp.cc b/cef/libcef_dll/ctocpp/web_urlrequest_ctocpp.cc old mode 100755 new mode 100644 index 589fded3f..b99490e30 --- a/cef/libcef_dll/ctocpp/web_urlrequest_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/web_urlrequest_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -18,8 +18,7 @@ // STATIC METHODS - Body may be edited by hand. CefRefPtr CefWebURLRequest::CreateWebURLRequest( - CefRefPtr request, CefRefPtr client) -{ + CefRefPtr request, CefRefPtr client) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: request; type: refptr_same @@ -41,11 +40,9 @@ CefRefPtr CefWebURLRequest::CreateWebURLRequest( } - // VIRTUAL METHODS - Body may be edited by hand. -void CefWebURLRequestCToCpp::Cancel() -{ +void CefWebURLRequestCToCpp::Cancel() { if (CEF_MEMBER_MISSING(struct_, cancel)) return; @@ -55,9 +52,7 @@ void CefWebURLRequestCToCpp::Cancel() struct_->cancel(struct_); } - -CefWebURLRequest::RequestState CefWebURLRequestCToCpp::GetState() -{ +CefWebURLRequest::RequestState CefWebURLRequestCToCpp::GetState() { if (CEF_MEMBER_MISSING(struct_, get_state)) return WUR_STATE_UNSENT; @@ -71,7 +66,6 @@ CefWebURLRequest::RequestState CefWebURLRequestCToCpp::GetState() } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/web_urlrequest_ctocpp.h b/cef/libcef_dll/ctocpp/web_urlrequest_ctocpp.h old mode 100755 new mode 100644 index 4a7e01de4..0a363fc01 --- a/cef/libcef_dll/ctocpp/web_urlrequest_ctocpp.h +++ b/cef/libcef_dll/ctocpp/web_urlrequest_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,25 +10,25 @@ // for more information. // -#ifndef _WEBURLREQUEST_CTOCPP_H -#define _WEBURLREQUEST_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_WEB_URLREQUEST_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_WEB_URLREQUEST_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_web_urlrequest.h" +#include "include/capi/cef_web_urlrequest_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 CefWebURLRequestCToCpp : public CefCToCpp -{ -public: - CefWebURLRequestCToCpp(cef_web_urlrequest_t* str) + cef_web_urlrequest_t> { + public: + explicit CefWebURLRequestCToCpp(cef_web_urlrequest_t* str) : CefCToCpp(str) {} virtual ~CefWebURLRequestCToCpp() {} @@ -38,6 +38,6 @@ public: virtual RequestState GetState() OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _WEBURLREQUEST_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_WEB_URLREQUEST_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/xml_reader_ctocpp.cc b/cef/libcef_dll/ctocpp/xml_reader_ctocpp.cc old mode 100755 new mode 100644 index 23f7351be..73f0724ad --- a/cef/libcef_dll/ctocpp/xml_reader_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/xml_reader_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -17,8 +17,7 @@ // STATIC METHODS - Body may be edited by hand. CefRefPtr CefXmlReader::Create(CefRefPtr stream, - EncodingType encodingType, const CefString& URI) -{ + EncodingType encodingType, const CefString& URI) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: stream; type: refptr_same @@ -41,11 +40,9 @@ CefRefPtr CefXmlReader::Create(CefRefPtr stream, } - // VIRTUAL METHODS - Body may be edited by hand. -bool CefXmlReaderCToCpp::MoveToNextNode() -{ +bool CefXmlReaderCToCpp::MoveToNextNode() { if (CEF_MEMBER_MISSING(struct_, move_to_next_node)) return false; @@ -58,9 +55,7 @@ bool CefXmlReaderCToCpp::MoveToNextNode() return _retval?true:false; } - -bool CefXmlReaderCToCpp::Close() -{ +bool CefXmlReaderCToCpp::Close() { if (CEF_MEMBER_MISSING(struct_, close)) return false; @@ -73,9 +68,7 @@ bool CefXmlReaderCToCpp::Close() return _retval?true:false; } - -bool CefXmlReaderCToCpp::HasError() -{ +bool CefXmlReaderCToCpp::HasError() { if (CEF_MEMBER_MISSING(struct_, has_error)) return false; @@ -88,9 +81,7 @@ bool CefXmlReaderCToCpp::HasError() return _retval?true:false; } - -CefString CefXmlReaderCToCpp::GetError() -{ +CefString CefXmlReaderCToCpp::GetError() { if (CEF_MEMBER_MISSING(struct_, get_error)) return CefString(); @@ -105,9 +96,7 @@ CefString CefXmlReaderCToCpp::GetError() return _retvalStr; } - -CefXmlReader::NodeType CefXmlReaderCToCpp::GetType() -{ +CefXmlReader::NodeType CefXmlReaderCToCpp::GetType() { if (CEF_MEMBER_MISSING(struct_, get_type)) return XML_NODE_UNSUPPORTED; @@ -120,9 +109,7 @@ CefXmlReader::NodeType CefXmlReaderCToCpp::GetType() return _retval; } - -int CefXmlReaderCToCpp::GetDepth() -{ +int CefXmlReaderCToCpp::GetDepth() { if (CEF_MEMBER_MISSING(struct_, get_depth)) return 0; @@ -135,9 +122,7 @@ int CefXmlReaderCToCpp::GetDepth() return _retval; } - -CefString CefXmlReaderCToCpp::GetLocalName() -{ +CefString CefXmlReaderCToCpp::GetLocalName() { if (CEF_MEMBER_MISSING(struct_, get_local_name)) return CefString(); @@ -152,9 +137,7 @@ CefString CefXmlReaderCToCpp::GetLocalName() return _retvalStr; } - -CefString CefXmlReaderCToCpp::GetPrefix() -{ +CefString CefXmlReaderCToCpp::GetPrefix() { if (CEF_MEMBER_MISSING(struct_, get_prefix)) return CefString(); @@ -169,9 +152,7 @@ CefString CefXmlReaderCToCpp::GetPrefix() return _retvalStr; } - -CefString CefXmlReaderCToCpp::GetQualifiedName() -{ +CefString CefXmlReaderCToCpp::GetQualifiedName() { if (CEF_MEMBER_MISSING(struct_, get_qualified_name)) return CefString(); @@ -186,9 +167,7 @@ CefString CefXmlReaderCToCpp::GetQualifiedName() return _retvalStr; } - -CefString CefXmlReaderCToCpp::GetNamespaceURI() -{ +CefString CefXmlReaderCToCpp::GetNamespaceURI() { if (CEF_MEMBER_MISSING(struct_, get_namespace_uri)) return CefString(); @@ -203,9 +182,7 @@ CefString CefXmlReaderCToCpp::GetNamespaceURI() return _retvalStr; } - -CefString CefXmlReaderCToCpp::GetBaseURI() -{ +CefString CefXmlReaderCToCpp::GetBaseURI() { if (CEF_MEMBER_MISSING(struct_, get_base_uri)) return CefString(); @@ -220,9 +197,7 @@ CefString CefXmlReaderCToCpp::GetBaseURI() return _retvalStr; } - -CefString CefXmlReaderCToCpp::GetXmlLang() -{ +CefString CefXmlReaderCToCpp::GetXmlLang() { if (CEF_MEMBER_MISSING(struct_, get_xml_lang)) return CefString(); @@ -237,9 +212,7 @@ CefString CefXmlReaderCToCpp::GetXmlLang() return _retvalStr; } - -bool CefXmlReaderCToCpp::IsEmptyElement() -{ +bool CefXmlReaderCToCpp::IsEmptyElement() { if (CEF_MEMBER_MISSING(struct_, is_empty_element)) return false; @@ -252,9 +225,7 @@ bool CefXmlReaderCToCpp::IsEmptyElement() return _retval?true:false; } - -bool CefXmlReaderCToCpp::HasValue() -{ +bool CefXmlReaderCToCpp::HasValue() { if (CEF_MEMBER_MISSING(struct_, has_value)) return false; @@ -267,9 +238,7 @@ bool CefXmlReaderCToCpp::HasValue() return _retval?true:false; } - -CefString CefXmlReaderCToCpp::GetValue() -{ +CefString CefXmlReaderCToCpp::GetValue() { if (CEF_MEMBER_MISSING(struct_, get_value)) return CefString(); @@ -284,9 +253,7 @@ CefString CefXmlReaderCToCpp::GetValue() return _retvalStr; } - -bool CefXmlReaderCToCpp::HasAttributes() -{ +bool CefXmlReaderCToCpp::HasAttributes() { if (CEF_MEMBER_MISSING(struct_, has_attributes)) return false; @@ -299,9 +266,7 @@ bool CefXmlReaderCToCpp::HasAttributes() return _retval?true:false; } - -size_t CefXmlReaderCToCpp::GetAttributeCount() -{ +size_t CefXmlReaderCToCpp::GetAttributeCount() { if (CEF_MEMBER_MISSING(struct_, get_attribute_count)) return 0; @@ -314,16 +279,14 @@ size_t CefXmlReaderCToCpp::GetAttributeCount() return _retval; } - -CefString CefXmlReaderCToCpp::GetAttribute(int index) -{ +CefString CefXmlReaderCToCpp::GetAttribute(int index) { if (CEF_MEMBER_MISSING(struct_, get_attribute_byindex)) return CefString(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: index; type: simple_byval - DCHECK(index >= 0); + DCHECK_GE(index, 0); if (index < 0) return CefString(); @@ -337,9 +300,7 @@ CefString CefXmlReaderCToCpp::GetAttribute(int index) return _retvalStr; } - -CefString CefXmlReaderCToCpp::GetAttribute(const CefString& qualifiedName) -{ +CefString CefXmlReaderCToCpp::GetAttribute(const CefString& qualifiedName) { if (CEF_MEMBER_MISSING(struct_, get_attribute_byqname)) return CefString(); @@ -360,10 +321,8 @@ CefString CefXmlReaderCToCpp::GetAttribute(const CefString& qualifiedName) return _retvalStr; } - CefString CefXmlReaderCToCpp::GetAttribute(const CefString& localName, - const CefString& namespaceURI) -{ + const CefString& namespaceURI) { if (CEF_MEMBER_MISSING(struct_, get_attribute_bylname)) return CefString(); @@ -389,9 +348,7 @@ CefString CefXmlReaderCToCpp::GetAttribute(const CefString& localName, return _retvalStr; } - -CefString CefXmlReaderCToCpp::GetInnerXml() -{ +CefString CefXmlReaderCToCpp::GetInnerXml() { if (CEF_MEMBER_MISSING(struct_, get_inner_xml)) return CefString(); @@ -406,9 +363,7 @@ CefString CefXmlReaderCToCpp::GetInnerXml() return _retvalStr; } - -CefString CefXmlReaderCToCpp::GetOuterXml() -{ +CefString CefXmlReaderCToCpp::GetOuterXml() { if (CEF_MEMBER_MISSING(struct_, get_outer_xml)) return CefString(); @@ -423,9 +378,7 @@ CefString CefXmlReaderCToCpp::GetOuterXml() return _retvalStr; } - -int CefXmlReaderCToCpp::GetLineNumber() -{ +int CefXmlReaderCToCpp::GetLineNumber() { if (CEF_MEMBER_MISSING(struct_, get_line_number)) return 0; @@ -438,16 +391,14 @@ int CefXmlReaderCToCpp::GetLineNumber() return _retval; } - -bool CefXmlReaderCToCpp::MoveToAttribute(int index) -{ +bool CefXmlReaderCToCpp::MoveToAttribute(int index) { if (CEF_MEMBER_MISSING(struct_, move_to_attribute_byindex)) return false; // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: index; type: simple_byval - DCHECK(index >= 0); + DCHECK_GE(index, 0); if (index < 0) return false; @@ -459,9 +410,7 @@ bool CefXmlReaderCToCpp::MoveToAttribute(int index) return _retval?true:false; } - -bool CefXmlReaderCToCpp::MoveToAttribute(const CefString& qualifiedName) -{ +bool CefXmlReaderCToCpp::MoveToAttribute(const CefString& qualifiedName) { if (CEF_MEMBER_MISSING(struct_, move_to_attribute_byqname)) return false; @@ -480,10 +429,8 @@ bool CefXmlReaderCToCpp::MoveToAttribute(const CefString& qualifiedName) return _retval?true:false; } - bool CefXmlReaderCToCpp::MoveToAttribute(const CefString& localName, - const CefString& namespaceURI) -{ + const CefString& namespaceURI) { if (CEF_MEMBER_MISSING(struct_, move_to_attribute_bylname)) return false; @@ -507,9 +454,7 @@ bool CefXmlReaderCToCpp::MoveToAttribute(const CefString& localName, return _retval?true:false; } - -bool CefXmlReaderCToCpp::MoveToFirstAttribute() -{ +bool CefXmlReaderCToCpp::MoveToFirstAttribute() { if (CEF_MEMBER_MISSING(struct_, move_to_first_attribute)) return false; @@ -522,9 +467,7 @@ bool CefXmlReaderCToCpp::MoveToFirstAttribute() return _retval?true:false; } - -bool CefXmlReaderCToCpp::MoveToNextAttribute() -{ +bool CefXmlReaderCToCpp::MoveToNextAttribute() { if (CEF_MEMBER_MISSING(struct_, move_to_next_attribute)) return false; @@ -537,9 +480,7 @@ bool CefXmlReaderCToCpp::MoveToNextAttribute() return _retval?true:false; } - -bool CefXmlReaderCToCpp::MoveToCarryingElement() -{ +bool CefXmlReaderCToCpp::MoveToCarryingElement() { if (CEF_MEMBER_MISSING(struct_, move_to_carrying_element)) return false; @@ -553,7 +494,6 @@ bool CefXmlReaderCToCpp::MoveToCarryingElement() } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/xml_reader_ctocpp.h b/cef/libcef_dll/ctocpp/xml_reader_ctocpp.h old mode 100755 new mode 100644 index 27bbdc708..eeaad3dd6 --- a/cef/libcef_dll/ctocpp/xml_reader_ctocpp.h +++ b/cef/libcef_dll/ctocpp/xml_reader_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,24 +10,24 @@ // for more information. // -#ifndef _XMLREADER_CTOCPP_H -#define _XMLREADER_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_XML_READER_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_XML_READER_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_xml_reader.h" +#include "include/capi/cef_xml_reader_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 CefXmlReaderCToCpp - : public CefCToCpp -{ -public: - CefXmlReaderCToCpp(cef_xml_reader_t* str) + : public CefCToCpp { + public: + explicit CefXmlReaderCToCpp(cef_xml_reader_t* str) : CefCToCpp(str) {} virtual ~CefXmlReaderCToCpp() {} @@ -65,6 +65,6 @@ public: virtual bool MoveToCarryingElement() OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _XMLREADER_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_XML_READER_CTOCPP_H_ diff --git a/cef/libcef_dll/ctocpp/zip_reader_ctocpp.cc b/cef/libcef_dll/ctocpp/zip_reader_ctocpp.cc old mode 100755 new mode 100644 index 76d85f4b4..44401ed48 --- a/cef/libcef_dll/ctocpp/zip_reader_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/zip_reader_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -16,8 +16,8 @@ // STATIC METHODS - Body may be edited by hand. -CefRefPtr CefZipReader::Create(CefRefPtr stream) -{ +CefRefPtr CefZipReader::Create( + CefRefPtr stream) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: stream; type: refptr_same @@ -34,11 +34,9 @@ CefRefPtr CefZipReader::Create(CefRefPtr stream) } - // VIRTUAL METHODS - Body may be edited by hand. -bool CefZipReaderCToCpp::MoveToFirstFile() -{ +bool CefZipReaderCToCpp::MoveToFirstFile() { if (CEF_MEMBER_MISSING(struct_, move_to_first_file)) return false; @@ -51,9 +49,7 @@ bool CefZipReaderCToCpp::MoveToFirstFile() return _retval?true:false; } - -bool CefZipReaderCToCpp::MoveToNextFile() -{ +bool CefZipReaderCToCpp::MoveToNextFile() { if (CEF_MEMBER_MISSING(struct_, move_to_next_file)) return false; @@ -66,10 +62,8 @@ bool CefZipReaderCToCpp::MoveToNextFile() return _retval?true:false; } - bool CefZipReaderCToCpp::MoveToFile(const CefString& fileName, - bool caseSensitive) -{ + bool caseSensitive) { if (CEF_MEMBER_MISSING(struct_, move_to_file)) return false; @@ -89,9 +83,7 @@ bool CefZipReaderCToCpp::MoveToFile(const CefString& fileName, return _retval?true:false; } - -bool CefZipReaderCToCpp::Close() -{ +bool CefZipReaderCToCpp::Close() { if (CEF_MEMBER_MISSING(struct_, close)) return false; @@ -104,9 +96,7 @@ bool CefZipReaderCToCpp::Close() return _retval?true:false; } - -CefString CefZipReaderCToCpp::GetFileName() -{ +CefString CefZipReaderCToCpp::GetFileName() { if (CEF_MEMBER_MISSING(struct_, get_file_name)) return CefString(); @@ -121,24 +111,20 @@ CefString CefZipReaderCToCpp::GetFileName() return _retvalStr; } - -long CefZipReaderCToCpp::GetFileSize() -{ +int64 CefZipReaderCToCpp::GetFileSize() { if (CEF_MEMBER_MISSING(struct_, get_file_size)) return 0; // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - long _retval = struct_->get_file_size(struct_); + int64 _retval = struct_->get_file_size(struct_); // Return type: simple return _retval; } - -time_t CefZipReaderCToCpp::GetFileLastModified() -{ +time_t CefZipReaderCToCpp::GetFileLastModified() { if (CEF_MEMBER_MISSING(struct_, get_file_last_modified)) return 0; @@ -151,9 +137,7 @@ time_t CefZipReaderCToCpp::GetFileLastModified() return _retval; } - -bool CefZipReaderCToCpp::OpenFile(const CefString& password) -{ +bool CefZipReaderCToCpp::OpenFile(const CefString& password) { if (CEF_MEMBER_MISSING(struct_, open_file)) return false; @@ -169,9 +153,7 @@ bool CefZipReaderCToCpp::OpenFile(const CefString& password) return _retval?true:false; } - -bool CefZipReaderCToCpp::CloseFile() -{ +bool CefZipReaderCToCpp::CloseFile() { if (CEF_MEMBER_MISSING(struct_, close_file)) return false; @@ -184,9 +166,7 @@ bool CefZipReaderCToCpp::CloseFile() return _retval?true:false; } - -int CefZipReaderCToCpp::ReadFile(void* buffer, size_t bufferSize) -{ +int CefZipReaderCToCpp::ReadFile(void* buffer, size_t bufferSize) { if (CEF_MEMBER_MISSING(struct_, read_file)) return 0; @@ -206,24 +186,20 @@ int CefZipReaderCToCpp::ReadFile(void* buffer, size_t bufferSize) return _retval; } - -long CefZipReaderCToCpp::Tell() -{ +int64 CefZipReaderCToCpp::Tell() { if (CEF_MEMBER_MISSING(struct_, tell)) return 0; // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - long _retval = struct_->tell(struct_); + int64 _retval = struct_->tell(struct_); // Return type: simple return _retval; } - -bool CefZipReaderCToCpp::Eof() -{ +bool CefZipReaderCToCpp::Eof() { if (CEF_MEMBER_MISSING(struct_, eof)) return false; @@ -237,7 +213,6 @@ bool CefZipReaderCToCpp::Eof() } - #ifndef NDEBUG template<> long CefCToCpp::DebugObjCt = 0; diff --git a/cef/libcef_dll/ctocpp/zip_reader_ctocpp.h b/cef/libcef_dll/ctocpp/zip_reader_ctocpp.h old mode 100755 new mode 100644 index c293ece3f..c9464a7d3 --- a/cef/libcef_dll/ctocpp/zip_reader_ctocpp.h +++ b/cef/libcef_dll/ctocpp/zip_reader_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,24 +10,24 @@ // for more information. // -#ifndef _ZIPREADER_CTOCPP_H -#define _ZIPREADER_CTOCPP_H +#ifndef CEF_LIBCEF_DLL_CTOCPP_ZIP_READER_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_ZIP_READER_CTOCPP_H_ +#pragma once #ifndef USING_CEF_SHARED #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#else // USING_CEF_SHARED -#include "include/cef.h" -#include "include/cef_capi.h" +#include "include/cef_zip_reader.h" +#include "include/capi/cef_zip_reader_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 CefZipReaderCToCpp - : public CefCToCpp -{ -public: - CefZipReaderCToCpp(cef_zip_reader_t* str) + : public CefCToCpp { + public: + explicit CefZipReaderCToCpp(cef_zip_reader_t* str) : CefCToCpp(str) {} virtual ~CefZipReaderCToCpp() {} @@ -38,15 +38,15 @@ public: bool caseSensitive) OVERRIDE; virtual bool Close() OVERRIDE; virtual CefString GetFileName() OVERRIDE; - virtual long GetFileSize() OVERRIDE; + virtual int64 GetFileSize() OVERRIDE; virtual time_t GetFileLastModified() OVERRIDE; virtual bool OpenFile(const CefString& password) OVERRIDE; virtual bool CloseFile() OVERRIDE; virtual int ReadFile(void* buffer, size_t bufferSize) OVERRIDE; - virtual long Tell() OVERRIDE; + virtual int64 Tell() OVERRIDE; virtual bool Eof() OVERRIDE; }; -#endif // USING_CEF_SHARED -#endif // _ZIPREADER_CTOCPP_H +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_ZIP_READER_CTOCPP_H_ diff --git a/cef/libcef_dll/transfer_util.cpp b/cef/libcef_dll/transfer_util.cpp old mode 100755 new mode 100644 diff --git a/cef/libcef_dll/transfer_util.h b/cef/libcef_dll/transfer_util.h old mode 100755 new mode 100644 index 7992dd392..88dff1a38 --- a/cef/libcef_dll/transfer_util.h +++ b/cef/libcef_dll/transfer_util.h @@ -2,14 +2,16 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#ifndef _TRANSFER_UTIL_H -#define _TRANSFER_UTIL_H +#ifndef CEF_LIBCEF_DLL_TRANSFER_UTIL_H_ +#define CEF_LIBCEF_DLL_TRANSFER_UTIL_H_ +#pragma once + +#include +#include #include "include/internal/cef_string_list.h" #include "include/internal/cef_string_map.h" #include "include/internal/cef_string_multimap.h" -#include -#include // Copy contents from one list type to another. typedef std::vector StringList; @@ -32,4 +34,4 @@ void transfer_string_multimap_contents(cef_string_multimap_t fromMap, void transfer_string_multimap_contents(const StringMultimap& fromMap, cef_string_multimap_t toMap); -#endif // _TRANSFER_UTIL_H +#endif // CEF_LIBCEF_DLL_TRANSFER_UTIL_H_ diff --git a/cef/libcef_dll/wrapper/cef_byte_read_handler.cc b/cef/libcef_dll/wrapper/cef_byte_read_handler.cc old mode 100755 new mode 100644 index 1620f9b04..8ae5b2d8b --- a/cef/libcef_dll/wrapper/cef_byte_read_handler.cc +++ b/cef/libcef_dll/wrapper/cef_byte_read_handler.cc @@ -2,17 +2,16 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "include/cef_wrapper.h" +#include "include/wrapper/cef_byte_read_handler.h" +#include #include "libcef_dll/cef_logging.h" CefByteReadHandler::CefByteReadHandler(const unsigned char* bytes, size_t size, CefRefPtr source) - : bytes_(bytes), size_(size), offset_(0), source_(source) -{ + : bytes_(bytes), size_(size), offset_(0), source_(source) { } -size_t CefByteReadHandler::Read(void* ptr, size_t size, size_t n) -{ +size_t CefByteReadHandler::Read(void* ptr, size_t size, size_t n) { AutoLock lock_scope(this); size_t s = (size_ - offset_) / size; size_t ret = std::min(n, s); @@ -21,25 +20,26 @@ size_t CefByteReadHandler::Read(void* ptr, size_t size, size_t n) return ret; } -int CefByteReadHandler::Seek(long offset, int whence) -{ +int CefByteReadHandler::Seek(int64 offset, int whence) { int rv = -1L; AutoLock lock_scope(this); - switch(whence) { + switch (whence) { case SEEK_CUR: - if(offset_ + offset > size_) + if (offset_ + offset > size_ || offset_ + offset < 0) break; offset_ += offset; rv = 0; break; - case SEEK_END: - if(offset > static_cast(size_)) + case SEEK_END: { + int64 offset_abs = abs(offset); + if (offset_abs > size_) break; - offset_ = size_ - offset; + offset_ = size_ - offset_abs; rv = 0; break; + } case SEEK_SET: - if(offset > static_cast(size_)) + if (offset > size_ || offset < 0) break; offset_ = offset; rv = 0; @@ -49,14 +49,12 @@ int CefByteReadHandler::Seek(long offset, int whence) return rv; } -long CefByteReadHandler::Tell() -{ +int64 CefByteReadHandler::Tell() { AutoLock lock_scope(this); return offset_; } -int CefByteReadHandler::Eof() -{ +int CefByteReadHandler::Eof() { AutoLock lock_scope(this); return (offset_ >= size_); } diff --git a/cef/libcef_dll/wrapper/cef_xml_object.cc b/cef/libcef_dll/wrapper/cef_xml_object.cc old mode 100755 new mode 100644 index db6b896fa..49b1ff586 --- a/cef/libcef_dll/wrapper/cef_xml_object.cc +++ b/cef/libcef_dll/wrapper/cef_xml_object.cc @@ -2,24 +2,22 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "include/cef_wrapper.h" +#include "include/wrapper/cef_xml_object.h" +#include "include/cef_stream.h" #include "libcef_dll/cef_logging.h" #include namespace { -class CefXmlObjectLoader -{ -public: - CefXmlObjectLoader(CefRefPtr root_object) - : root_object_(root_object) - { +class CefXmlObjectLoader { + public: + explicit CefXmlObjectLoader(CefRefPtr root_object) + : root_object_(root_object) { } bool Load(CefRefPtr stream, CefXmlReader::EncodingType encodingType, - const CefString& URI) - { + const CefString& URI) { CefRefPtr reader( CefXmlReader::Create(stream, encodingType, URI)); if (!reader.get()) @@ -33,7 +31,7 @@ public: CefXmlReader::NodeType cur_type; std::stringstream cur_value; bool last_has_ns = false; - + queue.push_back(root_object_); do { @@ -49,7 +47,7 @@ public: // Add to the current value. cur_value << std::string(reader->GetOuterXml()); continue; - } else if(last_has_ns && reader->GetPrefix().empty()) { + } else if (last_has_ns && reader->GetPrefix().empty()) { if (!cur_object->HasChildren()) { // Start a new value because the last element has a namespace and // this element does not. @@ -82,11 +80,11 @@ public: do { new_object->SetAttributeValue(reader->GetQualifiedName(), reader->GetValue()); - } while(reader->MoveToNextAttribute()); + } while (reader->MoveToNextAttribute()); reader->MoveToCarryingElement(); } } - } else if(cur_type == XML_NODE_ELEMENT_END) { + } else if (cur_type == XML_NODE_ELEMENT_END) { if (cur_depth == value_depth) { // Ending an element that is already in the value. continue; @@ -116,8 +114,8 @@ public: // Set the current object to the previous object in the queue. cur_object = queue.back().get(); - } else if(cur_type == XML_NODE_TEXT || cur_type == XML_NODE_CDATA || - cur_type == XML_NODE_ENTITY_REFERENCE) { + } else if (cur_type == XML_NODE_TEXT || cur_type == XML_NODE_CDATA || + cur_type == XML_NODE_ENTITY_REFERENCE) { if (cur_depth == value_depth) { // Add to the current value. cur_value << std::string(reader->GetValue()); @@ -135,7 +133,7 @@ public: break; } } - } while(reader->MoveToNextNode()); + } while (reader->MoveToNextNode()); } if (reader->HasError()) { @@ -148,26 +146,23 @@ public: CefString GetLoadError() { return load_error_; } -private: + private: CefString load_error_; CefRefPtr root_object_; }; -} // namespace +} // namespace CefXmlObject::CefXmlObject(const CefString& name) - : name_(name), parent_(NULL) -{ + : name_(name), parent_(NULL) { } -CefXmlObject::~CefXmlObject() -{ +CefXmlObject::~CefXmlObject() { } bool CefXmlObject::Load(CefRefPtr stream, CefXmlReader::EncodingType encodingType, - const CefString& URI, CefString* loadError) -{ + const CefString& URI, CefString* loadError) { AutoLock lock_scope(this); Clear(); @@ -180,8 +175,7 @@ bool CefXmlObject::Load(CefRefPtr stream, return true; } -void CefXmlObject::Set(CefRefPtr object) -{ +void CefXmlObject::Set(CefRefPtr object) { DCHECK(object.get()); AutoLock lock_scope1(this); @@ -193,8 +187,7 @@ void CefXmlObject::Set(CefRefPtr object) } void CefXmlObject::Append(CefRefPtr object, - bool overwriteAttributes) -{ + bool overwriteAttributes) { DCHECK(object.get()); AutoLock lock_scope1(this); @@ -219,8 +212,7 @@ void CefXmlObject::Append(CefRefPtr object, } } -CefRefPtr CefXmlObject::Duplicate() -{ +CefRefPtr CefXmlObject::Duplicate() { CefRefPtr new_obj; { AutoLock lock_scope(this); @@ -230,15 +222,13 @@ CefRefPtr CefXmlObject::Duplicate() return new_obj; } -void CefXmlObject::Clear() -{ +void CefXmlObject::Clear() { AutoLock lock_scope(this); ClearChildren(); ClearAttributes(); } -CefString CefXmlObject::GetName() -{ +CefString CefXmlObject::GetName() { CefString name; { AutoLock lock_scope(this); @@ -247,8 +237,7 @@ CefString CefXmlObject::GetName() return name; } -bool CefXmlObject::SetName(const CefString& name) -{ +bool CefXmlObject::SetName(const CefString& name) { DCHECK(!name.empty()); if (name.empty()) return false; @@ -258,14 +247,12 @@ bool CefXmlObject::SetName(const CefString& name) return true; } -bool CefXmlObject::HasParent() -{ +bool CefXmlObject::HasParent() { AutoLock lock_scope(this); return (parent_ != NULL); } -CefRefPtr CefXmlObject::GetParent() -{ +CefRefPtr CefXmlObject::GetParent() { CefRefPtr parent; { AutoLock lock_scope(this); @@ -274,14 +261,12 @@ CefRefPtr CefXmlObject::GetParent() return parent; } -bool CefXmlObject::HasValue() -{ +bool CefXmlObject::HasValue() { AutoLock lock_scope(this); return !value_.empty(); } -CefString CefXmlObject::GetValue() -{ +CefString CefXmlObject::GetValue() { CefString value; { AutoLock lock_scope(this); @@ -290,8 +275,7 @@ CefString CefXmlObject::GetValue() return value; } -bool CefXmlObject::SetValue(const CefString& value) -{ +bool CefXmlObject::SetValue(const CefString& value) { AutoLock lock_scope(this); DCHECK(children_.empty()); if (!children_.empty()) @@ -300,20 +284,17 @@ bool CefXmlObject::SetValue(const CefString& value) return true; } -bool CefXmlObject::HasAttributes() -{ +bool CefXmlObject::HasAttributes() { AutoLock lock_scope(this); return !attributes_.empty(); } -size_t CefXmlObject::GetAttributeCount() -{ +size_t CefXmlObject::GetAttributeCount() { AutoLock lock_scope(this); return attributes_.size(); } -bool CefXmlObject::HasAttribute(const CefString& name) -{ +bool CefXmlObject::HasAttribute(const CefString& name) { if (name.empty()) return false; @@ -322,8 +303,7 @@ bool CefXmlObject::HasAttribute(const CefString& name) return (it != attributes_.end()); } -CefString CefXmlObject::GetAttributeValue(const CefString& name) -{ +CefString CefXmlObject::GetAttributeValue(const CefString& name) { DCHECK(!name.empty()); CefString value; if (!name.empty()) { @@ -336,8 +316,7 @@ CefString CefXmlObject::GetAttributeValue(const CefString& name) } bool CefXmlObject::SetAttributeValue(const CefString& name, - const CefString& value) -{ + const CefString& value) { DCHECK(!name.empty()); if (name.empty()) return false; @@ -352,33 +331,28 @@ bool CefXmlObject::SetAttributeValue(const CefString& name, return true; } -size_t CefXmlObject::GetAttributes(AttributeMap& attributes) -{ +size_t CefXmlObject::GetAttributes(AttributeMap& attributes) { AutoLock lock_scope(this); attributes = attributes_; return attributes_.size(); } -void CefXmlObject::ClearAttributes() -{ +void CefXmlObject::ClearAttributes() { AutoLock lock_scope(this); attributes_.clear(); } -bool CefXmlObject::HasChildren() -{ +bool CefXmlObject::HasChildren() { AutoLock lock_scope(this); return !children_.empty(); } -size_t CefXmlObject::GetChildCount() -{ +size_t CefXmlObject::GetChildCount() { AutoLock lock_scope(this); return children_.size(); } -bool CefXmlObject::HasChild(CefRefPtr child) -{ +bool CefXmlObject::HasChild(CefRefPtr child) { DCHECK(child.get()); AutoLock lock_scope(this); @@ -390,27 +364,25 @@ bool CefXmlObject::HasChild(CefRefPtr child) return false; } -bool CefXmlObject::AddChild(CefRefPtr child) -{ +bool CefXmlObject::AddChild(CefRefPtr child) { DCHECK(child.get()); if (!child.get()) return false; AutoLock lock_scope1(child); - + DCHECK(child->GetParent() == NULL); if (child->GetParent() != NULL) return false; AutoLock lock_scope2(this); - + children_.push_back(child); child->SetParent(this); return true; } -bool CefXmlObject::RemoveChild(CefRefPtr child) -{ +bool CefXmlObject::RemoveChild(CefRefPtr child) { DCHECK(child.get()); AutoLock lock_scope(this); @@ -425,15 +397,13 @@ bool CefXmlObject::RemoveChild(CefRefPtr child) return false; } -size_t CefXmlObject::GetChildren(ObjectVector& children) -{ +size_t CefXmlObject::GetChildren(ObjectVector& children) { AutoLock lock_scope(this); children = children_; return children_.size(); } -void CefXmlObject::ClearChildren() -{ +void CefXmlObject::ClearChildren() { AutoLock lock_scope(this); ObjectVector::iterator it = children_.begin(); for (; it != children_.end(); ++it) @@ -441,8 +411,7 @@ void CefXmlObject::ClearChildren() children_.clear(); } -CefRefPtr CefXmlObject::FindChild(const CefString& name) -{ +CefRefPtr CefXmlObject::FindChild(const CefString& name) { DCHECK(!name.empty()); if (name.empty()) return NULL; @@ -450,15 +419,14 @@ CefRefPtr CefXmlObject::FindChild(const CefString& name) AutoLock lock_scope(this); ObjectVector::const_iterator it = children_.begin(); for (; it != children_.end(); ++it) { - if((*it)->GetName() == name) + if ((*it)->GetName() == name) return (*it); } return NULL; } size_t CefXmlObject::FindChildren(const CefString& name, - ObjectVector& children) -{ + ObjectVector& children) { DCHECK(!name.empty()); if (name.empty()) return 0; @@ -468,7 +436,7 @@ size_t CefXmlObject::FindChildren(const CefString& name, AutoLock lock_scope(this); ObjectVector::const_iterator it = children_.begin(); for (; it != children_.end(); ++it) { - if((*it)->GetName() == name) { + if ((*it)->GetName() == name) { children.push_back(*it); ct++; } @@ -476,8 +444,7 @@ size_t CefXmlObject::FindChildren(const CefString& name, return ct; } -void CefXmlObject::SetParent(CefXmlObject* parent) -{ +void CefXmlObject::SetParent(CefXmlObject* parent) { AutoLock lock_scope(this); if (parent) { DCHECK(parent_ == NULL); diff --git a/cef/libcef_dll/wrapper/cef_zip_archive.cc b/cef/libcef_dll/wrapper/cef_zip_archive.cc old mode 100755 new mode 100644 index 508750798..b248e40d2 --- a/cef/libcef_dll/wrapper/cef_zip_archive.cc +++ b/cef/libcef_dll/wrapper/cef_zip_archive.cc @@ -2,20 +2,23 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "include/cef_wrapper.h" -#include "libcef_dll/cef_logging.h" -#include - #if defined(__linux__) #include #endif +#include +#include +#include "include/wrapper/cef_zip_archive.h" +#include "include/cef_stream.h" +#include "include/cef_zip_reader.h" +#include "include/wrapper/cef_byte_read_handler.h" +#include "libcef_dll/cef_logging.h" + namespace { -class CefZipFile : public CefZipArchive::File -{ -public: - CefZipFile(size_t size) : data_(size) {} +class CefZipFile : public CefZipArchive::File { + public: + explicit CefZipFile(size_t size) : data_(size) {} ~CefZipFile() {} // Returns the read-only data contained in the file. @@ -33,27 +36,24 @@ public: std::vector* GetDataVector() { return &data_; } -private: + private: std::vector data_; IMPLEMENT_REFCOUNTING(CefZipFile); }; -} // namespace +} // namespace // CefZipArchive implementation -CefZipArchive::CefZipArchive() -{ +CefZipArchive::CefZipArchive() { } -CefZipArchive::~CefZipArchive() -{ +CefZipArchive::~CefZipArchive() { } size_t CefZipArchive::Load(CefRefPtr stream, - bool overwriteExisting) -{ + bool overwriteExisting) { AutoLock lock_scope(this); CefRefPtr reader(CefZipReader::Create(stream)); @@ -78,7 +78,7 @@ size_t CefZipArchive::Load(CefRefPtr stream, if (!reader->OpenFile(CefString())) break; - + name = reader->GetFileName(); std::transform(name.begin(), name.end(), name.begin(), towlower); @@ -86,7 +86,7 @@ size_t CefZipArchive::Load(CefRefPtr stream, if (it != contents_.end()) { if (overwriteExisting) contents_.erase(it); - else // Skip files that already exist. + else // Skip files that already exist. continue; } @@ -111,20 +111,17 @@ size_t CefZipArchive::Load(CefRefPtr stream, return count; } -void CefZipArchive::Clear() -{ +void CefZipArchive::Clear() { AutoLock lock_scope(this); - contents_.empty(); + contents_.clear(); } -size_t CefZipArchive::GetFileCount() -{ +size_t CefZipArchive::GetFileCount() { AutoLock lock_scope(this); return contents_.size(); } -bool CefZipArchive::HasFile(const CefString& fileName) -{ +bool CefZipArchive::HasFile(const CefString& fileName) { std::wstring str = fileName; std::transform(str.begin(), str.end(), str.begin(), towlower); @@ -134,8 +131,7 @@ bool CefZipArchive::HasFile(const CefString& fileName) } CefRefPtr CefZipArchive::GetFile( - const CefString& fileName) -{ + const CefString& fileName) { std::wstring str = fileName; std::transform(str.begin(), str.end(), str.begin(), towlower); @@ -146,8 +142,7 @@ CefRefPtr CefZipArchive::GetFile( return NULL; } -bool CefZipArchive::RemoveFile(const CefString& fileName) -{ +bool CefZipArchive::RemoveFile(const CefString& fileName) { std::wstring str = fileName; std::transform(str.begin(), str.end(), str.begin(), towlower); @@ -160,9 +155,8 @@ bool CefZipArchive::RemoveFile(const CefString& fileName) return false; } -size_t CefZipArchive::GetFiles(FileMap& map) -{ - AutoLock lock_scope(this); - map = contents_; - return contents_.size(); +size_t CefZipArchive::GetFiles(FileMap& map) { + AutoLock lock_scope(this); + map = contents_; + return contents_.size(); } diff --git a/cef/libcef_dll/wrapper/libcef_dll_wrapper.cc b/cef/libcef_dll/wrapper/libcef_dll_wrapper.cc old mode 100755 new mode 100644 index 6f2e49c22..2b6d63da5 --- a/cef/libcef_dll/wrapper/libcef_dll_wrapper.cc +++ b/cef/libcef_dll/wrapper/libcef_dll_wrapper.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. // @@ -10,6 +10,22 @@ // for more information. // +#include "include/cef_app.h" +#include "include/capi/cef_app_capi.h" +#include "include/cef_origin_whitelist.h" +#include "include/capi/cef_origin_whitelist_capi.h" +#include "include/cef_scheme.h" +#include "include/capi/cef_scheme_capi.h" +#include "include/cef_storage.h" +#include "include/capi/cef_storage_capi.h" +#include "include/cef_task.h" +#include "include/capi/cef_task_capi.h" +#include "include/cef_url.h" +#include "include/capi/cef_url_capi.h" +#include "include/cef_v8.h" +#include "include/capi/cef_v8_capi.h" +#include "include/cef_web_plugin.h" +#include "include/capi/cef_web_plugin_capi.h" #include "include/cef_version.h" #include "libcef_dll/cpptoc/app_cpptoc.h" #include "libcef_dll/cpptoc/content_filter_cpptoc.h" @@ -26,11 +42,13 @@ #include "libcef_dll/cpptoc/life_span_handler_cpptoc.h" #include "libcef_dll/cpptoc/load_handler_cpptoc.h" #include "libcef_dll/cpptoc/menu_handler_cpptoc.h" +#include "libcef_dll/cpptoc/permission_handler_cpptoc.h" #include "libcef_dll/cpptoc/print_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/request_handler_cpptoc.h" +#include "libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h" #include "libcef_dll/cpptoc/scheme_handler_cpptoc.h" #include "libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h" #include "libcef_dll/cpptoc/storage_visitor_cpptoc.h" @@ -41,6 +59,7 @@ #include "libcef_dll/cpptoc/web_urlrequest_client_cpptoc.h" #include "libcef_dll/cpptoc/write_handler_cpptoc.h" #include "libcef_dll/ctocpp/browser_ctocpp.h" +#include "libcef_dll/ctocpp/cookie_manager_ctocpp.h" #include "libcef_dll/ctocpp/domdocument_ctocpp.h" #include "libcef_dll/ctocpp/domevent_ctocpp.h" #include "libcef_dll/ctocpp/domnode_ctocpp.h" @@ -56,6 +75,7 @@ #include "libcef_dll/ctocpp/v8context_ctocpp.h" #include "libcef_dll/ctocpp/v8exception_ctocpp.h" #include "libcef_dll/ctocpp/v8value_ctocpp.h" +#include "libcef_dll/ctocpp/web_plugin_info_ctocpp.h" #include "libcef_dll/ctocpp/web_urlrequest_ctocpp.h" #include "libcef_dll/ctocpp/xml_reader_ctocpp.h" #include "libcef_dll/ctocpp/zip_reader_ctocpp.h" @@ -67,8 +87,7 @@ // GLOBAL METHODS - Body may be edited by hand. CEF_GLOBAL bool CefInitialize(const CefSettings& settings, - CefRefPtr application) -{ + CefRefPtr application) { int build_revision = cef_build_revision(); if (build_revision != CEF_REVISION) { // The libcef build revision does not match the CEF API revision. @@ -89,9 +108,7 @@ CEF_GLOBAL bool CefInitialize(const CefSettings& settings, return _retval?true:false; } - -CEF_GLOBAL void CefShutdown() -{ +CEF_GLOBAL void CefShutdown() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute @@ -99,170 +116,84 @@ CEF_GLOBAL void CefShutdown() #ifndef NDEBUG // Check that all wrapper objects have been destroyed - DCHECK(CefBrowserCToCpp::DebugObjCt == 0); - DCHECK(CefContentFilterCppToC::DebugObjCt == 0); - DCHECK(CefCookieVisitorCppToC::DebugObjCt == 0); - DCHECK(CefDOMDocumentCToCpp::DebugObjCt == 0); - DCHECK(CefDOMEventCToCpp::DebugObjCt == 0); - DCHECK(CefDOMEventListenerCppToC::DebugObjCt == 0); - DCHECK(CefDOMNodeCToCpp::DebugObjCt == 0); - DCHECK(CefDOMVisitorCppToC::DebugObjCt == 0); - DCHECK(CefDisplayHandlerCppToC::DebugObjCt == 0); - DCHECK(CefDownloadHandlerCppToC::DebugObjCt == 0); - DCHECK(CefDragDataCToCpp::DebugObjCt == 0); - DCHECK(CefDragHandlerCppToC::DebugObjCt == 0); - DCHECK(CefFindHandlerCppToC::DebugObjCt == 0); - DCHECK(CefFocusHandlerCppToC::DebugObjCt == 0); - DCHECK(CefFrameCToCpp::DebugObjCt == 0); - DCHECK(CefJSDialogHandlerCppToC::DebugObjCt == 0); - DCHECK(CefKeyboardHandlerCppToC::DebugObjCt == 0); - DCHECK(CefLifeSpanHandlerCppToC::DebugObjCt == 0); - DCHECK(CefLoadHandlerCppToC::DebugObjCt == 0); - DCHECK(CefMenuHandlerCppToC::DebugObjCt == 0); - DCHECK(CefPostDataCToCpp::DebugObjCt == 0); - DCHECK(CefPostDataElementCToCpp::DebugObjCt == 0); - DCHECK(CefPrintHandlerCppToC::DebugObjCt == 0); - DCHECK(CefProxyHandlerCppToC::DebugObjCt == 0); - DCHECK(CefReadHandlerCppToC::DebugObjCt == 0); - DCHECK(CefRenderHandlerCppToC::DebugObjCt == 0); - DCHECK(CefRequestCToCpp::DebugObjCt == 0); - DCHECK(CefRequestHandlerCppToC::DebugObjCt == 0); - DCHECK(CefResponseCToCpp::DebugObjCt == 0); - DCHECK(CefSchemeHandlerCallbackCToCpp::DebugObjCt == 0); - DCHECK(CefSchemeHandlerCppToC::DebugObjCt == 0); - DCHECK(CefSchemeHandlerFactoryCppToC::DebugObjCt == 0); - DCHECK(CefStorageVisitorCppToC::DebugObjCt == 0); - DCHECK(CefStreamReaderCToCpp::DebugObjCt == 0); - DCHECK(CefStreamWriterCToCpp::DebugObjCt == 0); - DCHECK(CefTaskCppToC::DebugObjCt == 0); - DCHECK(CefV8AccessorCppToC::DebugObjCt == 0); - DCHECK(CefV8ContextCToCpp::DebugObjCt == 0); - DCHECK(CefV8ContextHandlerCppToC::DebugObjCt == 0); - DCHECK(CefV8ExceptionCToCpp::DebugObjCt == 0); - DCHECK(CefV8HandlerCppToC::DebugObjCt == 0); - DCHECK(CefV8ValueCToCpp::DebugObjCt == 0); - DCHECK(CefWebURLRequestCToCpp::DebugObjCt == 0); - DCHECK(CefWebURLRequestClientCppToC::DebugObjCt == 0); - DCHECK(CefWriteHandlerCppToC::DebugObjCt == 0); - DCHECK(CefXmlReaderCToCpp::DebugObjCt == 0); - DCHECK(CefZipReaderCToCpp::DebugObjCt == 0); -#endif // !NDEBUG + DCHECK_EQ(CefBrowserCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefContentFilterCppToC::DebugObjCt, 0); + DCHECK_EQ(CefCookieManagerCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefCookieVisitorCppToC::DebugObjCt, 0); + DCHECK_EQ(CefDOMDocumentCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefDOMEventCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefDOMEventListenerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefDOMNodeCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefDOMVisitorCppToC::DebugObjCt, 0); + DCHECK_EQ(CefDisplayHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefDownloadHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefDragDataCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefDragHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefFindHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefFocusHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefFrameCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefJSDialogHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefKeyboardHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefLifeSpanHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefLoadHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefMenuHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefPermissionHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefPostDataCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefPostDataElementCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefPrintHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefProxyHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefReadHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefRenderHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefRequestCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefRequestHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefResourceBundleHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefResponseCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefSchemeHandlerCallbackCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefSchemeHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefSchemeHandlerFactoryCppToC::DebugObjCt, 0); + DCHECK_EQ(CefStorageVisitorCppToC::DebugObjCt, 0); + DCHECK_EQ(CefStreamReaderCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefStreamWriterCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefTaskCppToC::DebugObjCt, 0); + DCHECK_EQ(CefV8AccessorCppToC::DebugObjCt, 0); + DCHECK_EQ(CefV8ContextCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefV8ContextHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefV8ExceptionCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefV8HandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefV8ValueCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefWebPluginInfoCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefWebURLRequestCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefWebURLRequestClientCppToC::DebugObjCt, 0); + DCHECK_EQ(CefWriteHandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefXmlReaderCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefZipReaderCToCpp::DebugObjCt, 0); +#endif // !NDEBUG } - -CEF_GLOBAL void CefDoMessageLoopWork() -{ +CEF_GLOBAL void CefDoMessageLoopWork() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute cef_do_message_loop_work(); } - -CEF_GLOBAL void CefRunMessageLoop() -{ +CEF_GLOBAL void CefRunMessageLoop() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute cef_run_message_loop(); } - -CEF_GLOBAL void CefQuitMessageLoop() -{ +CEF_GLOBAL void CefQuitMessageLoop() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute cef_quit_message_loop(); } - -CEF_GLOBAL bool CefRegisterExtension(const CefString& extension_name, - const CefString& javascript_code, CefRefPtr handler) -{ - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: extension_name; type: string_byref_const - DCHECK(!extension_name.empty()); - if (extension_name.empty()) - return false; - // Verify param: javascript_code; type: string_byref_const - DCHECK(!javascript_code.empty()); - if (javascript_code.empty()) - return false; - // Unverified params: handler - - // Execute - int _retval = cef_register_extension( - extension_name.GetStruct(), - javascript_code.GetStruct(), - CefV8HandlerCppToC::Wrap(handler)); - - // Return type: bool - return _retval?true:false; -} - - -CEF_GLOBAL bool CefRegisterCustomScheme(const CefString& scheme_name, - bool is_standard, bool is_local, bool is_display_isolated) -{ - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: scheme_name; type: string_byref_const - DCHECK(!scheme_name.empty()); - if (scheme_name.empty()) - return false; - - // Execute - int _retval = cef_register_custom_scheme( - scheme_name.GetStruct(), - is_standard, - is_local, - is_display_isolated); - - // Return type: bool - return _retval?true:false; -} - - -CEF_GLOBAL bool CefRegisterSchemeHandlerFactory(const CefString& scheme_name, - const CefString& domain_name, CefRefPtr factory) -{ - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: scheme_name; type: string_byref_const - DCHECK(!scheme_name.empty()); - if (scheme_name.empty()) - return false; - // Unverified params: domain_name, factory - - // Execute - int _retval = cef_register_scheme_handler_factory( - scheme_name.GetStruct(), - domain_name.GetStruct(), - CefSchemeHandlerFactoryCppToC::Wrap(factory)); - - // Return type: bool - return _retval?true:false; -} - - -CEF_GLOBAL bool CefClearSchemeHandlerFactories() -{ - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Execute - int _retval = cef_clear_scheme_handler_factories(); - - // Return type: bool - return _retval?true:false; -} - - CEF_GLOBAL bool CefAddCrossOriginWhitelistEntry(const CefString& source_origin, const CefString& target_protocol, const CefString& target_domain, - bool allow_target_subdomains) -{ + bool allow_target_subdomains) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: source_origin; type: string_byref_const @@ -289,11 +220,9 @@ CEF_GLOBAL bool CefAddCrossOriginWhitelistEntry(const CefString& source_origin, return _retval?true:false; } - CEF_GLOBAL bool CefRemoveCrossOriginWhitelistEntry( const CefString& source_origin, const CefString& target_protocol, - const CefString& target_domain, bool allow_target_subdomains) -{ + const CefString& target_domain, bool allow_target_subdomains) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: source_origin; type: string_byref_const @@ -320,9 +249,7 @@ CEF_GLOBAL bool CefRemoveCrossOriginWhitelistEntry( return _retval?true:false; } - -CEF_GLOBAL bool CefClearCrossOriginWhitelist() -{ +CEF_GLOBAL bool CefClearCrossOriginWhitelist() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute @@ -332,190 +259,59 @@ CEF_GLOBAL bool CefClearCrossOriginWhitelist() return _retval?true:false; } - -CEF_GLOBAL bool CefCurrentlyOn(CefThreadId threadId) -{ +CEF_GLOBAL bool CefRegisterCustomScheme(const CefString& scheme_name, + bool is_standard, bool is_local, bool is_display_isolated) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - // Execute - int _retval = cef_currently_on( - threadId); - - // Return type: bool - return _retval?true:false; -} - - -CEF_GLOBAL bool CefPostTask(CefThreadId threadId, CefRefPtr task) -{ - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: task; type: refptr_diff - DCHECK(task.get()); - if (!task.get()) + // Verify param: scheme_name; type: string_byref_const + DCHECK(!scheme_name.empty()); + if (scheme_name.empty()) return false; // Execute - int _retval = cef_post_task( - threadId, - CefTaskCppToC::Wrap(task)); + int _retval = cef_register_custom_scheme( + scheme_name.GetStruct(), + is_standard, + is_local, + is_display_isolated); // Return type: bool return _retval?true:false; } - -CEF_GLOBAL bool CefPostDelayedTask(CefThreadId threadId, - CefRefPtr task, long delay_ms) -{ +CEF_GLOBAL bool CefRegisterSchemeHandlerFactory(const CefString& scheme_name, + const CefString& domain_name, + CefRefPtr factory) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - // Verify param: task; type: refptr_diff - DCHECK(task.get()); - if (!task.get()) + // Verify param: scheme_name; type: string_byref_const + DCHECK(!scheme_name.empty()); + if (scheme_name.empty()) return false; + // Unverified params: domain_name, factory // Execute - int _retval = cef_post_delayed_task( - threadId, - CefTaskCppToC::Wrap(task), - delay_ms); + int _retval = cef_register_scheme_handler_factory( + scheme_name.GetStruct(), + domain_name.GetStruct(), + CefSchemeHandlerFactoryCppToC::Wrap(factory)); // Return type: bool return _retval?true:false; } - -CEF_GLOBAL bool CefParseURL(const CefString& url, CefURLParts& parts) -{ - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: url; type: string_byref_const - DCHECK(!url.empty()); - if (url.empty()) - return false; - - // Execute - int _retval = cef_parse_url( - url.GetStruct(), - &parts); - - // Return type: bool - return _retval?true:false; -} - - -CEF_GLOBAL bool CefCreateURL(const CefURLParts& parts, CefString& url) -{ +CEF_GLOBAL bool CefClearSchemeHandlerFactories() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - int _retval = cef_create_url( - &parts, - url.GetWritableStruct()); + int _retval = cef_clear_scheme_handler_factories(); // Return type: bool return _retval?true:false; } - -CEF_GLOBAL bool CefVisitAllCookies(CefRefPtr visitor) -{ - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: visitor; type: refptr_diff - DCHECK(visitor.get()); - if (!visitor.get()) - return false; - - // Execute - int _retval = cef_visit_all_cookies( - CefCookieVisitorCppToC::Wrap(visitor)); - - // Return type: bool - return _retval?true:false; -} - - -CEF_GLOBAL bool CefVisitUrlCookies(const CefString& url, bool includeHttpOnly, - CefRefPtr visitor) -{ - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: url; type: string_byref_const - DCHECK(!url.empty()); - if (url.empty()) - return false; - // Verify param: visitor; type: refptr_diff - DCHECK(visitor.get()); - if (!visitor.get()) - return false; - - // Execute - int _retval = cef_visit_url_cookies( - url.GetStruct(), - includeHttpOnly, - CefCookieVisitorCppToC::Wrap(visitor)); - - // Return type: bool - return _retval?true:false; -} - - -CEF_GLOBAL bool CefSetCookie(const CefString& url, const CefCookie& cookie) -{ - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: url; type: string_byref_const - DCHECK(!url.empty()); - if (url.empty()) - return false; - - // Execute - int _retval = cef_set_cookie( - url.GetStruct(), - &cookie); - - // Return type: bool - return _retval?true:false; -} - - -CEF_GLOBAL bool CefDeleteCookies(const CefString& url, - const CefString& cookie_name) -{ - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Unverified params: url, cookie_name - - // Execute - int _retval = cef_delete_cookies( - url.GetStruct(), - cookie_name.GetStruct()); - - // Return type: bool - return _retval?true:false; -} - - -CEF_GLOBAL bool CefSetCookiePath(const CefString& path) -{ - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Unverified params: path - - // Execute - int _retval = cef_set_cookie_path( - path.GetStruct()); - - // Return type: bool - return _retval?true:false; -} - - CEF_GLOBAL bool CefVisitStorage(CefStorageType type, const CefString& origin, - const CefString& key, CefRefPtr visitor) -{ + const CefString& key, CefRefPtr visitor) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: visitor; type: refptr_diff @@ -535,10 +331,8 @@ CEF_GLOBAL bool CefVisitStorage(CefStorageType type, const CefString& origin, return _retval?true:false; } - CEF_GLOBAL bool CefSetStorage(CefStorageType type, const CefString& origin, - const CefString& key, const CefString& value) -{ + const CefString& key, const CefString& value) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Verify param: origin; type: string_byref_const @@ -565,10 +359,8 @@ CEF_GLOBAL bool CefSetStorage(CefStorageType type, const CefString& origin, return _retval?true:false; } - CEF_GLOBAL bool CefDeleteStorage(CefStorageType type, const CefString& origin, - const CefString& key) -{ + const CefString& key) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Unverified params: origin, key @@ -583,9 +375,7 @@ CEF_GLOBAL bool CefDeleteStorage(CefStorageType type, const CefString& origin, return _retval?true:false; } - -CEF_GLOBAL bool CefSetStoragePath(CefStorageType type, const CefString& path) -{ +CEF_GLOBAL bool CefSetStoragePath(CefStorageType type, const CefString& path) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Unverified params: path @@ -599,4 +389,141 @@ CEF_GLOBAL bool CefSetStoragePath(CefStorageType type, const CefString& path) return _retval?true:false; } +CEF_GLOBAL bool CefCurrentlyOn(CefThreadId threadId) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = cef_currently_on( + threadId); + + // Return type: bool + return _retval?true:false; +} + +CEF_GLOBAL bool CefPostTask(CefThreadId threadId, CefRefPtr task) { + // 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 = cef_post_task( + threadId, + CefTaskCppToC::Wrap(task)); + + // Return type: bool + return _retval?true:false; +} + +CEF_GLOBAL bool CefPostDelayedTask(CefThreadId threadId, + CefRefPtr task, int64 delay_ms) { + // 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 = cef_post_delayed_task( + threadId, + CefTaskCppToC::Wrap(task), + delay_ms); + + // Return type: bool + return _retval?true:false; +} + +CEF_GLOBAL bool CefParseURL(const CefString& url, CefURLParts& parts) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: url; type: string_byref_const + DCHECK(!url.empty()); + if (url.empty()) + return false; + + // Execute + int _retval = cef_parse_url( + url.GetStruct(), + &parts); + + // Return type: bool + return _retval?true:false; +} + +CEF_GLOBAL bool CefCreateURL(const CefURLParts& parts, CefString& url) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = cef_create_url( + &parts, + url.GetWritableStruct()); + + // Return type: bool + return _retval?true:false; +} + +CEF_GLOBAL bool CefRegisterExtension(const CefString& extension_name, + const CefString& javascript_code, CefRefPtr handler) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: extension_name; type: string_byref_const + DCHECK(!extension_name.empty()); + if (extension_name.empty()) + return false; + // Verify param: javascript_code; type: string_byref_const + DCHECK(!javascript_code.empty()); + if (javascript_code.empty()) + return false; + // Unverified params: handler + + // Execute + int _retval = cef_register_extension( + extension_name.GetStruct(), + javascript_code.GetStruct(), + CefV8HandlerCppToC::Wrap(handler)); + + // Return type: bool + return _retval?true:false; +} + +CEF_GLOBAL size_t CefGetWebPluginCount() { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + size_t _retval = cef_get_web_plugin_count(); + + // Return type: simple + return _retval; +} + +CEF_GLOBAL CefRefPtr CefGetWebPluginInfo(int index) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + cef_web_plugin_info_t* _retval = cef_get_web_plugin_info( + index); + + // Return type: refptr_same + return CefWebPluginInfoCToCpp::Wrap(_retval); +} + +CEF_GLOBAL CefRefPtr CefGetWebPluginInfo( + const CefString& name) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: name; type: string_byref_const + DCHECK(!name.empty()); + if (name.empty()) + return NULL; + + // Execute + cef_web_plugin_info_t* _retval = cef_get_web_plugin_info_byname( + name.GetStruct()); + + // Return type: refptr_same + return CefWebPluginInfoCToCpp::Wrap(_retval); +} diff --git a/cef/libcef_dll/wrapper/libcef_dll_wrapper2.cc b/cef/libcef_dll/wrapper/libcef_dll_wrapper2.cc old mode 100755 new mode 100644 index 28943a1b8..cb34a0a55 --- a/cef/libcef_dll/wrapper/libcef_dll_wrapper2.cc +++ b/cef/libcef_dll/wrapper/libcef_dll_wrapper2.cc @@ -2,12 +2,9 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "include/cef.h" -#include "include/cef_capi.h" #include "include/cef_nplugin.h" -#include "include/cef_nplugin_capi.h" +#include "include/capi/cef_nplugin_capi.h" -bool CefRegisterPlugin(const CefPluginInfo& plugin_info) -{ +bool CefRegisterPlugin(const CefPluginInfo& plugin_info) { return cef_register_plugin(&plugin_info)?true:false; } diff --git a/cef/tools/README-TRANSFER.txt b/cef/tools/README-TRANSFER.txt old mode 100755 new mode 100644 diff --git a/frameworks/libcef.dylib b/frameworks/libcef.dylib index c72809e51..74d9d74f6 100755 Binary files a/frameworks/libcef.dylib and b/frameworks/libcef.dylib differ