Commit Graph

22767 Commits

Author SHA1 Message Date
Jonathan Kew
d24f60c5a9 bug 1059167 - add reftest. r=smontagu 2014-08-28 16:00:02 +01:00
Jonathan Kew
9f0ce791fe bug 1059167 - fix accidental regression in FloatMarginWidth. r=smontagu 2014-08-28 16:00:02 +01:00
Jonathan Kew
9d90a1a297 bug 1058954 - add testcase. r=smontagu 2014-08-28 16:00:01 +01:00
Jonathan Kew
23c8be9fa7 bug 1058954 - use logical-size with the proper writing mode when setting up to call ReflowAbsoluteFrames. r=smontagu 2014-08-28 16:00:01 +01:00
Carsten "Tomcat" Book
aef0b33b55 merge mozilla-inbound to mozilla-central a=merge 2014-08-28 13:07:10 +02:00
Kartikaya Gupta
8b8760b990 Bug 1055760 - Move the scroll handoff parent id from Layer to FrameMetrics. r=botond 2014-08-27 22:13:39 -04:00
Matt Woodrow
e5027a0a1e Bug 1051134 - Revert reftest annotation too. 2014-08-28 18:39:19 +12:00
cku@mozilla.com
4673f6fbc6 Bug 839735 - Enable test cases, which are disable because of scrollbar fade out effect. r=ahal 2014-08-26 10:17:00 +02:00
Mats Palmgren
aefa35c4e1 Bug 1042489 - Call DrainOverflowColumns() to pick up any overflow frames from our prev-in-flow. r=roc 2014-08-25 04:25:00 +02:00
Paul Adenot
3494e982d0 Bug 848954 - Part 6 - Put cubeb-related static functions in their own file. r=kinetik 2014-08-25 15:26:09 +02:00
Daniel Holbert
bc95e21070 Bug 1059138 band-aid: Skip flex item sortedness assertion if the first flex item is part of a shadow DOM. r=bz
Not sure what the right fix is here yet, but this should stop the new 'gaia-header' web component from making this dominate the logcat output.
2014-08-27 17:48:21 -07:00
Markus Stange
0e4d29ece6 Bug 1051522 - Add -moz-appearance values -moz-mac-vibrancy-light and -moz-mac-vibrancy-dark for the behind-window vibrancy effect on 10.10. r=roc 2014-08-28 02:15:31 +02:00
Mats Palmgren
6b28f982ee Bug 1059242 - Initialize |allowedRange| with aPoint and a distance of zero in both directions (otherwise we'll return zero in the non-scrolled direction and reset that scroll position). r=kip 2014-08-27 11:42:00 -04:00
Nicholas Nethercote
8b3951c20f Bug 1057912 - Privatize most of PLDHashTable's fields. r=roc.
--HG--
extra : rebase_source : 0f55e70b63d9c191fbd9418cb1177ff534deeed9
2014-08-25 16:56:33 -07:00
Matt Woodrow
9d7154f323 Bug 936690 - Remove nsIContentView and nsIContentViewManager. r=roc 2014-08-27 10:56:24 +12:00
Matt Woodrow
3f37812157 Bug 1050788 - Add test for complex path that is entirely clipped out. r=roc
--HG--
extra : rebase_source : 3844baef99a92332b0bc4d1b382596f7aea51f40
2014-08-27 10:21:20 +12:00
Matt Woodrow
624f9df95e Bug 1056171 - Account for continuations when generating background clip areas. r=roc
--HG--
extra : rebase_source : aa554aa075c5d1286a1f32351abec547c151213f
2014-08-27 10:15:50 +12:00
Ryan VanderMeulen
a390eae5a3 Backed out 5 changesets (bug 965022) for mochitest-2 failures on a CLOSED TREE.
Backed out changeset 7f68752ffe1e (bug 965022)
Backed out changeset 24251d4da019 (bug 965022)
Backed out changeset a34ae046c947 (bug 965022)
Backed out changeset f747fd154739 (bug 965022)
Backed out changeset f076faf3c282 (bug 965022)
2014-08-26 16:02:37 -04:00
Botond Ballo
b3b8a74941 Bug 965022 - Use MOZ_FORMAT_PRINTF for nsTString::AppendPrintf, and fix incorrect usages. r=jrmuizel 2014-08-26 12:05:41 -04:00
Botond Ballo
18e3296080 Bug 965022 - Use MOZ_FORMAT_PRINTF for [f]printf_stderr, and fix incorrect usages. r=jrmuizel 2014-08-25 18:28:25 -04:00
Max Vujovic
f05c37ff89 Bug 1057900 - Resolve calc values for CSS blur() in nsRuleNode instead of storing them. r=dbaron,mstange 2014-08-26 11:11:45 -07:00
Jeff Muizelaar
91cd5c097b Bug 1048916. Convert a bunch of layers from nsAutoPtr to UniquePtr. r=roc
This makes the ownership of LayerProperties more clear.

--HG--
extra : rebase_source : 5d786a246337353522fc1d6e2c252e98e673e936
2014-08-25 11:09:39 -04:00
James Kitchener
82a9455861 Bug 1043358 - Fix up font caching in MathMLTextRunFactory. r=roc 2014-08-22 03:48:00 -04:00
Kearwood (Kip) Gilbert
324102c660 Bug 1022818 - Part 3: Tests for CSSOM-View Smooth-Scroll DOM API Methods and MSD Animation. r=bz, r=roc
- Verify that instant scroll-behavior is synchronous.
- Verify that smooth scroll-behavior is asynchronous.
- Verify that smooth scroll-behavior is triggered by CSSOM-View DOM methods.
- Verify that instant scroll-behavior interrupts smooth scroll-behavior
  animation.
- Verify that smooth scroll-behavior is not framerate dependant.
- Verify that smooth scroll-behavior physics simulations used by animations
  converge and allow the animation to reach completion.
- CSSOM-View scroll-behavior smooth scroll animations must produce the same
  results indendently of frame-rate:
  - Reference samples of scroll position for each frame are captured from a
    smooth scroll at 120fps for variations in X-Distance, Y-Distance.
  - Test samples are captured from an animation with the same parameters at
    varying framerates.
  - Variance in position at each sampled interval is compared to the 120fps
    reference.  To pass the test, the position of each test sample must match
    the reference position with a tolerance of one test sample frame's range
    of motion.  This range of motion is calculated by the position delta of
    the reference samples one test frame duration before and after.
  - The duration of the reference sample animation and the test sample
    animation must match within 1 frame to pass the test.
  - The simulation driving the animation must converge and stop on the
    destination position for the test to pass.

--HG--
extra : rebase_source : 194f6c9364e316ea21cf1e74ab6f7542ee94edb8
2014-07-25 14:20:45 -07:00
Kearwood (Kip) Gilbert
95a74cd0af Bug 1022818 - Part 2: Implement Smooth Scrolling. r=bz
- Updated ScrollTo method in nsGlobalWindow to accept a
  mozilla::dom::ScrollOptions parameter to select between the instant
  and smooth MSD motion.
- Updated WebIDL binding boilerplate scrolling functions in nsGlobalWindow
  to pass the correct value of mozilla::dom::ScrollBehavior to the
  implementation and functions, activating smooth scrolling.
- These functions will need to be updated again to support the scroll-behavior
  CSS property in Bug 1010538.

--HG--
extra : rebase_source : 7c9ce94d09fed5c4aea63442d683876c0a9a2e50
2014-08-05 15:01:34 -07:00
Ting-Yu Lin
47924236fd Bug 1057256 - Part 3 - Make touch caret handle events before selection carets. r=roc 2014-08-25 02:50:00 +02:00
Ting-Yu Lin
75ae3bce11 Bug 1057256 - Part 2 - Add null pointer check for touch and selection carets. r=roc
TouchCaret::IsDisplayable() contains more null pointer check. It covers
what's original there in TouchCaret::HandleEvent().
2014-08-25 02:50:00 +02:00
Ting-Yu Lin
9b08fc1098 Bug 1057256 - Part 1 - Remove NS_ENSURE_TRUE in SelectionCarets.cpp. r=roc
Remove NS_ENSURE_TRUE and NS_ENSURE_TRUE_VOID since they are deprecated,
and we do not need to print log in plain null pointer check.
2014-08-25 02:50:00 +02:00
Morris Tseng
88bb1d737c Bug 1056457 - Remove batch changes in selection carets. r=roc 2014-08-20 20:23:00 +02:00
Nicholas Nethercote
01cd8c173d Bug 1057928 (part 1) - In SpanningCellSorter, use |ops| instead of |entryCount| to indicate table liveness. r=dbaron.
--HG--
extra : rebase_source : 36efff6619b4ffe88ba4f4ddad58b3cddf805541
2014-08-25 00:32:17 -07:00
L. David Baron
e25fc03b3a Bug 839812 - Add clip-path style for fullscreen override, which was probably originally intended ("SVG masking, clipping, or filtering"). r=dholbert 2014-08-25 15:32:03 -07:00
L. David Baron
6eecf93b18 Bug 1055865 patch 5 - Use normal inline handling for setting the size of a non-floating nsFirstLetterFrame. r=jfkthame
This is the actual fix for the bug.  This changes the vertical sizing of
inline ::first-letter frames to work like inlines (and size based on
font metrics), so that the line-height calculation that happens later
will produces the same results as inlines would produce.

In the case we're concerned with of having a text frame child that's
0x0, this changes the inline ::first-letter from from being 0x0 to
having a height that is determined from the font metrics.
2014-08-25 15:32:03 -07:00
L. David Baron
e6d12bd74c Bug 1055865 patch 4 - Remove bits of code that nsLineLayout takes care of. r=jfkthame
There's no need for these calls to be done in the inline ::first-letter
codepath.

In particular, nsLineLayout::ReflowFrame (called a few lines above)
calls SetRect and DidReflow, while nsLineLayout::RelativePositionFrames
(which is called at the end of inline reflow) calls
FinishAndStoreOverflow.
2014-08-25 15:32:03 -07:00
L. David Baron
6c8d67e604 Bug 1055865 patch 3 - Fork a bit of code between the floating and non-floating branches in nsFirstLetterFrame::Reflow. r=jfkthame
This patch makes no changes other than duplicating the code previously
after the if/else on both branches of the if/else.

The next two patches in this series will completely rewrite the half in
the non-floating (i.e., inline) codepath (the else branch).
2014-08-25 15:32:03 -07:00
L. David Baron
91d39d48ee Bug 1055865 patch 2 - Use separate nsHTMLReflowMetrics for reflowing the child of the nsFirstLetterFrame. r=jfkthame
This changes this code to do things in the normal way, which is to use a
separate nsHTMLReflowMetrics for each Reflow, rather than (as this code
was) reusing the one for the nsFirstLetterFrame for its text frame
child.
2014-08-25 15:32:03 -07:00
L. David Baron
d40a109c7c Bug 1055865 patch 1 - Add reftest for sizing of empty ::first-letter. r=jfkthame
This test fails without the patch series because the border around the
test is too tall, but patch 5 reduces the height of the border in the
test so that it matches the reference.
2014-08-25 15:32:02 -07:00
Max Vujovic
756e37fc12 Bug 1057674 - Unget the token when parsing the filter property expects a function but doesn't find one. r=dbaron 2014-08-25 13:25:08 -07:00
Botond Ballo
6f99a3e02e Bug 1057528 - Allow multiplying/dividing CoordTyped by ScaleFactor. r=kats 2014-08-22 17:26:46 -04:00
Max Vujovic
b74c23210b Bug 948265 - Add CSS opacity filter to nsCSSFilterInstance. r=mstange 2014-08-25 12:23:22 -07:00
Max Vujovic
8b28d77d17 Bug 948265 - Add CSS contrast filter to nsCSSFilterInstance. r=mstange 2014-08-25 12:23:21 -07:00
Max Vujovic
ddf7ed9934 Bug 948265 - Add CSS brightness filter to nsCSSFilterInstance. r=mstange 2014-08-25 12:23:20 -07:00
Max Vujovic
1514ba6246 Bug 948265 - Add CSS invert filter to nsCSSFilterInstance. r=mstange 2014-08-25 12:23:19 -07:00
Birunthan Mohanathas
57751773f4 Bug 1045801 - Rename SafeCast to AssertedCast. r=Waldo 2014-08-25 12:17:32 -07:00
Edgar Chen
d8bfd6768c Bug 843452 - Part 4-5: MobileConnectionGonkService for gonk backend. r=hsinyi,khuey 2014-02-10 19:55:22 +08:00
Edgar Chen
28a972fe77 Bug 843452 - Part 3-3: MobileConnectionIPCService for content process. r=smaug 2014-07-01 18:37:32 +08:00
Ryan VanderMeulen
f1e20fb689 Merge inbound to m-c. a=merge
CLOSED TREE
2014-08-25 11:49:37 -04:00
Daniel Holbert
40fc4720b8 Bug 1055977 part 1: Use !important (and 'initial') in full-screen-override.css, to more thoroughly prevent ancestors of a fullscreen element from creating stacking contexts. r=dbaron 2014-08-24 22:11:15 -07:00
L. David Baron
a07671d470 Bug 1057129 patch 3 - Post restyles from CheckAnimationRule directly to pseudo-elements. r=birtles
This matches patch 2, and also fixes an incorrect use of eRestyle_Self
on the parents of pseudo-elements in order to restyle those
pseudo-elements, where it would not previously have been effective.

This should all be temporary, since this code can go away with bug
960465, when animation phases are removed.
2014-08-24 21:48:22 -07:00
L. David Baron
043753b487 Bug 1057129 patch 2 - Post all animation restyles directly to pseudo-elements. r=birtles
This (like patch 1) posts restyles directly to the pseudo-element
content nodes, which is a new thing as of this bug.  Previously we'd
have posted eRestyle_Subtree restyles to the pseudo element's real
element (i.e., the parent of the pseudo-element content node).

This changes the way we post animation restyles for ::before and ::after
pseudo-elements with animations on them.
2014-08-24 21:48:22 -07:00
L. David Baron
90771e983b Bug 1057129 patch 1 - Make AddStyleUpdatesTo handle pseudo-elements. r=birtles
This (like patch 2) posts restyles directly to the pseudo-element
content nodes, which is a new thing.

This isn't needed right now since AddStyleUpdatesTo is currently only
used when updating main-thread-suppressed animations running on the
compositor.  However, it will be needed once we depend on
AddStyleUpdatesTo for bug 960465.  And it will have an effect now since
AddStyleUpdatesTo actually adds all animations rather than only the ones
that are suppressed from running on the main thread.
2014-08-24 21:48:22 -07:00
L. David Baron
eac189105e Bug 1057098 - Rename ElementRestyler::Restyle{Before,After}Pseudo to MaybeReframeFor{Before,After}Pseudo. r=bzbarsky 2014-08-24 21:48:21 -07:00
Ed Lee
60db3da502 Bug 1042876 - Reftest bustage to correctly disable remote connections for reftests [r=froydnj]
--HG--
extra : rebase_source : f2065bf559560fbc852d7e57e6d18bc5bcf65b40
2014-08-22 18:05:09 -07:00
Wes Kocher
915d568b45 Merge m-c to fx-team a=merge 2014-08-22 17:10:53 -07:00
Wes Kocher
02017e20ed Merge inbound to m-c a=merge 2014-08-22 16:47:32 -07:00
C.J. Ku
d323a2976a Bug 974242 - Enable B2G zoom-out test cases. r=ahal
--HG--
extra : rebase_source : d41b6bf70cd6e1ecc636aff6a147b2e73f2d5c70
2014-08-18 10:52:00 -04:00
C.J. Ku
8d30ee9e6d Bug 974242 - Registry and handle FullZoomChange chrome event in TabChild. r=tn, r=kats
--HG--
extra : rebase_source : 05a700f9071d30b87916ffa949acfed776f21f0c
2014-08-21 19:37:00 -04:00
Max Vujovic
d6749d8bc7 Bug 948265 - Add CSS sepia filter to nsCSSFilterInstance. r=mstange 2014-08-21 10:17:12 -07:00
Max Vujovic
35f5af6249 Bug 948265 - Add CSS grayscale filter to nsCSSFilterInstance. r=mstange 2014-08-21 10:17:09 -07:00
Chenxia Liu
9a2772894c Bug 1021751 - Homebanner snippet. r=lucasr 2014-08-22 15:07:40 -07:00
David Zbarsky
10410114ac Bug 952977: Switch some uses of gfx3DMatrix in nsLayoutUtils to Matrix4x4 r=nical 2014-08-22 09:40:02 -04:00
Ed Morley
c52d58f374 Backed out changeset 3a61a6eb04d6 (bug 1055821) for build failures 2014-08-22 14:12:01 +01:00
Benoit Girard
29db28c887 Bug 1055821 - Add layer construction logging. r=mattwoodrow 2014-08-21 13:46:07 -04:00
Simon Montagu
f154063dd2 Bug 1054810: when block size is unconstrained and we aren't setting aDesiredSize.BSize to the computed block size, preserve the original value. r=jfkthame. 2014-08-22 00:04:41 -07:00
Brian Birtles
5dd17adb88 Bug 1045993 part 2 - Move the animation name from AnimationPlayer to Animation; r=dbaron
This patch stores the animation name on the Animation object rather than its
AnimationPlayer. This is because Animation objects don't have a reference to
their AnimationPlayer but their AnimationEffect needs access to the animation
name.

This patch also adds an accessor for AnimationPlayer to get the name from its
Animation (since players *do* have a reference to their source animation
content).
2014-08-22 13:42:48 +01:00
Robert O'Callahan
bd73a2178e Bug 1054161. Don't build display items for text with alpha=0. r=dbaron
--HG--
extra : rebase_source : 869a05a652a3bc6e8e122d34fb166ed9fbbdaa5c
2014-08-23 00:08:12 +12:00
Trevor Saunders
86b7aff8fc bug 1047696 - mark a number of classes MOZ_FINAL to get compilers to devirtualize more r=froydnj 2014-08-05 13:33:55 -04:00
Matt Woodrow
4d7eebfb5f Bug 1056427 - Stop PRenderFrame from managing PLayerTransaction since it hasn't worked since the layers refactoring. r=roc
--HG--
extra : rebase_source : 38c86648bb8e59a6b992bd377acb9aacb418c98b
2014-08-22 12:16:44 +12:00
Daniel Holbert
158afd70a1 Bug 1056864: In ParseGridLine, use Maybe<int32_t> instead of separate bool & integer. r=SimonSapin 2014-08-21 15:56:40 -07:00
Nathan Froyd
631962a036 Bug 1055281 - check for existence of paths in LOCAL_INCLUDES in moz.build; r=mshal 2014-08-20 11:51:33 -04:00
Markus Stange
ba92f94878 Bug 1011166 - Improve the workarounds cairo does when rendering large gradients with pixman. rubber-stamp=roc, pending r?jrmuizel 2014-08-21 13:57:55 +02:00
Olli Pettay
5218f131a5 Bug 1054773 - Fix crashes in nsProgressFrame.cpp r=wchen 2014-08-20 17:38:01 -07:00
Max Vujovic
99a125168d Bug 948265 - Add CSS saturate filter to nsCSSFilterInstance. r=mstange,dbaron 2014-08-20 17:52:28 -07:00
Seth Fowler
7c7839561b Bug 1024454 (Part 1) - Eagerly propagate dirty bits so absolute children of table parts get reflowed reliably. r=dbaron 2014-08-20 17:48:56 -07:00
Max Vujovic
7a521db165 Bug 948265 - Add CSS hue-rotate filter to nsCSSFilterInstance. r=mstange,dbaron 2014-08-20 15:46:59 -07:00
L. David Baron
1cc0c4a825 Bug 1048838 - Add mochitest for transitions and restyles. No review.
The third test fails without the patch, and passes with the patch.
2014-08-20 14:57:21 -07:00
Brian Birtles
bd8fd74043 Bug 1048838 - Properly invalidate the style rule in nsTransitionManager::StyleContextChanged. r=dbaron
This patch fixes a regression from
https://hg.mozilla.org/mozilla-central/rev/31695984cfe2 (bug 1025709). That
patch replaced the EnsureStyleRuleFor method on ElementTransitions and
ElementAnimations with a common method in CommonElementAnimationData.

ElementTransitions::EnsureStyleRuleFor would create a new style rule if
there was no style rule (mStyleRule == nullptr) or if the refresh time was
old (mStyleRuleRefreshTime != aRefreshTime).

ElementAnimations::EnsureStyleRuleFor, however, would create a new style rule
only if mStyleRuleRefreshTime was null or old since a null style rule may
still be valid for animations (unlike transitions). If we bail as soon as we
a null style rule we would never update mNeedsRefreshes when the animation
finishes.

The unified version of EnsureStyleRuleFor in CommonElementAnimationData
adopted the behavior from ElementAnimations checking for a null or old
mStyleRuleRefreshTime.

However, nsTransitionManager::StyleContextChanged sets mStyleRule to nullptr
to indicate that we need to generate a new style rule. This means that we
will fail to create a style rule for the transition in some cases.

This patch addresses this by making nsTransitionManager::StyleContextChanged
set mStyleRuleRefreshTime to a null timestamp. Setting mStyleRule to nullptr
is no longer necessary since EnsureStyleRuleFor will do this when necessary
and nsTransitionManager::mStyleRule is only used after calling
EnsureStyleRuleFor.
2014-08-12 16:57:21 +09:00
Ryan VanderMeulen
655d07d1e0 Merge m-c to inbound. a=merge
CLOSED TREE
2014-08-20 16:23:04 -04:00
Ryan VanderMeulen
9767936074 Merge inbound to m-c. a=merge 2014-08-20 16:14:23 -04:00
Daniel Holbert
e11216a620 Bug 1041951 followup: Fix broken comparison against NS_FONT_VARIANT_CAPS_SMALLCAPS, to use != instead of negation. r=dbaron 2014-08-20 11:07:26 -07:00
Ed Morley
ac5b975368 Merge mozilla-central and b2g-inbound 2014-08-20 15:19:45 +01:00
John Daggett
ac15ab77f4 Bug 975744 - unprefix font-feature-settings and font-language-override in tests. r=jfkthame 2014-08-20 16:54:37 +09:00
John Daggett
80c7dbced9 Bug 975744 - remove font features pref and enable features by default. r=dbaron 2014-08-20 16:54:35 +09:00
John Daggett
2e46cd0be1 Bug 1041951 - reftests for font-variant shorthand. r=jfkthame 2014-08-20 16:54:33 +09:00
John Daggett
35ca879eb7 Bug 1041951 - rework computed value of font-variant to support only 2.1 values. r=dbaron 2014-08-20 16:54:27 +09:00
John Daggett
784d03c63a Bug 1041951 - parse font-variant as a shorthand for font feature subproperties. r=dbaron 2014-08-20 16:54:25 +09:00
C.J. Ku
67a5b4b70f Bug 1055040 - Send mouse events base on canvas position and enable this test case on all B2G builds. r=ehsan 2014-08-19 19:38:00 -04:00
Matt Woodrow
ea72ac6615 Bug 1030124 - If the nsDisplayTransform frame isn't actually transformed (and not a reference frame), then apply the coordinate space change offset when we compute the transform for the preserve-3d
parent. r=roc
2014-08-20 17:43:26 +12:00
Ehsan Akhgari
38a6ed7fd0 Bug 1055519 - Fix some more bad implicit constructors in layout and widget; r=roc 2014-08-20 00:58:22 -04:00
Seth Fowler
2534cf2221 Bug 35168 - Backout 4 changesets (e15a7a0c8f70, 852b5ce53278, f36adee1958f, 479ff28f783f) for B2G bustage and reftest failures ON A CLOSED TREE
--HG--
extra : amend_source : 2be4ad526c51311c6f03b2681dd3961c1502c303
2014-08-19 20:37:14 -07:00
Seth Fowler
396315207a Bug 35168 (Part 3) - Add dynamic tests for table part relative positioning. r=dbaron 2014-08-19 18:24:59 -07:00
Seth Fowler
e750b9b5ad Bug 35168 (Part 3) - Add tests for table part relative positioning. r=dbaron 2014-08-19 18:24:58 -07:00
Seth Fowler
d7be6c6847 Bug 35168 (Part 2) - Allow relative positioning of internal table objects. r=dbaron 2014-08-19 18:24:58 -07:00
Seth Fowler
d28a953fd4 Bug 35168 (Part 1) - Add GetNormalRect to nsIFrame. r=dbaron 2014-08-19 18:24:57 -07:00
Ryan VanderMeulen
476e0aef44 Merge m-c to inbound. a=merge 2014-08-19 16:25:33 -04:00
Botond Ballo
1d16def11d Bug 923512 - Introduce strongly-typed coordinate classes. r=kats,Bas
--HG--
extra : rebase_source : 22e5fe577ea503aede765c70e16c0bf875c4a9fd
2014-08-19 13:08:16 -04:00
Ed Morley
de83ad501a Merge mozilla-central and b2g-inbound 2014-08-19 15:19:13 +01:00
Matt Woodrow
7c13ca416b Bug 781701 - Interpolate rotate3d rotation angles numerically when we can instead of using matrix decompositon. r=dbaron 2014-08-19 15:58:17 +12:00
Ehsan Akhgari
22b151eb6b Bug 1055286 - Flatten editor/libeditor/text to editor/libeditor; r=poiru
--HG--
rename : editor/libeditor/text/crashtests/403965-1.xhtml => editor/libeditor/crashtests/403965-1.xhtml
rename : editor/libeditor/text/crashtests/580151-1.xhtml => editor/libeditor/crashtests/580151-1.xhtml
rename : editor/libeditor/text/nsInternetCiter.cpp => editor/libeditor/nsInternetCiter.cpp
rename : editor/libeditor/text/nsInternetCiter.h => editor/libeditor/nsInternetCiter.h
rename : editor/libeditor/text/nsPlaintextDataTransfer.cpp => editor/libeditor/nsPlaintextDataTransfer.cpp
rename : editor/libeditor/text/nsPlaintextEditor.cpp => editor/libeditor/nsPlaintextEditor.cpp
rename : editor/libeditor/text/nsPlaintextEditor.h => editor/libeditor/nsPlaintextEditor.h
rename : editor/libeditor/text/nsTextEditRules.cpp => editor/libeditor/nsTextEditRules.cpp
rename : editor/libeditor/text/nsTextEditRules.h => editor/libeditor/nsTextEditRules.h
rename : editor/libeditor/text/nsTextEditRulesBidi.cpp => editor/libeditor/nsTextEditRulesBidi.cpp
rename : editor/libeditor/text/nsTextEditUtils.cpp => editor/libeditor/nsTextEditUtils.cpp
rename : editor/libeditor/text/nsTextEditUtils.h => editor/libeditor/nsTextEditUtils.h
rename : editor/libeditor/text/tests/test_bug1026397.html => editor/libeditor/tests/test_bug1026397.html
rename : editor/libeditor/text/tests/test_bug318065.html => editor/libeditor/tests/test_bug318065.html
rename : editor/libeditor/text/tests/test_bug471319.html => editor/libeditor/tests/test_bug471319.html
rename : editor/libeditor/text/tests/test_bug471722.html => editor/libeditor/tests/test_bug471722.html
rename : editor/libeditor/text/tests/test_bug483651.html => editor/libeditor/tests/test_bug483651.html
rename : editor/libeditor/text/tests/test_bug527935.html => editor/libeditor/tests/test_bug527935.html
rename : editor/libeditor/text/tests/test_bug569988.html => editor/libeditor/tests/test_bug569988.html
rename : editor/libeditor/text/tests/test_bug590554.html => editor/libeditor/tests/test_bug590554.html
rename : editor/libeditor/text/tests/test_bug596001.html => editor/libeditor/tests/test_bug596001.html
rename : editor/libeditor/text/tests/test_bug596333.html => editor/libeditor/tests/test_bug596333.html
rename : editor/libeditor/text/tests/test_bug596506.html => editor/libeditor/tests/test_bug596506.html
rename : editor/libeditor/text/tests/test_bug597331.html => editor/libeditor/tests/test_bug597331.html
rename : editor/libeditor/text/tests/test_bug600570.html => editor/libeditor/tests/test_bug600570.html
rename : editor/libeditor/text/tests/test_bug602130.html => editor/libeditor/tests/test_bug602130.html
rename : editor/libeditor/text/tests/test_bug603556.html => editor/libeditor/tests/test_bug603556.html
rename : editor/libeditor/text/tests/test_bug604532.html => editor/libeditor/tests/test_bug604532.html
rename : editor/libeditor/text/tests/test_bug625452.html => editor/libeditor/tests/test_bug625452.html
rename : editor/libeditor/text/tests/test_bug629172.html => editor/libeditor/tests/test_bug629172.html
rename : editor/libeditor/text/tests/test_bug636465.xul => editor/libeditor/tests/test_bug636465.xul
rename : editor/libeditor/text/tests/test_bug638596.html => editor/libeditor/tests/test_bug638596.html
rename : editor/libeditor/text/tests/test_bug641466.html => editor/libeditor/tests/test_bug641466.html
rename : editor/libeditor/text/tests/test_bug645914.html => editor/libeditor/tests/test_bug645914.html
rename : editor/libeditor/text/tests/test_bug681229.html => editor/libeditor/tests/test_bug681229.html
rename : editor/libeditor/text/tests/test_bug692520.html => editor/libeditor/tests/test_bug692520.html
rename : editor/libeditor/text/tests/test_bug740784.html => editor/libeditor/tests/test_bug740784.html
rename : editor/libeditor/text/tests/test_bug757771.html => editor/libeditor/tests/test_bug757771.html
rename : editor/libeditor/text/tests/test_bug830600.html => editor/libeditor/tests/test_bug830600.html
rename : editor/libeditor/text/tests/test_dom_input_event_on_texteditor.html => editor/libeditor/tests/test_dom_input_event_on_texteditor.html
rename : editor/libeditor/text/tests/test_texteditor_keyevent_handling.html => editor/libeditor/tests/test_texteditor_keyevent_handling.html
2014-08-18 20:59:37 -04:00
Daniel Holbert
5f28cdacf9 (no bug) Fix incorrect indentation in nsComputedDOMStyle::DoGetMixBlendMode. whitespace-only, DONTBUILD 2014-08-18 15:20:02 -07:00
Botond Ballo
aef24da2ed Bug 923512 - Transition the TransformTo<>() functions from gfx3DMatrix to Matrix4x4. r=kats
--HG--
extra : rebase_source : 3a82faa2e95b889cb19db5cc24e24d74e6498f08
2014-08-06 12:52:04 -04:00
Markus Stange
7030974fef Bug 1055585 - Add nsITheme::NeedToClearBackgroundBehindWidget and create nsDisplayClearBackground if the theme needs it for a widget. r=roc 2014-08-20 17:26:11 +02:00
Markus Stange
49e7e5c7bd Bug 1055585 - Call nsDisplayList::SetNeedsTransparentSurface when adding a display item that NeedToForceTransparentSurfaceForItem to a layer. r=roc 2014-08-20 17:25:19 +02:00
Markus Stange
0113ba6a30 Bug 1055585 - Make nsDisplayClearBackground force drawing into a transparent surface. r=roc 2014-08-20 17:24:39 +02:00
Markus Stange
000d7be674 Bug 1055585 - Add nsDisplayClearBackground. r=roc 2014-08-20 17:16:41 +02:00
Daniel Holbert
ed48874d45 Bug 1053035: Don't give <body> its own scroll frame, when it's styled as 'flex' or 'grid' and we've propagated its scrollability to the viewport. r=mats 2014-08-20 08:01:32 -07:00
Ting-Yu Lin
0fdbd536e5 Bug 1054889 - Update images for touch caret and selection carets. r=roc, f=mtseng, ui-r=chuang
Update images provided in bug 1024930, and make touch caret uses the
same images as selection carets.
2014-08-19 01:34:00 -04:00
Benoit Girard
dd68564fab Bug 1010584 - Part 1: Introduce RenderTargetPixel. r=mwoodrow 2014-07-30 14:36:15 -04:00
Birunthan Mohanathas
996e2e8c16 Bug 1053013 - Collapse test-only moz.build files under layout/ into ancestor moz.build files. r=glandium 2014-08-20 10:27:18 -07:00
Ting-Yu Lin
2c800401af Bug 1016184 - Part 3i: Fix test_reftests_with_caret.html on Mulet. r=ehsan
bug512295-1.html and bug512295-2.html are sending key events which hides
touch caret. Turn off the touch caret preference to fix test cases that
ought to be failed by definition of the touch caret behavior.
2014-08-18 00:02:00 -04:00
Ehsan Akhgari
81e509cdc8 Backed out changeset 0409c8faca80 because of build bustage on a CLOSED TREE 2014-08-18 13:44:59 -04:00
Ehsan Akhgari
03e222d7d9 Add SetProp to the list of windows.h #defined functions that we need to #undef, no bug 2014-08-18 13:19:16 -04:00
Aryeh Gregor
15ec3ba67b Bug 1053190 - Reduce unnecessary inclusion of nsINode.h in headers; r=ehsan 2014-08-18 17:44:50 +03:00
L. David Baron
917f60dc36 Bug 1054163 - Replace numbered reftest manifest file errors with more descriptive error messages. r=dholbert
--HG--
extra : transplant_source : %0C%F1%20%BEB%03%01%8E%FC%95%AC%24%11%EE%09W%5Bs%AC%93
2014-08-17 21:21:21 -07:00
Robert O'Callahan
d61cef56ec Bug 1048752. Part 39: Call SelectionLanguageChange even when bidi keyboard is not available, for consistency, and fix broken tests. r=jfkthame
--HG--
extra : rebase_source : c25d92fbc1d2237c35de80f0273dc00e81d0444d
2014-08-13 01:27:02 +12:00
Robert O'Callahan
4e7ef71b18 Bug 1048752. Part 37: GetGeometryForFrame should return a rect instead of an nsresult. r=tn
--HG--
extra : rebase_source : f49846cc50de2a3a616a991d81b38bf6c1d9a2c5
2014-08-06 17:19:32 +12:00
Robert O'Callahan
b9eb4b74d7 Bug 1048752. Part 36: Remove ancient horizontal rules. r=tn
--HG--
extra : rebase_source : 7537ad3060b7703565d2a259109fae96e238e0a4
2014-08-06 17:19:31 +12:00
Robert O'Callahan
9e3f9ec33b Bug 1048752. Part 35: Remove GetFrameSelection (unused). r=tn
--HG--
extra : rebase_source : 4b528b7de79bf3f1e03891cb093d16a111605c2c
2014-08-06 17:19:31 +12:00
Robert O'Callahan
3874da6a87 Bug 1048752. Part 34: Handle null selection returned by GetSelection(). r=tn
Previous changes broke this. Tests caught it.

--HG--
extra : rebase_source : 20f365b3f6074fe18d4aaa7f81baf64f3b64e8de
2014-08-06 17:19:31 +12:00
Robert O'Callahan
9bd73f017e Bug 1048752. Part 33: A zero blink rate should mean the caret is always on. r=tn
Previous changes broke this.

--HG--
extra : rebase_source : d0dc9bd22f93f40465b3448cf20050ac725ee560
2014-08-06 17:19:31 +12:00
Robert O'Callahan
87f76c825e Bug 1048752. Part 32: Rename DrawAtPosition to SetCaretPosition and don't make it turn off blinking. r=tn
There's no need for this method to turn off blinking anymore. Its only
caller already calls SetCaretReadOnly to achieve the same effect. That
means we don't actually need the mIsBlinking flag after all.

--HG--
extra : rebase_source : 9d4c31282ed280c0f822f1d9f7fa8ae1c2ba6cab
2014-08-06 17:19:31 +12:00
Robert O'Callahan
d23ebbff90 Bug 1048752. Part 31: nsCaret.h must be the first #include in nsCaret.cpp. r=tn
Also cleans up a couple of other ordering issues.

--HG--
extra : rebase_source : 3c5e3f4b56cf3d11b73e9d495fc6c2c8a8170e5f
2014-08-06 17:19:30 +12:00
Robert O'Callahan
31539d61d7 Bug 1048752. Part 30: Simplify caret blinking logic. r=tn
A few things got mashed together here:
-- Inline KillTimer/PrimeTimer into their callers.
-- Instead of having to call StopBlinking and StartBlinking together,
change StartBlinking to ResetBlinking and have it set up
the correct blink state and reset the blink cycle.
-- nsCaret::NotifySelectionChange needs a SchedulePaint
-- nsCaret::DrawAtPosition needs a ResetBlinking

--HG--
extra : rebase_source : abc7fd78c4f20b787b212e1e3f13226a1ccff16b
2014-08-06 17:19:30 +12:00
Robert O'Callahan
de0cd02d0a Bug 1048752. Part 29: mVisible is never true in nsCaret::Init. r=tn
--HG--
extra : rebase_source : 7fd2386e3f5ea667bc0ff4948182187d56647482
2014-08-06 17:19:30 +12:00
Robert O'Callahan
a8c6bcad57 Bug 1048752. Part 28: Remove unused fields and rename mLast* to mOverride*. r=tn
--HG--
extra : rebase_source : 71f40b16935dc57b2ea8674ebb28d93cfe85567d
2014-08-06 17:19:30 +12:00
Robert O'Callahan
343a7df89e Bug 1048752. Part 27: Remove obsolete caret state logic and just SchedulePaint as needed. r=tn
This is the core of the whole patch set.

Now GetPaintGeometry/PaintCaret figure out on their own almost all the state
they need every time we paint. So when caret flags change, all we need
to do is SchedulePaint. We don't need to fiddle with mDrawn and most of the
logic in DrawCaret is obsolete. (In fact, it was duplicated by GetGeometry
and friends, and we're removing that duplication.) EraseCaret, CheckCaretState
and UpdateCaretPosition are also obsolete.

We need to have GetPaintGeometry/PaintCaret choose the correct content node
and offset, either getting them from the Selection or using specific data set by
DrawAtPosition. This logic, plus a bit of other code shared between them, is
put into the helper GetFrameAndOffset.

--HG--
extra : rebase_source : e777605dd2507ae043e9f82d0a30e23aa06e0c12
2014-08-06 17:19:29 +12:00
Robert O'Callahan
40c7848353 Bug 1048752. Part 26: Move all "should draw caret" responsibility to GetPaintGeometry. r=tn
Instead of checking the mysterious mDrawn state (which is evil and will be
removed), let nsCaret::GetPaintGeometry take sole responsibilty for deciding
whether to draw. It takes the nsStyleUserInterface checks. It also needs to
check blink state, which is made possible by separating blink state into
the mIsBlinkOn flag.

--HG--
extra : rebase_source : 4a4796c37bc9ec7c25ffb2a320f9484cee1dc52f
2014-08-06 17:19:29 +12:00
Robert O'Callahan
d3a40df85c Bug 1048752. Part 25: Inline MustDrawCaret into IsVisible. r=tn
This also fixes what appears to be a bug. MustDrawCaret returned true
when mShowDuringSelection is set even if the caret would otherwise be
hidden due a popup showing. That doesn't make sense.

--HG--
extra : rebase_source : e05e0892a85448dbc6666e23a0dbc7fa21a9c61e
2014-08-06 17:19:29 +12:00
Robert O'Callahan
70c695fa57 Bug 1048752. Part 24: Rename and deCOM Set/GetCaretVisible. r=tn
--HG--
extra : rebase_source : 04249e9b22a62b8f2952515fa48f4ba3227e235e
2014-08-06 17:19:29 +12:00
Robert O'Callahan
acbc163fc1 Bug 1048752. Part 23: Remove aIgnoreDrawnState from MustDrawCaret. r=tn
--HG--
extra : rebase_source : 20e724ce09deec3987437838ac9f05e84ddbe2fd
2014-08-06 17:19:28 +12:00
Robert O'Callahan
b1e6bddb83 Bug 1048752. Part 22: Factor out SelectionLanguageChange call to run early in nsCaret::GetPaintGeometry. r=tn
This code is somewhat tricky. nsCaret::ComputeCaretRects was checking to see
if we have a bidi keyboard, and if so, what direction it's set to.
If the direction changed from the last direction seen for *this caret*,
we fired a SelectionLanguageChange notification on the caret's current
Selection. This looked bogus because the caret can be switched between
selections so it would seem some selections won't get a notification when
they should, but that's how it was. Also, when the SelectionLanguageChange
notification fired we then didn't draw the caret in that iteration, which
seems even more bogus.

This patch fixes all that by moving the logic to fire SelectionLanguageChange
out to GetPaintGeometry and firing the notification every single time without
trying to detect whether the state has changed or not. I carefully examined
the implementation of SelectionLanguageChange and I'm pretty sure it's
idempotent so this should be correct. That doesn't look like an
expensive function, and runs at most once per window paint, so I'm not
worried about perf. Because we now fire SelectionLanguageChange before
reading selection or frame state, it should be fine to carry on after
calling SelectionLanguageChange and drawing the caret based on whatever
changes SelectionLanguageChange has performed.

This also lets us remove mKeyboardRTL, which as noted above seems inherently
bogus.

--HG--
extra : rebase_source : 3ddfd10f6f30033e090e72b4bb43f2695218752e
2014-08-06 17:19:28 +12:00
Robert O'Callahan
ad25f90af2 Bug 1048752. Part 21: Instead of storing mCaretRect/mHookRect, recompute them whenever they're needed. r=tn
Also, moves the "If the offset falls outside of the frame" check from
PaintCaret to GetPaintGeometry so we do less work in that case.

UpdateCaretRects is no longer needed.

--HG--
extra : rebase_source : 4b2925952a34d0388ae44c642129ce9015c367ea
2014-08-06 17:19:28 +12:00
Robert O'Callahan
a3ebb7d120 Bug 1048752. Part 20: Inline GetCaretFrame into its callers. r=tn
This duplicates some code, but later patches will modify the callers and then
eventually we'll re-share common code.

--HG--
extra : rebase_source : 53f4756e87aadf22046972ef9102c190fbb35132
2014-08-06 17:19:28 +12:00
Robert O'Callahan
27a3fe0069 Bug 1048752. Part 19: Create nsCaret::GetPaintGeometry to call during painting. r=tn
This is the start of the changes to caret-drawing proper.

The idea is to combine GetCaretFrame and GetCaretRect into a method
GetPaintGeometry which looks like GetGeometry but returns values
needed for painting (i.e. including bidi decorations, and returning
a null frame if we're not supposed to paint due to specific caret
state, e.g. in the "off" phase of the blink cycle).

Mostly a straightforward refactoring but there are a few interesting changes:
-- nsDisplayCaret stores its bounds instead of getting them from nsCaret on
demand. Eventually those bounds will not be stored in nsCaret at all.
-- nsDisplayCaret::GetBounds returns true for aSnap. nsCaret draws snapped
rects, so why not.
-- I removed "if (caretRect.Intersects(aDirtyRect))" in EnterPresShell.
As far as I can tell, this check is incorrect because it doesn't take
transforms into account. Since there's at most one drawn caret per window,
hence we do this at most once per paint, I don't think there's any real
performance advantage to having this check.

--HG--
extra : rebase_source : c98d3a5994478b482d19cc2e2ac83ab51bd17e00
2014-08-06 17:19:28 +12:00
Robert O'Callahan
1b1473f94c Bug 1048752. Part 18: Add nsCaret::SchedulePaint. r=tn
We'll use this later.

--HG--
extra : rebase_source : e2d81ec006718d1c91b47978c16df0bffd42ff5b
2014-08-06 17:19:27 +12:00
Robert O'Callahan
9780343dd6 Bug 1048752. Part 17: Rename Get/SetCaretDOMSelection to Get/SetSelection. r=tn
The forward declaration of Selection in nsCaret.h will be used in later patches.

--HG--
extra : rebase_source : d1b749adac983c04d3365bb6bfb76a50101beeb5
2014-08-06 17:19:27 +12:00
Robert O'Callahan
ae6a16193a Bug 1048752. Part 16: Move nsFrameSelection::HINT to CaretAssociationHint.h. r=tn
This patch started an attempt to remove nsFrameSelection.h from nsCaret.h
and metastasized into a rather large refactoring patch that removed it
from some other header files as well, and changed nsFrameSelection::HINT
into a global-scope enum with better names. I also converted bools
into CaretAssociationHint in a few places where that was appropriate,
but there are still some more places (GetChildFrameContainingOffset)
where bools need to be converted. I figured this patch was big enough already.

--HG--
extra : rebase_source : cc618ef60e707e1360644340a2648de389383da0
2014-08-06 17:19:27 +12:00
Robert O'Callahan
b796347bb8 Bug 1048752. Part 15: Fix some comments. r=tn
--HG--
extra : rebase_source : c21e494622615b306e796afedf6c0a424d6f1046
2014-08-06 17:19:26 +12:00
Robert O'Callahan
922821fdc8 Bug 1048752. Part 14: Split GetGeometry into a static and a non-static version. r=tn
GetGeometry is used in two different ways. Sometimes it's used to get
information about a particular caret. Sometimes it's used to get
information about a particular selection that's not associated with
a caret. Splitting GetGeometry into a non-static version for the former
and a static version for the latter makes this more clear. Also it saves
code since for the latter version we don't have to get an nsCaret first.

--HG--
extra : rebase_source : b7730dac56b308a82b79b175749234c9a92b6f59
2014-08-06 17:19:26 +12:00
Robert O'Callahan
534e15cb7d Bug 1048752. Part 13: Remove GetGeometry's aBidiIndicatorSize. r=tn
Callers always pass null.

--HG--
extra : rebase_source : 169f9fe4f4236cffe2c0f760305ebf8093300c69
2014-08-06 17:19:26 +12:00
Robert O'Callahan
857db778d8 Bug 1048752. Part 12: Replace mBlinkRate with mIsBlinking. r=tn
We don't need to store the blink rate. Instead we can just fetch it whenever
we need it. However we do need a flag to handle the case where
nsCaret::DrawAtPosition disables blinking.

--HG--
extra : rebase_source : 4f36825a8e22edd3a2e37edb1fae5675c85adadd
2014-08-06 17:19:26 +12:00
Robert O'Callahan
52ce18f581 Bug 1048752. Part 11: Remove nsLayoutUtils.h from nsDisplayList.h. r=tn
--HG--
extra : rebase_source : 02251076442a5c4251e8d9484cb428a4c07f3a13
2014-08-06 17:19:25 +12:00
Robert O'Callahan
912c1e35de Bug 1048752. Part 10: Remove FrameLayerBuilder.h from nsDisplayList.h. r=tn
I was inspired by the previous patch to remove FrameLayerBuilder.h from
nsDisplayList.h too.

--HG--
extra : rebase_source : b34a01bea5865da4737817e2396b98d54cc6d1bf
2014-08-06 17:19:25 +12:00
Robert O'Callahan
7ea822125b Bug 1048752. Part 9: Remove nsCaret.h from nsDisplayList.h. r=tn
I got tired of slow build turnarounds every time I modified nsCaret.h.

--HG--
extra : rebase_source : 0c4598c4881ab8de0a636b08c70fb801bb912247
2014-08-06 17:19:25 +12:00
Robert O'Callahan
22a250e9db Bug 1048752. Part 8: Remove mCaretAspectRatio. r=tn
mCaretAspectRatio doesn't need to be stored. We can recompute it
whenever we need it.

--HG--
extra : rebase_source : 065a6996e920800edf5cbcc7f072f0439ef84553
2014-08-06 17:19:25 +12:00
Robert O'Callahan
9501a2c9ee Bug 1048752. Part 7: Remove mCaretWidthCSSPx. r=tn
mCaretWidthCSSPx doesn't need to be stored. We can just recompute it
whenever we need it.

--HG--
extra : rebase_source : 850b556651afade0da543e281e5fa54235969ab4
2014-08-06 17:19:25 +12:00
Robert O'Callahan
8932f6dda1 Bug 1048752. Part 6: Remove 'virtual' declarations. r=tn
These used to be needed for linking with non-libxul builds, but are no
longer needed. The obsolete comment is fixed in a later patch.

--HG--
extra : rebase_source : 034f69b647bd64d4353e51a15e166094b7b2e638
2014-08-06 17:19:24 +12:00
Robert O'Callahan
069d4c4180 Bug 1048752. Part 5: Reorder API declarations. r=tn
To make it more clear what's going on, make CaretBlinkCallback protected
and reorder the public methods to put the state-changing "API" methods first.

--HG--
extra : rebase_source : fddf0ea4b9269b2d431d0b75c40f99a9140138a1
2014-08-06 17:19:24 +12:00
Robert O'Callahan
8c19042ffb Bug 1048752. Part 4: Make EViewCoordinates (unused). r=tn
--HG--
extra : rebase_source : 571ba155fb5741fdd26d0391ef4a029a7383b34a
2014-08-06 17:19:24 +12:00
Robert O'Callahan
311f843a5a Bug 1048752. Part 3: Make GetCaretFrameForNodeOffset static. r=tn
GetCaretFrameForNodeOffset only uses the nsFrameSelection and mBidiUI
from its nsCaret. For mBidiUI we can just get the pref directly whenever
we need it. By modifying GetCaretFrameForNodeOffset to take nsFrameSelection
as a parameter, we can make it static to make it clear it isn't really
related to the state of the nsCaret.

This may also fix a bug in Selection::GetPrimaryFrameForFocusNode where
things would go unexpectedly wrong if mCaret is temporarily observing
a different selection to the Selection.

--HG--
extra : rebase_source : cdd59f6e20cd1060bc5d2325cb3adb5e5c4a1d2c
2014-08-06 17:19:24 +12:00
Robert O'Callahan
2aa74c872a Bug 1048752. Part 2: Remove InvalidateOutsideCaret and MaybeInvalidateCaretPosition. r=tn
I'm quite sure DLBI means we don't need these anymore.

--HG--
extra : rebase_source : 6cb6cd7c160a46688793c6ab1cdded333aecdd61
2014-08-06 17:19:23 +12:00