bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 14bd12d6 (#333041)

Browse Source 
- Remove CefNavigationEntry::GetFrameName() (see http://crbug.com/477150#c5).
- Devirtualize base::BindState (see http://crbug.com/486594).
- Move Tuple to the base namespace.
This commit is contained in:
Marshall Greenblatt
2015-06-05 18:06:48 -04:00
parent d820080479
commit 378a64b39a
77 changed files with 523 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libcef_dll/cpptoc/drag_handler_cpptoc.cc
View File

@@ -67,7 +67,8 @@ void CEF_CALLBACK drag_handler_on_draggable_regions_changed(
std::vector<CefDraggableRegion > regionsList;
if (regionsCount > 0) {
for (size_t i = 0; i < regionsCount; ++i) {
regionsList.push_back(regions[i]);
CefDraggableRegion regionsVal = regions[i];
regionsList.push_back(regionsVal);
}
}

16
libcef_dll/cpptoc/navigation_entry_cpptoc.cc
View File

@@ -123,21 +123,6 @@ int CEF_CALLBACK navigation_entry_has_post_data(
return _retval;
}
cef_string_userfree_t CEF_CALLBACK navigation_entry_get_frame_name(
struct _cef_navigation_entry_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self)
return NULL;
// Execute
CefString _retval = CefNavigationEntryCppToC::Get(self)->GetFrameName();
// Return type: string
return _retval.DetachToUserFree();
}
cef_time_t CEF_CALLBACK navigation_entry_get_completion_time(
struct _cef_navigation_entry_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@@ -181,7 +166,6 @@ CefNavigationEntryCppToC::CefNavigationEntryCppToC() {
GetStruct()->get_title = navigation_entry_get_title;
GetStruct()->get_transition_type = navigation_entry_get_transition_type;
GetStruct()->has_post_data = navigation_entry_has_post_data;
GetStruct()->get_frame_name = navigation_entry_get_frame_name;
GetStruct()->get_completion_time = navigation_entry_get_completion_time;
GetStruct()->get_http_status_code = navigation_entry_get_http_status_code;
}

3
libcef_dll/cpptoc/print_settings_cpptoc.cc
View File

@@ -209,7 +209,8 @@ void CEF_CALLBACK print_settings_set_page_ranges(
std::vector<CefPageRange > rangesList;
if (rangesCount > 0) {
for (size_t i = 0; i < rangesCount; ++i) {
rangesList.push_back(ranges[i]);
CefPageRange rangesVal = ranges[i];
rangesList.push_back(rangesVal);
}
}

3
libcef_dll/cpptoc/render_handler_cpptoc.cc
View File

@@ -235,7 +235,8 @@ void CEF_CALLBACK render_handler_on_paint(struct _cef_render_handler_t* self,
std::vector<CefRect > dirtyRectsList;
if (dirtyRectsCount > 0) {
for (size_t i = 0; i < dirtyRectsCount; ++i) {
dirtyRectsList.push_back(dirtyRects[i]);
CefRect dirtyRectsVal = dirtyRects[i];
dirtyRectsList.push_back(dirtyRectsVal);
}
}

14
libcef_dll/cpptoc/test/translator_test_cpptoc.cc
View File

@@ -231,7 +231,8 @@ int CEF_CALLBACK translator_test_set_int_list(
std::vector<int > valList;
if (valCount > 0) {
for (size_t i = 0; i < valCount; ++i) {
valList.push_back(val[i]);
int valVal = val[i];
valList.push_back(valVal);
}
}
@@ -586,7 +587,8 @@ int CEF_CALLBACK translator_test_set_point_list(
std::vector<CefPoint > valList;
if (valCount > 0) {
for (size_t i = 0; i < valCount; ++i) {
valList.push_back(val[i]);
CefPoint valVal = val[i];
valList.push_back(valVal);
}
}
@@ -770,7 +772,9 @@ int CEF_CALLBACK translator_test_set_object_list(
std::vector<CefRefPtr<CefTranslatorTestObject> > valList;
if (valCount > 0) {
for (size_t i = 0; i < valCount; ++i) {
valList.push_back(CefTranslatorTestObjectCppToC::Unwrap(val[i]));
CefRefPtr<CefTranslatorTestObject> valVal =
CefTranslatorTestObjectCppToC::Unwrap(val[i]);
valList.push_back(valVal);
}
}
@@ -943,7 +947,9 @@ int CEF_CALLBACK translator_test_set_handler_list(
std::vector<CefRefPtr<CefTranslatorTestHandler> > valList;
if (valCount > 0) {
for (size_t i = 0; i < valCount; ++i) {
valList.push_back(CefTranslatorTestHandlerCToCpp::Wrap(val[i]));
CefRefPtr<CefTranslatorTestHandler> valVal =
CefTranslatorTestHandlerCToCpp::Wrap(val[i]);
valList.push_back(valVal);
}
}

3
libcef_dll/cpptoc/v8handler_cpptoc.cc
View File

@@ -52,7 +52,8 @@ int CEF_CALLBACK v8handler_execute(struct _cef_v8handler_t* self,
std::vector<CefRefPtr<CefV8Value> > argumentsList;
if (argumentsCount > 0) {
for (size_t i = 0; i < argumentsCount; ++i) {
argumentsList.push_back(CefV8ValueCToCpp::Wrap(arguments[i]));
CefRefPtr<CefV8Value> argumentsVal = CefV8ValueCToCpp::Wrap(arguments[i]);
argumentsList.push_back(argumentsVal);
}
}
// Translate param: retval; type: refptr_diff_byref

8
libcef_dll/cpptoc/v8value_cpptoc.cc
View File

@@ -863,7 +863,9 @@ struct _cef_v8value_t* CEF_CALLBACK v8value_execute_function(
std::vector<CefRefPtr<CefV8Value> > argumentsList;
if (argumentsCount > 0) {
for (size_t i = 0; i < argumentsCount; ++i) {
argumentsList.push_back(CefV8ValueCppToC::Unwrap(arguments[i]));
CefRefPtr<CefV8Value> argumentsVal = CefV8ValueCppToC::Unwrap(
arguments[i]);
argumentsList.push_back(argumentsVal);
}
}
@@ -899,7 +901,9 @@ struct _cef_v8value_t* CEF_CALLBACK v8value_execute_function_with_context(
std::vector<CefRefPtr<CefV8Value> > argumentsList;
if (argumentsCount > 0) {
for (size_t i = 0; i < argumentsCount; ++i) {
argumentsList.push_back(CefV8ValueCppToC::Unwrap(arguments[i]));
CefRefPtr<CefV8Value> argumentsVal = CefV8ValueCppToC::Unwrap(
arguments[i]);
argumentsList.push_back(argumentsVal);
}
}