chrome/browser/history/android/android_provider_backend.cc - Issue 10857065: Revert 152162 - Change HistoryAndBookmarkRow favicon_ field to be scoped_refptr<base::RefCountedMem…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/history/android/android_provider_backend.cc

Issue 10857065: Revert 152162 - Change HistoryAndBookmarkRow favicon_ field to be scoped_refptr<base::RefCountedMem… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/history/android/android_history_types.h ('k') | chrome/browser/history/android/android_provider_backend_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/history/android/android_provider_backend.cc

===================================================================

--- chrome/browser/history/android/android_provider_backend.cc (revision 152168)

+++ chrome/browser/history/android/android_provider_backend.cc (working copy)

@@ -385,7 +385,7 @@

scoped_ptr<FaviconChangeDetails> favicon;

if (row.is_value_set_explicitly(HistoryAndBookmarkRow::FAVICON) &&

- row.favicon_valid()) {

+ !row.favicon().empty()) {

favicon.reset(new FaviconChangeDetails);

if (!favicon.get())

return false;

@@ -966,11 +966,10 @@

FaviconID favicon_id = statement->statement()->ColumnInt64(4);

if (favicon_id) {

- scoped_refptr<base::RefCountedBytes> favicon = new base::RefCountedBytes();

- if (!thumbnail_db_->GetFavicon(favicon_id, NULL, &favicon->data(), NULL,

- NULL))

+ std::vector<unsigned char> favicon;

+ if (!thumbnail_db_->GetFavicon(favicon_id, NULL, &favicon, NULL, NULL))

return false;

- if (favicon->size())

+ if (!favicon.empty())

new_row.set_favicon(favicon);

favicon_details->urls.insert(old_url_row.url());

favicon_details->urls.insert(row.url());