diff options
| author | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-17 02:20:14 +0000 |
|---|---|---|
| committer | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-17 02:20:14 +0000 |
| commit | 07628c01d6c4f009abc2874099822c2bb9dd89fc (patch) | |
| tree | a05cbc5b5ddf7620171adc452bbda6c6fd827086 /chrome/browser/in_process_webkit | |
| parent | 6523f294e0c687a14a625e7488e761adfb55998c (diff) | |
| download | chromium_src-07628c01d6c4f009abc2874099822c2bb9dd89fc.zip chromium_src-07628c01d6c4f009abc2874099822c2bb9dd89fc.tar.gz chromium_src-07628c01d6c4f009abc2874099822c2bb9dd89fc.tar.bz2 | |
Roll WebKit's version to 57768 to pick up a change to
WebSecurityOrigin::createFromDatabaseIdentifier(), and fix all its
callers.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1646013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44870 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/in_process_webkit')
| -rw-r--r-- | chrome/browser/in_process_webkit/dom_storage_context.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/in_process_webkit/dom_storage_context.cc b/chrome/browser/in_process_webkit/dom_storage_context.cc index bea4611..a4cba5f 100644 --- a/chrome/browser/in_process_webkit/dom_storage_context.cc +++ b/chrome/browser/in_process_webkit/dom_storage_context.cc @@ -166,10 +166,10 @@ void DOMStorageContext::DeleteDataModifiedSince( file_util::FileEnumerator::FILES); for (FilePath path = file_enumerator.Next(); !path.value().empty(); path = file_enumerator.Next()) { - scoped_ptr<WebKit::WebSecurityOrigin> web_security_origin( + WebKit::WebSecurityOrigin web_security_origin = WebKit::WebSecurityOrigin::createFromDatabaseIdentifier( - webkit_glue::FilePathToWebString(path.BaseName()))); - if (EqualsASCII(web_security_origin->protocol(), url_scheme_to_be_skipped)) + webkit_glue::FilePathToWebString(path.BaseName())); + if (EqualsASCII(web_security_origin.protocol(), url_scheme_to_be_skipped)) continue; file_util::FileEnumerator::FindInfo find_info; file_enumerator.GetFindInfo(&find_info); @@ -260,10 +260,10 @@ void DOMStorageContext::ClearLocalState(const FilePath& profile_path, for (FilePath file_path = file_enumerator.Next(); !file_path.empty(); file_path = file_enumerator.Next()) { if (file_path.Extension() == kLocalStorageExtension) { - scoped_ptr<WebKit::WebSecurityOrigin> web_security_origin( + WebKit::WebSecurityOrigin web_security_origin = WebKit::WebSecurityOrigin::createFromDatabaseIdentifier( - webkit_glue::FilePathToWebString(file_path.BaseName()))); - if (!EqualsASCII(web_security_origin->protocol(), + webkit_glue::FilePathToWebString(file_path.BaseName())); + if (!EqualsASCII(web_security_origin.protocol(), url_scheme_to_be_skipped)) file_util::Delete(file_path, false); } |