bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 115967. 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@445 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2011-12-29 20:26:26 +00:00
parent 9b979dfa14
commit 8ece0ba240
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -17,5 +17,5 @@
{ {
'chromium_url': 'http://src.chromium.org/svn/trunk/src', 'chromium_url': 'http://src.chromium.org/svn/trunk/src',
'chromium_revision': '115322', 'chromium_revision': '115967',
} }

23
libcef/browser_persistent_cookie_store.cc
View File

@ -226,11 +226,14 @@ bool InitTable(sql::Connection* db) {
} }
// Try to create the index every time. Older versions did not have this index, // Try to create the index every time. Older versions did not have this index,
// so we want those people to get it. Ignore errors, since it may exist. // so we want those people to get it.
db->Execute("CREATE INDEX IF NOT EXISTS cookie_times ON cookies" if (!db->Execute("CREATE INDEX IF NOT EXISTS cookie_times ON cookies"
" (creation_utc)"); " (creation_utc)")) {
return false;
}
db->Execute("CREATE INDEX IF NOT EXISTS domain ON cookies(host_key)"); if (!db->Execute("CREATE INDEX IF NOT EXISTS domain ON cookies(host_key)"))
return false;
return true; return true;
} }
@ -497,24 +500,24 @@ bool BrowserPersistentCookieStore::Backend::EnsureDatabaseVersion() {
sql::Transaction transaction(db_.get()); sql::Transaction transaction(db_.get());
transaction.Begin(); transaction.Begin();
#if !defined(OS_WIN) #if !defined(OS_WIN)
db_->Execute( ignore_result(db_->Execute(
"UPDATE cookies " "UPDATE cookies "
"SET creation_utc = creation_utc + 11644473600000000 " "SET creation_utc = creation_utc + 11644473600000000 "
"WHERE rowid IN " "WHERE rowid IN "
"(SELECT rowid FROM cookies WHERE " "(SELECT rowid FROM cookies WHERE "
"creation_utc > 0 AND creation_utc < 11644473600000000)"); "creation_utc > 0 AND creation_utc < 11644473600000000)"));
db_->Execute( ignore_result(db_->Execute(
"UPDATE cookies " "UPDATE cookies "
"SET expires_utc = expires_utc + 11644473600000000 " "SET expires_utc = expires_utc + 11644473600000000 "
"WHERE rowid IN " "WHERE rowid IN "
"(SELECT rowid FROM cookies WHERE " "(SELECT rowid FROM cookies WHERE "
"expires_utc > 0 AND expires_utc < 11644473600000000)"); "expires_utc > 0 AND expires_utc < 11644473600000000)"));
db_->Execute( ignore_result(db_->Execute(
"UPDATE cookies " "UPDATE cookies "
"SET last_access_utc = last_access_utc + 11644473600000000 " "SET last_access_utc = last_access_utc + 11644473600000000 "
"WHERE rowid IN " "WHERE rowid IN "
"(SELECT rowid FROM cookies WHERE " "(SELECT rowid FROM cookies WHERE "
"last_access_utc > 0 AND last_access_utc < 11644473600000000)"); "last_access_utc > 0 AND last_access_utc < 11644473600000000)"));
#endif #endif
++cur_version; ++cur_version;
meta_table_.SetVersionNumber(cur_version); meta_table_.SetVersionNumber(cur_version);