George Wright
bbbab52ed9
Bug 849253 - Make SkiaGL a build-time option independent of Skia, and disable it on PPC[64] r=mattwoodrow
2013-03-13 19:29:47 -04:00
Mike Shal
9680b82df6
Bug 844654 - Part 2: Move MODULE to moz.build; rs=gps
2013-03-19 11:47:00 -07:00
Jacek Caban
d708ac8932
Bug 849207 - Use __declspec(dllexport) for exporting skia C++ symbols. r=gwright
...
--HG--
extra : rebase_source : 333c7fcc334db6f6969995f0ff5fac8bb9607e74
2013-03-12 11:33:36 +01:00
Steve Singer
ab64fcd011
Bug 817356 - Patch SKIA to recognize uppercase PPC/PPC64. r=gwright
2013-03-11 20:24:52 -04:00
George Wright
57ed2de6e1
[PATCH 9/9] Bug 751418 - Add Skia patches to the Skia patch directory. r=none
...
From ea01f59a84548b222e4a04e5d5e8b83a844aca75 Mon Sep 17 00:00:00 2001
---
...18-Add-our-own-GrUserConfig-r-mattwoodrow.patch | 29 ++++++++++++++++++++++
...Fix-compile-error-on-gcc-in-Skia-GL-r-mat.patch | 26 +++++++++++++++++++
gfx/skia/patches/README | 2 ++
3 files changed, 57 insertions(+)
create mode 100644 gfx/skia/patches/0012-Bug-751418-Add-our-own-GrUserConfig-r-mattwoodrow.patch
create mode 100644 gfx/skia/patches/0013-Bug-751418-Fix-compile-error-on-gcc-in-Skia-GL-r-mat.patch
2013-03-06 02:06:29 -05:00
George Wright
9a7d9e3192
[PATCH 4/9] Bug 751418 - Ensure we define USE_SKIA globally r=ted
...
From f0e2d2aa3f9a5738369ce9e0e8cd00d937ac77ab Mon Sep 17 00:00:00 2001
---
configure.in | 4 ++++
gfx/2d/Makefile.in | 7 -------
gfx/skia/Makefile.in | 3 ---
3 files changed, 4 insertions(+), 10 deletions(-)
2013-02-26 18:29:33 -05:00
George Wright
cf0f3e63ff
[PATCH 3/9] Bug 751418 - Fix compile error on gcc in Skia/GL r=mattwoodrow
...
From 3d786b1f0c040205ad9ef6d4216ce06b41f7359f Mon Sep 17 00:00:00 2001
---
gfx/skia/src/gpu/gl/GrGLProgram.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
2012-11-05 15:49:42 +00:00
George Wright
4610f7b916
[PATCH 2/9] Bug 751418 - Add our own GrUserConfig r=mattwoodrow
...
From 4c25387e6e6cdb55f19e51631a78c3fa9b4a3c73 Mon Sep 17 00:00:00 2001
---
gfx/skia/include/gpu/GrUserConfig.h | 6 ++++++
1 file changed, 6 insertions(+)
2012-11-01 17:29:50 -04:00
George Wright
904bd8027d
[PATCH 1/9] Bug 751418 - Build Skia with GPU support r=mattwoodrow
...
From 09b1695eff40e68232849668a33ceeafc8ebd606 Mon Sep 17 00:00:00 2001
---
gfx/skia/Makefile.in | 133 +++++++++++++++++++++++++++++++++
gfx/skia/include/config/SkUserConfig.h | 2 +-
2 files changed, 134 insertions(+), 1 deletion(-)
2012-10-16 16:21:54 -04:00
Gregory Szorc
21460a71f3
Bug 784841 - Part 18o: Convert /gfx; r=jrmuizel f=Ms2ger
2013-02-25 12:47:21 -08:00
Daniel Holbert
1eae6b4255
Bug 839347: Move SkNO_RETURN_HINT out of anonymous namespace so that clang won't warn about it being unused. r=mattwoodrow
2013-02-17 23:46:05 -08:00
Rik Cabanier
bfce7b535d
Bug 836892 - Add new blending modes to SkXfermode. r=gw280
2013-02-08 10:54:59 +13:00
Makoto Kato
e4fd62d2ce
Bug 838504 - Turn on SSSE3 opt on Skia for Windows. r=gw280
2013-02-07 17:13:03 +09:00
Nicholas Nethercote
1d5169b3d1
Bug 394311 - Stop building with -pedantic. r=ted,dbaron.
...
--HG--
rename : content/svg/content/nsISVGPoint.cpp => content/svg/content/src/DOMSVGPoint.cpp
rename : docshell/test/browser/browser_bug234628-9.js => docshell/test/browser/browser_bug134911.js
rename : layout/reftests/w3c-css/submitted/values3/calc-background-image-gradient-1-ref.html => layout/reftests/css-calc/background-image-gradient-1-ref.html
rename : layout/reftests/w3c-css/submitted/values3/calc-background-image-gradient-1.html => layout/reftests/css-calc/background-image-gradient-1.html
rename : layout/reftests/w3c-css/submitted/values3/reftest.list => layout/reftests/css-calc/reftest.list
rename : layout/reftests/text/auto-hyphenation-10-ref.html => layout/reftests/text/auto-hyphenation-10.html
rename : layout/reftests/text/auto-hyphenation-8-ref.html => layout/reftests/text/auto-hyphenation-8.html
rename : layout/reftests/text/auto-hyphenation-9-ref.html => layout/reftests/text/auto-hyphenation-9.html
extra : rebase_source : 012df725d55b031ccc03d9bfcf785056d95a2ebe
2013-01-20 14:12:42 -08:00
Steve Fink
57a2c2471b
Bug 828753 - jsid rooting, mostly in jsinfer.*. Also switch JSObject from struct to class. r=terrence
2012-12-31 12:40:21 -08:00
Steve Fink
380ecf9335
Backed out changeset fce4e0f8a553 (bug 828753) for breaking windows warnings-as-errors (stop adding JSObject forward decls, please!)
2013-01-18 13:20:21 -08:00
Steve Fink
01f8a5b4d8
Bug 828753 - jsid rooting, mostly in jsinfer.*. Also switch JSObject from struct to class. r=terrence
...
--HG--
extra : rebase_source : c8806b27677594925ad0e6b54c47af5cf17e1153
2012-12-31 12:40:21 -08:00
Jeff Muizelaar
ff213a8bda
Bug 830792. Build SkAnnotation.cpp. r=gw280
...
To link SkPaint.o with rtti we need to build SkAnnotation.o
--HG--
extra : rebase_source : f097dd54c13307a19b58588b51834bd162d1fa9b
2013-01-15 11:44:36 -05:00
Steve Singer
d4a2df7f43
Bug 817356. the skia image resizers need to respect endian order when finding the alpha values. r=joedrew
2012-12-09 21:20:41 +01:00
Jacek Caban
0bcd156c4a
Bug 803063 - Skia cross compilation for Windows fails on case sensitive OS r=gwright
...
--HG--
extra : rebase_source : 89da358d123edefc2093e5d66f4ab6d326e9ff21
2012-10-31 09:34:07 +01:00
Bill McCloskey
760cd44124
Bug 714050 - Add support for optional JS helper threads (r=luke)
2012-10-16 11:57:09 -07:00
George Wright
716ce43876
Bug 795549 - Move TileProc functions into their own file to ensure they only exist once in a library r=mattwoodrow
2012-09-29 09:58:46 -04:00
George Wright
4c7a7edf63
Bug 795538 - Ensure we use the correct colour (and alpha) for the clamp values r=mattwoodrow
2012-09-28 23:12:19 -04:00
George Wright
29c1fe2fc6
Bug 777614 - Update patches directory for patches applied against upstream Skia
2012-09-18 15:41:38 -04:00
George Wright
221d22df52
Bug 777614 - Re-apply 759683 - Handle compilers that don't support SSSE3 intrinsics r=nrc
2012-09-18 15:41:38 -04:00
George Wright
e78a7d7cfb
Bug 777614 - Re-apply bug 687188 - Expand the gradient cache by 2 to store 0/1 colour stop values for clamping. r=nrc
2012-09-18 15:41:37 -04:00
George Wright
1f5e6f9aba
Bug 777614 - Re-apply bug 719872 - Fix crash on Android by reverting to older FontHost r=nrc
2012-09-18 15:41:37 -04:00
George Wright
4fd0e54d2d
Bug 777614 - Explicitly convert ints to SkScalars using SkIntToScalar, to avoid a compiler error (reviewed upstream)
2012-09-18 15:41:36 -04:00
George Wright
6c85057496
Bug 777614 - Re-add our SkUserConfig.h r=nrc
2012-09-18 15:41:36 -04:00
George Wright
b6a50f2036
Bug 777614 - Update Skia to r5539.
2012-09-18 15:41:36 -04:00
Landry Breuil
1bc80d0294
Bug 786995: Ensure the whole toolchain supports -mssse3, not only the compiler. r=ted
2012-09-04 22:19:50 +02:00
George Wright
66a49ed9e6
Bug 740194 - Add missing .patch file to gfx/skia/patches which was left out of the commit for bug 740194 by accident. r=none
2012-08-22 22:09:53 -04:00
George Wright
4a11ba2c89
Bug 740194 - [Skia] Implement a version of SkMemory for Mozilla that uses the infallible mozalloc allocators r=cjones
2012-08-15 23:51:34 -04:00
George Wright
77abf24bff
Backed out changeset c2475674e105
2012-08-15 17:26:45 -04:00
George Wright
d6f608d0d1
Bug 740194 - [Skia] Implement a version of SkMemory for Mozilla that uses the infallible mozalloc allocators r=cjones
...
--HG--
extra : rebase_source : 6dc39ae06b4cb38cd8e85e41c01077f815b8f8c8
2012-08-15 16:59:07 -04:00
Mike Hommey
6173fa297f
Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted
2012-08-04 20:26:44 +02:00
Nicholas Cameron
00dd95f3d6
Bug 718849; patch to keep Skia up to date. r=gw280
2012-07-31 18:30:10 +12:00
Matt Woodrow
52bee18527
Bug 718849; match radial gradients to spec. r=bas
2012-06-18 15:06:22 +12:00
Nicholas Cameron
db90500fee
Back out bug 779001, bug 746883, bug 778595, bug 776803, bug 7118849
2012-07-31 18:17:23 +12:00
Nicholas Cameron
d8993b1756
Bug 718849; patch to keep Skia up to date. r=gw280
2012-07-31 12:58:14 +12:00
Matt Woodrow
d8981c966e
Bug 718849; fix radial gradients in Skia. r=Bas
2012-06-18 15:06:22 +12:00
Nicholas Cameron
e2b2783492
Backout bug 718849
2012-07-30 11:40:42 +12:00
Nicholas Cameron
6d2208c3ad
Bug 718849; patch to keep Skia up to date. r=gw280
2012-07-30 10:35:54 +12:00
Matt Woodrow
a4e32aaab0
Bug 718849; fix radial gradients to the spec. r=Bas
2012-06-18 15:06:22 +12:00
George Wright
2a90ed1ba7
Bug 778202 - Filter out -pedantic for the Skia subdirectory. r=jrmuizel
2012-07-27 14:10:36 -04:00
Bill McCloskey
2100b10524
Bug 770759 - Add mutable handles (r=bhackett)
2012-07-04 11:12:16 -07:00
David Zbarsky
85d3d4ef59
Bug 766017 - Fix some skia warnings r=gw280
2012-06-22 13:16:31 -07:00
Nicholas Cameron
4d1cdf1eb1
Bug 765038; fix a Clang compilation bug in Skia; r=jwatt
2012-06-15 11:52:15 +01:00
Nicholas Cameron
aa4bc97d31
Bug 761890 (was 746883); bug fixing Skia fonts; r=gw280
2012-04-26 10:04:35 +12:00
Nicholas Cameron
94da7bc7ce
Bug 761890 (was 746883); changes to the Skia library. r=gw280
2012-05-16 17:42:07 +12:00
Nicholas Cameron
281be0879e
Bug 761890; build Skia on Windows. r=gw280
2012-06-14 16:27:53 +12:00
Matt Brubeck
8aad0a2626
Back out bug 761890, bug 746896, and bug 759036 because of reftest failures
...
--HG--
extra : rebase_source : b5bdad8a69eab8e9ba35d21637c0bbcb18bce703
2012-06-11 22:50:31 -07:00
Nicholas Cameron
480bde076f
Bug 761890 (was 746883); changes to the Skia library. r=gw280
...
--HG--
extra : rebase_source : bf619eaad94265334b89e1adf97a00cb0d1d7c67
2012-05-16 17:42:07 +12:00
Nicholas Cameron
0826e53b52
Bug 761890 (was 746883); bug fixing Skia fonts; r=gw280
...
--HG--
extra : rebase_source : 89b3501dad46f0c1284107afe906869548623992
2012-04-26 10:04:35 +12:00
Nicholas Cameron
e9b95c1edf
Bug 761890; build Skia on Windows. r=gw280
...
--HG--
extra : rebase_source : 51c85a45aa0ac50fd69ee054047f7ca19661737b
2012-06-08 11:42:20 +12:00
Landry Breuil
2d64658038
Bug 759671 - reapply missing chunk from bug 722011 to fix build on OpenBSD - r=ms2ger
2012-06-01 15:12:44 -07:00
Landry Breuil
b125a37fb3
Bug 759683 - Check for -mssse3 instead of inconditionally using it. r=glandium
2012-06-01 15:12:09 -07:00
George Wright
4bee8e9e08
Bug 755869 - Update the patches directory for Skia r=joe
2012-05-30 13:53:22 -04:00
Ed Morley
da18754c01
Merge mozilla-central to mozilla-inbound
2012-05-30 18:24:56 +01:00
Gervase Markham
d4eb7d5782
Bug 759095 - upgrade license to MPL 2, and other licensing cleanups.
...
--HG--
extra : rebase_source : da55a4937383eda2baf7c9a362501da8ee664146
2012-05-29 16:52:43 +01:00
Ehsan Akhgari
e587bd4e43
Bug 755869 - Re-apply patch from bug 719575 to fix clang builds for the new Skia r=gw280
2012-05-29 15:39:55 -04:00
Ed Morley
b2cb7d71ab
Merge last PGO-green changeset of mozilla-inbound to mozilla-central
2012-05-29 12:49:27 +01:00
George Wright
a529641827
Bug 755869 - [13] Re-apply bug 750733 - Use handles in API object hooks where possible r=mattwoodrow
2012-05-23 14:52:36 -04:00
George Wright
8d2a39a547
Bug 755869 - [12] Re-apply bug 749533 - Add support for GNU/kFreeBSD and Hurd in Skia. r=mattwoodrow
2012-05-23 14:49:57 -04:00
George Wright
61e6428e3d
Bug 755869 - [11] Re-apply bug 687188 - Skia radial gradients should use the 0/1 color stop values for clamping. r=mattwoodrow
2012-05-23 11:40:25 -04:00
Ed Morley
cee7bd6028
Merge mozilla-central to mozilla-inbound
2012-05-30 13:26:37 +01:00
George Wright
895c1a132d
Bug 755869 - [10] Re-apply bug 719872 - Fix crash on Android by reverting to older FontHost impl r=mattwoodrow
2012-05-18 14:52:40 -04:00
George Wright
06e7a88a73
Bug 755869 - [9] Re-apply bug 751814 - Various Skia fixes for ARM without EDSP and ARMv6+ r=mattwoodrow
2012-05-18 14:16:08 -04:00
George Wright
fb3758384d
Bug 755869 - [8] Re-apply bug 731384 - Fix compile errors on older versions of clang r=mattwoodrow
2012-05-18 14:15:50 -04:00
George Wright
1ec259a42d
Bug 755869 - [7] Re-apply bug 722011 - Fix trailing commas at end of enum lists r=mattwoodrow
2012-05-18 14:15:28 -04:00
George Wright
991f57aa39
Bug 755869 - [6] Re-apply SkUserConfig (no original bug) r=mattwoodrow
2012-05-18 14:13:49 -04:00
George Wright
f0f601eb3b
Bug 755869 - [5] Re-apply bug 688366 - Fix Skia marking radial gradients with the same radius as invalid. r=mattwoodrow
2012-05-18 14:11:32 -04:00
George Wright
fe6a0f355b
Bug 755869 - [4] Re-apply bug 687189 - Implement SkPaint::getPosTextPath r=mattwoodrow
2012-05-18 14:10:44 -04:00
George Wright
dd6dfec444
Bug 755869 - [3] Re-apply bug 689069 - Patch to get arm opts to build with frame pointers enabled. r=mattwoodrow
2012-05-18 13:58:59 -04:00
George Wright
faeda4d046
Bug 755869 - [2] Update Makefile.in for the new Skia r=mattwoodrow
2012-05-18 14:47:02 -04:00
George Wright
5ed8f40fa3
Bug 755869 - [1] Update Skia to r4037 r=mattwoodrow
2012-05-23 14:43:41 -04:00
Brian Hackett
c07eaa0e3e
Use handles in API object hooks where possible, bug 750733. r=billm
2012-05-19 15:03:45 -07:00
Brian Hackett
9ae1966596
Backed out changeset 5fc7462dd394 for android orange.
2012-05-19 11:52:55 -07:00
Brian Hackett
a863456144
Use handles in API object hooks where possible, bug 750733. r=billm
2012-05-19 09:48:09 -07:00
Mike Hommey
4aca5b4bdb
Bug 751814 - Various Skia fixes for ARM without EDSP and ARMv6+. r=derf
2012-05-15 07:46:02 +02:00
Mike Hommey
3947b2915d
Bug 749533 - Add support for GNU/kFreeBSD and Hurd in SKIA. r=bjacob
2012-05-03 08:38:53 +02:00
George Wright
39ab722a10
Bug 740191 - [Skia] Fix SkBlitRow_opts_arm.cpp for compiling with NEON and Thumb enabled. r=mattwoodrow
2012-03-28 22:23:28 -04:00
George Wright
acc9c1e114
Bug 740187 - [Skia] Prevent the ARM implementation of memset16 from failing if count=0 r=mattwoodrow
2012-03-28 22:20:55 -04:00
George Wright
79f76b0311
Bug 740138 - [Skia] Use SkDebug_android for Android instead of SkDebug_stdio. r=mattwoodrow
2012-03-28 18:27:01 -04:00
Oleg Romashin
b87df218fe
Bug 733922 - Fix Qt port compilation with --enable-skia. r=gwright
2012-03-22 13:24:57 -07:00
Igor Bukanov
877dee50e1
bug 736978 - remove JS_FinalizeStub. r=:billm
...
Currently the GC finalizes on the background thread only objects with null
JSClass::finalize. However, this implies that any object that uses
JS_FinalizeStub for the finalizer would be prevented from the background
finalization.
To fix this the patch removes JS_FinalizeStub replacing it with NULL in all
cases when the class has no custom finalizer. For style consistency the patch
also removed the usage of JSCLASS_NO_OPTIONAL_MEMBERS in the static
declarations as the compiler fills the missing fields with null in any cases.
2012-03-19 15:27:58 +01:00
Irving Reid
438e1ecd58
Bug 731384 - Use feature test macros when defining new C++ features. r=matt.woodrow
2012-03-07 16:03:14 -05:00
David Mandelin
0be0db4666
Bug 730511: remove obsolete typedefs intN, uintN, r=luke
2012-02-28 15:11:11 -08:00
Marco Castelluccio
9ee802a28e
Bug 702158 - [Skia] Get Skia backend working on Linux, part 2
2012-01-31 10:24:27 +09:00
James Willcox
a32a62755e
Bug 719872 (part 2) - Use old FontHost implementation on Android r=mattwoodrow
2012-01-30 16:47:22 -05:00
James Willcox
41a08dbe71
Bug 719872 (part 1) - Backout 8de271eee34b r=mattwoodrow DONTBUILD
2012-01-30 16:47:19 -05:00
Landry Breuil
e73b511e09
Bug 722011 - Comma at the end of enums are not valid in C++, r=Ms2ger
...
Skia headers are included from c++ code and -pedantic is on by default,
which leads to 'error: comma at end of enumerator list' on OpenBSD/gcc 4.2.1.
2012-01-28 05:54:00 -08:00
Marco Castelluccio
94763126a2
Bug 702158 - [Skia] Get Skia backend working on Linux. r=mattwoodrow
2012-01-26 09:54:31 +09:00
Ehsan Akhgari
ca0546008e
Bug 719575 - Fix clang builds which are broken now because of Skia changes; r=mattwoodrow
...
--HG--
extra : rebase_source : 0470d992199f094b60fb16032415b6f6e00ff720
2012-01-19 16:32:41 -05:00
Matt Woodrow
96bb9c226e
Bug 716415 - Follow to include changes that I forgot to qref. r=bustage
2012-01-19 17:55:27 +13:00
Matt Woodrow
7102edd4ed
Bug 716415 - Fix windows build of Skia. r=jrmuizel
2012-01-19 17:48:35 +13:00
Matt Woodrow
00d569c12d
Bug 715718 - Fix uninitialized variable in SkDraw.cpp. r=gwright
2012-01-19 17:48:35 +13:00
Matt Woodrow
607dff74b1
Bug 716415 - Store our changes to SkUserConfig.h in a patch file. r=gwright
2012-01-19 17:48:35 +13:00
Matt Woodrow
4e230168bb
Bug 716415 - Apply mozilla patches to skia and fix bitrot. r=jrmuizel
2012-01-19 17:48:35 +13:00
Matt Woodrow
0157118305
Bug 716415 - Update Skia to svn revision 2980. r=jrmuizel
2012-01-19 17:48:34 +13:00
Matt Woodrow
519154cff3
Bug 716415 - Add missing README_MOZILLA file. r=jrmuizel
2012-01-19 17:48:34 +13:00
Matt Woodrow
841caeb8f4
Bug 712509 - Disable Skia's internal malloc debugging as it was causing crashes on android. r=Bas
2012-01-12 13:46:09 +13:00
Makoto Kato
88492785cf
Bug 712870 - Skia works on non-tier1 cpu. r=mattwoodrow
2011-12-27 18:01:12 +09:00
Jacek Caban
4d585841b8
Bug 705656 - Broken SKIA compilation on mingw r=matt.woodrow
2011-11-30 10:26:15 +01:00
Ehsan Akhgari
3b2e403dd7
Remove the executable bit from the skia source files; rs=joe (no bug)
...
DONTBUILD
2011-11-23 15:18:18 -05:00
Matt Woodrow
4f177d1dba
Bug 702517 - Disable dithering of 32bit skia gradients. r=jrmuizel
2011-11-18 17:00:38 +13:00
Marco Castelluccio
65fe650cde
Bug 699258 - Get skia backend compiling and running on Windows. r=mattwoodrow
2011-11-18 17:00:37 +13:00
Marco Castelluccio
33003fe27f
Bug 699258 - Move skia gradient shader implementations out of the class to fix a compile error on windows. r=mattwoodrow
2011-11-11 15:51:00 +13:00
Matt Brubeck
d9a00c1f73
Back out 5ddda2b25e28 and 3abfdb807a4f (bug 699258) for crashes in WinXP tests
2011-11-11 17:49:47 -08:00
Marco Castelluccio
f70d384da0
Bug 699258 - Part 2: [Skia] Get Skia backend working on Windows.
2011-11-11 15:51:00 -05:00
Marco Castelluccio
dad1070375
Bug 699258 - Part 1: [Skia] Resolve Skia restrict problems.
2011-11-11 15:51:00 -05:00
Matt Woodrow
aa850c7070
Bug 688366 - Fix Skia marking radial gradients with the same radius as invalid. r=jrmuizel
2011-10-31 13:48:54 +13:00
Matt Woodrow
a43bc9ddf2
Bug 688365 - Enable Skia 'New AA' mode. r=jrmuizel
2011-10-31 13:47:43 +13:00
Matt Woodrow
4dff6352a5
Bug 687189 - Implement SkPaint::getPosTextPath. r=jrmuizel
2011-10-28 20:10:02 +13:00
Matt Woodrow
983581c509
Bug 687188 - Skia radial gradients should use the 0/1 color stop values for clamping. r=jrmuziel
2011-10-28 20:08:54 +13:00
Matt Woodrow
748e151af8
Bug 689069 - Disable frame pointer for Skia arm optimized functions. r=jrmuizel
2011-10-28 20:05:42 +13:00
Matt Woodrow
6ba9d89bcd
Bug 688333 - Build changes to compile skia. r=khuey
2011-10-28 20:05:35 +13:00
Matt Woodrow
4b4d0412eb
Bug 688333 - Initial import of Skia source code
2011-10-28 20:05:31 +13:00
Matt Woodrow
f9b815c30c
Bug 688333 - Add script for importing Skia into our source tree. r=jrmuizel
2011-10-28 20:05:24 +13:00