Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-21 17:59:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
526,062 Commits 616 Branches 98 Tags
Commit Graph

3146 Commits

Author SHA1 Message Date
Cameron McCormack
52f712bba2 Bug 1338461 - Pass eRestyle_StyleAttribute through to Servo_NoteExplicitHints. r=bholley 
MozReview-Commit-ID: C7HIOTs1SSY

--HG--
extra : rebase_source : 638fe3e1c9ecf47dcd9b175ae03344450417c7da
 2017-03-20 14:42:31 +08:00
Michael Layzell
54f4acb9b2 Bug 1332166 - Wait for the clipboard to be updated before checking it, r=enndeakin 
MozReview-Commit-ID: Ea6jZCYjuaY
 2017-03-14 13:48:51 -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
087da3f0d9 merge mozilla-inbound to mozilla-central a=merge 2017-03-07 15:13:31 +01:00
Tom Ritter
15cb139b10 Bug 1344845 - Fix --disable-sandbox by ifdef-ing an include. r=handyman 
MozReview-Commit-ID: F06jWmvH52V

--HG--
extra : transplant_source : %9E%D4%96%8C%2Bn%ED%B7B%E6%C04%CC%C0%7Ez%8A%EA%7E%3A
 2017-03-06 13:38:32 -06:00
Wei-Cheng Pan
510ba75c20 Bug 1310127 - Part 17: Use MOZ_MUST_USE in netwerk/protocol/http r=smaug 
MozReview-Commit-ID: 5gvVZtsa3yS

--HG--
extra : rebase_source : 5e1ab2fc06ae58f18abb8909ac93f9512abbe220
 2016-12-20 11:49:32 +08:00
Daniel Holbert
95a650ec1b Bug 1343975: Get rid of all dos/windows linebreaks in Mozilla C++ code. r=ehsan 
This is an automated patch, generated by the following command:
find . -name "*.h" -exec fromdos {} \; && \
  find . -name "*.cpp" -exec fromdos {} \; && \
  hg revert -C gfx/angle \
               gfx/sfntly \
               media/webrtc \
               media/libstagefright \
               media/openmax_il \
               other-licenses

MozReview-Commit-ID: Gunlz3vE3h6
 2017-03-02 13:08:29 -08:00
Ehsan Akhgari
a68da672d5 Bug 1344588 - Fix a leak in test_plugin_default_state_xpi.js; r=baku 2017-03-06 09:43:12 -05:00
Masatoshi Kimura
7be7b11a1c Bug 1342144 - Remove version parameter from the type attribute of script elements. r=jmaher 
This patch is generated by the following sed script:
find . ! -wholename '*/.hg*' -type f \( -iname '*.html' -o -iname '*.xhtml' -o -iname '*.xul' -o -iname '*.js' \) -exec sed -i -e 's/\(\(text\|application\)\/javascript\);version=1.[0-9]/\1/g' {} \;

MozReview-Commit-ID: AzhtdwJwVNg

--HG--
extra : rebase_source : e8f90249454c0779d926f87777f457352961748d
 2017-02-23 06:10:07 +09:00
Wes Kocher
e84fc624ff Merge inbound to central, a=merge 
MozReview-Commit-ID: DpCZgRV1csS
 2017-02-24 16:46:12 -08:00
Benjamin Smedberg
e2482f716f Bug 1338172 part E - make all the PPluginWidget stuff Windows-only. Rip out the GTK-specific native widget support from widget/gtk/nsWindow and elsewhere, r=jimm 
MozReview-Commit-ID: J6E8sYcyX4U

--HG--
extra : rebase_source : 63aa9d4a603a7cc56e068ce05434fb7faceac751
extra : source : 9ee6c6f4e59c7967108a727a80e46d686b983a0b
 2017-02-09 11:53:50 -05:00
Benjamin Smedberg
183387de41 Bug 1338172 part D - Fix tests that expect windowed mode on Linux, r=jimm 
MozReview-Commit-ID: 8zAZ3K9LxlW

--HG--
extra : rebase_source : be1cafc78a1a7fe7f88181211ad5fa678260cd80
extra : source : 1c92fbfca20a1fc85df7aa617962a80b49869f79
 2017-02-09 10:16:18 -05:00
Benjamin Smedberg
97d5872250 Bug 1338172 part C - Remove support for windowed mode plugins on Linux (GTK). r=jimm 
MozReview-Commit-ID: 5rnxozEKCwn

--HG--
extra : rebase_source : 15fd86ebea076d10c068c8443dca60ecf50d74b2
extra : source : 907d9c3d104303eeb873d63d82286aeac015fd00
 2017-02-09 10:05:00 -05:00
Benjamin Smedberg
97745f1b66 Bug 1338172 part B - remove the ancient carbon detection on Mac which is no longer used, r=jimm 
MozReview-Commit-ID: 9UEAfPHg7fP

--HG--
extra : rebase_source : 1b9de20f37866984cd4af39b398506963ed74a3c
extra : source : e4994ab9d628dd639c95c64359fb420ca0253911
 2017-02-08 14:27:49 -05:00
Benjamin Smedberg
e16a82150d Bug 1338172 part A - remove windowed plugin support from the GTK testplugin, r=jimm 
MozReview-Commit-ID: 9vlarj5C59

--HG--
extra : rebase_source : 619677dca4e97ae0d869dc68c000e427825dd350
extra : source : 6209f07e1f2655b6b14c99098c89b55db6b4d5a2
 2017-02-08 13:44:21 -05:00
Benjamin Smedberg
c974a29a4b Bug 1342141 part B - Use NP_EMBED as the mode for all plugins, whether they are full-page or not, r=jimm 
MozReview-Commit-ID: BeB24ux8TEp

--HG--
extra : histedit_source : 74c556c04e56ae7e5d6c5cd8f42f49f358864bac
 2017-02-23 12:37:42 -05:00
Benjamin Smedberg
27cc367f50 Bug 1342141 part A - The test plugin will use name="plugin" as an indicator of fullpage, rather than NP_FULL, to make test_fullpage.html green, r=jimm 
MozReview-Commit-ID: D7HVr9f37se

--HG--
extra : histedit_source : bc1b57ae9579098d8a2d2fe7c3bbe395a9ab5ed6
 2017-02-23 13:07:34 -05:00
Carsten "Tomcat" Book
e6b82618f4 merge mozilla-inbound to mozilla-central a=merge 2017-02-23 14:59:37 +01: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
Nicholas Nethercote
348841f745 Bug 1340928 (part 12) - Remove profiler_get_gatherer(). r=mstange. 
profiler_get_gatherer() exposes ProfileGatherer to the outside world in a way
that makes future changes difficult.

This patch:

- Removes ProfileGatherer.h from the list of headers exported from the
  profiler.

- Removes nsIProfiler.profileGatherer and nsProfiler::GetProfileGatherer().

- Replaces profiler_get_gatherer() with three new functions that provide
  minimal but sufficient access to ProfileGatherer:
  profiler_will_gather_OOP_profile(), profiler_gathered_OOP_profile(), and
  profiler_OOP_exit_profile().

  These functions provide access to the ProfileGatherer in a similar fashion to
  the pre-existing functions profiler_get_profile_jsobject_async() and
  profiler_save_profile_to_file_async()

This significantly reduces the size of the profiler's API surface.

--HG--
rename : tools/profiler/public/ProfileGatherer.h => tools/profiler/gecko/ProfileGatherer.h
extra : rebase_source : d8e06a1133d4098c3a214858d3ff2c4bdcd9f1f2
 2017-02-22 10:19:53 +11:00
David Parks
8e150e4643 Bug 1284897 - Hook GetSaveFileNameW/GetOpenFileNameW to record and grant a sandboxed process permission to access user-chosen files. r=jimm 
--HG--
extra : rebase_source : 024eae9f9657579debd38baba1526acfdca2385a
 2017-02-08 11:38:40 -08:00
Wes Kocher
5295bd9f91 Merge m-c to inbound, a=merge 
MozReview-Commit-ID: AoD5GpFatBw
 2017-02-21 17:41:05 -08: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
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
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
Sebastian Hengst
3db78708f4 Backed out changeset c35afe490583 (bug 1284897) 2017-02-21 23:13:20 +01:00
David Parks
7c0cff84c2 Bug 1284897 - Hook GetSaveFileNameW/GetOpenFileNameW to record and grant a sandboxed process permission to access user-chosen files. r=jimm 
--HG--
extra : rebase_source : fcfe35521d457905d3205752343c2b9da9bef13d
extra : histedit_source : f44f572c1bc17d1ac8d8d1cef7ed35e5f8125b79
 2017-02-08 11:38:40 -08:00
David Anderson
dfac09e59c Remove PCrashReporter. (bug 1338310, r=billm) 2017-02-21 11:24:26 -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
Wes Kocher
6a2b9f5e43 Merge m-c to autoland, a=merge 
MozReview-Commit-ID: 4z9MXOzghI7
 2017-02-10 15:40:01 -08:00
Kartikaya Gupta
96c394d70c Merge m-c to graphics 
MozReview-Commit-ID: AXRXwXgkOTv
 2017-02-10 13:57:53 -05:00
Ethan Lin
cbce1095a3 Bug 1337291 - Part3. Enable a reftest for WebRenderBorderlayer's border style. r=pchang 2017-02-10 15:44:59 +08:00
Kartikaya Gupta
61bc491994 Merge m-c to graphics 
MozReview-Commit-ID: Ejcj1CD87t3
 2017-02-09 10:12:03 -05:00
Carsten "Tomcat" Book
e2a2f8d124 merge mozilla-inbound to mozilla-central a=merge 2017-02-09 16:04:14 +01:00
Carsten "Tomcat" Book
f0343913a8 Backed out changeset f4c6758e15f9 (bug 1307708) on developers request 2017-02-09 11:49:38 +01:00
Carsten "Tomcat" Book
ffe70d35b2 Merge mozilla-central to mozilla-inbound 2017-02-09 11:38:08 +01:00
Ryan Hunt
963025a5dd Merge m-c to graphics 2017-02-08 10:57:06 -06:00
Ryan Hunt
5e2990dc18 Merge m-c to graphics 2017-02-07 09:05:18 +00:00
Ryan VanderMeulen
1314446302 Bug 1267432 - Skip test_pluginstream_geturl.html and test_pluginstream_geturlnotify.html for intermittent failures. 2017-02-08 17:26:49 -05:00
Kartikaya Gupta
2c58155ac0 Merge m-c to graphics 
MozReview-Commit-ID: EcjJhQuqDFI
 2017-02-05 10:39:54 -05:00
Benjamin Smedberg
2772deba78 Bug 1334080 - If a plugin is associated with a window that has no nsIWebNavigation, don't crash, r=qdot 
MozReview-Commit-ID: CZLne2N498d

--HG--
extra : rebase_source : aac04a1c16824fde27e3869109e7e8b591ce9296
 2017-02-10 11:27:08 -05:00
Brad Lassey
a5e07b93bf bug 1303096 - Stop sending sync messages soon after content process start-up r=billm 2017-02-05 00:52:38 -05:00
Kartikaya Gupta
21e9123c56 Merge m-c to graphics 
MozReview-Commit-ID: 3tWI3srj2uj
 2017-02-01 08:48:31 -05:00
Carsten "Tomcat" Book
005011be4c merge mozilla-inbound to mozilla-central a=merge 2017-02-01 13:14:23 +01:00
Kartikaya Gupta
1c269ab364 Merge m-c to graphics 
MozReview-Commit-ID: 7PVyxahE0p6
 2017-01-31 09:04:18 -05:00
Cameron McCormack
f7f9c5f69e Bug 1324647 - stylo: Downgrade "Need to flush before destroying!" assertion since it occurs frequently. r=me 
MozReview-Commit-ID: AOUnCyG4I2O
 2017-01-31 15:10:45 +08:00