summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/glue
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-15 21:56:26 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-15 21:56:26 +0000
commite2709240cf5112d3d2cb83854149616dcd56b6ad (patch)
treea8886e9c5d8cdfb00a5731c867d63007cd383004 /chrome/browser/sync/glue
parent41491b412f95d8e440c30dde0cd5f895e6801c2b (diff)
downloadchromium_src-e2709240cf5112d3d2cb83854149616dcd56b6ad.zip
chromium_src-e2709240cf5112d3d2cb83854149616dcd56b6ad.tar.gz
chromium_src-e2709240cf5112d3d2cb83854149616dcd56b6ad.tar.bz2
[Sync] Prevent redundant sync title changes
Title truncation is now performed in the WriteNode, before we do the idempotency checks. By fixing this and an issue in the favicon cache that was leading to automatic rewrites we should significantly reduce the number of useless sync cycles. BUG=229658 Review URL: https://codereview.chromium.org/13953003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194243 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/glue')
-rw-r--r--chrome/browser/sync/glue/favicon_cache.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/sync/glue/favicon_cache.cc b/chrome/browser/sync/glue/favicon_cache.cc
index 8871fde..e14b763 100644
--- a/chrome/browser/sync/glue/favicon_cache.cc
+++ b/chrome/browser/sync/glue/favicon_cache.cc
@@ -88,12 +88,13 @@ IconSize GetIconSizeBinFromBitmapResult(const gfx::Size& pixel_size) {
int max_size =
(pixel_size.width() > pixel_size.height() ?
pixel_size.width() : pixel_size.height());
+ // TODO(zea): re-enable 64p and 32p resolutions once we support them.
if (max_size > 64)
return SIZE_INVALID;
else if (max_size > 32)
- return SIZE_64;
+ return SIZE_INVALID;
else if (max_size > 16)
- return SIZE_32;
+ return SIZE_INVALID;
else
return SIZE_16;
}