mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
488 415 коммитов 615 Ветки 98 Теги 5,7 GiB
Граф коммитов

1398 Коммитов

Автор SHA1 Сообщение Дата
Jeff Gilbert bbed19189c Bug 1290634 - Remove unnecessary respecifyTexture arg from ZeroTextureData. - r=mtseng 
MozReview-Commit-ID: 52VirsA4eCQ
 2016-08-04 20:04:53 -07:00
Ethan Lin 41b10604fb Bug 1290628 - Change the assertion rule to prevent assert with large number. r=lsalzman 2016-08-02 19:47:00 +02:00
JerryShih 184798636b Bug 1236785 - return WebGLTexture cache value for GetTexParameter() call. r=mtseng 
--HG--
extra : rebase_source : 6c5d6358f6f4ee0f3c5f4e09a2b17998657415e8
 2016-08-02 20:20:00 +02:00
JerryShih 28b72fb07b Bug 1291612 - update webgl conformance test gl-object-get-calls.js. r=mtseng 
Update webgl conformance test gl-object-get-calls.js to
24323861fe

--HG--
extra : rebase_source : 0cb51ef71f78d6e9d2ed8cf716b78e8d95f87927
 2016-08-02 22:52:00 +02:00
JerryShih 3b6936ef71 Bug 1236394 - turn on gl-object-get-calls.html WebGL conformance test, a=mtseng 
--HG--
extra : rebase_source : 8f4daf60eefcbb40915d455f90064bb973ad5ea5
 2016-07-31 19:39:00 +02:00
Jeff Gilbert 974f4e1ea8 Bug 1291083 - Explicitly make WEBGL_depth_texture formats filterable. - r=mtseng 
MozReview-Commit-ID: DaVpIHZZ0cI
 2016-08-03 12:24:47 -07:00
Jeff Gilbert 901ccc3aeb Bug 1291083 - Textures with depth-compare should be filterable. - r=mtseng 
This also makes depth-textures follow filtering rules, whereas before we
allowed filtered depth textures for WEBGL_depth_texture.

MozReview-Commit-ID: LxepCb4WEkr
 2016-08-03 12:24:39 -07:00
Ethan Lin 5e6875ec23 Bug 1260599 - Change EXT_disjoint_timer_query mochitest status. r=mtseng 
--HG--
extra : rebase_source : 2112d7b74e3fa83a0b0bf04991dcdb7f20b9b701
 2016-08-01 20:14:00 +02:00
Ethan Lin d775ae4e6e Bug 1260599 - Enable EXT_disjoint_timer_query extension on ANGLE. r=jgilbert 
--HG--
extra : rebase_source : cd31f7ff2daa4fec743726fd2e1a04ca83820b5b
 2016-07-17 19:37:00 +02:00
Jeff Gilbert e7ad10dadf Bug 1290987 - #version needs to be on the first line. CLOSED TREE 
MozReview-Commit-ID: D5FMDOKiSLY
 2016-08-01 15:38:49 -07:00
Jeff Gilbert 1f38e7b76d Bug 1290987 - Don't skip shader validation or disable-angle in webgl-mochitest. - r=jrmuizel CLOSED TREE 
MozReview-Commit-ID: FSqr4W5xOak
 2016-08-01 14:13:29 -07:00
Jeff Gilbert 8ada226207 Bug 1290987 - s/enable-prototype-webgl2/enable-webgl/ - r=jrmuizel,mrbkap CLOSED TREE 
MozReview-Commit-ID: 3EArs8BLTpK
 2016-08-01 14:13:01 -07:00
Jeff Gilbert 336b801590 Bug 1289655 - Mark test. 
MozReview-Commit-ID: 5jA9mZDRjYR
 2016-08-01 01:20:12 -07:00
Jeff Gilbert 720b873197 Bug 1289655 - Use UINT32_MAX for drawArrays because of OSX. - r=mtseng 
MozReview-Commit-ID: 8bB4DHGQRnB
 2016-08-01 01:20:12 -07:00
Jeff Gilbert 9125182b21 Bug 1289655 - Add primitive restart for WebGL 2. - r=mtseng 
MozReview-Commit-ID: 6SfI8yfROGI
 2016-08-01 01:20:12 -07:00
Jeff Gilbert ba54e6b7a0 Bug 1289655 - Organize GLFeature checks for WebGL2. - r=mtseng 
MozReview-Commit-ID: 7Ci6PqVkvM0
 2016-08-01 01:20:12 -07:00
Iris Hsiao 2a17847230 Backed out changeset 6f50eb01832c (bug 1286458) for Reftest failures 2016-08-01 15:18:46 +08:00
vincentliu a9ad0d0841 Bug 1286458 - Add crashtest. r=lsalzman 
---
 dom/canvas/crashtests/1286458-1.html  | 20 ++++++++++++++++++++
 dom/canvas/crashtests/crashtests.list |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 dom/canvas/crashtests/1286458-1.html
 2016-08-01 13:40:16 +08:00
Carsten "Tomcat" Book fc8e03f0d8 Merge mozilla-central to autoland 2016-07-30 16:49:41 +02:00
Nicolas Silva 1fdb65d654 Bug 1289816 - Simplify CopyableCanvasLayer::UpdateTarget and remove unnecessary copies. r=jnicol 2016-07-29 20:19:28 +02:00
JerryShih 98b9a25b33 Bug 1290328 - Return null for webgl GetActiveUniformBlockName() error. r=jgilbert 2016-07-28 18:21:00 -04:00
JerryShih ba521880fb Bug 1290032 - return null for InvalidEnum. r=jgilbert 
--HG--
extra : rebase_source : ae3d4fda39bee8441105b593a2d2c6b2c4003e29
 2016-07-28 17:37:00 +02:00
JerryShih 609c57770f Bug 1290018 - update webgl conformance tests. r=jgilbert 
Add DEPTH_STENCIL to depth-renderable list.
https://github.com/KhronosGroup/WebGL/pull/1945

--HG--
extra : rebase_source : 8a983a7eb166cb60e31b0b0731fc67066199635d
 2016-07-28 18:15:00 +02:00
Jeff Gilbert 0ee365e60a Bug 1289653 - Mark tests. 
MozReview-Commit-ID: IWB8gBthP2v
 2016-07-28 14:37:41 -07:00
Jeff Gilbert d6af553fb8 Bug 1289653 - Disallow null `pixels` in texSubImage. - r=mtseng 
MozReview-Commit-ID: HgbJEhykEda
 2016-07-28 14:37:41 -07:00
Jeff Gilbert 2d3a353980 Bug 1289652 - Disabled arrays don't change getVertexAttrib for SIZE,TYPE. - r=mtseng 
MozReview-Commit-ID: 71RJlIFayNH
 2016-07-28 14:33:38 -07:00
Ethan Lin c0b8ab7939 Bug 1287652 - Add crash test case. r=mchang 
--HG--
extra : rebase_source : de4ebae4ca2e7981c1ad21e1ce7834df2dc81d89
 2016-07-20 19:10:00 -04:00
Wes Kocher 5cc2b19359 Backed out 2 changesets (bug 1260599) for winxp mochitest gl bustage 
Backed out changeset 4e066314768c (bug 1260599)
Backed out changeset d50028181044 (bug 1260599)
 2016-07-28 10:53:22 -07:00
Lee Salzman 99a26ab433 Bug 1284578 - add crashtest. r=me 2016-07-28 13:38:50 -04:00
Lee Salzman c316de06c2 Bug 1284356 - add crashtest. r=me 2016-07-28 13:34:28 -04:00
Ethan Lin 6ab3df37e7 Bug 1260599 - Change EXT_disjoint_timer_query mochitest status. r=mtseng 
--HG--
extra : rebase_source : 1f2e1e83477d7baf8d35eafe342090a38c8eaef0
 2016-07-26 12:51:32 +08:00
Ethan Lin 29ace485e1 Bug 1260599 - Enable EXT_disjoint_timer_query extension on ANGLE. r=jgilbert 
--HG--
extra : rebase_source : debccc5664b65f568f3cb82f6434108bb9092045
 2016-07-26 12:51:32 +08:00
Sebastian Hengst f140568d4d Bug 1242165 - Disable another conformance/typedarrays webgl test due to spec changes to fix failing webgl tests (and requested by evilpie on IRC). r=me 2016-07-28 10:06:33 +02:00
Jeff Gilbert 6502268813 Bug 1242165 - Disable conformance/typedarrays/data-view-test due to spec changes. 2016-07-28 00:24:17 +02:00
Nicolas Silva a4ee782267 Bug 1289380 - Simplify PersistentBufferProviderShared. r=edwin 2016-07-27 16:50:20 +02:00
Carsten "Tomcat" Book 7293066753 merge mozilla-inbound to mozilla-central a=merge 2016-07-27 16:35:44 +02:00
Wes Kocher cef61ca9ed Merge m-c to autoland, a=merge 2016-07-26 16:54:33 -07:00
Nicolas Silva 48805c9b3e Bug 1284837 - Disallow implicit conversions from float to integer when creating IntPoint and IntSize objects. r=botond 2016-07-26 16:48:30 +02:00
Benoit Girard fecbc5166c Bug 1288746 - Handle missing WebGL failure IDs. r=jrmuizel 
MozReview-Commit-ID: 3kdr8Dwinqm

--HG--
extra : rebase_source : dea04b6d4288e305bb3bb2b8f3965e8f1f713ef9
 2016-07-22 13:26:05 -04:00
Ethan Lin e89d62b83f Bug 1279986 - Make WebGL Uniform*, UniformMatrix* and VertexAttrib* accept SharedArrayBuffer. r=jgilbert 2016-07-19 20:00:00 +02:00
Morris Tseng b53cf295ac Bug 1247977 - Handle FakeBlackTexture creation fail. r=jgilbert 
MozReview-Commit-ID: GiwoIcFsv2k
 2016-07-27 09:42:09 +08:00
Sotaro Ikeda 2d11b798fa Bug 1284803 part 10 - Add toleranes to testColorConversions() r=jrmuizel 2016-07-26 00:02:19 -07:00
Jeff Gilbert 4f4b4cb007 Bug 1288638 - Unconditionally SH_UNROLL_FOR_LOOP_WITH_SAMPLER_ARRAY_INDEX. - r=mtseng 
MozReview-Commit-ID: CPgJTTV8vAA
 2016-07-25 20:01:09 -07:00
Jeff Gilbert 66ac1e0650 Bug 1288638 - Update shader validator usage. - r=mtseng 
MozReview-Commit-ID: 5bSUacggvR8
 2016-07-25 20:01:09 -07:00
Iris Hsiao 60bb75129e Backed out changeset 65e1219ade06 (bug 1284803) 2016-07-26 10:20:57 +08:00
Sotaro Ikeda f660774b3d Bug 1284803 part 10 - Add toleranes to testColorConversions() r=jrmuizel 2016-07-25 18:23:14 -07:00
Jeff Gilbert c6bdac40c5 Bug 1288649 - 2-arg ctors shouldn't be explicit. 
MozReview-Commit-ID: 8yZeVcOj3Et
 2016-07-25 14:46:25 -07:00
Jeff Gilbert 407bc3c38c Bug 1288649 - Fix non-unified-build errors. - r=ethlin 
MozReview-Commit-ID: EI7FtmuEBl7
 2016-07-25 14:46:20 -07:00
Jeff Gilbert a4dadbacbe Bug 1280499 - Mark tests. 
MozReview-Commit-ID: DnVgcJvZ9NM
 2016-07-25 13:55:24 -07:00
Jeff Gilbert ff9844ee32 Bug 1280499 - Allow SKIP_ROWS+height>IMAGE_HEIGHT and fix paranoid uploading. - r=jrmuizel 
Top-of-tree test is green now.

MozReview-Commit-ID: IbCTHK62qGT
 2016-07-25 13:52:41 -07:00
Jeff Gilbert 3740e5150b Bug 1280499 - Support paranoid uploading for nVidia. - r=jrmuizel 
MozReview-Commit-ID: 3CMNoHiBACT
 2016-07-25 13:52:41 -07:00
Jeff Gilbert e4c382d96e Bug 1280499 - Unlock UNPACK_BUFFER. - r=ethlin 
MozReview-Commit-ID: 5RbFNeKsvqF
 2016-07-25 13:52:41 -07:00
Jeff Gilbert 41c0b57871 Bug 1280499 - Implement PBOs for textures. - r=jrmuizel 
MozReview-Commit-ID: 3FCinT9hS8j
 2016-07-25 13:52:41 -07:00
Jeff Gilbert 3b7adaea8f Bug 1280499 - Add stubs and forwards. - r=ethlin 
MozReview-Commit-ID: BZUAGCjnINM
 2016-07-25 13:52:41 -07:00
Lee Salzman db08b356a2 Bug 1288872 - verify cairo_scaled_font creation succeeds in SkFontHost_cairo. r=mchang 
MozReview-Commit-ID: JKRiyQgi9Y2
 2016-07-22 21:23:56 -04:00
Sotaro Ikeda 2c8122c501 Bug 1250914 - Create gl texture for each video frame drawing to SkiaGL canvas r=jrmuizel 2016-07-22 18:10:13 -07:00
JerryShih a9bb41be63 Bug 1288351 - Handle gl.getFramebufferAttachmentParameter() FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE query for DS format. r=jgilbert 2016-07-21 18:37:00 -04:00
JerryShih 7712664858 Bug 1288598 - Handle gl.getFramebufferAttachmentParameter() call for default framebuffer. r=jgilbert 2016-07-22 07:42:00 -04:00
Ethan Lin cef86a68d7 Bug 1285086 - Enable related webgl conformance test. r=jgilbert 
--HG--
extra : histedit_source : 2923e5c992879ae732843982e03b18bb676bcbef
 2016-07-21 07:32:00 -04:00
Ethan Lin 0931d35c4c Bug 1285086 - Turn on WebGLSampler. r=jgilbert 
--HG--
extra : histedit_source : 9a788a293cbf8fc373c9bf7dbce7596f845e460d
 2016-07-21 07:31:00 -04:00
Andrea Marchesini 60ab8339e0 Bug 1288736 - Add some missing rv.SuppressException(), r=smaug 2016-07-22 16:50:10 +02:00
Carsten "Tomcat" Book 336105a0de merge mozilla-inbound to mozilla-central a=merge 2016-07-22 11:58:02 +02:00
Tom Tromey 5538d692d3 Bug 1286877 - do not set c-basic-offset for python-mode; r=gps 
This removes the unnecessary setting of c-basic-offset from all
python-mode files.

This was automatically generated using

    perl -pi -e 's/; *c-basic-offset: *[0-9]+//'

... on the affected files.

The bulk of these files are moz.build files but there a few others as
well.

MozReview-Commit-ID: 2pPf3DEiZqx

--HG--
extra : rebase_source : 0a7dcac80b924174a2c429b093791148ea6ac204
 2016-07-14 10:16:42 -06:00
Nicolas Silva e4a4580aeb Bug 1285263 - Restore clips with the proper transform when in CanvasRenderingContext2D::EnsureTarget. r=bas 2016-07-21 11:02:12 +02:00
Chris Peterson b175c9fdd5 Bug 1277106 - Part 2: Expand MOZ_UTF16() strings to u"" string literals. r=Waldo 2016-07-20 22:03:25 -07:00
Carsten "Tomcat" Book 0e01bff3d3 Backed out changeset 323b479bd91f (bug 1285100) for webgl issues 
--HG--
extra : rebase_source : 12fe2e27927b16c971667ecb4fa625f67b3f1be5
 2016-07-21 08:03:23 +02:00
Lee Salzman 91cc2c640d Bug 1287515 - fix crashtest for d2d. r=me 2016-07-21 01:05:31 -04:00
Ethan Lin dbede03dce Bug 1285100 - Fix bufferSubData when the returnData is null. r=jgilbert 2016-07-06 20:42:00 +02:00
Lee Salzman 6323d3129d Bug 1287515 - limit the number of points in SkDashPathEffect::asPoints. r=mchang 
MozReview-Commit-ID: 4QI82EfsHh6
 2016-07-20 23:35:35 -04:00
Ethan Lin c96a4b134e Bug 1285100 - Enable the webgl conformance test. r=pchang 
--HG--
extra : rebase_source : d78dbd87068ff72ed20afbb8aa5062585b4f6eb1
 2016-07-21 07:24:00 -04:00
Ethan Lin e2381526b7 Bug 1285100 - Fix bufferSubData when the returnData is null. r=jgilbert 
--HG--
extra : rebase_source : 7a844e306abd398de96142a3192eadd009864ccd
 2016-07-06 20:42:00 -04:00
Benoit Girard fbfff14ea5 Bug 1289813 - split out safe mode from FEATURE_FAILURE_WEBGL_DISABLED. r=jrmuizel 
MozReview-Commit-ID: Jmp911jYjix

--HG--
extra : rebase_source : 825eaae61c3a685ff2853eba3820a02087779dd5
 2016-07-29 14:28:51 -04:00
Jeff Gilbert e65989db46 Bug 1287801 - Mark test webgl2 counterpart. 
MozReview-Commit-ID: 5fjj15YV7ld
 2016-07-19 10:25:01 -07:00
Ethan Lin 0334d84e82 Bug 1279997 - Improve the check of alpha premult in TexOrSubImage. r=jgilbert 2016-07-18 19:37:00 +02:00
Carsten "Tomcat" Book 80839e9ddd Backed out changeset 3b24fcb598fd (bug 1285692) 2016-07-19 14:15:59 +02:00
Jeff Gilbert 1a452594b3 Bug 1286459 - Hotfix. CLOSED TREE 
MozReview-Commit-ID: 8VrGes96FLs
 2016-07-26 12:48:55 -07:00
Jeff Gilbert bd589e4b43 Bug 1286459 - Be very careful about nulling WebGLContext::gl. - r=jerry 
MozReview-Commit-ID: 3evG45zLT5j
 2016-07-26 12:31:02 -07:00
Jeff Gilbert 21852bdb47 Bug 1285692 - Skip test to try to stem the bleeding. 
MozReview-Commit-ID: EImhK07oCFm
 2016-07-19 00:50:57 -07:00
Jeff Gilbert 0dab237072 Bug 1136455 - Mark test as still failing on OSX. 
MozReview-Commit-ID: D8kHzzMVwlC
 2016-07-19 00:35:57 -07:00
Jeff Gilbert 2171d30c9b Bug 1136416 - Mark test. 
MozReview-Commit-ID: 4EwCTPkcJF3
 2016-07-18 22:52:02 -07:00
Jeff Gilbert 088b64c968 Bug 1136416 - Hack to pass the context-lost test for now. - r=ethlin 
MozReview-Commit-ID: 2sue4UcB1Y4
 2016-07-18 22:52:02 -07:00
Jeff Gilbert abcfdebc6d Bug 1136455 - Mark passing test. 
MozReview-Commit-ID: 3HaHgx5cLOG
 2016-07-18 19:58:13 -07:00
Jeff Gilbert 9992bedd7e Bug 1136455 - Validate built-in varyings for invariance. - r=mtseng 
MozReview-Commit-ID: KxIxc9MhPp8
 2016-07-18 19:58:13 -07:00
vincentliu acbc420513 Bug 1281800 - The API should return an empty array if maxWidth was provided but is less than or equal to zero or equal to NaN. r=jrmuizel 
---
 dom/canvas/CanvasRenderingContext2D.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
 2016-07-19 10:52:50 +08:00
Wes Kocher 228dfe2a90 Merge m-c to inbound a=merge CLOSED TREE 2016-07-18 15:05:16 -07:00
Jeff Gilbert 65bed54efc No bug - Mark now-passing tests as no longer failing. - a=kwierso 
MozReview-Commit-ID: K6T497r6nEb
 2016-07-18 14:55:25 -07:00
Wes Kocher 02b63e9ff0 Backed out 12 changesets (bug 1284803) for near permafailing Windows Wr tests a=backout CLOSED TREE 
Backed out changeset 80468414501e (bug 1284803)
Backed out changeset 08d2e46308fd (bug 1284803)
Backed out changeset 6bacfaadbc29 (bug 1284803)
Backed out changeset 28e0ca5cb68e (bug 1284803)
Backed out changeset 9ea43addc3af (bug 1284803)
Backed out changeset 3b11ba39748c (bug 1284803)
Backed out changeset b23773965e94 (bug 1284803)
Backed out changeset 6eb7bce6f4c1 (bug 1284803)
Backed out changeset 109f79e577a0 (bug 1284803)
Backed out changeset 52bd1efc6c1f (bug 1284803)
Backed out changeset fb3d8468b758 (bug 1284803)
Backed out changeset 92c15211f59b (bug 1284803)
 2016-07-18 14:46:05 -07:00
Carsten "Tomcat" Book ca457776f8 merge mozilla-inbound to mozilla-central a=merge 2016-07-18 17:07:59 +02:00
peter chang 13995f0c0c Bug 1277424 - Update generated test cases, r=jgilbert 
MozReview-Commit-ID: 2MtFukhR4BU

--HG--
extra : rebase_source : eb2a092a375472eafb659a039b61a380bc8c7921
 2016-07-05 10:18:24 +08:00
peter chang d2a9b7b5ab Bug 1277424 - Disable tests under conformance textures because of random failures on window 7, r=mtseng 
MozReview-Commit-ID: 96Iq9MZ8xxX

--HG--
extra : rebase_source : c4fec88086158affe00f6dbceae5477597165f75
 2016-07-14 22:27:07 +08:00
peter chang e7831ede07 Bug 1277424 - Disable WebGL2 and address failures for windows XP/windows 8, r=mtseng 
MozReview-Commit-ID: B5szFHrOr3t

--HG--
extra : rebase_source : 6133f670acdd33dffa592253c260d6eb58dc4296
 2016-07-14 14:31:31 +08:00
peter chang d6d0a4c326 Bug 1277424 - Enable webgl.force-enabled by default to bypass old driver problem, r=mtseng 
MozReview-Commit-ID: LRl359klk6m

--HG--
extra : rebase_source : 16b48df213609dbd6ff962bcc9f98ab4aefd36fe
 2016-07-12 14:59:28 +08:00
peter chang d73005c87e Bug 1277424 - Update wrapper generator to skip WebGL2 testing for linux and Android, r=jgilbert 
MozReview-Commit-ID: GmyvaxYlWZr

--HG--
extra : rebase_source : a85edab38cadc702fb70e4505e38f080b164a07e
 2016-07-07 12:15:11 +08:00
peter chang b46b589aee Bug 1277424 - Mark failed test cases on Android and Linux as failures, r=jgilbert 
MozReview-Commit-ID: 32dhCCkITjT

--HG--
extra : rebase_source : 8d1f6846e65e378f5c5132f57349b7204a86bc7f
 2016-07-07 17:47:38 +08:00
peter chang fd16b1ccf4 Bug 1277424 - Mark failed test cases on OSX and Windows as failures, r=jgilbert 
MozReview-Commit-ID: AaBRF4tTg3h

--HG--
extra : rebase_source : 07d008e114a52fe516a361a619328688eb2a7916
 2016-07-01 16:43:49 +08:00
peter chang 44bd73a857 Bug 1277424 - Disable process-crash test cases on windows, r=jgilbert 
MozReview-Commit-ID: 4eQ5tkETLrO

--HG--
extra : rebase_source : a3e3ad8e896e43fabc59cc6e669a793f453a79fc
 2016-06-30 17:44:43 +08:00
peter chang bcbc948a6d Bug 1277424 - Skip test cases that contain Non-local network connections, r=jgilbert 
MozReview-Commit-ID: 9eRWEZUfrFn

--HG--
extra : rebase_source : 366c813cba8a0264fb55f034cfbc6f3c631a59f4
 2016-06-30 10:49:18 +08:00
peter chang fd32465cbd Bug 1277424 - Remove unnecessary test cases in mochitest-errata.ini, r=jgilbert 
MozReview-Commit-ID: JyPEDNcAFCK

--HG--
extra : rebase_source : ce50ed08b25f8b1491982bb92fbdcc9cc87961bb
 2016-06-16 15:37:51 +01:00
peter chang 4310d34d79 Bug 1277424 - Disable image_bitmap* test cases because createImageBitmap API is not fully supported, r=jgilbert 
MozReview-Commit-ID: 5qKC1wvYQoV

--HG--
extra : rebase_source : 47f2344f4e65135e4fce5cb4f55e7dedec366098
 2016-06-30 10:18:45 +08:00
peter chang f2ad3a4d42 Bug 1277424 - Correct the script path of always-fail.html, r=jgilbert 
MozReview-Commit-ID: 6XtFZSUYlXD

--HG--
extra : rebase_source : 09790f2bc646def4ec1b7186c2aeb0d1e23125b1
 2016-06-22 15:30:10 +08:00