diff options
| author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-12 20:44:49 +0000 |
|---|---|---|
| committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-12 20:44:49 +0000 |
| commit | 9e7572846ad7a0c34cf57a64fdc255c87b417b29 (patch) | |
| tree | 911b21904d3ede270c34a944ddc9c90c9dd4b232 /content/renderer/websharedworker_proxy.cc | |
| parent | d7c919661c7da112647ebc96ad353f71ec2ea201 (diff) | |
| download | chromium_src-9e7572846ad7a0c34cf57a64fdc255c87b417b29.zip chromium_src-9e7572846ad7a0c34cf57a64fdc255c87b417b29.tar.gz chromium_src-9e7572846ad7a0c34cf57a64fdc255c87b417b29.tar.bz2 | |
Fix update_conflicts_resolved() setting wrong var
The point of this change is to make the function do what it claims to
do, while not affecting current syncer behaviour. This bug has been
around for almost two years; we may have come to rely on it in some way.
I'm not prepared to risk breaking the old functionality at this time.
I have removed the if statement in syncer.cc's
APPLY_UPDATES_TO_RESOLVE_CONFLICTS step because we would always take the
false branch when the bug was in effect.
I did not change SyncSession::HasMoreToSync() because the buggy
behaviour would set conflict_sets_built() instead of
conflicts_resolved(), but this would have had the same effect. We might
be relying on the fact that update_conflict_resolved(true) implies
HasMoreToSync(), so it's best to not change that now.
BUG=109072
TEST=
Review URL: http://codereview.chromium.org/9087003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/websharedworker_proxy.cc')
0 files changed, 0 insertions, 0 deletions