Граф коммитов

535758 Коммитов

Автор SHA1 Сообщение Дата
Julian Seward 83969e88eb Bug 1361258 - Add a jemalloc_thread_local_arena API with a binding for rust. r=glandium
The intent of the API is to allow threads to opt-in to use a separate
mozjemalloc arena.

This indroduces a dummy shell with no actual implementation.
2017-05-12 18:08:08 +09:00
Ruturaj K. Vartak eeb5e9e9e1 Bug 1354504 - Add autocomplete to network monitor search box. r=jdescottes, ntim
MozReview-Commit-ID: KojxbqOAJAQ
2017-05-11 04:25:00 +01:00
Jan de Mooij 652857ca5b Bug 1364014 - Remove unnecessary is-array check in GCMarker::restoreValueArray. r=jonco 2017-05-12 09:46:21 +02:00
Ehsan Akhgari 8a04849cee Bug 1362814 - Part 2: Move GeckoProfilerReporter to its own header; r=mstange
This allows us to get rid of the nsIMemoryReporter.h inclusion in GeckoProfiler.h.
That brings XPCOM string headers with it.
2017-05-12 02:35:09 -04:00
Ehsan Akhgari 9fc6c978e3 Bug 1362814 - Part 1: Remove an unneeded inclusion from GeckoProfiler.h; r=mstange 2017-05-12 02:35:09 -04:00
vincentliu 3d037c531f Bug 1363675 - Get D3D11Device from TextureSourceProvider if it exists. r=dvander 2017-05-12 14:09:53 +08:00
Phil Ringnalda 0b5026dbf2 Backed out 3 changesets (bug 1310885) for heap write hazard failures
Backed out changeset 77352010d8e8 (bug 1310885)
Backed out changeset 9245a2fbb974 (bug 1310885)
Backed out changeset 7c2db290c4b6 (bug 1310885)

MozReview-Commit-ID: 7JWuxt9QDO0
2017-05-11 23:03:31 -07:00
Kris Maglione 01da50be42 Bug 1358846: Temporarily disable low-value tests that fail only on Windows. r=me
MozReview-Commit-ID: AklygLaeckt

--HG--
extra : rebase_source : 39b68fc73a87caacb8a401d786df9e0a21569bc2
2017-05-11 22:42:44 -07:00
Botond Ballo 2c52e58651 Bug 1349750 - Put async initiation of scrollbar drags behind a pref. r=kats
This allows the feature to ride the trains later than async scrollbar
dragging itself, if desired.

MozReview-Commit-ID: 73ZlCqM5hMN

--HG--
extra : rebase_source : dabc4a4b72210133d8b62256510213183312f18f
2017-05-10 17:57:54 -04:00
Botond Ballo 6606b827b5 Bug 1349750 - Have APZ initiate async scrollbar dragging when possible. r=kats
MozReview-Commit-ID: 1snCEl6H9bN

--HG--
extra : rebase_source : dce1353e5ccebfacd5d100719ebb684dfa0f516b
2017-05-10 19:29:46 -04:00
Botond Ballo 390338b8cd Bug 1349750 - Store the thumb's start offset in ScrollThumbData. r=kats
Also add a comment to AsyncDragMetrics documenting that mScrollbarDragOffset
is relative to the thumb's start offset.

MozReview-Commit-ID: uipsOCzs2N

--HG--
extra : rebase_source : 25183e22cb7ffb9995a2594d6aea106cdef7924a
2017-05-10 19:24:26 -04:00
Botond Ballo 933619aa8d Bug 1349750 - Have AsyncDragMetrics use ScrollDirection instead of rolling its own direction enum. r=kats
MozReview-Commit-ID: FKK4OBx12oa

--HG--
extra : rebase_source : 538579bd965863ecac5d7846f1c5df232b8a2108
2017-05-10 15:22:04 -04:00
Botond Ballo f5c583a72c Bug 1349750 - Add a ConvertScrollbarPoint() helper to AsyncPanZoomController. r=kats
MozReview-Commit-ID: ESbWqhy1tKT

--HG--
extra : rebase_source : a380346fefd9e0fbcbbbcdcd61c0272b727acfed
2017-05-10 19:25:27 -04:00
Kris Maglione 695828f6ff Bug 1358846: Disable Jetpack child_process test. r=me
MozReview-Commit-ID: 65a0bfbtskU

--HG--
extra : rebase_source : e0d9e8a6f6927ab999b2a29fa6a9fd6a33dde5a9
2017-05-09 21:04:35 -07:00
Botond Ballo e1636dd2cd Bug 1349750 - Add HitTestingTreeNode::IsScrollThumbNode(). r=kats
MozReview-Commit-ID: GMKg3akA9qp

--HG--
extra : rebase_source : 10518e52777e39743587adcca6c73b9f6382646e
2017-05-05 18:05:52 -04:00
Botond Ballo 107be6aac9 Bug 1349750 - Have AsyncPanZoomController expose an IsScrollInfoLayer() method. r=kats
MozReview-Commit-ID: 5TEIcv9svk

--HG--
extra : rebase_source : edd32f6d2988c38df4cdf470fadf155136baed80
2017-05-05 18:02:05 -04:00
Botond Ballo 59c181ae2d Bug 1349750 - If APZ hit testing hits a scrollbar node, return the node for later use. r=kats
MozReview-Commit-ID: Lgz5N3nkPlb

--HG--
extra : rebase_source : edee38f3b9a7bbce6bae90a2a63bcd4bbcd6bef1
2017-05-05 18:08:18 -04:00
Botond Ballo 9127b9d4f3 Bug 1349750 - Move the scroll track extents from AsyncDragMetrics to ScrollThumbData. r=kats
To conserve space in LayerAttributes, we only store the extents along the
relevant axis.

MozReview-Commit-ID: GAL8Oa2NOde

--HG--
extra : rebase_source : 9420d0fb36175e190cbff6e162fd41d8e5240c81
2017-05-05 15:54:27 -04:00
Botond Ballo bae009bd63 Bug 1349750 - Add an 'is async-draggable' flag to ScrollThumbData. r=kats
This flag is set to false if there are any conditions that only the main
thread knows about that prevent the thumb from being async-dragged.

MozReview-Commit-ID: Gl7f7bY0QnA

--HG--
extra : rebase_source : 60ab680a3995e3b5c0e1b4482ca0e7142352bbd2
2017-05-05 16:17:06 -04:00
Botond Ballo 3bc007b384 Bug 1349750 - Move the scroll thumb length from AsyncDragMetrics to ScrollThumbData. r=kats
MozReview-Commit-ID: Atp7Kgn6adM

--HG--
extra : rebase_source : f22d89f6b8397984e48657dda7f68826c3cc90f8
2017-05-03 20:37:14 -04:00
Botond Ballo 2029f1cf93 Bug 1349750 - Store the entire ScrollThumbData in HitTestingTreeNode. r=kats
This is preparation for future changes that will add fields to ScrollThumbData
that will be accessed via HitTestingTreeNode.

To accomplish this, this patch also exposes the entire ScrollThumbData via
LayerMetricsWrapper and WebRenderScrollDataWrapper.

MozReview-Commit-ID: 1Ed8Z80Wk1V

--HG--
extra : rebase_source : 86cce84eab0cd8bcd2998f1682137e9514bb1fb5
2017-05-03 20:25:09 -04:00
Botond Ballo 0f1863f7ac Bug 1349750 - Introduce a PlainOldDataSerializer utility class and use it for SimpleLayerAttributes. r=kats
MozReview-Commit-ID: 2tntLfnAINy

--HG--
extra : rebase_source : 2da85ab1c4695ef23a29f1289fa996d879cd8e7b
2017-05-03 20:21:11 -04:00
Botond Ballo 3981a3686a Bug 1349750 - Remove the no-longer-used WebRenderScrollData[Wrapper]::GetScrollThumbLength(). r=kats
Also remove a vestigial declaration of the previously removed method
HitTestingTreeNode::GetScrollThumbLength().

MozReview-Commit-ID: 3BvFNeGwPXd

--HG--
extra : rebase_source : 6cc6d2f2e3ecc4dedce2b83f6b0faf819f4be0f8
2017-05-03 20:23:42 -04:00
Botond Ballo 6c0eea50b3 Bug 1349750 - Group scroll thumb-related information in Layer into a ScrollThumbData structure. r=kats
The patch also renames Layer::SetScrollbarData() to Layer::SetScrollThumbData()
for clarity.

MozReview-Commit-ID: DVwJ3DMl3Zs

--HG--
extra : rebase_source : 7b2bfccf1351c82bb16296635e69d5488c87a50f
2017-05-10 14:02:15 -04:00
Matt R 4b4e7d2ae0 Bug 1361473 - Add filter option for network requests checking for transferred size being larger than specified value. r=Honza
MozReview-Commit-ID: LJeENle7t20

--HG--
extra : rebase_source : 7f008215bdf19ed55c9644cc3a36bc20d6b0d2de
2017-05-13 00:06:39 +01:00
Ryan VanderMeulen 5f9d8f5990 Backed out changeset 555b205831e7 (bug 1364245) because it didn't fully fix the problem. 2017-05-13 13:10:40 -04:00
Thomas Nguyen f5bf535cd4 Bug 1322523 - Add telemetry to capture the length of long Safe Browsing V4 prefixes r=francois
MozReview-Commit-ID: F0oTW3Kplxk

--HG--
extra : rebase_source : 6a04d89307c678ff433a599ee50a6b3afe552ec4
2017-05-08 17:50:51 +08:00
Kevin Chen d6f7dc2900 Bug 1363677 - Skip Flush() and EndDraw() if the ID2D1DeviceContext is stale; r=dvander
MozReview-Commit-ID: 6KnryMZE8Qj

--HG--
extra : rebase_source : 7e8794825934b82c887159b04128cf830f77d897
2017-05-10 16:22:08 +08:00
Alex Gaynor 33b7e1fa87 Bug 1363179 - do not allow content processes to read from /Volumes on macOS r=haik
MozReview-Commit-ID: 8osJVQD3myh

--HG--
extra : rebase_source : 8cda32ca1bca80b796458d36099244a45af2f185
2017-05-12 16:18:57 -04:00
Gregory Szorc e5c00fdd77 Bug 1364511 - Upgrade Mercurial during `mach bootstrap` on MozillaBuild; r=RyanVM
The base bootstrap class has code to conditionally upgrade Mercurial
depending on its version. It is kinda broken. This commit overrides
that code in the MozillaBuild bootstrapper to always run `pip`, which
will ensure the latest stable Mercurial release is installed.

MozReview-Commit-ID: 2O1Ff7dAp4o

--HG--
extra : rebase_source : 98cba0abbebf13e8fe93673d5b46eb16e6a3c147
2017-05-12 15:04:28 -07:00
Imanol Fernandez c36ed63911 servo: Merge #16769 - Support for Android armv7 and aarch64 target triples (from MortimerGoro:android_archs); r=larsbergstrom
<!-- Please describe your changes on the following line: -->

Support for Android armv7 and aarch64 target triples in python build scripts (build + packaging)

`--android` build parameter works as always (arm-linux-androideabi still the default)
`./mach build --release --android`

New compilation modes for android
`./mach build --release --target=arm-linux-androideabi`
`./mach build --release --target=armv7-linux-androideabi`
`./mach build --release --target=aarch64-linux-android`

See https://github.com/servo/servo/issues/11921. When all crates are ready we'll switch default android compilations to` armv7-linux-androideabi` target triple.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 286bfb96a06705e37e690be07a51f5e1797f35b0

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 5e578d7a8b567da6913e8ba63720d6a877b20ca1
2017-05-13 10:24:29 -05:00
Simon Sapin 0966630712 servo: Merge #16854 - Add 'mach check' and 'mach check-geckolib' (from servo:check); r=nox
With a reminder that you may still need to do a full build if you want to run it.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2766529c2450ba3fac1b7669c195869a0f7e341b

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : ebb4360dd02f68da6781efa4afd68e3912da2e09
2017-05-13 08:30:07 -05:00
Brad Werth 4f193e918a Bug 1363572 Part 3: Change ServoStyleSet to use sheet addresses as unique IDs. r=heycam
MozReview-Commit-ID: BZSKZx0wjL8

--HG--
extra : rebase_source : 2404ba8acaa8877a242c92c265de1d341f631839
2017-05-12 12:04:55 -07:00
Brad Werth 1abf09eb7e Bug 1363572 Part 2: Change ServoStyleSet to use uint64_t for entry unique IDs. r=heycam
MozReview-Commit-ID: 50whQ71j4B5

--HG--
extra : rebase_source : 9f4fa6aa77d43c609c9b9c3af9d10dac54ced649
2017-05-10 11:20:57 -07:00
Alan Jeffrey cb93fc35dd servo: Merge #16845 - Renamed BrowsingContext to WindowProxy in script (from asajeffrey:script-rename-browsing-contexts); r=jdm
<!-- Please describe your changes on the following line: -->

Renamed `script::dom::BrowsingContext` to `script::dom::WindowProxy`.

The browsing context is mostly maintained in the constellation, not in script. It would be nice to rename `constellation::Frame` to `constellation::BrowsingContext`, but that will be very confusing if there are two `BrowsingContext` types.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because renamings aren't externally visible

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 34d0e59849a0a3e231e47fe10d66484340b8b80c

--HG--
rename : servo/components/script/dom/browsingcontext.rs => servo/components/script/dom/windowproxy.rs
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : b6982ad56bf64ced344baceb66c9728e6dad6e6d
2017-05-13 07:09:29 -05:00
Xidorn Quan fd2887981d Bug 1363984 - Update mochitest expectations for this bug.
MozReview-Commit-ID: B6AShaCXwv1
2017-05-13 22:33:52 +10:00
Simon Sapin 0ad27e0428 servo: Merge #16836 - Make `./mach rustup` use the latest nightly rather than master (from servo:nightly); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: d2fa2ae9343db8d958570a501ff9a7b7a203ceeb

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 12ab30e06306fc348969350f8641a9dcace422be
2017-05-13 06:07:11 -05:00
Xidorn Quan 2bbe4ddc15 servo: Merge #16827 - Make font-feature-settings a subprop of font (from upsuper:subprop-font-feature-settings); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: e83e102736907a5905134aa129dd43debf5c216c

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 4a21e1c307de47a17c59e558e8628a841a02be5a
2017-05-13 04:40:18 -05:00
Timothy Guan-tin Chien 1d08bd439b Bug 1360500 - Allow custom colors on find selection type selections. r=jaws,masayuki,smaug
This patch implements chrome-only Selection#setColors and
Selection#resetColors methods, and use it to set the background color of
the preferences search highlight.

MozReview-Commit-ID: 2U92aBCAyeh

--HG--
extra : rebase_source : b07af1f37309d8184584b298a720cd5c1382929a
2017-05-10 10:48:50 -04:00
Nathan Froyd b92dd9bc28 servo: Merge #16843 - explicitly specify bitness for x86 cross-compilation situations (from froydnj:bindgen-cross-compile); r=emilio
Despite compiling for architecture X, the user may have specified a
clang that defaults to architecture Y.  We need to ensure that we invoke
clang with the correct architecture selection.  We do not use --target
to do this, however, because that runs into problems with LLVM's default
search paths.  For the x86 case, we can simply use -m$BITNESS to select
the correct architecture.

This is not at all a general solution, but it does unblock compiling Stylo for 32-bit Linux on Gecko's infra.

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

Source-Repo: https://github.com/servo/servo
Source-Revision: 9be1fead3ccf419e5d32a935ba6a5271c2e5170a

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 9275f12796ebe784febe8bcfa3060c2a7b8af835
2017-05-13 02:03:19 -05:00
Wes Kocher b0d1320ad8 Backed out 2 changesets (bug 1363421) for assertions in test_enterjit_osr.js on Windows xpcshell tests a=backout
Backed out changeset 722236d77865 (bug 1363421)
Backed out changeset 8a9e10fae26c (bug 1363421)

MozReview-Commit-ID: 93rH7BqbgHP
2017-05-13 00:32:36 -07:00
Hiroyuki Ikezoe 5505838637 Bug 1341102 - Update reftest expectations. r=me
https://github.com/servo/servo/issues/16824

MozReview-Commit-ID: LmuEyDj6wRi
2017-05-13 16:24:22 +09:00
Boris Zbarsky fd6b98f272 servo: Merge #16841 - Fix the situation when :any-link starts or stops matching to actually restyle correctly (from bzbarsky:fix-moz-any-matching); r=emilio
<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix https://bugzilla.mozilla.org/show_bug.cgi?id=1364335

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 3b13b152a0198b9a005ca122e6cb411b12f8c334

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : b400548f6f4f1d7a315adf9eade154e8a87ba2db
2017-05-13 01:00:46 -05:00
Bobby Holley 43faf047c5 Bug 1361258 - Backout 2214b3c57c9c (bug 1291356), disabling multiple jemalloc arenas. r=glandium 2017-05-13 08:21:05 +02:00
Manish Goregaokar 4a5e1e7e86 servo: Merge #16824 - Recalculate font-size when generic changes (from Manishearth:font-size-generic-changed); r=heycam
With the MathML refactorings this feature got lost. It would still get
recalculated when explicitly specified as a keyword, but not otherwise.

To avoid hitting the font metrics provider too often, we only do this
when the generic changes. Otherwise we trust the existing calculated
font.

I swear, once Stylo lands I'm going to campaign to remove font-size from CSS entirely. 😩

Source-Repo: https://github.com/servo/servo
Source-Revision: 29f5b226ac6029cfa3806a36e58974b94c12d655

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : feaf14b66482d4ceeb79c4d44c91e38ed3d31d72
2017-05-12 23:59:25 -05:00
Daniel Holbert 396f88abfc Bug 1364338: Force a repaint when CSS 'outline-width' or 'outline-offset' change. r=heycam
Previously, when these properties changed, we'd only send change hints to
recompute overflow areas & trigger DLBI. If the outline was always outside of
the element's border box, this old strategy was generally OK, because the
outline tweak would cause a change to the overflow areas' size, and that would
invalidate the changed area via DLBI & trigger a repaint.

However, for outlines that are *inside* of the element (via negative
'outline-offset'), these change hints were not sufficient, because tweaks to
the outline width & offset will NOT affect the size of the element's overflow
areas and will not trigger any DLBI invalidation.

So in order to correctly handle these changes, we really need to request a
repaint of the affected element, since some piece of the element may need to be
repainted even if it's not changing in size.

MozReview-Commit-ID: J4KGUHrJ09U

--HG--
extra : rebase_source : 677950d5aebdf7e90120b8fe7bb937344da42d7d
2017-05-12 18:42:10 -07:00
Mike Hommey 6ddaf5ad21 Bug 1316956 - Add a when argument to check_prog. r=chmanchester
--HG--
extra : rebase_source : ce5167bbceb31e554857cba940e72181a5fa361b
2017-05-13 07:12:56 +09:00
Simon Sapin e1a25706be servo: Merge #16837 - Fix future illegal_floating_point_literal_pattern warnings (from servo:illegal_floating_point_literal_pattern); r=emilio
They make component/style fail to build, because of `#[deny(warnings)]`

Source-Repo: https://github.com/servo/servo
Source-Revision: b6f5d65bbddc9e8d35016c8669256a8a539b7516

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 626223612f9972e075e3fe92bcb78f220beaff7f
2017-05-12 22:34:09 -05:00
Imanol Fernandez c3ef7be747 servo: Merge #16833 - Fix unsafe AtomicRefCell<T> transmutes in Layout component (from MortimerGoro:layout_alignment); r=SimonSapin
<!-- Please describe your changes on the following line: -->

Fixes unsafe transmute between `AtomicRefCell<PersistentLayoutData>` and `AtomicRefCell<PartialPersistentLayoutData>` which have different memory alignment in 32 bit archs leading to SEGV crashes. See https://github.com/servo/servo/issues/16817 and https://github.com/servo/servo/pull/16816

mem::align_of values in 32 bit archs (e.g. Android):
```
PersistentLayoutData 8
PersistentLayoutData 4
AtomicRefCell<PersistentLayoutData> 8
AtomicRefCell<PartialPersistentLayoutData> 4
```
mem::align_of values in 64 bit archs
```
PersistentLayoutData 8
PersistentLayoutData 8
AtomicRefCell<PersistentLayoutData> 8
AtomicRefCell<PartialPersistentLayoutData> 8
```

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #16817 (github issue number if applicable).

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 47e4c48feb12e4189f11fd94631f0abea5827f91

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 51c494d499c304cd69e5504acc1ed8399afada05
2017-05-12 20:44:02 -05:00
Kris Maglione f942b2418c Bug 1358846: Part 6 - Clean up error handling. r=me
MozReview-Commit-ID: ApF7H3NTIU8

--HG--
extra : rebase_source : e1fdf13a2abc73ae961b7d4087dbfd7232101ede
2017-04-29 19:03:40 -07:00