diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 07:46:37 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 07:46:37 +0000 |
| commit | 3e377c5a80be45d36a6015c80d9e2dae525cf042 (patch) | |
| tree | 089f72c86a2f2314e527f2e95a3903253fbcf51a /chrome/browser/bookmarks | |
| parent | a42d22a1abe11d4f138c4c0870568be69bad5301 (diff) | |
| download | chromium_src-3e377c5a80be45d36a6015c80d9e2dae525cf042.zip chromium_src-3e377c5a80be45d36a6015c80d9e2dae525cf042.tar.gz chromium_src-3e377c5a80be45d36a6015c80d9e2dae525cf042.tar.bz2 | |
Revert of r22559.
This caused an easily reproducible crash:
1. Start with a fresh profile
2. Navigate to google.com
3. Restart
4. Navigate to google.com
5. crash
The change from pass-by-value to pass-by-ref in
fav_icon_helper.* seems to be to blame, but I can't see it
right off.
TBR=phajdan.jr@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22595 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_model.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_model.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc index e9573ac..9bcc8c3 100644 --- a/chrome/browser/bookmarks/bookmark_model.cc +++ b/chrome/browser/bookmarks/bookmark_model.cc @@ -636,7 +636,7 @@ void BookmarkModel::OnFavIconDataAvailable( bool know_favicon, scoped_refptr<RefCountedBytes> data, bool expired, - const GURL& icon_url) { + GURL icon_url) { SkBitmap fav_icon; BookmarkNode* node = load_consumer_.GetClientData( diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h index 1137159..8da3bcd 100644 --- a/chrome/browser/bookmarks/bookmark_model.h +++ b/chrome/browser/bookmarks/bookmark_model.h @@ -371,7 +371,7 @@ class BookmarkModel : public NotificationObserver, public BookmarkService { bool know_favicon, scoped_refptr<RefCountedBytes> data, bool expired, - const GURL& icon_url); + GURL icon_url); // Invoked from the node to load the favicon. Requests the favicon from the // history service. |