From 8ece0ba2404a51108ecee405dc338bf558ab674c Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 29 Dec 2011 20:26:26 +0000 Subject: [PATCH] Update to Chromium revision 115967. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@445 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- libcef/browser_persistent_cookie_store.cc | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 66709edf4..560ad4132 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -17,5 +17,5 @@ { 'chromium_url': 'http://src.chromium.org/svn/trunk/src', - 'chromium_revision': '115322', + 'chromium_revision': '115967', } diff --git a/libcef/browser_persistent_cookie_store.cc b/libcef/browser_persistent_cookie_store.cc index 88ec7dc1a..80be5f2d1 100644 --- a/libcef/browser_persistent_cookie_store.cc +++ b/libcef/browser_persistent_cookie_store.cc @@ -226,11 +226,14 @@ bool InitTable(sql::Connection* db) { } // 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. - db->Execute("CREATE INDEX IF NOT EXISTS cookie_times ON cookies" - " (creation_utc)"); + // so we want those people to get it. + if (!db->Execute("CREATE INDEX IF NOT EXISTS cookie_times ON cookies" + " (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; } @@ -497,24 +500,24 @@ bool BrowserPersistentCookieStore::Backend::EnsureDatabaseVersion() { sql::Transaction transaction(db_.get()); transaction.Begin(); #if !defined(OS_WIN) - db_->Execute( + ignore_result(db_->Execute( "UPDATE cookies " "SET creation_utc = creation_utc + 11644473600000000 " "WHERE rowid IN " "(SELECT rowid FROM cookies WHERE " - "creation_utc > 0 AND creation_utc < 11644473600000000)"); - db_->Execute( + "creation_utc > 0 AND creation_utc < 11644473600000000)")); + ignore_result(db_->Execute( "UPDATE cookies " "SET expires_utc = expires_utc + 11644473600000000 " "WHERE rowid IN " "(SELECT rowid FROM cookies WHERE " - "expires_utc > 0 AND expires_utc < 11644473600000000)"); - db_->Execute( + "expires_utc > 0 AND expires_utc < 11644473600000000)")); + ignore_result(db_->Execute( "UPDATE cookies " "SET last_access_utc = last_access_utc + 11644473600000000 " "WHERE rowid IN " "(SELECT rowid FROM cookies WHERE " - "last_access_utc > 0 AND last_access_utc < 11644473600000000)"); + "last_access_utc > 0 AND last_access_utc < 11644473600000000)")); #endif ++cur_version; meta_table_.SetVersionNumber(cur_version);