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

10
libcef/common/json_impl.cc
View File

@@ -34,10 +34,10 @@ int GetJSONWriterOptions(cef_json_writer_options_t options) {
CefRefPtr<CefValue> CefParseJSON(const CefString& json_string,
cef_json_parser_options_t options) {
const std::string& json = json_string.ToString();
base::Value* parse_result =
scoped_ptr<base::Value> parse_result =
base::JSONReader::Read(json, GetJSONReaderOptions(options));
if (parse_result)
return new CefValueImpl(parse_result);
return new CefValueImpl(parse_result.release());
return NULL;
}
@@ -50,10 +50,10 @@ CefRefPtr<CefValue> CefParseJSONAndReturnError(
int error_code;
std::string error_msg;
base::Value* parse_result = base::JSONReader::ReadAndReturnError(
scoped_ptr<base::Value> parse_result = base::JSONReader::ReadAndReturnError(
json, GetJSONReaderOptions(options), &error_code, &error_msg);
if (parse_result)
return new CefValueImpl(parse_result);
return new CefValueImpl(parse_result.release());
error_code_out = static_cast<cef_json_parser_error_t>(error_code);
error_msg_out = error_msg;
@@ -69,7 +69,7 @@ CefString CefWriteJSON(CefRefPtr<CefValue> node,
CefValueImpl::ScopedLockedValue scoped_value(impl);
std::string json_string;
if (base::JSONWriter::WriteWithOptions(scoped_value.value(),
if (base::JSONWriter::WriteWithOptions(*scoped_value.value(),
GetJSONWriterOptions(options),
&json_string)) {
return json_string;