diff options
| author | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 03:16:38 +0000 |
|---|---|---|
| committer | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 03:16:38 +0000 |
| commit | 3bc56e26caa284999192a7100006dffd222f7189 (patch) | |
| tree | f8dc95be00ba1222d6b529dc018cc3a6b3bfea4f | |
| parent | 6f9968865e62cfc75b8c4ce3308837d95967fa21 (diff) | |
| download | chromium_src-3bc56e26caa284999192a7100006dffd222f7189.zip chromium_src-3bc56e26caa284999192a7100006dffd222f7189.tar.gz chromium_src-3bc56e26caa284999192a7100006dffd222f7189.tar.bz2 | |
Previously we didn't pre-read at all if there was any configuration in the ChromeFrame key. This change makes that decision sensitive to the existance of the PreRead value, not just the existance of the ChromeFrame key.
TEST=On Vista, create a ChromeFrame pref key, then run: chrome_frame_perftests.exe --gtest_filter=*X.PerfCold
BUG=45510
Review URL: http://codereview.chromium.org/2844023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51486 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/client_util.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc index 5a59049..e361db3 100644 --- a/chrome/app/client_util.cc +++ b/chrome/app/client_util.cc @@ -117,8 +117,11 @@ HMODULE LoadChromeWithDirectory(std::wstring* dir) { if (::RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Google\\ChromeFrame", 0, KEY_QUERY_VALUE, &key) == ERROR_SUCCESS) { DWORD unused = sizeof(pre_read_size_mb); - RegQueryValueEx(key, L"PreRead", NULL, NULL, - reinterpret_cast<LPBYTE>(&pre_read_size_mb), &unused); + if (::RegQueryValueEx(key, L"PreRead", NULL, NULL, + reinterpret_cast<LPBYTE>(&pre_read_size_mb), + &unused) != ERROR_SUCCESS) { + pre_read_size_mb = 16; // Default + } RegCloseKey(key); key = NULL; } else { |