Google Git
Sign in
chromium / chromium / src / 84c5295c862a417dc6808cd170b5bbcaa8c91a2a
commit84c5295c862a417dc6808cd170b5bbcaa8c91a2a[log] [tgz]
authorRushan Suleymanov <[email protected]>Fri Apr 10 08:01:47 2020
committerCommit Bot <[email protected]>Fri Apr 10 08:01:47 2020
tree4867fb3d4ce088f476454f767c0bb858a645e68a
parent0bc343bc2e0c1cec7f4f82ebb9be5916a25846ed [diff]
[Sync] Fix bookmarks initial merge for local entities.

Currently, during the initial merge of bookmarks it may be possible that
processing of local creation may cause crash if the previous neighbour
wasn't processed yet (due to matching by GUID with some remote update).

This patch fixes that behaviour by finding the last tracked entity. That
entity will be used to calculate next UniquePosition.

Bug: 1050776
Change-Id: I5275aee07d5bd5f4e4ac534734c209ec2ed78b85
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2144160
Commit-Queue: Rushan Suleymanov <[email protected]>
Reviewed-by: Mikel Astiz <[email protected]>
Cr-Commit-Position: refs/heads/master@{#758159}
3 files changed
tree: 4867fb3d4ce088f476454f767c0bb858a645e68a
  1. android_webview/
  2. apps/
  3. ash/
  4. base/
  5. build/
  6. build_overrides/
  7. buildtools/
  8. cc/
  9. chrome/
  10. chromecast/
  11. chromeos/
  12. cloud_print/
  13. components/
  14. content/
  15. courgette/
  16. crypto/
  17. dbus/
  18. device/
  19. docs/
  20. extensions/
  21. fuchsia/
  22. gin/
  23. google_apis/
  24. google_update/
  25. gpu/
  26. headless/
  27. infra/
  28. ios/
  29. ipc/
  30. jingle/
  31. media/
  32. mojo/
  33. native_client_sdk/
  34. net/
  35. pdf/
  36. ppapi/
  37. printing/
  38. remoting/
  39. rlz/
  40. sandbox/
  41. services/
  42. skia/
  43. sql/
  44. storage/
  45. styleguide/
  46. testing/
  47. third_party/
  48. tools/
  49. ui/
  50. url/
  51. weblayer/
  52. .clang-format
  53. .clang-tidy
  54. .eslintrc.js
  55. .git-blame-ignore-revs
  56. .gitattributes
  57. .gitignore
  58. .gn
  59. .vpython
  60. .vpython3
  61. .yapfignore
  62. AUTHORS
  63. BUILD.gn
  64. CODE_OF_CONDUCT.md
  65. codereview.settings
  66. DEPS
  67. ENG_REVIEW_OWNERS
  68. LICENSE
  69. LICENSE.chromium_os
  70. OWNERS
  71. PRESUBMIT.py
  72. PRESUBMIT_test.py
  73. PRESUBMIT_test_mocks.py
  74. README.md
  75. WATCHLISTS
README.md

Logo Chromium

Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.

The project's web site is https://www.chromium.org.

Documentation in the source is rooted in docs/README.md.

Learn how to Get Around the Chromium Source Code Directory Structure .

For historical reasons, there are some small top level directories. Now the guidance is that new top level directories are for product (e.g. Chrome, Android WebView, Ash). Even if these products have multiple executables, the code should be in subdirectories of the product.