Google Git
Sign in
chromium / chromium / src / 035117fc872c003925563e350cc0bdf4e2f449c1
commit035117fc872c003925563e350cc0bdf4e2f449c1[log] [tgz]
authorDaniel Bratell <bratell@opera.com>Wed Feb 27 12:25:57 2019
committerCommit Bot <commit-bot@chromium.org>Wed Feb 27 12:25:57 2019
tree0504c6255ec0ac3148999485c81a10dac352f882
parent599efcbd542769813a44218df513dab841f7bd5e [diff]
[jumbo] Avoid having two TimeTicksFromSecondsD

With the changes to port from wtf/time.h to base/time/time.h
the core test build target ended up with two TimeTicksFromSecondsD
which clashed in some jumbo builds. This patch is a short
term fix that inlines one of them.

A long term fix would imho be to add a TimeTick::FromSecondsD
method.

Bug: 919383
Change-Id: I5ff65f2a8bcfb95fc0163453793f7c290bbd9e52
Reviewed-on: https://chromium-review.googlesource.com/c/1489196
Auto-Submit: Daniel Bratell <bratell@opera.com>
Commit-Queue: Sergio Villar <svillar@igalia.com>
Reviewed-by: Sergio Villar <svillar@igalia.com>
Cr-Commit-Position: refs/heads/master@{#635974}
1 file changed
tree: 0504c6255ec0ac3148999485c81a10dac352f882
  1. android_webview/
  2. apps/
  3. ash/
  4. base/
  5. build/
  6. build_overrides/
  7. buildtools/
  8. cc/
  9. chrome/
  10. chrome_elf/
  11. chromecast/
  12. chromeos/
  13. cloud_print/
  14. components/
  15. content/
  16. courgette/
  17. crypto/
  18. dbus/
  19. device/
  20. docs/
  21. extensions/
  22. fuchsia/
  23. gin/
  24. google_apis/
  25. google_update/
  26. gpu/
  27. headless/
  28. infra/
  29. ios/
  30. ipc/
  31. jingle/
  32. media/
  33. mojo/
  34. native_client_sdk/
  35. net/
  36. pdf/
  37. ppapi/
  38. printing/
  39. remoting/
  40. rlz/
  41. sandbox/
  42. services/
  43. skia/
  44. sql/
  45. storage/
  46. styleguide/
  47. testing/
  48. third_party/
  49. tools/
  50. ui/
  51. url/
  52. .clang-format
  53. .eslintrc.js
  54. .git-blame-ignore-revs
  55. .gitattributes
  56. .gitignore
  57. .gn
  58. .vpython
  59. AUTHORS
  60. BUILD.gn
  61. CODE_OF_CONDUCT.md
  62. codereview.settings
  63. DEPS
  64. ENG_REVIEW_OWNERS
  65. LICENSE
  66. LICENSE.chromium_os
  67. OWNERS
  68. PRESUBMIT.py
  69. PRESUBMIT_test.py
  70. PRESUBMIT_test_mocks.py
  71. README.md
  72. 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 .