Nicolas Silva
b4d60e7777
Bug 1245241
- Force the main thread to sync with the compositor when it tries to allocate insane amounts of shmems. r=lsalzman
2016-02-23 19:15:24 +01:00
Milan Sreckovic
94b767a7cd
Bug 1247700: Avoid crash from invalid fonts. r=bas
...
MozReview-Commit-ID: 9ULEBZAH9zz
--HG--
extra : rebase_source : 3eeea06396e0cca6685ac98915278a1bd768e55c
2016-02-23 09:55:44 -08:00
Kartikaya Gupta
f61cf00d34
Bug 1249915 - Write a test to ensure touch-driven tapping works. r=botond
...
MozReview-Commit-ID: HDwjus26fww
2016-02-23 10:17:46 -05:00
Andi-Bogdan Postelnicu
f91d783b13
Bug 1230911 - modified asseert in order to prevent null pointer dereference. r=roc
2015-12-14 00:00:00 +01:00
Jeremy Chen
47aa0a5855
Bug 1239564 - Post translate maskSurface to renderTarget. r=roc
2016-02-22 04:19:00 +01:00
Mason Chang
28ebbd63fc
Bug 1249659 - Disable accelerated Canvas on OS X versions < 10.8. r=milan
2016-02-22 17:12:40 -08:00
Ehsan Akhgari
195eeef0a1
Bug 1250196 - Part 1: Import mozilla::Forward and mozilla::UniqePtr into the std namespace in a way that is compatible with libc++; r=lsalzman
2016-02-22 15:51:59 -05:00
Kearwood (Kip) Gilbert
e3fd6329c9
Bug 1237691 - Implement Oculus Head Pose Prediction
...
MozReview-Commit-ID: 4hbKmZycEcn
2016-02-16 12:53:33 -08:00
Sotaro Ikeda
0f29054d1b
Bug 1248923 - Store result in Update ParamTraits<GonkNativeHandle>::Read() r=nical
2016-02-21 16:44:50 -08:00
Botond Ballo
ceceabf821
Bug 1237905 - Remove logging added temporarily to test_wheel_transactions to diagnose an intermittent failure. r=kats
...
MozReview-Commit-ID: JkuMXoTDXbL
2016-02-21 14:43:52 -05:00
Matthew S
f91b1ade98
Bug 1247450 - Rename LayerComposite::GetShadowTransform to GetShadowBaseTransform. r=botond
...
MozReview-Commit-ID: 4HkKFCDQW4l
2016-02-20 19:05:59 -05:00
Kartikaya Gupta
cfeae7187c
Bug 1246480 - Update test to not wait for a scroll event that might never arrive. r=botond
...
MozReview-Commit-ID: JZmRmqFCJAG
--HG--
extra : rebase_source : bc321b991f27dafaa694c610f33bac5a68b01c4e
2016-02-17 15:53:45 -05:00
Alexandre Lissy
dcf3f71348
Bug 1249280 - Fix coordinates of APZ-detected gestures when crossing process boundaries. r=kats
...
MozReview-Commit-ID: 9xPcG9uERB0
2016-02-19 21:46:31 -05:00
Milan Sreckovic
c0c9e1c9f0
Bug 1249312: UseAcceleratedCanvas on Mac should really be UseAcceleratedSkiaCanvas. r=mchang
2016-02-18 14:00:53 -05:00
Hiroyuki Ikezoe
bff8c71b2a
Bug 1216842 - Part 10: Remove the limit of the computed timing progress. r=birtles
...
Now we produce computed timing progress outside [0,1] range.
We use the last segment to calculate animation values if the value is greater than 1.
We use the first segment to calculate animation values if the value is lesser than 0.
2016-02-18 14:20:00 +01:00
Lee Salzman
2d3967c30f
Bug 1019856 - avoid double-buffering in BasicCompositor when window allows it. r=mattwoodrow
2016-02-18 20:57:29 -05:00
Thinker K.F. Li
4c328ff551
Bug 1244943 - Make PostProcessLayers aware of preserve-3d. r=mattwoodrow
...
--HG--
extra : commitid : S1u1kZ0sGV
2016-02-18 17:12:40 -08:00
Nathan Froyd
701d601a46
Bug 1249368 - use UniquePtr instead of nsAutoArrayPtr in gfxAlphaBoxBlur; r=jrmuizel
2016-02-18 14:10:00 -05:00
kearwood
d2f423667c
Bug 1237689 - Enable Oculus hardware latency tester r=daoshengmu
...
- Generate and pass sequential frame indexes into the ovr_GetTrackingState call and the corresponding call to ovr_SubmitFrame
MozReview-Commit-ID: 5tJl5YJt7Eo
--HG--
extra : rebase_source : 5dbb35ea1451a9f378e28d81a8704b63b1b72b4d
2016-01-08 18:50:10 -08:00
Milan Sreckovic
2967cf9b23
Bug 1240160: Add the TimeStamp based uptime value to crash reports, tagging it as UptimeTS, to differentiate from an existing Uptime value. A bit of additional code, avoiding the usage of C libraries to format some strings and a way to gtest these. r=BenWa,ted.mielczarek carrying ted.mielczarek review for the exception handler changes.
...
MozReview-Commit-ID: 12pRuD7agIG
--HG--
extra : rebase_source : f4427c8a6fdc1054f0f74cdce8d42bbf470dd143
2016-02-17 17:44:21 -05:00
Mason Chang
579a548e8f
Bug 1249033 - Enable Subpixel AA Text on Skia for Dwrite and GDI Fonts. r=jrmuizel
2016-02-18 08:37:43 -08:00
Lee Salzman
41d307c324
Bug 1245241
- part 1 - Close Shmem file handles after mapping them when possible to reduce exhaustion issues. r=billm
2016-02-18 10:56:15 -05:00
Kan-Ru Chen
39658a1669
Bug 1249245 - Add missing header gfxPrefs.h to GrallocTextureClient.cpp. r=cyu
...
MozReview-Commit-ID: ILck1Eh6XGU
--HG--
extra : rebase_source : 48aeac8b7b8ee1b9abfd2a36de681cfc12994867
2016-02-18 18:59:38 +08:00
Milan Sreckovic
3fe5de3dab
Bug 1247706 - "Please don't disable WebGL if crashed on WebGL context". r=dvander
2016-02-15 12:53:00 +01:00
Mason Chang
488e418aaa
Backout 2c97c2a5dad7 bug 1249033. r=me
2016-02-17 13:19:56 -08:00
Mason Chang
5006e4e550
Bug 1249033 - Enable Subpixel AA Text on Skia for Dwrite and GDI Fonts. r=jrmuizel
2016-02-17 13:09:35 -08:00
Wes Kocher
14a39eb4fe
Merge m-c to inbound, a=merge
...
--HG--
extra : commitid : EcXZgqBBN3f
2016-02-17 11:14:33 -08:00
Wes Kocher
4c4e5f57b5
Backed out changeset 3dce92c9562d (bug 1232042) for causing Win7 slaves to apparently crash and lock up a=backout
...
--HG--
extra : commitid : LR9A2AvlKN6
2016-02-17 11:11:10 -08:00
Bobby Holley
d7835725e4
Bug 1248784 - Extract the AddRef/Release calls into a non-inner helper trait. r=froydnj
2016-02-17 10:15:19 -08:00
Milan Sreckovic
4b17d4d133
Bug 1248450: Send the graphics messages to the parent process. r=dvander
...
MozReview-Commit-ID: EshCrdT5lYu
--HG--
extra : rebase_source : bc83b76bf6eea5e2e450eca4aacee5685373aed7
2016-02-16 18:07:37 -05:00
Mason Chang
4ab8d2c595
Bug 1239152 Memset RGBX surfaces to opaque white. r=nical
2016-02-17 07:34:37 -08:00
Kartikaya Gupta
a77c6753e6
Bug 1246056 - Ensure that the MockContentController's timestamp is always >= GetStartupTime(). r=botond
...
MozReview-Commit-ID: KfkX1ixpKaI
--HG--
extra : rebase_source : 8161b02c704c7e225a8ab0e87935e1dbba0dd236
2016-02-16 17:25:54 -05:00
Botond Ballo
c5fb5cdd95
Bug 1247452 - Use the effective visible region rather than the visible region where appropriate in the compositor. r=mattwoodrow
...
MozReview-Commit-ID: 6wbe0kUWh9h
--HG--
extra : rebase_source : 1263fcf02beb41bd8f7c6d6556b629f772fd955a
2016-02-12 20:24:38 -05:00
Jim Mathies
f7c7fcb101
Bug 1229429 - Refresh plugin window state during composition if we detect a change of layer trees. Fixes issues with plugin window visibility during rapid tab switching. r=roc
...
MozReview-Commit-ID: pVnTksTt2d
--HG--
extra : rebase_source : 1e50f5386ce3236cf3081f75e4d6f10940a7de88
2016-02-16 09:30:55 -06:00
Botond Ballo
175bd0065f
Bug 1238137 - Telemetry pings for APZ-driven scroll input methods. r=kats
...
--HG--
extra : commitid : 95kQvLI8EpQ
extra : rebase_source : 4fc618e9bcb3373ab09b145a7be0055ed9fd6acd
extra : histedit_source : c35955da462a1134ceee05c0dbcdd21e4ab0d405
2016-02-03 20:34:43 -05:00
Botond Ballo
2b0b5361e2
Bug 1238137 - Define a telemetry histogram for tracking the input methods used to trigger scrolling. r=kats
...
--HG--
extra : commitid : LEya95Nrulp
extra : rebase_source : da21eb4edc7e8221642a95d15d9b1a217c66866b
extra : amend_source : fc6a994f5feae7f7b023ba6d79a27f8523f49864
extra : histedit_source : c22f451cdb416f8c9a6e13a4c982a9fbd3199b76%2Cd3c11a44b707d410b78360b29bae294332506b4f
2016-02-16 14:17:35 -05:00
Mason Chang
b4c228baec
Bug 1246213 - Skia reftest fuzzing for Skia content on OS X. r=jmuizelaar
2016-02-16 09:07:52 -08:00
Sotaro Ikeda
01f2e9b0c0
Bug 1248325 - Update BufferTextureHost::GetAsSurface() r=nical
2016-02-16 01:47:36 -08:00
David Anderson
e8462418d4
Add instrumentation for when content processes fail to acquire D3D11 devices. (bug 1247539, r=milan)
...
--HG--
extra : rebase_source : 9d13831f25867d993cccc9b2717e14cc0a4893a0
2016-02-15 23:59:24 -08:00
David Anderson
0b9ff5b722
Lazily initialize D3D11 mix-blend shaders. (bug 1246388, r=mattwoodrow)
2016-02-12 17:15:33 -08:00
Jonathan Kew
4e37cb9e3c
Bug 1248248 - Don't break glyph run for orientation mismatch before a cluster-extender. r=xidorn
2016-02-15 09:07:53 +00:00
Michelangelo De Simone
ebffe910b0
Bug 1247445 - Rename Layer::GetEffectiveVisibleRegion GetLocalVisibleRegion. r=botond
...
--HG--
extra : amend_source : 375eedb2c6f3e7aec206071a0be0e5fbc0367e76
2016-02-13 16:50:51 -08:00
Bas Schouten
259d24796a
Bug 1247775 - Part 3: Remove Moz2D code to support Direct2D 1.0. r=dvander
...
MozReview-Commit-ID: KBZSqIdx0OC
2016-02-13 14:33:28 +01:00
Bas Schouten
0ba3291163
Bug 1247775 - Part 2: Remove Direct2D 1.0 code from Thebes. r=dvander
...
MozReview-Commit-ID: EC8yhkvvood
2016-02-13 14:33:27 +01:00
Bas Schouten
273c601802
Bug 1247775 - Part 1: Remove D3D10/D2D 1.0 texture integration from layers. r=dvander
...
MozReview-Commit-ID: CPBTl0cEG3p
2016-02-13 14:33:27 +01:00
Jeff Gilbert
c6dad7bd09
Bug 1094458 - Implement RenderbufferStorageMultisample. - r=jrmuizel
2016-02-12 19:31:58 -08:00
Peter Van der Beken
1900a0608e
Bug 1020199 - Make sure APZ works with nested oop iframe. r=kats, r=dvander.
...
--HG--
extra : rebase_source : be158c15f328b19be4e4189c1b755841caabcb10
2016-01-08 20:17:39 +01:00
Lee Salzman
a85ba89f0a
Bug 1248228 - Build fix for SkOSFile_stdio on OpenBSD. r=jmuizelaar
2016-02-16 11:33:31 -05:00
Milan Sreckovic
40a9c94aaa
Bug 1187464 - Part 3. Check if GetSurface returned null. r=mstange
2016-02-08 11:58:00 +01:00
Milan Sreckovic
e5d1fffa48
Bug 1187464 - Part 2. RTTI for TextureSource debug purposes. Carry r=botond
2016-02-08 11:57:00 +01:00
Milan Sreckovic
59d6d38319
Bug 1187464 - Part 1. We can get the wrong texture source type, so deal with it. Carry r=mstange
2016-02-08 11:56:00 +01:00
Jeff Muizelaar
ba79c9643e
Bug 1247979. Optimize ScaleToOutsidePixels. r=kats
...
This does a union of all the rectangles at once, instead of one-by-one. It
also cuts down a lot on allocation churn.
It would be possible to avoid an additional allocation/copy if we change
the interface of this function to mutate the existing region instead of
returning a new one.
2016-02-12 18:48:28 -05:00
Milan Sreckovic
e9025efa1b
Bug 1247671: Increase the crash logging length to 16 by default (+ small white space change in the comments) r=dvander
...
MozReview-Commit-ID: 9KH6ZdWInZM
--HG--
extra : rebase_source : 62d608c0fd859586a129d9663b92aa634bca1c7d
2016-02-11 13:04:20 -05:00
Jonathan Kew
01c301aa57
Bug 1246346 - patch 1 - Expose a DesktopToDevice scale factor on nsDeviceContext. r=emk
2016-02-12 11:07:32 +00:00
Kartikaya Gupta
b295e34959
Bug 1229624 - Disable chaos mode on APZ scrollbar tests, because it makes the reftest timeout fire chaotically. rs=Tomcat
2016-02-12 08:42:59 -05:00
Kartikaya Gupta
d805fe7934
Bug 1247677 - Add support for the general.smoothScroll.{pages,pixels} prefs in APZ. r=dvander
...
MozReview-Commit-ID: HCOqbRZV5ui
2016-02-12 08:30:16 -05:00
Kartikaya Gupta
6de82d82fb
Bug 1243589 - Use SingleTiledContentClient even for scrollable layers if the layer is smaller than a single tile. r=mattwoodrow
...
MozReview-Commit-ID: 6eYFmoOVL6b
2016-02-12 08:29:25 -05:00
Lee Salzman
c631aefd3b
Bug 1246775 - use already_AddRefed in PersistentBufferProvider interface. r=bas
2016-02-10 13:16:13 -05:00
Carsten "Tomcat" Book
01b9f62513
Backed out changeset 9320c843aa7e (bug 1247775) for breaking win 8 reftests
2016-02-12 08:49:50 +01:00
Carsten "Tomcat" Book
eebf5d68a5
Backed out changeset 4adb7586410a (bug 1247775)
2016-02-12 08:49:29 +01:00
Carsten "Tomcat" Book
fdcf299e32
Backed out changeset 8e13ba75bccf (bug 1247775)
2016-02-12 08:49:28 +01:00
Bas Schouten
54dad93d74
Bug 1247775 - Part 3: Remove Moz2D code to support Direct2D 1.0. r=dvander
...
MozReview-Commit-ID: KBZSqIdx0OC
--HG--
extra : rebase_source : 632fb5208a702f79fa5c648698f73bc9b0bf8992
2016-02-12 02:11:50 +01:00
Bas Schouten
341a0f43ec
Bug 1247775 - Part 2: Remove Direct2D 1.0 code from Thebes. r=dvander
...
MozReview-Commit-ID: EC8yhkvvood
--HG--
extra : rebase_source : fbb8a83f359e31bf77a058e202666df7f244893e
2016-02-12 02:05:35 +01:00
Bas Schouten
86009f3faf
Bug 1247775 - Part 1: Remove D3D10/D2D 1.0 texture integration from layers. r=dvander
...
MozReview-Commit-ID: CPBTl0cEG3p
--HG--
extra : rebase_source : 88e86efda5e943ffe8d374ab6462b4b0fed20487
2016-02-12 00:52:59 +01:00
Kevin Wern
9a846abe86
Bug 1227224 - Further improvements to generic tree traversal algorithms. r=botond
...
- Introduce a more general version of ForEachNode that takes two actions
(pre-action and post-action).
- Express the one-action version of ForEachNode in terms of the two-action
version.
- Add TraversalFlag::Abort, which stops traversal immediately.
- Express DepthFirstSearch in terms of ForEachNode.
- Add ForEachNodePostOrder and DepthFirstSearchPostOrder.
- The new functions are all recursive, and traverse children in the order
provided by the node accessors. Adjust tests to reflect this.
- Refactor two APZCTreeManager functions, FindTargetNode and GetAPZCAtPoint,
to use the algorithms.
MozReview-Commit-ID: 83Y7psjkUWG
--HG--
extra : commitid : JSMoSuDetUL
extra : rebase_source : 6ef99b1d6dac841eb94d99feb605ca235d9086c9
extra : amend_source : 518a636ee5a5162bca83dde6b90cb1a3b5304a3b
2016-01-25 04:04:13 -08:00
Wes Kocher
5d6f82ee76
Backed out changeset 19c631cc41c8 (bug 1243589) for test_transformed_scrolling_repaints.html failures on OS X
...
--HG--
extra : commitid : 8PbwCNrV2to
2016-02-11 16:34:28 -08:00
Matt Woodrow
c37f9c5c28
Bug 1224433 - Part 3: Compute the invalidation area for preserve-3d layers by accumulating the leaves. r=roc
...
--HG--
extra : rebase_source : 8c144c06bee84bd9bdcf99878eebe6e9c3fddfb9
2016-02-12 11:35:35 +13:00
Matt Woodrow
2f1cbec9a2
Bug 1224433 - Part 2: Clamp the invalidation rect to values that fit within nscoord. r=roc
...
--HG--
extra : rebase_source : 0aaede54d8622786cddaf8365e6bf091d6bff8f8
2016-02-12 11:35:17 +13:00
Kartikaya Gupta
9b986bd61e
Bug 1243589 - Use SingleTiledContentClient even for scrollable layers if the layer is smaller than a single tile. r=mattwoodrow
...
MozReview-Commit-ID: LHIrrtFfRgm
2016-02-11 16:49:04 -05:00
Bas Schouten
693fff053b
Bug 1247380: Only copy the background if we can succesfully get a snapshot. r=jrmuizel
...
MozReview-Commit-ID: uWH7MtJmSp
2016-02-11 22:15:11 +01:00
Bas Schouten
66c618a6ee
Bug 1246641: Also execute an occasional EndDraw for CommandLists used by non-operator OVER drawing. r=jrmuizel
...
MozReview-Commit-ID: H3V3z8ZIiIK
2016-02-11 21:35:07 +01:00
Bas Schouten
fe90bf3a21
Bug 1232042: Workaround Windows presentation bug by executing a present call on the main thread during a WM_PAINT event. r=jrmuizel
...
MozReview-Commit-ID: JbPdhIi9zCd
2016-02-06 03:14:44 +00:00
Botond Ballo
4b9059bd5a
Bug 1237905 - Ensure the page is painted before synthesizing native events. r=kats
...
MozReview-Commit-ID: LRt7l3S9Jz6
2016-02-10 20:16:14 -05:00
Matt Woodrow
8532605cf4
Bug 1216832 - Add crashtest. r=roc
2016-02-12 00:19:19 +13:00
Nicholas Nethercote
a008feb871
Bug 1246846
(part 3) - Avoid nsTHashtable::RawRemoveEntry() in gfxFontconfigUtils. r=jfkthame.
...
This assumes that it's safe to possibly shrink the table after the removal,
i.e. there are no surprising subtleties with how this table is managed.
--HG--
extra : rebase_source : 9a0581f30e752f2f0f42b35062e62052488d1912
2016-02-09 13:55:42 +11:00
Kartikaya Gupta
17f323d482
Bug 1235899 - Add a test for frame reconstruction during an APZ scroll animation. r=botond
...
MozReview-Commit-ID: 3MDHWEfTD8e
2016-02-10 16:31:33 -05:00
Kartikaya Gupta
7c935ef5ba
Bug 1235899 - Don't allow frame reconstruction to clobber the APZ scroll offset. r=botond
...
MozReview-Commit-ID: HZMavMJNtmq
2016-02-10 16:31:20 -05:00
Tom Tromey
d1272d2ee4
Bug 1239504 - Avoid ASan leak report by holding PseudoStack in ImageBridgeChild. r=sotaro
...
--HG--
extra : rebase_source : d1642fd0b1a85fe34cc4221ef8748c93c818a58b
2016-02-10 07:33:00 -05:00
Botond Ballo
9a2d7d1f30
Bug 1237827 - Be sure to clear LayerComposite::mLayerComposited between each composite. r=mattwoodrow
2016-02-08 20:26:54 -05:00
Mason Chang
089ecec90a
Bug 1246952. Cleanup references to vsync prefs. r=kats
2016-02-10 08:31:48 -08:00
Bogdan Postelnicu
60db75464b
Bug 1246889 - Correctly check whether hb_blob_create failed in ShareTableAndGetBlob. r=jfkthame
...
MozReview-Commit-ID: EMsr5uipjjL
--HG--
extra : rebase_source : 6431c01b9bad331b12f5820e8c2eade9759eb55a
2016-02-10 16:47:02 +02:00
Jonathan Kew
8cf27fec61
Bug 1243843 - Pull latest bugfixes from upstream graphite2 (now at e569e28d83491fedb31b9220493f3c07f6ec6d80). r=jdaggett
2016-02-01 20:26:09 +00:00
Nicholas Nethercote
a28a2e22e9
Bug 1246834
- Fix memory reporting of nsFontFamily{List,Name}. r=jfkthame.
...
--HG--
extra : rebase_source : 81da7c78a310c8e5e08bac75146b08367dbee1a2
2016-02-09 12:16:34 +11:00
Lee Salzman
42ed58661a
Bug 1246756 - part 3 - update Skia to m49 branch. r=jrmuizel
...
--HG--
rename : gfx/skia/skia/include/core/SkTDict.h => gfx/skia/skia/include/private/SkTDict.h
rename : gfx/skia/skia/include/core/SkTSearch.h => gfx/skia/skia/include/private/SkTSearch.h
rename : gfx/skia/skia/include/utils/SkParsePaint.h => gfx/skia/skia/include/views/SkParsePaint.h
rename : gfx/skia/skia/include/core/SkDither.h => gfx/skia/skia/src/core/SkDither.h
rename : gfx/skia/skia/include/gpu/GrRect.h => gfx/skia/skia/src/gpu/GrRect.h
rename : gfx/skia/skia/src/gpu/GrBatchFontCache.cpp => gfx/skia/skia/src/gpu/text/GrBatchFontCache.cpp
rename : gfx/skia/skia/src/gpu/GrBatchFontCache.h => gfx/skia/skia/src/gpu/text/GrBatchFontCache.h
rename : gfx/skia/skia/src/gpu/GrFontScaler.cpp => gfx/skia/skia/src/gpu/text/GrFontScaler.cpp
rename : gfx/skia/skia/src/gpu/GrFontScaler.h => gfx/skia/skia/src/gpu/text/GrFontScaler.h
rename : gfx/skia/skia/src/gpu/GrTextBlobCache.h => gfx/skia/skia/src/gpu/text/GrTextBlobCache.h
2016-02-09 13:38:06 -05:00
Lee Salzman
3a2bac0af5
Bug 1246756 - part 2 - update Skia moz.build for m49 update. r=jrmuizel
2016-02-09 13:36:40 -05:00
Lee Salzman
9c09b93cc2
Bug 1246756 - part 1 - fix moz2d Skia usage for Skia m49 update. r=jrmuizel
2016-02-09 13:36:19 -05:00
Bas Schouten
9e0dc8074b
Bug 1240800: When we've reallocated our buffer client side and fail to track the proper invalid region always upload the bounds of the visible region. r=mattwoodrow
...
--HG--
extra : commitid : 7gPm9cOSQT3
2016-02-09 06:07:30 +01:00
James Willcox
34358e8ff5
Bug 1245612 - Send texture usage bytes in crash reports r=bsmedberg
2016-02-08 09:18:52 -06:00
James Willcox
03c12b87a9
Bug 1243418 - Fix up incorrect 'aOverwrite' usage and impl in GLUploadHelpers r=jgilbert
2016-02-08 09:18:52 -06:00
James Willcox
7528f84391
Bug 1243072 - Make GfxTexturesReporter work again r=nical,jgilbert
2016-02-08 09:18:52 -06:00
John Daggett
cb1a460415
Bug 1244017 - remove system font cascade for OSX. r=m_kato
2016-02-08 15:26:50 +09:00
Jonathan Watt
17c8267a53
Bug 1245845, part 2 - Remove code that is now useless from gfxContext::EnsurePath. r=Bas
2016-02-08 02:15:59 +00:00
Jonathan Watt
ed38f5c352
Bug 1245845, part 1 - Stop Moz2D Path::CopyToBuilder/TransformedCopyToBuilder implicitly converting the Path's FillRule. r=Bas
2016-02-08 02:15:54 +00:00
John Daggett
535864fddf
Bug 1188802 - only rebuild local webfont rules when needed. r=heycam
2016-02-08 10:11:39 +09:00
Sotaro Ikeda
1fadea02c2
Bug 1161978 - Use GetEffectiveVisibleRegion() for Layer invalidation r=matt.woodrow
2016-02-07 16:43:16 -08:00
Jacek Caban
ac5793d34d
Bug 1213429 - GCC compilation fixup.
2016-02-07 13:15:21 +01:00
Matt Woodrow
7cd754d8cf
Bug 1229317 - Allow preserve-3d and opacity to be combined on the root element of a preserve-3d chain. r=roc
2016-02-07 23:51:11 +13:00
Jonathan Kew
08f9b29485
Bug 1240085
- Revert to CSS-pixel units for screenX, screenY, moveTo() APIs, and adjust the origin for secondary displays with differing resolution to avoid overlapping coordinate spaces. r=emk
2016-02-05 16:29:33 +00:00
Phil Ringnalda
ac03b87535
Back out aeceae3e0e96 (bug 1232042) for Win8 crashes @nvwgf2umx.dll + 0x2d416a in addon manager tests
2016-02-06 09:52:35 -08:00
Phil Ringnalda
ec6b8aac53
Back out e751d638ab4b (bug 1229317) for reftest "Assertion failure: oldState < kReadMax" and crashes
...
CLOSED TREE
2016-02-05 22:42:55 -08:00
Matt Woodrow
8857b37db9
Bug 1229317 - Allow preserve-3d and opacity to be combined on the root element of a preserve-3d chain. r=roc
2016-02-06 17:57:34 +13:00
Bas Schouten
06a81d915b
Bug 1232042: Workaround Windows presentation bug by executing a present call on the main thread during a WM_PAINT event. r=jrmuizel
...
--HG--
extra : commitid : K5S8gKJzzhj
2016-02-06 03:14:44 +00:00
Phil Ringnalda
24bee43b71
Merge m-c to m-i
2016-02-05 19:42:00 -08:00
Phil Ringnalda
7f5bfce5de
Merge m-i to m-c, a=merge
2016-02-05 18:41:47 -08:00
Mason Chang
2a788162c4
Bug 1239861. Skip composite if vsync time is before force composite time. r=kats
2016-02-05 10:11:48 -08:00
Mason Chang
0e244c6f7b
Bug 1239861. Part 2 Properly resize DXGI swap chain buffer size. r=bas
2016-02-05 10:11:46 -08:00
Benoit Girard
63eb0bffc0
Bug 1213429 - Check the result of LockRect. r=Bas
...
--HG--
extra : commitid : CDNYBJhujLX
2016-02-05 13:02:01 -05:00
Kartikaya Gupta
af75f92c75
Bug 1245830 - Remove an unnecessary assertion that can fail due to timing. r=botond
...
--HG--
extra : commitid : EvIy7LcjUdX
2016-02-05 16:31:15 -05:00
Felipe Gomes
5cae0e50dd
Bug 1230196 - Allow release channel to run e10s. r=billm
...
--HG--
extra : commitid : 7rKp9YfaaUC
2016-02-05 13:27:12 -02:00
Jonathan Howard
195c5660d9
Bug 1241931 - On shutdown stop any ongoing loading of fonts; GDI in particular. r=jdaggett
2016-02-05 10:24:00 +09:00
Jim Mathies
1839261e94
Bug 1243413 - If a plugin window is hidden in an adjacent scroll frame due to APZ scroll state changes, make sure to show the plugin window after the scroll operation complete. r=kats
2016-02-04 09:10:55 -06:00
Randall Barker
f7c435db3c
Bug 1245285 - part 3, Remove unused repaint_interval prefs r=botond
2016-02-04 07:18:20 -08:00
Randall Barker
a9a2103f92
Bug 1245285 - part 2, Prevent Zoom and Overscroll animations from repainting durring animation r=botond
2016-02-04 07:18:07 -08:00
Randall Barker
54fa69b98b
Bug 1245285 - part 1, Remove unused mRepaintInterval from AsyncPanZoomAnimation r=botond
2016-02-04 07:17:56 -08:00
William Chen
a7c2c21d89
Bug 1245242 - Normalize to unit vector for DOMMatrix.rotateAxisAngleSelf. r=roc
2016-02-04 00:30:00 -08:00
Frédéric Wang
6cc1afdda7
Bug 1227058 - Update OTS to version 5.0.0. r=jfkthame
2016-01-26 14:08:00 +01:00
Lee Salzman
c4f3bf16cc
Bug 1244228
- fix DrawTargetSkia::OptimizeSourceSurface to still create Skia surfaces for GPU canvases even if creating a GPU surface failed. r=jmuizelaar
2016-02-03 13:49:36 -05:00
Phil Ringnalda
e8bf2f165a
Back out 3 changesets (bug 1245285) for e10s failures in test_layerization.html
...
Backed out changeset e0c8fb70a095 (bug 1245285)
Backed out changeset a211643de3b6 (bug 1245285)
Backed out changeset 41ea5de656a9 (bug 1245285)
2016-02-03 21:46:11 -08:00
Benoit Girard
27bc1a5a64
Bug 1213429 - Recycle e10s D3D9 textures and add partial upload support. r=Bas
...
--HG--
extra : commitid : Eog9Widi6IK
extra : rebase_source : 1092bfcd51b78c8472be89f28998cb87b79ac0d1
2016-01-25 14:58:46 -08:00
Sotaro Ikeda
2e7f1b09d6
Bug 1224833 - Check explicitly if image has TextureClient r=nical
2016-02-03 18:11:38 -08:00
Randall Barker
d08ecfaa7a
Bug 1245285 - part 3, Remove unused repaint_interval prefs r=botond
2016-02-03 17:16:14 -08:00
Randall Barker
0ab3435006
Bug 1245285 - part 2, Prevent Zoom and Overscroll animations from repainting durring animation r=botond
2016-02-03 17:16:14 -08:00
Randall Barker
d63c83b829
Bug 1245285 - part 1, Remove unused mRepaintInterval from AsyncPanZoomAnimation r=botond
2016-02-03 17:16:14 -08:00
Kartikaya Gupta
830a6d5631
Bug 990916 - Update test_layerization to also test displayport expiry and de-layerization. r=tnikkel,botond
...
--HG--
extra : commitid : LMV1n0z5x3X
2016-02-03 19:13:35 -05:00
Kartikaya Gupta
e7dd4d9941
Bug 990916 - When setting a displayport, schedule a timer to remove it as well. r=tnikkel
...
--HG--
extra : commitid : 4u7JlPJLoFT
2016-02-03 19:13:35 -05:00
James Willcox
1cc1b45965
Also back out bug 1243072 for mac bustage on a CLOSED TREE
2016-02-03 14:45:21 -06:00
Jeff Muizelaar
2e6be2fc80
Bug 1244742. Use the default copy constructor and assignment operators.
2016-02-03 15:34:31 -05:00
James Willcox
d6cc922a79
Back out bug 1243418 for build bustage on mac
2016-02-03 14:33:57 -06:00
James Willcox
7a195bd71f
Bug 1243418 - Fix up incorrect 'aOverwrite' usage and impl in GLUploadHelpers r=jgilbert
2016-02-03 14:16:48 -06:00
James Willcox
6ce8f1df22
Bug 1243072 - Make GfxTexturesReporter work again r=nical,jgilbert
2016-02-03 14:16:40 -06:00
Kartikaya Gupta
b41e197e54
Bug 1236046 - Don't use a stupidly small time delta to compute a velocity. r=botond
...
--HG--
extra : commitid : L79kov6tYbg
2016-02-03 14:07:45 -05:00
Bas Schouten
888d48a29a
Bug 1245525: Fix some compiler errors in Moz2D type classes. r=jrmuizel
...
--HG--
extra : commitid : FmfVYTFF0DR
2016-02-03 19:44:41 +01:00
Kartikaya Gupta
a18b744836
Bug 1242173 - Typing in input fields does not visually update r=
2016-02-03 10:04:26 -08:00
Sourabh
7b7bab8e91
Bug 1241991 - Switch mTreeLock from a Monitor to a Mutex. r=kats
...
--HG--
extra : commitid : JOnB7YtNo19
2016-02-03 09:31:35 -05:00
Carsten "Tomcat" Book
c92db23864
Backed out changeset 63e2a056311a (bug 1187464) for reftest failures
...
--HG--
extra : rebase_source : 8102427c109ff38e42b26b7f48dcaba67bdd7c4c
2016-02-03 15:04:37 +01:00
Carsten "Tomcat" Book
2d8c4c26f5
Backed out changeset 0cee3cdcce99 (bug 1187464)
...
--HG--
extra : rebase_source : 977a8167488bc1dbf71c6205a2eb4b77c1c3a0ca
2016-02-03 15:04:21 +01:00
Carsten "Tomcat" Book
d17059df02
Backed out changeset b64710d45b28 (bug 1187464)
...
--HG--
extra : rebase_source : 9128b958e65ba5fb289aedee4f8771180478a733
2016-02-03 15:04:19 +01:00
Lee Salzman
0fc3e0a084
Bug 1242794 - make SkGrPixelRef::deepCopy preserve alpha type. r=jmuizelaar
...
--HG--
extra : rebase_source : 5406d41a892877f3cbcf4bb6386b46d16ef3eca1
2016-01-25 21:14:58 -05:00
Milan Sreckovic
a4077255db
Bug 1187464 - Part 3. Check if GetSurface returned null. r=mstange
2016-02-02 11:07:00 +01:00
Milan Sreckovic
91bbfbdf90
Bug 1187464 - Part 2. RTTI for TextureSource debug purposes. r=botond
2016-02-02 11:06:00 +01:00
Milan Sreckovic
e8a5e06fdb
Bug 1187464 - Part 1. We can get the wrong texture source type, so deal with it. r=mstange
2016-02-02 11:05:00 +01:00
Edwin Flores
e60aaa13ff
Bug 1227548 - Check the result of MakeCurrent in ReadBuffer and DrawBuffer destructors - r=jgilbert
2016-02-03 09:59:22 +00:00
Jonathan Kew
3b6f4b11ff
Bug 1244693 - On Beta/Release channels, allow OpenType Layout tables (GDEF/GPOS/GSUB) to pass through OTS unchecked, relying on harfbuzz to handle them safely. r=jdaggett
2016-02-03 09:22:58 +00:00
David Anderson
3af026a7f5
Add full mix-blend mode support to the D3D11 compositor. (bug 1238496, r=bas)
2016-02-02 16:33:13 -08:00
Mike Hommey
6896ab7efa
Bug 1245055 - Remove gfx/skia/Makefile.in. r=mshal
...
The remains in this file are related to bug 633436. But more than being
apparently obsolete, they are also not used at all, because they don't
appear after including config.mk, which resets CFLAGS and CXXFLAGS
anyways, removing whatever the Makefile set.
2016-02-03 08:41:27 +09:00
Birunthan Mohanathas
e00f212825
Bug 1235261 - Part 6: Rename AutoInfallibleTArray to AutoTArray. r=froydnj
2016-02-02 17:36:31 +02:00
Birunthan Mohanathas
690e6fe38b
Bug 1235261 - Part 3: Switch remaining uses of AutoFallibleTArray to AutoTArray. r=froydnj
...
This is effectively a no-op because the affected array operations already use
`mozilla::fallible`.
2016-02-02 17:36:30 +02:00
Birunthan Mohanathas
9137955c65
Bug 1235261 - Part 2: Switch some uses of AutoFallibleTArray to AutoTArray. r=froydnj
...
This changes some function signatures to take a nsTArray<T>& instead of a
FallibleTArray<T>& because AutoTArray does not inherit from FallibleTArray.
This is effectively a no-op because the affected array operations already use
`mozilla::fallible`.
2016-02-02 17:36:30 +02:00
Birunthan Mohanathas
d7371d07d0
Bug 1235261 - Part 1: Rename nsAutoTArray to AutoTArray. r=froydnj
2016-02-02 17:36:30 +02:00
Thomas Zimmermann
51f8425723
Bug 1245057: Refer to |gfx::IntPoint| in |GrallocTextureHostOGL::SetCropRect|, r=sotaro
...
This change is required to build for B2G.
2016-02-02 14:23:21 +01:00
Fabrice Desré
81a683418d
Bug 1245016 - b2g build failure in gfx/layers/ipc/LayerAnimationUtils.h r=hiro
2016-02-02 01:53:05 -08:00
Milan Sreckovic
f20acb8ca1
Bug 1244735 - Preference to override the default behaviour for partial present. r=jrmuizel
2016-02-01 13:34:00 +01:00
Kartikaya Gupta
3d73d0eed2
Bug 1244901 - When recording transform duration for potential checkerboarding time, do so on the compositor thread. r=botond
...
--HG--
extra : commitid : 55FF2DFP4YI
2016-02-01 19:59:23 -05:00
David Anderson
7b6e752abc
Add software mix-blend mode support to the D3D9 compositor. (bug 1243071 part 3, r=bas,mattwoodrow)
2016-02-01 16:28:00 -08:00
David Anderson
3183956eeb
Use double precision when computing the backdrop copy rect. (bug 1243071 part 2, r=mattwoodrow)
2016-02-01 16:27:49 -08:00
David Anderson
d11fbc361b
Remove Compositor::mRenderBounds. (bug 1243071 part 1, r=mattwoodrow)
2016-02-01 16:27:38 -08:00
David Anderson
2dcd6e8f02
Fix stale intermediate surfaces in the D3D9 compositor. (bug 1244821, r=mattwoodrow)
...
--HG--
extra : rebase_source : 83a3dd01dc1caffde1348a5e4dca9c1a46204897
2016-02-01 16:22:51 -08:00
Bas Schouten
dae57ec4b3
Bug 1245870: When concluding there is nothing to draw inside the clip be sure to balance the Save() since it won't be balanced in PopGroupForlayer. r=jrmuizel
...
--HG--
extra : commitid : Ra5uaA0wki
2016-02-05 13:53:45 +01:00
Lee Salzman
4729f64a2a
Bug 1245550 - add gfx.use-glx-texture-from-pixmap pref to control whether texture_from_pixmap is used. r=nical
2016-02-03 13:05:24 -05:00
Carsten "Tomcat" Book
c797ca6392
Backed out changeset 0e3ca319b742 (bug 1244017) for reftest failures
2016-02-05 11:19:25 +01:00
Carsten "Tomcat" Book
745be97723
Backed out changeset 2257088c6b04 (bug 1188802)
2016-02-05 11:19:11 +01:00
John Daggett
a4c7835ada
Bug 1188802 - only rebuild local webfont rules when needed. r=heycam
2016-02-05 16:46:27 +09:00
John Daggett
debbbb10f6
Bug 1244017 - remove system font cascade for OSX. r=m_kato
2016-02-05 16:46:05 +09:00
Jacek Caban
4445996c6b
Bug 1244454 - Fixed skia compilation on mingw. r=lsalzman
...
--HG--
extra : rebase_source : ad3b2b9e361234165076e3d106adf7f740509095
2016-02-01 17:55:09 +01:00
James Willcox
ec95f4bf71
Bug 1238541 - Don't die in SharedSurface_EGLImage::ProducerReadReleaseImpl() if there is an existing fence r=jgilbert
2016-02-01 10:53:25 -06:00
Nicolas Silva
cd021cdc29
Bug 1208226 - Don't crash when failing to map a segment of shared memory. r=sotaro, billm
2016-02-01 16:11:00 +01:00
Hiroyuki Ikezoe
4b31027fae
Bug 1216842 - Part 7: Add easing function to laryer::Animation. r=cam
2016-01-26 21:19:00 +01:00
Hiroyuki Ikezoe
409715935c
Bug 1216842 - Part 2: Add LayerAnimationUtils. r=cam
...
This is also for compositor side.
we need a new class to share the function which converts TimingFunction
to ComputedTimingFunction for either keyframe's timing function or keyframe
effect's timing function.
2016-01-29 14:44:00 +01:00
Hiroyuki Ikezoe
8c08c46bf6
Bug 1216842 - Part 1: Add null_t into TimingFunction to skip calculation of linear timing function. r=cam
...
This is a patch for compositor side to represent linear function as null_t/Nothing().
Also the first argument of ToTimingFunction changes to a Maybe<ComputedTimingFunction>.
As a result of this change we can also use ToTimingFunction for animation
effect's timing function.
2016-01-26 21:14:00 +01:00
Nicholas Nethercote
ac9a8bf77c
Bug 1181444 (part 1.5) - Remove dead PLDHashOperator declarations. r=froydnj.
...
--HG--
extra : rebase_source : 82888ad8037a6024508b042030469fac5a8f5fa4
2016-01-28 14:08:19 -08:00
Kartikaya Gupta
6f5c11bbbf
Back out 3 csets from bug 1242690 for causing bug 1244549. r=backout
...
--HG--
extra : commitid : G7hFhHC4YDt
2016-01-31 14:44:58 -05:00
Phil Ringnalda
d381b4bca6
Back out 7 changesets (bug 1235261) for cpptest failures in TestTArray
...
CLOSED TREE
Backed out changeset d66c3f19a210 (bug 1235261)
Backed out changeset 467d945426bb (bug 1235261)
Backed out changeset 32b61df13142 (bug 1235261)
Backed out changeset c50bb8ed4196 (bug 1235261)
Backed out changeset 0ff0fa6fe81f (bug 1235261)
Backed out changeset df70e89669da (bug 1235261)
Backed out changeset 064969357fc9 (bug 1235261)
2016-01-31 10:10:57 -08:00
Birunthan Mohanathas
b00cdd6088
Bug 1235261 - Part 6: Rename AutoInfallibleTArray to AutoTArray. r=froydnj
2016-01-31 17:12:12 +02:00
Birunthan Mohanathas
720fce4f80
Bug 1235261 - Part 3: Switch remaining uses of AutoFallibleTArray to AutoTArray. r=froydnj
...
This is effectively a no-op because the affected array operations already use
`mozilla::fallible`.
2016-01-31 17:12:12 +02:00
Birunthan Mohanathas
53bb27f2a4
Bug 1235261 - Part 2: Switch some uses of AutoFallibleTArray to AutoTArray. r=froydnj
...
This changes some function signatures to take a nsTArray<T>& instead of a
FallibleTArray<T>& because AutoTArray does not inherit from FallibleTArray.
This is effectively a no-op because the affected array operations already use
`mozilla::fallible`.
2016-01-31 17:12:12 +02:00
Birunthan Mohanathas
373593275e
Bug 1235261 - Part 1: Rename nsAutoTArray to AutoTArray. r=froydnj
2016-01-31 17:12:12 +02:00
Botond Ballo
7b73cdff36
Bug 1237905 - Add logging to test_wheel_transactions to help investigate an intermittent failure. r=kats
2016-01-29 18:50:02 -05:00
Kartikaya Gupta
eec655d1f0
Bug 1242690 - Ensure that mouse events have the callback transform applied. r=botond
...
--HG--
extra : commitid : IXh9rbTOf5R
2016-01-29 16:31:15 -05:00
Kartikaya Gupta
661c759eec
Bug 1243547 - Route scroll position adjusting for surface shifting directly to APZC. r=rbarker
...
--HG--
extra : commitid : 2aa3HgQj1wD
2016-01-28 16:00:05 -05:00
Milan Sreckovic
98b3c800cb
Bug 1235437 - Add annotation for major graphics preferences. r=bgirard
...
--HG--
extra : transplant_source : Zt%94Rv%13u%C7aRP%FD%14%C7%DFe%95%0F%AC%A2
2016-01-18 12:56:38 -05:00
Jeff Muizelaar
daeaa01c5e
Bug 1178385. Add a pref to force enable hw video decode. r=milan
2016-01-27 19:31:42 -05:00
Nicholas Nethercote
9ec51cfd62
Bug 1239864 (part 11) - Remove the old rect iterators. r=roc.
...
--HG--
extra : rebase_source : 778b87ae616f7c0292de20771c09a16051c8508c
2016-01-14 14:57:50 -08:00
Nicholas Nethercote
79bfbfd42b
Bug 1239864 (part 8) - Use the new rect iterators in gfx/. r=nical.
...
--HG--
extra : rebase_source : 52187e5da197e961d533ef6eac2dc9dfe3c83827
2016-01-18 17:20:58 -08:00
Nicholas Nethercote
ab52b9a0ea
Bug 1239864 (part 7) - Use the new rect iterators in gfx/. r=nical.
...
--HG--
extra : rebase_source : 27d77656d578deefff0860184346ff962e32762f
2016-01-18 17:20:58 -08:00
Nicholas Nethercote
bd2573b703
Bug 1239864 (part 6) - Use the new rect iterators in gfx/. r=nical.
...
--HG--
extra : rebase_source : 396d472f620fbbe65982da90ce66021382eaf324
2016-01-18 17:20:58 -08:00
Randall Barker
b9be241b63
Bug 1230674 - part 4, Update AsyncPanZoomController to call overscroll api when building for Android r=kats
2016-01-27 07:45:31 -08:00
Randall Barker
567ea9f9c9
Bug 1230674 - part 3, Add overscroll api to GeckoContentController and AndroidContentController r=snorp,kats
2016-01-27 07:45:31 -08:00
Markus Stange
a7cc7fa9ec
Bug 1235223 - Fix another typo in the layers history document.
...
--HG--
extra : commitid : 2DCqDryDgGn
extra : rebase_source : dd5dd653c6d3a9cc3085ab15838a41c1618723a7
2016-01-27 13:33:56 +01:00
Markus Stange
7a5fbde2bc
Bug 1241816 - In CreateSourceSurfaceFromMacIOSurface, unlock the IOSurface even in failure cases. r=mattwoodrow
...
--HG--
extra : commitid : 4I01MZg56Lj
extra : rebase_source : d5d389b4d4c2d2d3bc8fd3574372242e496dcae1
2016-01-22 10:57:12 +01:00
Markus Stange
60d76ec6c8
Bug 1240241 - Don't recurse infinitely in FilterCachedColorModels::ForColorModel if the original filter node was null. r=roc
...
--HG--
extra : commitid : LhJXm2RA5OF
extra : rebase_source : 1ae690be8649c71fa3c98cf029ae33ce68502980
2016-01-20 22:45:58 +01:00
Lee Salzman
4aff274ce6
Bug 1242751 - fix assertion in SkLinearGradient. r=jmuizelaar
2016-01-25 17:20:24 -05:00
Bogdan Postelnicu
85e3e6dee1
Bug 1242421 - remove useless null check. r=roc@ocallahan.org
...
--HG--
extra : transplant_source : %0D%9E%D5%21l%FC%EF%15g%0B%16x%DD%88H%80%C3L%CB%A0
2016-01-25 14:00:29 +02:00
Lee Salzman
30e1e65908
Bug 1242044 - "layout/reftests/css-gradients/linear-zero-length-1 fails under Skia content". r=jmuizelaar
...
--HG--
extra : rebase_source : ec250bf261aec9ffe6eb6c21ec87a2b01ae9e5a0
2016-01-22 14:11:00 +01:00
Sotaro Ikeda
252806de74
Bug 1238602 - Update ParamTraits<GonkNativeHandle>::Read() r=nical
2016-01-27 00:32:03 -08:00
John Daggett
03e62378ba
Bug 1243226 - relax the limit on fontconfig generics. r=heycam, a=me
2016-01-27 17:21:31 +09:00
Masayuki Nakano
02e13bc9fe
Bug 1153156 part.4 Make APZC system scroll speed overriding aware r=mstange
2016-01-27 15:09:13 +09:00
Sotaro Ikeda
25ee3640a7
Bug 1239702 - Fix SK_ARM_HAS_NEON build config r=lsalzman
2016-01-26 18:47:54 -08:00
Nicholas Nethercote
702fb54dd6
Bug 1239864 (part 5) - Use the new rect iterators in gfx/. r=nical.
...
--HG--
extra : rebase_source : bed24467918b4a12837e37d6f7f15c42f20b0b6a
2016-01-18 17:20:58 -08:00
Nicholas Nethercote
74831ef786
Bug 1239864 (part 4) - Use the new rect iterators in gfx/. r=nical.
...
--HG--
extra : rebase_source : 633ae2a881c15ae14d08e9ea9289e2b8f079a4b9
2016-01-18 17:20:58 -08:00
Nicholas Nethercote
7d571e1691
Bug 1239864 (part 2) - Use the new rect iterators in nsRegion.cpp. r=roc.
...
--HG--
extra : rebase_source : 5b52cae3f0ed41381266d7c4d1805dd07c4631d6
2016-01-14 21:47:16 -08:00