Commit Graph

139 Commits

Author SHA1 Message Date
Emilio Cobos Álvarez
9f898f11f2 servo: Merge #18904 - style: Stop threading the ElementData around the invalidator (from emilio:invalidator-less-dependencies); r=heycam,jdm,nox
style: Stop threading the ElementData around the invalidator.

Source-Repo: https://github.com/servo/servo
Source-Revision: c1e0889971582488ed7a4d3a3af21a49bf497abc
2017-10-17 05:18:29 -05:00
Emilio Cobos Álvarez
9424bfb1bc servo: Merge #18894 - style: Remove the ElementExt trait (from emilio:bye-elementext); r=nox
It is likely it's the most useless trait ever existing.

Source-Repo: https://github.com/servo/servo
Source-Revision: 7d05c76d1828bc80e578c9b77f0c57b0e1afafc2
2017-10-16 07:32:40 -05:00
Emilio Cobos Álvarez
0a5ccb5323 servo: Merge #18763 - style: Check transitions per longhand to know which transitions to keep (from emilio:transition-longhand-id); r=hiro,birtles
This fixes bug https://bugzilla.mozilla.org/show_bug.cgi?id=1406111

This fixes the fishy TransitionProperty mapping which I complained about in my
previous refactor.

Turns out that those properties could only be longhands, and thus the expansion
we did before that (and which I removed) was correct.

This fixes the bug by moving back to the previous correct behavior but using the
correct types.

The optimization to avoid creating a HashSet if we're transitioning all
properties or had no existing transition is removed since now we're creating a
LonghandIdSet, which is cheap, and that was only a performance optimization.

Source-Repo: https://github.com/servo/servo
Source-Revision: 04f787dbf9b235bf3af58dc7f3160689cdb2311c
2017-10-06 12:56:27 -05:00
Manish Goregaokar
8d9db22426 servo: Merge #18712 - stylo: use FnvHashMap everywhere, remove default HashMap construction methods (from Manishearth:fnv); r=bholley
r=bholley bug 1385971

Source-Repo: https://github.com/servo/servo
Source-Revision: 89724c6b32c6c0b7673df6d5b735e057a392f51b
2017-10-03 18:47:46 -05:00
Emilio Cobos Álvarez
b6ad582c69 servo: Merge #18604 - style: Cleanup the animated value setup (from emilio:animated-value-cleanup); r=nox
We have three different enums to represent slightly different things. Reuse them
properly, and kill some code in the animated_properties module while at it.

Source-Repo: https://github.com/servo/servo
Source-Revision: 9ffd2b8c9e2b897f12daa5eac48a76a0c10c60c9
2017-09-29 10:01:52 -05:00
Emilio Cobos Álvarez
b6716bad81 servo: Merge #18652 - style: Fix various issues with XBL rule matching (from emilio:xbl-stuff); r=TYLin
See the commit details.

Source-Repo: https://github.com/servo/servo
Source-Revision: bad77b6a20ee9bdba27d0af9edd1dd638c73d64b
2017-09-27 09:15:16 -05:00
Emilio Cobos Álvarez
ef053f704c servo: Merge #18620 - style: Remove UnsafeNode (from emilio:bye-unsafe-node); r=glennw
No longer needed since a while ago.

Source-Repo: https://github.com/servo/servo
Source-Revision: 4628db14951667b7ffddb47bdcc0c5ed886cb3b1
2017-09-24 20:04:58 -05:00
Emilio Cobos Álvarez
fa46fd409e servo: Merge #18531 - Reland #18519 (from emilio:body-quirk); r=heycam
This relands #18519 as-is.

It was backed-out because some Gecko changes hadn't landed yet, but I just pushed them in a way they wouldn't break the build.

Source-Repo: https://github.com/servo/servo
Source-Revision: 3d2dccf1f3e7bf99cb750ee9fd245c24255ad9e2
2017-09-15 20:21:25 -05:00
Wes Kocher
42e3d8950c Backed out changeset 67769dac78c4 for busting builds CLOSED TREE
MozReview-Commit-ID: 82QTBjYc0jC
2017-09-15 13:38:03 -07:00
Emilio Cobos Álvarez
2b05fbdbad servo: Merge #18519 - style: Implement the body text color quirk in a more straight-forward way (from emilio:body-quirk); r=heycam
This avoids grabbing the body when values that inherit from the body,
whatever that means, aren't under the body.

In that case we'll get a semi-random value, but that's also mishandled by Gecko
anyways (and probably Blink, though haven't tested), and doesn't really make
much sense.

Source-Repo: https://github.com/servo/servo
Source-Revision: 89d5780570894a54774542e79585b79ece3f2dce
2017-09-15 12:43:55 -07:00
Bobby Holley
6a7fe3a3f6 servo: Merge #18465 - Eliminate RestyleData (from bholley:kill_restyledata); r=emilio
https://bugzilla.mozilla.org/show_bug.cgi?id=1399011

Source-Repo: https://github.com/servo/servo
Source-Revision: 72f0fda836ff97d33169cd1fc0d23d2d07ad74c6
2017-09-12 13:16:26 -05:00
Manish Goregaokar
1080df440b servo: Merge #18334 - Add fallible hashmaps from HashGlobe for stylo (from Manishearth:hashglobe); r=emilio,Gankro
HashGlobe code is r=emilio,Gankro

integration code is r=emilio from https://bugzilla.mozilla.org/show_bug.cgi?id=1393656

Source-Repo: https://github.com/servo/servo
Source-Revision: ac7cf536927a42a5cece379c53d6f39813a77d71
2017-09-01 16:09:53 -05:00
Emilio Cobos Álvarez
7d0d7a9aa2 servo: Merge #18268 - style: Recascade the document instead of using the dirty_on_viewport_size_change bit (from emilio:dirty-viewport-followup); r=SimonSapin
This allows us to simplify a lot of code.

On top of #18267.

Source-Repo: https://github.com/servo/servo
Source-Revision: 473934c989c94773c38f585b1c4500cd8c811738
2017-08-29 14:18:58 -05:00
Emilio Cobos Álvarez
df27ce804b servo: Merge #18257 - stylo: Make a few functions output more useful debug information (from emilio:debug-stuff-helps); r=bholley
Reviewed by Bobby on bug 1389645.

Source-Repo: https://github.com/servo/servo
Source-Revision: 08b9588011b0e70ad48177e890fc5475048db96b
2017-08-26 18:13:40 -05:00
Bobby Holley
2fb4ae2f88 servo: Merge #18246 - stylo: followup fixes for restyle roots (from bholley:restyle_root_followups); r=emilio
https://bugzilla.mozilla.org/show_bug.cgi?id=1392863

Source-Repo: https://github.com/servo/servo
Source-Revision: 1fd0edf158bb479b420fb6ddc76470d82c88cb61
2017-08-26 12:22:33 -05:00
Clément DAVID
a6c6efb7e6 servo: Merge #18179 - Automatically verify that derive() lists are alphabetically ordered #… (from davidcl:master); r=jdm
<!-- Please describe your changes on the following line: -->
Automatically verify that derive() lists are alphabetically ordered #18172

---
<!-- 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 #18172 (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: 474369618965569407d127b1e8c481e757cc59d3
2017-08-23 17:18:31 -05:00
Bobby Holley
08dfc88998 servo: Merge #18196 - stylo: Maintain a restyle root and use it to cull the traversal (from bholley:restyle_roots); r=emilio
https://bugzilla.mozilla.org/show_bug.cgi?id=1383332

Source-Repo: https://github.com/servo/servo
Source-Revision: 20c73e7f7d620600f161f3c00cbe5a80b5e2a5a9
2017-08-22 22:04:34 -05:00
Emilio Cobos Álvarez
99be60945a servo: Merge #18153 - stylo: Remove a lot of the restyle damage related complexity (from emilio:restyle-damage-cleanup); r=heycam
The only reason why we had the `existing_style_for_style_damage` bit is to apply
some optimizations that we don't have anymore.

I still want to reintroduce a few of them, at least for the non-eager
pseudo-element case... But I think I won't need this at all.

This allows us to remove a fair amount of Gecko code too.

<!-- 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: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- 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: 87206bd68ee6e870c10dc09d5a7b1f893805c379
2017-08-20 07:00:25 -05:00
Bobby Holley
3b875cdb0f servo: Merge #18094 - Avoid leaving stale ANCESTOR_WAS_RECONSTRUCTED bits in the tree (from bholley:ancestor_reconstruct); r=emilio
https://bugzilla.mozilla.org/show_bug.cgi?id=1390179

Source-Repo: https://github.com/servo/servo
Source-Revision: 99b4b7e9602ea1440d2d2ae6c32be30bd0c4f721
2017-08-15 17:07:20 -05:00
Bobby Holley
5d0517864e servo: Merge #18054 - Simplify throttled animation flushes (from bholley:simplify_throttled_animation_flushes); r=bholley
https://bugzilla.mozilla.org/show_bug.cgi?id=1388031

Source-Repo: https://github.com/servo/servo
Source-Revision: 4ddf6dbd153969e990d05298bc25a06be868319c
2017-08-11 21:15:12 -05:00
Bobby Holley
5fdff3535c servo: Merge #18053 - Overhaul dirty descendants propagation in preparation for restyle roots (from bholley:descendants_bit_refactor); r=emilio
https://bugzilla.mozilla.org/show_bug.cgi?id=1389385

Source-Repo: https://github.com/servo/servo
Source-Revision: faad7ffb457100d35164b132c012e221cbc62bf5
2017-08-11 19:01:15 -05:00
Bobby Holley
2221e7e9ab servo: Merge #18048 - More refactoring of the traversal in preparation for restyle roots (from bholley:more_traversal_refactoring_for_restyle_roots); r=emilio
https://bugzilla.mozilla.org/show_bug.cgi?id=1389347

Source-Repo: https://github.com/servo/servo
Source-Revision: 8fb7836f40b03c94d0e87929965ee3c19b171091
2017-08-11 16:47:12 -05:00
Hiroyuki Ikezoe
de481a6691 servo: Merge #17944 - Display property animation for SMIL (from hiikezoe:display-property-animation); r=emilio
<!-- Please describe your changes on the following line: -->
https://bugzilla.mozilla.org/show_bug.cgi?id=1385089

---
<!-- 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

Source-Repo: https://github.com/servo/servo
Source-Revision: e07beacd4db4805beb6fd063bf5ccc806f90bf15
2017-08-02 16:27:58 -05:00
Bobby Holley
c50c3dfc02 servo: Merge #17895 - Clean up traversal modes (from bholley:clean_up_traversal); r=emilio
https://bugzilla.mozilla.org/show_bug.cgi?id=1384769

Source-Repo: https://github.com/servo/servo
Source-Revision: 255c9d00da8d6837a5625ad19d9b1cd623286c3b
2017-07-27 18:29:29 -05:00
Emilio Cobos Álvarez
56b2ae34ea servo: Merge #17837 - style: Avoid looking at descendant hints to check whether the element needs a restyle (from emilio:assert-fix); r=hiikezoe
This makes us hit some assertions in Gecko.

Source-Repo: https://github.com/servo/servo
Source-Revision: 9f412caab21ae407173187cdb5d0250fb1ae6b37
2017-07-24 04:49:08 -07:00
Emilio Cobos Álvarez
bd2d3bc7ca servo: Merge #17834 - stylo: Fix the interaction of frame construction restyles with animation restyles (from emilio:animation-fc-crash); r=heycam
Fixes bug 1383001.

Source-Repo: https://github.com/servo/servo
Source-Revision: 30d6d6024bd0a082424395621f620dc9580970e5
2017-07-24 01:09:24 -07:00
Emilio Cobos Álvarez
2b0be17f61 servo: Merge #17825 - style: Move the RELEVANT_LINK_VISITED flag to servo (from emilio:is-visited); r=manishearth
Bug: 1383307
Reviewed-by: Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 14b12eeb3b7ff110dbdb1f9672c2cbfad4133ae0
2017-07-23 04:15:39 -07:00
Michael Partheil
728ab1f36c servo: Merge #17775 - Replace all uses of the style::stylearc alias with servo_arc (from michael-p:rename-stylearc-to-servo-arc); r=emilio
The `stylearc` alias is left there temporarilly and will be removed completely in a later commit/PR where also `components/style/gecko/generated/structs_{debug|release}.rs` are re-generated (they still use the old alias).

---
<!-- 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 #17768  (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because no new features / only refactoring

Source-Repo: https://github.com/servo/servo
Source-Revision: 31228c18499d1c7f68b6b64b559354c768e81215
2017-07-19 06:03:17 -07:00
Emilio Cobos Álvarez
cae5c53a3f servo: Merge #17773 - style: Cleanup post #17767 (from emilio:removing-the-ugly); r=manishearth
Reviewed in https://bugzilla.mozilla.org/show_bug.cgi?id=1381764

Source-Repo: https://github.com/servo/servo
Source-Revision: 66e06578ee68b98c94029fba3cfc3ae7d3782044
2017-07-18 09:23:03 -07:00
Hiroyuki Ikezoe
6cf42e52d8 servo: Merge #17770 - Avoid snapshot handling in animation only restyle (from hiikezoe:snapshot-in-animation-only-restyle); r=emilio
<!-- Please describe your changes on the following line: -->
https://bugzilla.mozilla.org/show_bug.cgi?id=1381431

---
<!-- 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

Source-Repo: https://github.com/servo/servo
Source-Revision: e57ed3d42f818630157102e824867a763964291e
2017-07-18 04:55:30 -07:00
Manish Goregaokar
cb8af9ffe8 servo: Merge #17767 - stylo: Fuse ServoStyleContext and ServoComputedValues (from Manishearth:stylo-fuse); r=bholley
r=bholley https://bugzilla.mozilla.org/show_bug.cgi?id=1367904

Source-Repo: https://github.com/servo/servo
Source-Revision: d746abaa9e69e6cf0ad187d2b46be661bbe03a9f
2017-07-17 19:44:25 -07:00
Emilio Cobos Álvarez
44ec6c7983 servo: Merge #17744 - script: Move the layout_wrapper outside of script (from emilio:ensure-data); r=nox
This allows us to have ensure_data() and clear_data() functions on the TElement
trait, instead of hacking around it adding methods in random traits.

This also allows us to do some further cleanup, which I'd rather do in a
followup.

Source-Repo: https://github.com/servo/servo
Source-Revision: 3497bbbf1d092dd8ab274e21b33b6394afa61d8a
2017-07-15 07:44:08 -07:00
Emilio Cobos Álvarez
27fff64d23 servo: Merge #17688 - style: Split style resolution and dynamic change computation (from emilio:split-style-resolution); r=heycam,BorisChiou
This is the Servo side of Mozilla bug 1379505.

Source-Repo: https://github.com/servo/servo
Source-Revision: 16d6dc133b40a5d48e33b1f8e2aeafa88e36a6e3
2017-07-12 00:28:44 -07:00
Bobby Holley
e30bb44994 servo: Merge #17615 - Rip out the generic abstractions around ThreadLocalStyleContext (from bholley:simplify_local_context); r=emilio
https://bugzilla.mozilla.org/show_bug.cgi?id=1378540

Source-Repo: https://github.com/servo/servo
Source-Revision: 8923a9e5f0cc292062f852babe878326aff656ef
2017-07-05 19:29:01 -07:00
Emilio Cobos Álvarez
b180d83e27 servo: Merge #17550 - Fix dynamic style changes in XBL (from emilio:xbl-is-a-pain-in-the); r=heycam
From bug 1375969

Source-Repo: https://github.com/servo/servo
Source-Revision: c3a202b17d698b855d1aa775899e15e33347ca4e
2017-06-28 17:02:17 -07:00
Cameron McCormack
050f39fd27 servo: Merge #17541 - style: Make GeckoElement::traversal_children faster (from heycam:is-needed); r=emilio
From https://bugzilla.mozilla.org/show_bug.cgi?id=1372061.

Source-Repo: https://github.com/servo/servo
Source-Revision: a40e5353b32076e429c96112dab134bb3db3b728
2017-06-28 11:59:31 -07:00
Boris Zbarsky
594cb907dc servo: Merge #17528 - Fix stylo support for first-letter (from bzbarsky:first-letter-better); 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=1324618

<!-- 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: 4e8cf678bf12c1fa3400454905ae33dabff45bb5
2017-06-26 23:46:13 -07:00
Ting-Yu Lin
39fd6a0434 servo: Merge #17471 - stylo: Fix pseudo element matching for rules in XBL stylesheets (from aethanyc:fix-pseudo-element-matching-xbl); r=emilio
stylo: Fix pseudo element matching for rules in XBL stylesheets

This change was reviewed in https://bugzilla.mozilla.org/show_bug.cgi?id=1372876

Source-Repo: https://github.com/servo/servo
Source-Revision: 6342a4b455e7714d42b9f8379eec7eec6262abb6
2017-06-22 19:53:37 -07:00
J. Ryan Stinnett
5417317b00 servo: Merge #17481 - Stylo: Move match and cascade temporaries to CurrentElementInfo (from jryans:move-rule-node); r=bholley
https://bugzilla.mozilla.org/show_bug.cgi?id=1370719

Source-Repo: https://github.com/servo/servo
Source-Revision: 9ba71fcd57bd8aef7977f09b0f095aa51796c1b3
2017-06-22 17:46:55 -07:00
Emilio Cobos Álvarez
600467e348 servo: Merge #17447 - style: Be more strict when setting the root font size (from emilio:root-disconnected-subtree); r=heycam,Manishearth
Before this commit, we assumed that if the element had no parent element, it was
the root of the document, which is plain false, since we can arrive there from,
let's say, getComputedStyle on a detached node.

Bug: 1374062
Reviewed-By: heycam
MozReview-Commit-ID: 65DxdzXgd0J
Source-Repo: https://github.com/servo/servo
Source-Revision: 7d785e75cd9c1b3b74d708bcc9d6ff10a40ae2f6
2017-06-22 04:17:04 -07:00
Bobby Holley
7bc7317f26 servo: Merge #17439 - Match compound selectors left-to-right (second try) (from bholley:compound_left_to_right); r=SimonSapin
https://bugzilla.mozilla.org/show_bug.cgi?id=1373800

Source-Repo: https://github.com/servo/servo
Source-Revision: b211664e877a3e4d712314fa7f3002fd19cff549
2017-06-21 09:28:43 -07:00
Emilio Cobos Álvarez
efb06dc5ea servo: Merge #17429 - style: Get restyle hints right in presence of XBL (from emilio:restyle-hints-xbl); r=heycam
Fixes bug 1371130.

Source-Repo: https://github.com/servo/servo
Source-Revision: f5a61684f4d357e9259cd42d7b626f73cb32faaf
2017-06-20 04:15:57 -07:00
Simon Sapin
3727d5f818 servo: Merge #17390 - Untry (from servo:untry); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: 568ab550053fddf346806ed6cc2d3bfe37f3e1d0
2017-06-18 05:55:11 -07:00
Emilio Cobos Álvarez
b5b0a3f2c9 servo: Merge #17348 - style: Inline RestyleData (from emilio:bup); r=bholley
Bug: 1368236
MozReview-Commit-ID: 49s3SO0PMHf
Source-Repo: https://github.com/servo/servo
Source-Revision: 33766b2714443399808c950e5bb74b1f124f2bc4
2017-06-15 20:28:56 -07:00
Ting-Yu Lin
1d9a65519f servo: Merge #17318 - stylo: Fix pseudo element matching for XBL stylesheets (Bug 1371577) (from aethanyc:fix-pseudo-xbl-stylesheet); r=emilio
This change is reviewed in https://bugzilla.mozilla.org/show_bug.cgi?id=1371577#c9

Source-Repo: https://github.com/servo/servo
Source-Revision: 5dce166266d1f74e2ae88dbe52ca5ced75c2349b
2017-06-14 05:11:31 -07:00
Simon Sapin
920407d98b servo: Merge #17213 - ID and class selectors are ASCII case-insensitive in quirks mode (from servo:quirk-case); r=bholley
https://bugzilla.mozilla.org/show_bug.cgi?id=1363778

Source-Repo: https://github.com/servo/servo
Source-Revision: 1b077303237d5ecb8307f866e9172d0d8e6b132d
2017-06-12 15:52:29 -07:00
Bobby Holley
a59bc7deb4 servo: Merge #17281 - Pack bloom filter hashes better and save a word on Rule (from bholley:shrink_rule_again); r=emilio
https://bugzilla.mozilla.org/show_bug.cgi?id=1371949

Source-Repo: https://github.com/servo/servo
Source-Revision: 75d6796cbd1274c3711472d1a8b728c3cf6ac70c
2017-06-12 12:41:39 -07:00
Cameron McCormack
a0ab73cd9e servo: Merge #17252 - style: don't perform selector matching on the flattened tree (from heycam:flattened-tree); r=emilio
From https://bugzilla.mozilla.org/show_bug.cgi?id=1369954.

Source-Repo: https://github.com/servo/servo
Source-Revision: 969047bb7cab0f5e8c235017b7e9f7a170c9b7e4
2017-06-09 03:57:36 -07:00
Manish Goregaokar
c70bf2a485 servo: Merge #17247 - stylo: Make all attribute selectors respect case insensitivity (from Manishearth:stylo-insensitive-selectors); r=SimonSapin
r=simonsapin https://bugzilla.mozilla.org/show_bug.cgi?id=1364162

Source-Repo: https://github.com/servo/servo
Source-Revision: a6b3bf1517b8329e26c6b8dec84b294bf7d257be
2017-06-08 17:26:45 -07:00
Ting-Yu Lin
b7f5c76d1a servo: Merge #17221 - stylo: Get rules from Gecko XBL stylesheets in cascading (Bug 1290276) (from aethanyc:support-xbl-stylesheet); r=heycam
The change was reviewed in https://bugzilla.mozilla.org/show_bug.cgi?id=1290276

Source-Repo: https://github.com/servo/servo
Source-Revision: 433b7bf9fab0fb4cd35bcb01670a14da903498a2
2017-06-08 00:19:27 -07:00