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 217791.

Browse Source 
- Pass popup window attributes to CefLifeSpanHandler::OnBeforePopup (issue #520).
- Windows: Add manifest files for all binary targets and include compatibility manifest in *.exe targets.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1367 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-08-15 19:38:55 +00:00
parent 0a452addf0
commit cdd7333b76
22 changed files with 188 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libcef/common/values_impl.cc
View File

@ -452,20 +452,19 @@ bool CefDictionaryValueImpl::SetList(const CefString& key,
}
bool CefDictionaryValueImpl::RemoveInternal(const CefString& key) {
base::Value* out_value = NULL;
scoped_ptr<base::Value> out_value;
if (!mutable_value()->RemoveWithoutPathExpansion(key, &out_value))
return false;
// Remove the value.
controller()->Remove(out_value, true);
controller()->Remove(out_value.get(), true);
// Only list and dictionary types may have dependencies.
if (out_value->IsType(base::Value::TYPE_LIST) ||
out_value->IsType(base::Value::TYPE_DICTIONARY)) {
controller()->RemoveDependencies(out_value);
controller()->RemoveDependencies(out_value.get());
}
delete out_value;
return true;
}
@ -811,20 +810,19 @@ bool CefListValueImpl::SetList(int index, CefRefPtr<CefListValue> value) {
}
bool CefListValueImpl::RemoveInternal(int index) {
base::Value* out_value = NULL;
scoped_ptr<base::Value> out_value;
if (!mutable_value()->Remove(index, &out_value))
return false;
// Remove the value.
controller()->Remove(out_value, true);
controller()->Remove(out_value.get(), true);
// Only list and dictionary types may have dependencies.
if (out_value->IsType(base::Value::TYPE_LIST) ||
out_value->IsType(base::Value::TYPE_DICTIONARY)) {
controller()->RemoveDependencies(out_value);
controller()->RemoveDependencies(out_value.get());
}
delete out_value;
return true;
}