Commit Graph

12109 Commits

Author SHA1 Message Date
Markus Stange
32deb51be9 Bug 1026450 - Don't let clipped animated transforms trigger layerization of elements outside the clip. r=roc
--HG--
extra : rebase_source : 2e260272a4d6aa4271d4e3231d7da3dd224b838c
2014-06-25 10:36:13 +02:00
Gijs Kruitbosch
69b99988f1 Bug 1030115 - fix apz.printtree caching to use gfxPrefs. r=kats, bas 2014-06-25 16:12:32 +01:00
Mats Palmgren
3e13115cf3 Bug 1025669 - part 0, Add BaseMargin::ApplySkipSides, remove nsIFrame::Apply*SkipSides, and change call sites to use the former. r=roc 2014-06-24 17:52:19 +00:00
Mats Palmgren
f640b8d77d Bug 1025212 - Initialize 'last' to silence a static analyzer warning. r=dholbert 2014-06-24 17:52:18 +00:00
Brian Birtles
65c7f861cb Bug 1010067 part 1 - Rename nsStyleAnimation::Value to mozilla::StyleAnimationValue; r=dbaron
This patch also moves the static methods defined on nsStyleAnimation so that
they are part of StyleAnimationValue class.

Renaming nsStyleAnimation.h to StyleAnimationValue.h is performed in a separate
patch to simplify the diff (since some tools may not handle file renames
elegantly).
2014-06-24 15:29:54 +09:00
Ed Morley
2a6e6feea8 Backed out changeset 5f35e9f7ad4a (bug 1026450) for B2G reftest failures; CLOSED TREE
--HG--
extra : amend_source : f9a3650794b0844becd8ff0ab6b284d727e463b3
2014-06-25 17:13:20 +01:00
Jonathan Watt
74a5f2859e Bug 940625 - Discard the surfaces for SVG images that are in the ImageLib SurfaceCache when the app theme changes. r=seth 2014-06-25 13:04:36 +01:00
Markus Stange
6cebd31352 Bug 1026450 - Don't let clipped animated transforms trigger layerization of elements outside the clip. r=roc 2014-06-25 10:36:13 +02:00
Matt Woodrow
0f74b2d77a Bug 1028216 - Backout 660cc013d558 (bug 952721) for causing b2g animation regressions. 2014-06-24 12:12:52 +12:00
Benoit Jacob
e1b7dbca34 Bug 1028588 - Fix dangerous public destructors in layout/ - r=dbaron 2014-06-23 18:40:01 -04:00
Jonathan Watt
77c21d8bd6 Bug 1003505 - Fix printing of SVG images so that they're no longer pixelated. r=seth 2014-06-26 08:40:12 +01:00
Brian Birtles
a774eb935e Bug 1028511 - Don't let refresh driver time go backwards when changing timers; r=vlad
--HG--
extra : rebase_source : c01f7a7ba8c82282e5c00a81f7b2dc598bf2defa
2014-06-26 09:17:50 +09:00
Jonathan Watt
b73bc43c94 Bug 1016680, part 5 - Report the memory used by PresShell::mCaret. r=dbaron 2014-06-22 23:02:59 +01:00
Ms2ger
bad4ca4d29 Bug 1022855 - Rename nsCSSStyleSheet to mozilla::CSSStyleSheet; r=heycam
--HG--
rename : layout/style/nsCSSStyleSheet.cpp => layout/style/CSSStyleSheet.cpp
rename : layout/style/nsCSSStyleSheet.h => layout/style/CSSStyleSheet.h
2014-06-20 12:32:49 +02:00
Ms2ger
451c7edf83 Backout revision 308e51eae10c for build bustage.
--HG--
rename : layout/style/CSSStyleSheet.cpp => layout/style/nsCSSStyleSheet.cpp
rename : layout/style/CSSStyleSheet.h => layout/style/nsCSSStyleSheet.h
2014-06-20 13:00:08 +02:00
Ms2ger
9fb7f507f0 Bug 1022855 - Rename nsCSSStyleSheet to mozilla::CSSStyleSheet; r=heycam
--HG--
rename : layout/style/nsCSSStyleSheet.cpp => layout/style/CSSStyleSheet.cpp
rename : layout/style/nsCSSStyleSheet.h => layout/style/CSSStyleSheet.h
2014-06-20 12:32:49 +02:00
Jonathan Watt
ef224664db Bug 1027645 - Eliminate all nsRenderingContext::AppUnitsPerDevPixel() callers and all non-propagating nsRenderingContext::DeviceContext() callers. r=roc 2014-06-20 07:42:30 +01:00
Timothy Nikkel
fd868e10b6 Bug 977831. Store layer event regions on thebes layer data in appunits relative to the reference frame until we finalize the thebes layer and then convert to layer coordinates. r=roc
Event regions weren't in a workable state prior to this. They were already stored relative to the reference frame, but in layer pixels.

Inside inactive layer managers the scale is always 1 regardless of the scale on the containing thebes layer (which is the scale it will actually be drawn at), and so the event regions did not take into account scale in this situation.

Storing the regions in appunits relative to the reference frame means we can just transform to the new reference frame (if it is different) when passing event regions up and out of inactive layer managers. The proper scale will be applied when we apply the event regions to the layer.
2014-06-19 22:56:36 -05:00
Brian Birtles
06035eb4a8 Bug 1025709 part 13 - Simplify ComputeSuitableScaleForAnimation; r=heycam
Now that animations and transitions are largely treated alike, we can remove
some redundant code in the processing of transform animations in
ComputeSuitableScaleForAnimation.
2014-06-20 12:39:26 +09:00
Brian Birtles
5c1ec8e2f7 Bug 1025709 part 12 - Remove ElementTransitions; r=heycam
This patch replaces all references to ElementTransitions (now that it is empty)
with references to the base class, CommonElementAnimationData. It also takes the
opportunity to tidy up some of the call sites in nsLayoutUtils since they no
longer need to differentiate between animations and transitions.
2014-06-20 12:39:26 +09:00
Brian Birtles
a722f517b1 Bug 1025709 part 9 - Move heavy lifting of GetAnimationsForCompositor from ElementAnimations/ElementTransitions to base class; r=heycam
This patch still leaves ElementAnimations|
ElementTransitions::GetAnimationsForCompositor as shortcuts
for the method now defined on CommonElementAnimationData.
2014-06-20 12:39:25 +09:00
Brian Birtles
f4c56d0897 Bug 1025709 part 7 - Move HasAnimationOfProperty from ElementAnimations/ElementTransitions to base class; r=heycam
This patch moves HasAnimationOfProperty to CommonElementAnimationData. It also
takes the chance to start removing some redundancy from nsLayoutUtils
/ ActiveLayerTracker. Some of this should never have been added in the first
place and some could have been removed earlier on but while we're fixing up
HasAnimationOfProperty it seems like an appropriate time to fix up its call
sites too.

Also, since HasAnimationOrTransition actually returns an object, not a bool, we
this patch renames it to GetAnimationsOrTransitions.
2014-06-20 12:39:25 +09:00
Brian Birtles
5c00d7239f Bug 1025709 part 2 - Add IsFinished() to ElementAnimation; r=heycam
One of the main differences in handling a list of transitions vs a list of
regular animations is that when we are dealing with a list of transitions we
need to check for transitions that have finished and are about to be discarded
but need to be retained temporarily to provide correct triggering of subsequent
transitions. Such transitions are marked as "removed sentinels" and are ignored
for most operations.

This patch moves the methods for setting and checking such transitions to the
base class ElementAnimation so that we can treat animations and transitions
alike without having to downcast or do obscure checks for mStartTime.IsNull()
(which equates to checking if the animation is a "removed sentinel" but is not
particularly clear).

In the process, this patch renames said methods to Is/SetFinishedTransition
since hopefully that is a little easier to understand at a glance.
2014-06-20 12:39:24 +09:00
Brian Birtles
5bb2caab0a Bug 1025709 part 1 - Move mDelay to AnimationTiming; r=heycam
This patch is the first part in preparing the way to merge ElementTransitions
with CommonElementAnimationData (which we'll eventually rename to something
nicer).

Here we move mTiming from CommonElementAnimationData to the AnimationTiming
struct. While this is not strictly necessary in order to do the later
refactoring it makes it simpler since it:

- Divides time calculation into calculation based on dynamic play state (the
  responsibility of animation players in Web Animations terms) and static
  author-specified timing parameters (a property of animations in Web Animations
  terms).
- In future we will probably put animations on the compositor during their
  delay phase so we will want the delay to be present in the AnimationTiming
  struct then.
- Makes AnimationTiming line up with the dictionary of the same name in Web
  Animations.
2014-06-20 12:39:23 +09:00
Kyle Huey
b1e3198eed Bug 737976: Remove nsINodeInfo. r=smaug
--HG--
rename : content/base/src/nsNodeInfo.cpp => dom/base/NodeInfo.cpp
rename : content/base/public/nsINodeInfo.h => dom/base/NodeInfo.h
rename : content/base/src/nsNodeInfo.h => dom/base/NodeInfoInlines.h
2014-06-19 19:01:40 -07:00
Benoit Girard
19effe56b7 Bug 1027496 - Stream display list and layers dump. r=mattwoodrow 2014-06-19 18:36:25 -04:00
Benjamin Chen
303b54cc27 Bug 969372: part1: Change the prototype of FreezableElementEnumerator in nsIDocument from nsIContent to nsISupports, and rename it to ActivityObservers. r=roc 2014-06-19 10:09:35 +08:00
Jonathan Watt
6586dcffb2 Bug 1027763, part 2 - Make non-Moz2D callers of DrawTarget::GetType() call DrawTarget::GetBackendType() instead. r=Bas 2014-06-19 21:35:33 +01:00
Benoit Girard
bab551040d backout d4bf4c76854e for causing mochitest-other failures 2014-06-19 00:35:54 -04:00
Birunthan Mohanathas
bc0233fe47 Bug 1026535 - Fix mismatched class/struct tags. r=ehsan 2014-06-18 17:57:51 -07:00
Benoit Girard
502934023e Bug 1027380 - Don't paint flash for inactive layer manager. r=mattwoodrow
--HG--
extra : rebase_source : 29238270960b22c3391c59e68d3cced748984650
2014-06-18 21:22:54 -04:00
Benoit Girard
fd2dfb49c6 Bug 1027433 - Reported throttled transaction to the profiler. r=mattwoodrow
--HG--
extra : rebase_source : 348571e878f4068247f8adfda284233b61b610b0
2014-06-18 21:21:39 -04:00
Benoit Jacob
15b208d7f3 Bug 1027251 - Fix or whitelist dangerous public destructors in layout/ - r=dbaron 2014-06-18 22:28:59 -04:00
Nicholas Nethercote
aaf6fb2124 Bug 1010064 - Allow memory reports to be anonymized. r=bsmedberg.
--HG--
extra : rebase_source : 5eb756b17a97e751deb0f47e909fdb35533cb23b
2014-05-20 23:06:54 -07:00
L. David Baron
cc63c0810a Bug 1026768 - Pass the restyle hint through from ProcessOneRestyle to ComputeStyleChangeFor rather than converting it to a boolean and back. r=heycam
This was originally bug 996796 patch 6, but it's also needed bug 931668,
so I'm moving it into its own bug.
2014-06-18 17:07:26 -07:00
L. David Baron
a13b5c1919 Bug 996798 - Add a typedef to make it easier to change the size of nsWrapperCache/nsINode flags. r=bzbarsky 2014-06-18 17:07:26 -07:00
Susanna Bowen
58e46a1570 Bug 727125 - Update overflow areas for text frames on text-decoration change to ensure text-decoration on hover is visible. r=dbaron 2014-06-17 10:32:00 -04:00
Jonathan Watt
2586dd3cb2 Bug 1025553, part 1 - Change the names of the members of gfxMatrix to match the names of the members of Moz2D's Matrix. r=Bas 2014-06-17 18:35:51 +01:00
Ehsan Akhgari
28c14d47a0 Fix the places where we forward declare already_AddRefed as a struct, no bug, r=I'm-sick-and-tired-of-MSVC-stupidity 2014-06-17 10:57:23 -04:00
Simon Montagu
aaa4878ee5 Replace GetBaseline with GetLogicalBaseline and use logical coordinates in the line position and baseline getters in nsLayoutUtils. Bug 789096, r=jfkthame 2014-06-17 05:19:38 -07:00
Susanna Bowen
64b0116f8b Bug 1025308 - Rename the variables associated with skipping style fixups for children element's based on parent display value. r=mats 2014-06-16 09:55:00 -04:00
Benoit Girard
99cc55b9f2 Bug 1024148 - Part 2: Merge nsDisplayOpacity into nsDisplayBackgroundColor. r=mattwoodrow
--HG--
extra : rebase_source : c48cc799414ff83b74caff8df5503a743dbf74b1
2014-06-14 11:10:45 -04:00
Benoit Girard
57bf9f52dd Bug 1024148 - Part 1: Merge nsDisplayOpacity items together. r=mattwoodrow
--HG--
extra : rebase_source : f461cb97357c854db22122b40777358a17f736ec
2014-06-12 11:34:35 -04:00
Wes Kocher
abf9a45351 Backed out 2 changesets (bug 727125) for reftest bustage on an otherwise CLOSED TREE
Backed out changeset 443361e2724a (bug 727125)
Backed out changeset 16c8d78df86e (bug 727125)
2014-06-16 13:34:50 -07:00
Susanna Bowen
dc169c8b48 Bug 727125 - Update overflow areas for text frames on text-decoration change to ensure text-decoration on hover is visible. r=dbaron 2014-06-16 11:58:29 -07:00
Neil Deakin
5504409f46 Bug 994117, add method to check if an element has current animations, r=bbirtles 2014-06-16 14:43:04 -04:00
Ting-Yu Lin
ced704867a Bug 1024848 - part 2 - Enable selection carets sanity tests on Windows browser. r=mdas 2014-06-13 02:34:00 +02:00
Ting-Yu Lin
f6ddf353cd Bug 1024848 - part 1 - Improve selection carets test cases. r=mdas
On Windows, when selecting a word by long pressing, extra spaces after
the word will also be selected. To solve this problem, I redesign the
test cases by comparing the target content with the selected content
directly while ignoring spaces at certain test cases. I believe it's
easier to understand and less error-prone than the old
replace-selected-content-and-compare way.

I added a new method SelectionManager.selected_content() to make it
easier to get the current selected text.
2014-06-13 02:33:00 +02:00
Xidorn Quan
603c17d06a Bug 982355 - Support disclosure-{open,closed} counter styles. r=jfkthame 2014-06-13 17:34:00 +02:00
Mats Palmgren
da55af8807 Bug 427928 - part 2, Add NS_THEME_FOCUS_OUTLINE to support drawing a native themed focus outline. r=roc 2014-06-14 12:48:07 +00:00
Mats Palmgren
e5d483a47c Bug 427928 - part 1, Treat outline:auto as outline:solid. r=roc 2014-06-14 12:48:07 +00:00
Chris Lord
ffcda6a27d Bug 1006084 - Allow ThebesLayers to be recreated when the creation hint changes. r=mattwoodrow 2014-06-13 17:11:08 +01:00
Benoit Girard
2ba3accee9 Bug 1024742 - show will-change on the display list dump. r=mattwoodrow 2014-06-13 11:32:15 -04:00
Ting-Yu Lin
0e464a2122 Bug 1020261 - Part 2: Enable touch caret sanity test on B2G. r=mdas 2014-06-12 23:02:00 -04:00
Ting-Yu Lin
a1ed7482f0 Bug 1020261 - Part 1: Fix touch event handling for touch caret. r=roc
For touch events generated by marionette, the touch id is not started
from 0. Therefore, instead of getting the event position of touch id 0
directly in HandleTouchDownEvent(), we should loop over all the touch
ids to get their positions.
2014-06-12 22:58:00 -04:00
Ryan VanderMeulen
0645a74aa3 Merge m-c to inbound on a CLOSED TREE. a=merge 2014-06-12 17:32:33 -04:00
Ryan VanderMeulen
0128970fd2 Bug 1019441 - Skip test_selectioncarats on Windows. a=permafail 2014-06-12 16:05:58 -04:00
Ting-Yu Lin
dd76b7d29d Bug 1019441 - Part 2: Add marionette test cases for selection carets. r=roc, r=mdas
Add marionette test cases for selection carets feature in bug 987718.
Test cases target <input>, <textarea>, editable and non-editable
elements.

Run tests on browser manually:
./mach marionette-test layout/base/tests/marionette/test_seletioncarets.py

Run tests on b2g emulator manually:
./mach marionette-webapi layout/base/tests/marionette/test_seletioncarets.py
2014-06-11 06:28:00 -04:00
Ting-Yu Lin
74116ed31d Bug 1019441 - Part 1: Add SelectionManager in marionette. r=mdas
* Extract those caret manipulating functions in test_touchcaret.py to
  selection.py, and generalize them for manipulating selection.
* Use SelectionManager in test_touchcaret.py.
* Remove unneeded </input> from test_touchcaret.html.
2014-06-11 03:02:00 -04:00
Jonathan Watt
c31782ccae Bug 1016680, part 4 - Explicitly initialize members in nsFrameManagerBase's ctor rather than using memset. r=bz 2014-06-12 20:25:33 +01:00
Ryan VanderMeulen
6acfa3e394 Merge m-c to inbound on a CLOSED TREE. 2014-06-12 14:56:35 -04:00
Ryan VanderMeulen
6ad0691f7e Backed out changesets d0ee7053aaf3 and c83f17cd74be (bug 727125) for B2G reftest failures.
CLOSED TREE
2014-06-12 14:45:40 -04:00
Daniel Holbert
901461ddb7 Bug 1024084: Clean up forward declarations and #includes in nsFrameManager.h and nsFrameManagerBase.h. r=jwatt 2014-06-12 10:09:31 -07:00
Susanna Bowen
bfe9ba9d94 Bug 727125 - Update overflow areas for text frames on text-decoration change to ensure text-decoration on hover is visible. r=dbaron 2014-06-09 15:00:00 -04:00
Xidorn Quan
a711bc7355 Bug 966166 - Part 4: Rewrite some builtin counter styles. r=dbaron 2014-06-11 21:12:00 -04:00
Xidorn Quan
c011970f03 Bug 966166 - Part 3: Link to other parts. r=dbaron 2014-06-11 21:12:00 -04:00
Xidorn Quan
4831f428cc Bug 966166 - Part 2: Computation of counter style. r=dbaron 2014-06-11 21:11:00 -04:00
Wes Kocher
b9d1bf909f Merge m-c to inbound 2014-06-11 18:38:53 -07:00
Ed Morley
63eff9d511 Merge mozilla-central and b2g-inbound 2014-06-11 18:06:52 +01:00
Daniel Holbert
a8e9a7e70c backout 703d26e9d979 (Bug 1024084) for Android bustage, on a CLOSED TREE 2014-06-11 16:10:29 -07:00
Jonathan Watt
0f23c6cd87 Bug 1024138 - Remove the GetPresShell() and GetPresContext() methods from nsFrameManager. r=dholbert 2014-06-11 23:38:17 +01:00
Daniel Holbert
d4dc8d8c50 Bug 1024084: Use forward declarations instead of #includes for nsIFrame & nsContent in nsFrameManager.h. r=jwatt 2014-06-11 15:35:17 -07:00
Jonathan Watt
730ae601c6 Bug 1016680, part 3 - DeCOMify nsGenConNode::mText. r=dholbert 2014-06-11 23:11:15 +01:00
Ting-Yu Lin
583c467b2f Bug 960897 - Add marionette test cases for touch caret. r=roc, r=mdas
Add marionette test cases for touch caret feature in bug 924692. Test
cases cover <input>, <textarea>, and contenteditable elements with
touch caret enabled and disabled.

Enlarge touch caret expiration time to 60 seconds to avoid intermittent
test failures in test cases which need to move touch caret.

Thanks Phoebe Chang <natsuki011077@gmail.com> for the WIP patch.
Thanks C.J. Ku <cku@mozilla.com> for various suggestions.

Run tests on browser manually:
./mach marionette-test layout/base/tests/marionette/test_touchcaret.py
2014-06-11 02:48:00 -04:00
Jonathan Watt
d66709e471 Bug 1016680, part 2 - Report the memory used by PresShell::mVisibleImages and PresShell::mFramesToDirty. r=dholbert
--HG--
extra : rebase_source : 0d348e97861917c67862271c4c4ee9f51b007255
2014-06-11 11:20:52 +01:00
Simon Montagu
961881d5da Mark line after a preformatted newline as dirty during bidi resolution. Bug 1015128, r=mats 2014-06-11 08:57:25 -07:00
Simon Montagu
90cb8f2dd9 Back out wallpaper patch from bug 1007067 in favour of real fix from bug 1015128, r=mats 2014-06-11 08:57:24 -07:00
Wes Kocher
934871f3a2 Merge m-c to inbound 2014-06-10 18:55:47 -07:00
Geoff Brown
d0860ecabe Bug 982915 - Use different expected assertion range for layout/base/crashtests/898913.html on Android; r=dholbert 2014-06-10 19:10:10 -06:00
Botond Ballo
14c54cd3c3 Bug 1022381 - Enforce that strongly-typed geometric classes are used with a proper coordinate system tag type. r=kats 2014-06-10 12:43:52 -04:00
Markus Stange
86d79d99f5 Bug 1021420 - Ensure that scrollable layers get a view ID created for them. r=tnikkel 2014-06-10 22:29:32 +02:00
Cameron McCormack
9a75e854c1 Bug 1017798 - Part 1: Make AncestorFilter and the TreeMatchContext style scope list include ancestors from following ShadowRoots up to the light tree. r=bzbarsky 2014-06-06 15:22:55 +10:00
Kartikaya Gupta
0d3a73d431 Bug 1018387 - Update various variables and comments to reflect the fact that the values are in layer pixels and not layout device pixels. r=Cwiiis 2014-06-09 14:02:39 -04:00
Ryan VanderMeulen
1a316f5d4f Merge inbound to m-c. a=merge 2014-06-08 22:10:12 -04:00
Ting-Yu Lin
129535f3e3 Bug 960897 - Add marionette test cases for touch caret. r=roc, r=mdas
Add marionette test cases for touch caret feature in bug 924692. Test
cases cover <input>, <textarea>, and contenteditable elements with
touch caret enabled and disabled.

Thanks Phoebe Chang <natsuki011077@gmail.com> for the WIP patch.
Thanks C.J. Ku <cku@mozilla.com> for various suggestions.

Run tests on browser manually:
./mach marionette-test layout/base/tests/marionette/test_touchcaret.py
2014-06-07 08:49:00 -04:00
Botond Ballo
727b1998f8 Bug 1014280 - Add a background color attribute to scrollable ContainerLayers. r=tn,BenWa
--HG--
extra : source : dff750e410e5f4e1ed019527ea17f37e53dd8fe6
2014-06-06 16:50:20 -04:00
Wes Kocher
42ab217b5b Merge inbound to m-c a=merge 2014-06-11 18:46:34 -07:00
Wes Kocher
709cdab11c Merge inbound to m-c a=merge 2014-06-11 18:23:43 -07:00
William Chen
00bef8c70a Bug 992521 - Part 5: Bind native anonymous content to null document when node is contained by a ShadowRoot. r=smaug 2014-06-07 01:42:55 -07:00
William Chen
d5a9346ba8 Bug 992521 - Part 4: Make PresShell events work when not in document, but contained by a ShadowRoot with a host in document. r=smaug 2014-06-07 01:42:54 -07:00
William Chen
416f36b0de Bug 992521 - Part 2: Make styles work when not in document, but contained by a ShadowRoot with a host in document. r=smaug 2014-06-07 01:42:54 -07:00
William Chen
603c74dbeb Bug 992521 - Part 1: Remove "in document" flag on ShadowRoot and its descendants. r=smaug 2014-06-07 01:42:53 -07:00
Timothy Nikkel
2d4f5b7712 Bug 1002992. Part 6. Rename ExpandRect to ExpandToNearlyVisibleRect. r=addressingreviewcomment 2014-06-06 21:23:22 -05:00
Timothy Nikkel
91256bfbc7 Bug 1002992. Part 5. Use a custom frame tree walker to find visible and almost visible images instead of using the heavier weight display list infrastructure. r=mats
This is about 3 or 4 times faster.
2014-06-06 21:23:21 -05:00
Timothy Nikkel
d36dde1982 Bug 1002992. Part 3. Don't build the caret when building a display list for image visibility. r=mats
It's not needed and complicates things.
2014-06-06 21:23:21 -05:00
Timothy Nikkel
ad28cfc802 Bug 1002992. Part 2. Handle display ports and ignore viewport scrolling for image visibility display lists the same way we do for painting display lists. r=mats 2014-06-06 21:23:20 -05:00
Markus Stange
1e0903dbed Bug 944938 - Pass scroll events to the APZC tree manager on the async event thread. r=smichaud 2014-06-07 00:49:59 +02:00
Ryan VanderMeulen
7f662cd774 Merge inbound to m-c. a=merge 2014-06-06 17:18:45 -04:00
Ed Morley
d791ee02f0 Merge mozilla-central and b2g-inbound 2014-06-06 19:12:21 +01:00
Ed Morley
28d36524ec Backed out changeset e982377e39a3 (bug 960897) since the new test_touchcaret.py intermittently fails 2014-06-06 18:14:43 +01:00