Commit Graph

2159 Commits

Author SHA1 Message Date
Emilio Cobos Álvarez
e2f5ea371a Bug 1341102: Skip some timing-dependent tests due to bug 1338982. r=emilio
MozReview-Commit-ID: 9VfSUA7kYux
2017-03-20 18:22:39 +01:00
Sebastian Hengst
0f9e0165a3 Bug 1341102: Adjust expectations for servo/servo#15604 and servo/servo#16028: Fix reftest expectation format. r=reftest-fix on a CLOSED TREE
--HG--
extra : amend_source : 673cc7490524789c15a9dca831c70b6cfe1fe8c4
2017-03-20 00:22:39 +01:00
Emilio Cobos Álvarez
3fad952356 Bug 1341102: Adjust expectations for servo/servo#15604 and servo/servo#16028. r=me
MozReview-Commit-ID: 9c8jmRqvVEz
2017-03-19 20:58:48 +01:00
Nazım Can Altınova
86953ca362 Bug 1341642 - Update test_selectors.html for better test coverage and update test expectations r=Manishearth
MozReview-Commit-ID: 54BtnYJ85PK
2017-03-18 15:07:24 -07:00
Matt Brubeck
04463a6104 Bug 1340683 - stylo: Update stylo test expectations r=KWierso
MozReview-Commit-ID: 54PFVqZfaau

--HG--
extra : rebase_source : abda5f644503f09934918538cfaf5e5e33194689
2017-03-16 11:38:33 -07:00
Emilio Cobos Álvarez
6e935eb90a Bug 1347381: Adjust test expectations to account for new passes. r=emilio
Whoops, had this commit locally but forgot to push to mozreview before landing.

Sorry :(

MozReview-Commit-ID: F3a9FB10SXD
2017-03-16 12:50:09 +01:00
Manish Goregaokar
12b518aef0 Bug 1340696 - stylo: Support system colors; r=heycam
MozReview-Commit-ID: HUfTdcMRoEx

--HG--
extra : rebase_source : 85af717eb521a2c790d3ec7a20c46dd318e4761f
2017-03-15 14:49:35 -07:00
Manish Goregaokar
b427546203 Bug 1296477 - Part 4: stylo: Update test expectations; r=heycam
MozReview-Commit-ID: 9fff2Pme3ey

--HG--
extra : rebase_source : 99a224155a876e25c99229ae48dc4a92dd420ae2
2017-03-12 21:12:08 -07:00
Kartikaya Gupta
916f12ed8f Merge m-c to graphics
MozReview-Commit-ID: GpqewOAwje8
2017-03-13 13:13:37 -04:00
Kartikaya Gupta
b1573d9a13 Bug 1344947 - Update reftest.list files with new webrender results. r=jrmuizel
MozReview-Commit-ID: 8F8ZetpBUUY
2017-03-13 13:03:24 -04:00
Carsten "Tomcat" Book
c1edc7067d merge mozilla-inbound to mozilla-central a=merge 2017-03-13 15:22:26 +01:00
Xidorn Quan
bbb1003707 Bug 1341102 - Mark several intermittent failures random.
--HG--
extra : rebase_source : fc8a7defbaf0f492f93dd00f67c4016f2a5896bf
2017-03-13 22:15:26 +11:00
Kartikaya Gupta
0ea7443517 Merge m-c to graphics
MozReview-Commit-ID: 3GcCKcscfkz
2017-03-10 09:58:01 -05:00
Kartikaya Gupta
8f54e2114e Merge m-c to graphics
MozReview-Commit-ID: QN682uyISF
2017-03-09 10:42:57 -05:00
Boris Zbarsky
f6f7b64e6f Bug 1341705. Reenable some stylo tests that involve urls with anchors. r=heycam
MozReview-Commit-ID: KYQTaW7WZOS
2017-03-08 22:29:57 -05:00
Kartikaya Gupta
90db7c5460 Merge m-c to graphics
MozReview-Commit-ID: DbHqbxaKedC
2017-03-07 10:30:42 -05:00
Kartikaya Gupta
cc2056e901 Bug 1343019 - Update webrender to cset 178a65d098afcda7de0298d80d423bc80c6426ba. r=jrmuizel
In addition to updating webrender and the third-party deps, this includes:
- Marking some more reftests as passing with the new version of webrender.
- Updating webrender bindings code to go with changes to push_stacking_context.
- Passing the window dimensions to the Renderer::new function.

MozReview-Commit-ID: 6dRHvAmIQ40

--HG--
rename : third_party/rust/servo-dwrote/.gitignore => third_party/rust/dwrote/.gitignore
rename : third_party/rust/servo-dwrote/README.md => third_party/rust/dwrote/README.md
rename : third_party/rust/servo-dwrote/src/bitmap_render_target.rs => third_party/rust/dwrote/src/bitmap_render_target.rs
rename : third_party/rust/servo-dwrote/src/com_helpers.rs => third_party/rust/dwrote/src/com_helpers.rs
rename : third_party/rust/servo-dwrote/src/comptr.rs => third_party/rust/dwrote/src/comptr.rs
rename : third_party/rust/servo-dwrote/src/font.rs => third_party/rust/dwrote/src/font.rs
rename : third_party/rust/servo-dwrote/src/font_collection.rs => third_party/rust/dwrote/src/font_collection.rs
rename : third_party/rust/servo-dwrote/src/font_face.rs => third_party/rust/dwrote/src/font_face.rs
rename : third_party/rust/servo-dwrote/src/font_family.rs => third_party/rust/dwrote/src/font_family.rs
rename : third_party/rust/servo-dwrote/src/font_file.rs => third_party/rust/dwrote/src/font_file.rs
rename : third_party/rust/servo-dwrote/src/font_file_loader_impl.rs => third_party/rust/dwrote/src/font_file_loader_impl.rs
rename : third_party/rust/servo-dwrote/src/gdi_interop.rs => third_party/rust/dwrote/src/gdi_interop.rs
rename : third_party/rust/servo-dwrote/src/glyph_run_analysis.rs => third_party/rust/dwrote/src/glyph_run_analysis.rs
rename : third_party/rust/servo-dwrote/src/helpers.rs => third_party/rust/dwrote/src/helpers.rs
rename : third_party/rust/servo-dwrote/src/rendering_params.rs => third_party/rust/dwrote/src/rendering_params.rs
rename : third_party/rust/servo-dwrote/src/test.rs => third_party/rust/dwrote/src/test.rs
rename : third_party/rust/servo-dwrote/src/types.rs => third_party/rust/dwrote/src/types.rs
2017-03-06 18:46:30 -05:00
Manish Goregaokar
6a31ced725 Bug 1329093 - Part 5: Update test expectations; r=bz
MozReview-Commit-ID: 4mfC99WEQFG
2017-03-09 17:47:45 -08:00
Carsten "Tomcat" Book
d0bd960945 merge mozilla-inbound to mozilla-central a=merge 2017-03-06 10:53:27 +01:00
Cameron McCormack
ad8f9b20ed Bug 1341102 - Update stylo test expectations. r=me 2017-03-13 17:42:31 +08:00
Xidorn Quan
5bdd2e9a58 Bug 1343168 - Update mochitest expectation. r=emilio
MozReview-Commit-ID: 4JzuafjUgKB

--HG--
extra : source : 09e43593d01fa2e80f2eee9a728d9e5e333a9e85
2017-03-07 15:10:21 +11:00
Manish Goregaokar
77c2ef9159 Bug 1341102 - Make stylo reftests green; r=orange
MozReview-Commit-ID: 2TeGOXp3DuV
2017-03-04 13:06:34 -08:00
Mats Palmgren
9d124ff6d7 Bug 1346527 - Allow a small fuzz factor on all platforms for 722923-1.html. r=me
MozReview-Commit-ID: B8bdGufhzQx

--HG--
extra : rebase_source : 00664420af978a3a78d88ed167572a1a6262e2c4
2017-03-11 07:15:00 -05:00
Andreas Farre
85536fcfc4 Bug 1337392 - Update test cases to match new cursor behavior. r=smaug
MozReview-Commit-ID: 4BdZyeqTBAx
2017-03-08 16:41:42 +01:00
Florian Quèze
9d62681259 Bug 1345253 - Use element.firstChild.remove() instead of element.removeChild(element.firstChild), r=jaws. 2017-03-08 10:17:52 +01:00
Manish Goregaokar
5ce0fe128d Bug 1341102 - Update stylo test expectations; r=bustage
MozReview-Commit-ID: 3zIi8Yu1GJO
2017-03-13 01:04:58 -07:00
Sebastian Hengst
d4f96dffaf Backed out changeset ab966fb76f78 (bug 1335475) 2017-03-10 23:26:51 +01:00
Benjamin Smedberg
98cbc926f4 Bug 1335475 - Reftest harness needs to check for the test plugin without using navigator.plugins. Load reftests that use plugins from HTTP since file: doesn't allow plugins any more, r=dbaron
The list of reftests modified here is based on searching for all reftest.list files with the "haveTestPlugin" string.

MozReview-Commit-ID: L0Pw6ZMwAF1

--HG--
extra : rebase_source : 85238d66a97d279f84c4eaba7f7cc5d6520eaef2
2017-03-09 09:16:31 -05:00
Joel Maher
8f0e410ab0 Bug 1342240 - Permafailing android 315920*, add fuzzy-if. r=gbrown
MozReview-Commit-ID: Itlh2RIVKtL
2017-03-03 16:58:24 -05:00
Xidorn Quan
46aeed66ff Bug 1343166 - Update test expectation for servo/servo#15761.
--HG--
extra : rebase_source : 54155b656ce81f6d10454d95b122dcb738c4490f
2017-02-28 19:55:39 +11:00
Emilio Cobos Alvarez
bbacba9f0d Bug 1342738, Bug 1342188: Reftest expectations adjustments. r=bz 2017-02-27 19:17:12 +01:00
Emilio Cobos Álvarez
b16dcfdba8 Bug 1342710, Bug 1324633: Update reftests and crashtests expectations.
MozReview-Commit-ID: LmapjDT6ggu
Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
2017-02-25 16:50:44 -08:00
Boris Zbarsky
24f6c20a9b Bug 1341728 test expectation adjustments, since servo now supports clip. r=bzbarsky
MozReview-Commit-ID: Hwnek9gkrMx
2017-02-24 12:20:52 -05:00
Boris Zbarsky
a16891fa05 Reenable some more stylo reftests. No bug. r=bzbarsky
MozReview-Commit-ID: BbRlPC60tvt
2017-02-24 10:49:37 -05:00
Brad Werth
0db32480d5 Bug 1290218 Part 11: Update mochitest failure count, and mark a reftest as failing. r=heycam
MozReview-Commit-ID: Ei2y7TnZceT

--HG--
extra : rebase_source : 96912d0f01977eed326dabf31e7fd56048cace15
2017-02-22 11:48:06 -08:00
Boris Zbarsky
daecf0ebce Reenable various stylo reftests that set preferences. No bug. r=bzbarsky
MozReview-Commit-ID: F57DNYfpRA5
2017-02-23 18:17:59 -05:00
Cameron McCormack
460ee0bd75 Bug 1341651 - stylo: reftest expectation adjustments. r=me 2017-02-23 17:47:12 +08:00
Boris Zbarsky
a11bfd53bd Bug 1341988. Reenable a bunch of stylo reftests that were disabled for reasons that are not relevant anymore. r=bz
MozReview-Commit-ID: CLqLHexhBX3

--HG--
extra : rebase_source : 07dfb89d0651240362395494fdd7ee94363430b6
2017-02-23 02:09:57 -05:00
Kartikaya Gupta
276003cab6 Merge m-c to graphics
MozReview-Commit-ID: EyM1zEhgtGP

--HG--
rename : devtools/client/netmonitor/filter-predicates.js => devtools/client/netmonitor/utils/filter-predicates.js
rename : devtools/client/netmonitor/l10n.js => devtools/client/netmonitor/utils/l10n.js
rename : devtools/client/netmonitor/prefs.js => devtools/client/netmonitor/utils/prefs.js
rename : devtools/client/netmonitor/request-utils.js => devtools/client/netmonitor/utils/request-utils.js
rename : devtools/client/netmonitor/sort-predicates.js => devtools/client/netmonitor/utils/sort-predicates.js
rename : testing/talos/talos/sps_profile.py => testing/talos/talos/gecko_profile.py
rename : testing/talos/talos/profiler/sps.py => testing/talos/talos/profiler/profiling.py
rename : third_party/rust/app_units/.cargo-checksum.json => third_party/rust/app_units-0.3.0/.cargo-checksum.json
rename : third_party/rust/app_units/Cargo.toml => third_party/rust/app_units-0.3.0/Cargo.toml
rename : third_party/rust/app_units/src/app_unit.rs => third_party/rust/app_units-0.3.0/src/app_unit.rs
rename : third_party/rust/euclid-0.10.3/.cargo-checksum.json => third_party/rust/euclid-0.10.5/.cargo-checksum.json
rename : third_party/rust/euclid-0.10.3/.gitignore => third_party/rust/euclid-0.10.5/.gitignore
rename : third_party/rust/euclid-0.10.3/.travis.yml => third_party/rust/euclid-0.10.5/.travis.yml
rename : third_party/rust/euclid-0.10.3/COPYRIGHT => third_party/rust/euclid-0.10.5/COPYRIGHT
rename : third_party/rust/euclid-0.10.3/Cargo.toml => third_party/rust/euclid-0.10.5/Cargo.toml
rename : third_party/rust/euclid-0.10.3/LICENSE-APACHE => third_party/rust/euclid-0.10.5/LICENSE-APACHE
rename : third_party/rust/euclid-0.10.3/LICENSE-MIT => third_party/rust/euclid-0.10.5/LICENSE-MIT
rename : third_party/rust/euclid-0.10.3/README.md => third_party/rust/euclid-0.10.5/README.md
rename : third_party/rust/euclid-0.10.3/src/approxeq.rs => third_party/rust/euclid-0.10.5/src/approxeq.rs
rename : third_party/rust/euclid-0.10.3/src/length.rs => third_party/rust/euclid-0.10.5/src/length.rs
rename : third_party/rust/euclid-0.10.3/src/lib.rs => third_party/rust/euclid-0.10.5/src/lib.rs
rename : third_party/rust/euclid-0.10.3/src/macros.rs => third_party/rust/euclid-0.10.5/src/macros.rs
rename : third_party/rust/euclid-0.10.3/src/matrix2d.rs => third_party/rust/euclid-0.10.5/src/matrix2d.rs
rename : third_party/rust/euclid-0.10.3/src/matrix4d.rs => third_party/rust/euclid-0.10.5/src/matrix4d.rs
rename : third_party/rust/euclid-0.10.3/src/num.rs => third_party/rust/euclid-0.10.5/src/num.rs
rename : third_party/rust/euclid-0.10.3/src/point.rs => third_party/rust/euclid-0.10.5/src/point.rs
rename : third_party/rust/euclid-0.10.3/src/rect.rs => third_party/rust/euclid-0.10.5/src/rect.rs
rename : third_party/rust/euclid-0.10.3/src/scale_factor.rs => third_party/rust/euclid-0.10.5/src/scale_factor.rs
rename : third_party/rust/euclid-0.10.3/src/side_offsets.rs => third_party/rust/euclid-0.10.5/src/side_offsets.rs
rename : third_party/rust/euclid-0.10.3/src/size.rs => third_party/rust/euclid-0.10.5/src/size.rs
rename : third_party/rust/euclid-0.10.3/src/trig.rs => third_party/rust/euclid-0.10.5/src/trig.rs
rename : tools/profiler/core/platform-linux.cc => tools/profiler/core/platform-linux-android.cpp
rename : tools/profiler/core/platform-macos.cc => tools/profiler/core/platform-macos.cpp
rename : tools/profiler/core/platform-win32.cc => tools/profiler/core/platform-win32.cpp
extra : amend_source : ad1a9da624ec302a61021cb1b44af5a37ce0450e
2017-02-21 10:58:47 -05:00
Ethan Lin
49b295e845 Bug 1341001 - Using ImageClient for WebRenderPaintedLayer to prevent crash problem. r=sotaro 2017-02-21 21:47:16 +08:00
Kartikaya Gupta
f62b8b3b3f Merge m-c to graphics
MozReview-Commit-ID: IN2hMCjMHLL

--HG--
rename : browser/components/extensions/test/browser/browser_ext_url_overrides.js => browser/components/extensions/test/browser/browser_ext_url_overrides_newtab.js
rename : browser/extensions/formautofill/content/FormAutofillContent.js => browser/extensions/formautofill/FormAutofillContent.jsm
rename : browser/extensions/formautofill/content/FormAutofillContent.js => browser/extensions/formautofill/FormAutofillHandler.jsm
rename : browser/extensions/formautofill/content/FormAutofillContent.js => browser/extensions/formautofill/FormAutofillHeuristics.jsm
rename : browser/extensions/formautofill/content/FormAutofillContent.js => browser/extensions/formautofill/content/FormAutofillFrameScript.js
rename : browser/themes/shared/devedition/urlbar-history-dropmarker.svg => browser/themes/shared/compacttheme/urlbar-history-dropmarker.svg
rename : config/tests/makefiles/autodeps/check_mkdir.tpy => config/tests/makefiles/autodeps/check_mkdir.py
rename : dom/bindings/MozMap.h => dom/bindings/Record.h
rename : dom/bindings/parser/tests/test_mozmap.py => dom/bindings/parser/tests/test_record.py
rename : dom/file/File.cpp => dom/file/BaseBlobImpl.cpp
rename : dom/file/File.h => dom/file/BaseBlobImpl.h
rename : dom/file/File.cpp => dom/file/Blob.cpp
rename : dom/file/File.h => dom/file/Blob.h
rename : dom/file/File.cpp => dom/file/BlobImpl.cpp
rename : dom/file/File.h => dom/file/BlobImpl.h
rename : dom/file/File.cpp => dom/file/EmptyBlobImpl.cpp
rename : dom/file/File.h => dom/file/EmptyBlobImpl.h
rename : dom/file/File.cpp => dom/file/FileBlobImpl.cpp
rename : dom/file/File.h => dom/file/FileBlobImpl.h
rename : dom/file/File.cpp => dom/file/MemoryBlobImpl.cpp
rename : dom/file/File.h => dom/file/MemoryBlobImpl.h
rename : dom/file/File.cpp => dom/file/StreamBlobImpl.cpp
rename : dom/file/File.h => dom/file/StreamBlobImpl.h
rename : dom/file/File.h => dom/file/StringBlobImpl.h
rename : dom/file/File.h => dom/file/TemporaryBlobImpl.h
rename : dom/media/platforms/agnostic/gmp/MediaDataDecoderProxy.cpp => dom/media/platforms/wrappers/MediaDataDecoderProxy.cpp
rename : dom/media/platforms/agnostic/gmp/MediaDataDecoderProxy.h => dom/media/platforms/wrappers/MediaDataDecoderProxy.h
rename : dom/tests/mochitest/general/test_interfaces.html => dom/tests/mochitest/general/test_interfaces.js
rename : dom/workers/test/test_navigator.html => dom/workers/test/test_navigator.js
rename : js/src/jsautokw.py => js/src/frontend/GenerateReservedWords.py
rename : js/src/vm/Keywords.h => js/src/frontend/ReservedWords.h
rename : layout/base/RestyleManager.cpp => layout/base/GeckoRestyleManager.cpp
rename : layout/base/RestyleManager.h => layout/base/GeckoRestyleManager.h
rename : layout/reftests/w3c-css/submitted/ui3/box-sizing-replaced-002-ref.xht => layout/reftests/bugs/1313772-ref.xhtml
rename : layout/reftests/w3c-css/submitted/ui3/box-sizing-replaced-002.xht => layout/reftests/bugs/1313772.xhtml
rename : servo/components/jstraceable_derive/Cargo.toml => servo/components/deny_public_fields/Cargo.toml
rename : servo/components/jstraceable_derive/Cargo.toml => servo/components/domobject_derive/Cargo.toml
rename : servo/components/plugins/lints/ban.rs => servo/components/script_plugins/ban.rs
rename : servo/components/plugins/jstraceable.rs => servo/components/script_plugins/jstraceable.rs
rename : servo/components/plugins/lib.rs => servo/components/script_plugins/lib.rs
rename : servo/components/plugins/lints/unrooted_must_root.rs => servo/components/script_plugins/unrooted_must_root.rs
rename : servo/components/plugins/utils.rs => servo/components/script_plugins/utils.rs
rename : testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_autocomplete.html => testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_autocomplete-manual.html
rename : testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_list.html => testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_list-manual.html
rename : testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasdate.html => testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasdate-manual.html
rename : testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasnumber.html => testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasnumber-manual.html
rename : testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_length.html => testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_length-manual.html
rename : testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_selectedindex.html => testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_selectedindex-manual.html
rename : testing/web-platform/tests/preload/link_header_preload_delay_onload.html.headers => testing/web-platform/tests/preload/link-header-preload-delay-onload.html.headers
rename : testing/web-platform/tests/preload/link_header_preload.html.headers => testing/web-platform/tests/preload/link-header-preload.html.headers
rename : services/sync/tests/unit/test_extension_storage_crypto.js => toolkit/components/extensions/test/xpcshell/test_ext_storage_sync_crypto.js
rename : toolkit/components/telemetry/TelemetryComms.h => toolkit/components/telemetry/ipc/TelemetryComms.h
rename : toolkit/components/telemetry/TelemetryIPCAccumulator.cpp => toolkit/components/telemetry/ipc/TelemetryIPCAccumulator.cpp
rename : toolkit/components/telemetry/TelemetryIPCAccumulator.h => toolkit/components/telemetry/ipc/TelemetryIPCAccumulator.h
extra : amend_source : 7411c39541f0b530b4b94cf359dc73e385abea4d
2017-02-17 23:33:24 -05:00
Ethan Lin
1897c36bb6 Bug 1332688 - Pass transform to webrender stacking context. r=jrmuizel 2017-02-17 14:57:43 +08:00
Jeff Muizelaar
831a168a7f Bug 1335799 - Update reftest annotations for webrender. r=kats
MozReview-Commit-ID: DBviifcrLHT
2017-02-14 13:34:15 -05:00
Cameron McCormack
058a689aa1 Bug 1338872 - stylo: Test expectation adjustments. r=bholley
MozReview-Commit-ID: 4q7NJJrpX7q

--HG--
extra : rebase_source : 98279628439e6d432794e726955605d6f1358b10
2017-02-12 17:23:14 +08:00
Mats Palmgren
78d34e4b5f Bug 1179543 - Add a fuzz factor to reftest 368020-1.html to account for anti-aliasing. r=me 2017-02-12 01:44:06 +01:00
Carsten "Tomcat" Book
9857d2af8e merge mozilla-inbound to mozilla-central a=merge 2017-02-20 14:05:25 +01:00
Manish Goregaokar
260e308c26 Bug 1338936 - Part 4: stylo: Update reftest results; r=emilio
MozReview-Commit-ID: 6wg32flypt7
2017-02-19 14:03:48 -08:00
Sebastian Hengst
a793db28eb Backed out changeset 2d887234705f (bug 1338936) 2017-02-19 10:37:16 +01:00
Manish Goregaokar
a6f7209030 Bug 1338936 - Part 4: stylo: Update reftest results; r=emilio
MozReview-Commit-ID: 6wg32flypt7
2017-02-18 21:57:58 -08:00
Boris Zbarsky
d4c9b1be0b Bug 1324661 part 2. Reenable various table reftests that were disabled before. They all seem to be passing, or at least failing for unrelated reasons, with the part 1 patch applied. r=bholley,emilio
MozReview-Commit-ID: 24VFWXJJE4E
2017-02-17 15:06:14 -05:00