Google Git
Sign in
chromium / chromium / src / 2478049adcb1ad5a0a742afef07d94523c94fbe7
commit2478049adcb1ad5a0a742afef07d94523c94fbe7[log] [tgz]
authorJihad Hanna <jihadghanna@google.com>Mon Sep 01 13:45:56 2025
committerChromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com>Mon Sep 01 13:45:56 2025
tree1ab2353e9c6b67889979e4cd7284c6dc388f5866
parentec97dfc115126b0f665b7df9ae291d95c64b5ab6 [diff]
Modify the construction of updated entities

Prior to this CL, attributes were added from the merge attempt and then
all attributes of the old entity were also added, duplicating the
attributes that were mergeable.

Merging probably worked before because upon constructing passing the
list of attributes to the `EntityInstance` constructor, the list was
converted to a `flat_set`, and the constructor could probably be
implemented in a way to discard subsequent duplicates.

This CL changes this logic and explicitly discards old mergeable
attributes to not rely on the `flat_set` construction, which could
change.

Bug: 436813697
Change-Id: I938bb79b093fe25a1bf5cefc4100a1998fdc31e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6903138
Reviewed-by: Jan Keitel <jkeitel@google.com>
Commit-Queue: Jihad Hanna <jihadghanna@google.com>
Cr-Commit-Position: refs/heads/main@{#1509173}
2 files changed
tree: 1ab2353e9c6b67889979e4cd7284c6dc388f5866
  1. .gemini/
  2. .github/
  3. agents/
  4. android_webview/
  5. apps/
  6. ash/
  7. base/
  8. build/
  9. build_overrides/
  10. buildtools/
  11. cc/
  12. chrome/
  13. chromecast/
  14. chromeos/
  15. codelabs/
  16. components/
  17. content/
  18. crypto/
  19. dbus/
  20. device/
  21. docs/
  22. extensions/
  23. fuchsia_web/
  24. gin/
  25. google_apis/
  26. gpu/
  27. headless/
  28. infra/
  29. ios/
  30. ipc/
  31. media/
  32. mojo/
  33. net/
  34. pdf/
  35. printing/
  36. remoting/
  37. rlz/
  38. sandbox/
  39. services/
  40. skia/
  41. sql/
  42. storage/
  43. styleguide/
  44. testing/
  45. third_party/
  46. tools/
  47. ui/
  48. url/
  49. webkit/
  50. clank
  51. clusterfuzz-data
  52. internal
  53. ios_internal
  54. signing_keys
  55. v8
  56. .clang-format
  57. .clang-tidy
  58. .clangd
  59. .cursorignore
  60. .geminiignore
  61. .git-blame-ignore-revs
  62. .gitallowed
  63. .gitattributes
  64. .gitignore
  65. .gitmodules
  66. .gn
  67. .mailmap
  68. .rustfmt.toml
  69. .vpython3
  70. .yapfignore
  71. ATL_OWNERS
  72. AUTHORS
  73. BUILD.gn
  74. CODE_OF_CONDUCT.md
  75. codereview.settings
  76. CPPLINT.cfg
  77. CRYPTO_OWNERS
  78. DEPS
  79. DIR_METADATA
  80. LICENSE
  81. LICENSE.chromium_os
  82. OWNERS
  83. PRESUBMIT.py
  84. PRESUBMIT_test.py
  85. PRESUBMIT_test_mocks.py
  86. README.md
  87. SECURITY_OWNERS
  88. 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.

To check out the source code locally, don't use git clone! Instead, follow the instructions on how to get the code.

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.

If you found a bug, please file it at https://crbug.com/new.