wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
91,189 Commits 1 Branch 166 Tags 1.2 GiB
a900917304
Commit Graph

12680 Commits

Author SHA1 Message Date
Ali Juma
cc0282e9e5 Bug 732091 - Part 2: Add {set,get}IsFirstPaint to nsIDOMWindowUtils and nsIPresShell. r=ehsan 2012-03-12 11:50:11 -04:00
Kartikaya Gupta
137c73d9f6 Merge m-c to maple 2012-03-12 10:41:42 -04:00
Daniel Holbert
aaff4a9f4a Backout f667f6c22bed (Bug 732988) for linux Cipc orange 2012-03-11 16:41:39 -07:00
Daniel Holbert
04b172bf20 merge m-c tip over to m-i 2012-03-11 15:40:05 -07:00
Bas Schouten
e99a373cb6 Bug 732988 - Part 2: Use ScaleToSize API for plugin drawing. r=roc 2012-03-11 22:33:23 +00:00
Avi Halachmi
3c59129fb9 Bug 206438 - Smooth scrolling should use the 'smoothwheel' algorithm. r=roc ui-r=limi 2012-03-11 13:55:00 -07:00
Bas Schouten
49606a96fc Bug 732988 - Part 2: Use ScaleToSize API for plugin drawing. r=roc 2012-03-13 01:41:34 +00:00
Jonathan Watt
726cd3bb85 Bug 734732 - Rename nsISVGChildFrame::SUPPRESS_INVALIDATION so it's not misleading. r=longsonr. 
--HG--
extra : rebase_source : e12bd28657acceec99b7dc723149a72be1b9b75f
 2012-03-11 15:53:36 +00:00
Ms2ger
477d52d719 No bug - Declare uri variable in StartTests() in reftest.js to fix a strict JS warning; r=themaid 2012-03-11 09:48:25 +01:00
Mats Palmgren
23f14c3023 Bug 730769 - Make nsLineBox use a frame hash table for lines with many frames. part=2/2 r=bz 2012-03-11 03:32:27 +01:00
Mats Palmgren
86aed91a8e Bug 730769 - Add NewLineBox/FreeLineBox methods to nsBlockFrame. part=1/2 r=bz 2012-03-11 03:32:27 +01:00
Mats Palmgren
38a55345e3 Bug 732941 - Deal with OOM when copying nsCOMArray. r=bz 2012-03-11 03:32:27 +01:00
Kartikaya Gupta
43952711c3 Merge m-c -> maple to pick up b159cd73c215 2012-03-10 11:21:26 -05:00
Benoit Girard
5950b72a1a Merge mc->maple 2012-03-09 18:16:26 -05:00
Benoit Girard
83961041e7 Merge mc->Maple 2012-03-09 11:13:30 -05:00
John Daggett
23e024f6f4 Bug 734313. Disabling reftests failing on OSX 10.5 2012-03-09 14:02:11 +09:00
Jacob Holzinger
acfe99c129 Bug 696242 - Convert NS_RegisterStaticAtoms and nsCSSScanner::ReportUnexpectedParams to take an array-reference rather than a pointer and length, making it impossible to pass a pointer/length that are inconsistent. r=jwalden 
--HG--
extra : rebase_source : 882b5b4d500b1fa242c0a3cfa3084e4171cbaa9d
 2012-03-08 18:22:57 -08:00
Benoit Girard
6d13bb7ab3 Merge mc->Maple 2012-03-08 10:22:42 -05:00
Rob Campbell
b13d39e0b9 merge fx-team to m-c 2012-03-08 10:30:11 -04:00
Mats Palmgren
6fca6aec5e Bug 728906 - Make nsIFrame::GetChildList return const nsFrameList&. r=bz 2012-03-08 02:57:37 +01:00
Mats Palmgren
dd7336d82b Bug 728913 - Remove the nsMenuFrame::mPopupFrame member and store it in a nsFrameList* frame property instead (as needed). r=bz 2012-03-08 02:57:37 +01:00
Mats Palmgren
d2745bc51c Bug 728911 - Remove the nsBlockFrame::mBullet member and store it in a frame property instead (as needed). For an outside bullet, store it as a nsFrameList* to support GetChildList(kBulletList). part 2/2 r=bz 2012-03-08 02:57:37 +01:00
Mats Palmgren
6b007e5ce3 Bug 728911 - Add a HasPushedFloat() method and move the PushedFloatProperty declaration to the .cpp file. part 1/2 r=bz 2012-03-08 02:57:37 +01:00
Mats Palmgren
59caec5782 Bug 728908 - Make nsLineBox::LastChild() DEBUG-only, since it's not used anymore to find the last frame of a line. part 2/2 r=bz 2012-03-08 02:57:37 +01:00
Mats Palmgren
66e9a4a3fe Bug 728908 - Make the Overflow lines property have both a nsLineList and a nsFrameList for fast access to the last frame, eliminate SetNextSibling calls, and to support GetChildList(kOverflowList). part 1/2 r=bz 2012-03-08 02:57:37 +01:00
Benoit Girard
479f0b2fb1 Merge mc->Maple 2012-03-07 11:10:45 -05:00
Benoit Girard
b17cdc6f76 Merge mc->Maple 2012-03-05 19:32:21 -05:00
Benoit Girard
d3dd25a616 Merge latest green changeset from mozilla-central to maple 
--HG--
rename : dom/base/nsDOMMemoryReporter.cpp => dom/base/nsWindowMemoryReporter.cpp
rename : dom/base/nsDOMMemoryReporter.h => dom/base/nsWindowMemoryReporter.h
 2012-03-05 13:41:15 -05:00
Benoit Girard
6345ad9c43 Restore merge changeset 39a3044823b0, regression fixed upstream in mc 2012-03-05 13:09:05 -05:00
Matt Brubeck
465b97cf40 Merge mozilla-central to mozilla-inbound 2012-03-08 16:27:40 -08:00
Jonathan Watt
cd715e1ba0 Bug 734218 - nsChangeHint_RepaintFrame should only invalidate the bounds of SVG frames, not update them. r=dholbert. 2012-03-09 08:55:28 +00:00
Benoit Girard
02e577f6ff Backed out changeset 39a3044823b0 because of bad interaction with maple. 2012-03-02 18:32:46 -05:00
Benoit Girard
72da51e037 Merge mc->Maple, resolved conflicts 2012-03-02 14:27:05 -05:00
Ehsan Akhgari
ff798fef5e Test case for bug 667512; r=smontagu 2012-03-07 17:43:51 -05:00
Josh Aas
9dbad6aafb Bug 723523: Plugin crash fix, nsPluginInstanceOwner::CreateWidget. r=jmathies 2012-03-07 11:48:30 -05:00
Timothy Nikkel
ff961d36b5 Bug 664707. Special case converting event coordinates when the frame is the root frame in the widget. r=matspal 
This has the side benefit of making events work in transformed select dropdown popups and is the real reason for making the change.
 2012-03-03 15:24:13 -06:00
Benoit Girard
3daa99ec38 Merge mc->maple 2012-03-01 10:44:44 -05:00
Chris Lord
24e85a9d10 Bug 729534 - Semi-fix scroll layer retention. r=mats 
When flattening the display list, the last child frame in a scroll layer is
used to retain the associated ThebesLayer. Instead, use the first child, which
tends to be more stable. This fixes retaining layers when scrolling through
engadget.com.

Fix by Robert O'Callahan <robert@ocallahan.org>
 2012-02-29 17:01:50 +00:00
Robert Longson
7a81195fe5 Bug 732836 - stop asserts when width or height attributes are removed from a use element. r=dholbert 2012-03-07 10:50:36 +00:00
Kartikaya Gupta
8fd5e0c78c Merge m-c again to pick up 75deec1f1a7b 2012-02-28 14:37:26 -05:00
Kartikaya Gupta
bb76282045 Merge m-c 2012-02-27 15:06:35 -05:00
Simon Montagu
b1f39a7cfb Treat <wbr> like ZERO WIDTH SPACE during bidi resoltion. Bug 729047, r=ehsan 2012-02-25 23:12:55 -08:00
Simon Montagu
848b814678 Reftest for bug 729047, r=ehsan 2012-02-25 23:12:55 -08:00
Doug Turner
63f2081ca1 Merge with mozilla-central 2012-02-24 11:57:27 -08:00
Marco Bonardo
49719e739d Merge last green PGO from inbound to central 2012-02-24 18:20:40 +01:00
Jonas Sicking
5e2c35737e Bug 722626: Implement DOMRequest object. r=mrbkap 2012-02-24 14:19:49 +01:00
Robert Longson
51d8917573 Bug 729996 - trailing spaces in text not properly ignored. r=dholbert 2012-02-24 10:20:53 +00:00
Jonathan Kew
7ff00e8673 bug 724826 pt 3 - replace users of nsIUGenCategory service within libxul with direct access to mozilla::unicode::GetGenCategory. r=smontagu 2012-02-24 10:15:46 +00:00
Jonathan Kew
d4399166e5 bug 724826 pt 1 - move various Unicode property tables from gfx to intl. r=smontagu 
--HG--
rename : gfx/thebes/gfxUnicodeProperties.h => intl/unicharutil/public/nsUnicodeProperties.h
rename : gfx/thebes/gfxUnicodeScriptCodes.h => intl/unicharutil/public/nsUnicodeScriptCodes.h
rename : gfx/thebes/gfxUnicodeProperties.cpp => intl/unicharutil/src/nsUnicodeProperties.cpp
rename : gfx/thebes/gfxUnicodePropertyData.cpp => intl/unicharutil/src/nsUnicodePropertyData.cpp
rename : gfx/thebes/genUnicodeScriptData.pl => intl/unicharutil/tools/genUnicodePropertyData.pl
 2012-02-24 10:15:46 +00:00
Masayuki Nakano
407199e3a7 Bug 707859 part.2 Forget PresShell::mSynthMouseMoveEvent when drag session prevents to dispatch it r=smaug 2012-02-24 13:41:33 +09:00
Boris Zbarsky
4f3e9ef6dc Bug 729143. Don't treat table rows as containing blocks. r=dbaron 2012-02-23 23:35:19 -05:00
Henri Sivonen
0c8d0764b7 Bug 650784 part 2 - Make nsPlainTextSerializer not be a content sink. r=smaug. 2012-03-08 16:42:16 +02:00
François Wang
a9c8ff3349 Bug 320294 - Remove space between mi with mathvarian normal. r=karlt 2012-03-06 21:58:20 +01:00
Doug Turner
476b362925 merge with mozilla-central: 2012-02-22 09:30:09 -08:00
Rob Campbell
eb749cad65 merge fx-team to m-c 2012-02-22 12:47:22 -04:00
Brad Lassey
e3e3efe902 bug 723597 - Spurious mouseover event fired on page load r=tn 
--HG--
extra : rebase_source : b8c820b54dc41160451eb2c16e1cec32be046951
 2012-03-12 19:30:40 -04:00
Bill McCloskey
d7a654d0c5 Bug 735014 - Wait longer for PAGE_HIDE GCs (r=smaug) 2012-03-12 16:25:03 -07:00
Nicholas Nethercote
4177b594d3 Bug 729008 - Add memory reporter for FramePropertyTable. r=bz. 
--HG--
extra : rebase_source : e366cd84d50b5277f9949b340d44190371e753f8
 2012-02-20 21:02:24 -08:00
Timothy Nikkel
ba1ac6d353 Bug 664707. Followup. Use the right point for touch events. r=matspal 2012-03-06 09:58:36 -06:00
Makoto Kato
2c1e47f122 Bug 590390 - deCOM nsICharsetAlias. r=smontagu 
--HG--
rename : intl/locale/public/nsICharsetAlias.h => intl/locale/public/nsCharsetAlias.h
rename : intl/locale/src/nsCharsetAliasImp.cpp => intl/locale/src/nsCharsetAlias.cpp
 2012-03-05 12:57:51 +09:00
Mats Palmgren
b52eae45eb Bug 638937 - For text frames that are a child a floating first-letter frame, use the parent of the associated placeholder as the line-container to search. r=roc 2012-02-22 00:50:16 +01:00
Ali Juma
926f982ccc Only try to scroll scrollable layers, and force Gecko to generate a scrollable layer even for smaller pages. 2012-02-20 11:30:05 -05:00
Tim Taubert
71e4bec105 Bug 731726 - Moving the parentNode of a focused DOM node does not remove the node's focus ring; r=Enn 2012-03-05 20:59:50 +01:00
Chris Lord
cfb5872a5b Bug 726817 - Add nsIFrameLoaderOwner.clampScrollPosition. r=roc 
Add an attribute to nsIFrameLoaderOwner that allows the clamping of set scroll
positions to be toggled.
 2012-02-17 23:41:13 +00:00
Chris Lord
93986b5c67 Backout scroll-clamp stuff again 
I hope this makes it easier to merge and I'm not just wasting time...
 2012-02-19 09:26:52 +00:00
Brad Lassey
34aa551009 merge from mozilla-central 2012-02-18 17:29:33 -05:00
Serge Gautherie
b35ea02e30 Bug 728541. (Av1) browser_bug703210.js: Add a missing removeEventListener(). r=smaug. 2012-02-18 21:49:14 +01:00
Chris Lord
c436bcb3c1 Bug 726817 - Add nsIFrameLoaderOwner.clampScrollPosition. r= 
Add an attribute to nsIFrameLoaderOwner that allows the clamping of set scroll
positions to be toggled.
 2012-02-17 23:41:13 +00:00
Chris Lord
b7a97d4f18 Backout 87134:1c1c22bd0291 and 87135:a4af71f1bc1f 
Realised I made a mistake with the nsIFrameLoaderOwner.clampScrollPosition
patch and I want this to go in as a single commit and not break building of
Maple.
 2012-02-18 00:46:23 +00:00
Chris Lord
02fd6d6c24 Bug 726817 - Add nsIFrameLoaderOwner.clampScrollPosition. r= 
Add an attribute to nsIFrameLoaderOwner that allows the clamping of set scroll
positions to be toggled.

--HG--
extra : rebase_source : db24645ff2fb04bb0ffa5ffb01a8d35a79274126
 2012-02-17 23:41:13 +00:00
Doug Turner
222fba130c Merge with mozilla-central 2012-02-16 18:06:54 -08:00
Marco Bonardo
da48108f5b Merge last green PGO from inbound to central 2012-02-16 11:45:18 +01:00
Robert O'Callahan
d7e856edfc Bug 727661. We should only optimize ThebesLayers to ColorLayers or ImageLayers for brand-new layers (ThebesLayers with no currently valid data). Otherwise we risk ColorLayers being a deoptimization if there is valid content in the layer that doesn't happen to be visible but might become visible later, or if the layer contents are only temporarily a solid color and will soon need a buffer again. r=tn 2012-02-16 17:17:20 +13:00
Robert O'Callahan
d937a55cdf Bug 727661. We should only optimize ThebesLayers to ColorLayers or ImageLayers for brand-new layers (ThebesLayers with no currently valid data). Otherwise we risk ColorLayers being a deoptimization if there is valid content in the layer that doesn't happen to be visible but might become visible later, or if the layer contents are only temporarily a solid color and will soon need a buffer again. r=tn 2012-02-16 17:17:20 +13:00
Bas Schouten
1f4742bbc1 Bug 712630 - Part 2: Mark some reftest fuzzy on D2D. r=roc 2012-02-16 04:04:18 +01:00
Andrew McCreight
4c07b5ba2a Bug 726331 - remove childless nsComputedDOMStyles from the purple buffer. r=smaug 2012-02-15 15:29:53 -08:00
Serge Gautherie
8b010944c3 Bug 718020. (Av1) test_bug583889.html: Delay "SimpleTest.finish()" call, Add missing 'yield' in bug583889_inner1.html, Add documentation. r=roc. 2012-02-15 21:43:46 +01:00
Matt Woodrow
42f3cd0352 Bug 724025 - Correctly flatten transform-style:flat with BasicLayers. r=roc 2012-02-15 22:28:22 +13:00
Matt Woodrow
cca8fbcca8 Bug 721082 - Make perspective-origin relative to the parent elements border box. r=roc 2012-02-15 22:28:22 +13:00
Matt Woodrow
6905e450dd Bug 721082 - Constify nsIFrame::GetParentStyleContextFrame. r=roc 2012-02-15 22:28:21 +13:00
Benoit Girard
41f6ac08c7 Make OMTC changes not effect desktop 2012-02-13 17:17:12 -05:00
Aryeh Gregor
c6d9662f3d Bug 721136 - transform property serialization doesn't normalize case; r=dbaron 2012-02-13 16:23:15 -05:00
Kyle Machulis
2fed82f6c6 Bug 711601 - Bluetooth Implementation on B2G - patch 1: Boilerplate code for creating navigator.mozBluetooth object. r=bent 2012-02-15 13:37:13 -08:00
Kyle Machulis
55bf17714a Bug 711601 - Bluetooth Implementation on B2G - patch 1: Boilerplate code for creating navigator.mozBluetooth object. r=bent 2012-02-14 17:51:52 -08:00
Daniel Holbert
7772f86486 Bug 733875: If you're a nsFrame inside a box, be sure to reflow your absolute children after box layout gives you your size. r=bz 2012-03-10 14:50:51 -08:00
Daniel Holbert
204ed71c30 Bug 640443: Allow positioned display:-moz-box elements to be containers for absolutely-positioned content. r=bz 2012-03-10 14:49:10 -08:00
Jonathan Watt
2370d31893 Bug 734656 - Add documenting comments to some SVG frame classes. r=longsonr. 
--HG--
extra : rebase_source : 0663c60ccaa1a89041d47d3db109f1de2a2b9f92
 2012-03-10 19:28:24 +00:00
Jonathan Watt
59b4bbc1cf Bug 734656 - Make the NS_STATE_SVG_NONDISPLAY_CHILD classes easier to find. r=longsonr. 
--HG--
extra : rebase_source : a3f882a4b0f8df3347288dff25c3bbb7be72332b
 2012-03-10 19:28:06 +00:00
Boris Zbarsky
cc7f7d488e Bug 696301 part 1. Refactor CORS attribute handling a bit. r=sicking 2012-03-10 10:13:51 -06:00
Boris Zbarsky
563434a254 Bug 734406. Fix printing and print preview for <canvas> by checking for script-enabled on the original document, not on the printing document. r=tnikkel 2012-03-09 22:32:51 -06:00
Benoit Girard
beb2ae7df8 Merge viewport with tip 2012-02-08 20:42:17 -05:00
Jared Wein
1c58f1711c Bug 725700 - Keyboard arrow keys and scrollbar buttons should have consistent scrolling distances. 2012-02-20 11:24:36 -05:00
Patrick Walton
380bcbc803 Force the creation of an nsDisplayScrollLayer if a displayport was set on a scroll frame 2012-02-07 22:32:21 -08:00
Patrick Walton
727090523b Temporary workaround for bug 681192 and bug 724786 (subpixel layer invalidation). Remove me later. 2012-02-07 22:21:38 -08:00
François Wang
6049fbc6ef Bug 722880 - reftests for attribute width on mtable. r=karlt 2012-02-27 18:57:28 -05:00
Henri Sivonen
e8058853dd Bug 650784 part 1.5 - Move nsScriptableUnescapeHTML from Toolkit to Core. r=smaug. 
--HG--
rename : toolkit/components/feeds/nsIScriptableUnescapeHTML.idl => parser/html/nsIScriptableUnescapeHTML.idl
rename : toolkit/components/feeds/nsScriptableUnescapeHTML.cpp => parser/html/nsParserUtils.cpp
rename : toolkit/components/feeds/nsScriptableUnescapeHTML.h => parser/html/nsParserUtils.h
 2012-02-27 13:57:48 +02:00
Brian Birtles
3fcc17a22d Bug 608161 - Don't rely on HasAttr to detect whether gradient attributes have values; r=longsonr 2012-03-06 15:58:40 +09:00
Ehsan Akhgari
50c889808a Merge mozilla-central into mozilla-inbound 2012-03-14 13:40:34 -04:00
Jonathan Kew
fb3c20721f bug 731536 - reftest for text-transform:capitalize with punctuation marks. r=smontagu 2012-03-14 06:47:36 +00:00
Jonathan Kew
67782abd95 bug 731536 - text-transform:capitalize should affect the first alphanumeric char in a word, not the first non-punctuation char. r=smontagu 2012-03-14 06:47:14 +00:00
Jonathan Kew
2a175b1c96 bug 605021 - handle surrogates in text-run transformations. r=smontagu 2012-03-14 06:45:11 +00:00
Boris Zbarsky
e29a0d7722 Bug 735481. Skip ancestor filtering on IDs and classes in quirks mode, because that matching needs to be case-insensitive. r=dbaron 2012-03-14 00:44:13 -05:00
Frédéric Wang
066d1dc1f2 Bug 732834 - Use MathJax fonts in mathematical text part 2. r=karlt 2012-03-09 20:52:14 -05:00
Frédéric Wang
c64ce5863c Bug 732834 - Use MathJax fonts in mathematical text part 1. r=karlt 2012-03-09 20:52:13 -05:00
Nicholas Nethercote
726ecd352b Bug 723799 - Use mallocSizeOf in the DOM memory reporters. r=mounir. 
--HG--
extra : rebase_source : 2eb96d2f901bbe4cc1ff6dbccdec4dc4099b08fc
 2012-02-01 13:58:01 -08:00
Nathan Froyd
72e8d1d540 Bug 731615 - Eliminate duplicate headers in layout. rs=smontagu 2012-02-29 10:57:47 -05:00
Mats Palmgren
9faef84315 Bug 717521 - Limit pre-rendering to max 4096 x 4096 pixels (post-transform) to avoid hang. r=tnikkel 2012-03-01 13:34:20 +01:00
Mats Palmgren
c3f6b14775 Bug 727601 - "ASSERTION: Only transformed frames should have UpdateTransformLayer hint" with display:table. r=roc 2012-03-01 13:34:19 +01:00
Bas Schouten
87964f395c Bug 651192 - Part 5: Support remote access to ImageContainers. r=roc 2012-02-16 04:26:19 +01:00
Matt Woodrow
bf3005c3f4 Bug 700240 - Print display lists to a file. r=roc,bjacob 2012-03-01 21:26:09 +13:00
Matt Woodrow
702ae83148 Bug 731858 - Add index numbers to nsDisplayTextOverflow so that they are unique for a given frame. r=mats 2012-03-01 21:26:09 +13:00
Matt Woodrow
fd91c7e2e4 Bug 547801 - Fix sort-additive-1 test to use MozReftestInvalidate. r=dholbert 2012-03-01 21:26:09 +13:00
Simon Montagu
585e0608f5 Use GetGeneralCategory in IsPunctuationMark instead of the precompiled ccmap. Bug 731222, r=jfkthame 2012-03-01 00:17:27 -08:00
Ed Morley
8c8d5812df Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-01-31 16:45:40 +00:00
Tim Taubert
b07eb6fddb merge m-c to fx-team 2012-01-31 14:45:13 +01:00
Jared Wein
1c062f7770 Bug 710373 - Pressing the vertical slider down arrow should move three lines instead of one. r=roc 2012-01-31 12:04:35 +01:00
Simon Montagu
bcbbe9a509 Remove unnecessary test for next sibling. Bug 722137, r=roc 2012-01-30 11:05:28 -08:00
Simon Montagu
f90e5dabf3 test for bug 722137, r=roc 2012-01-30 10:59:34 -08:00
Mats Palmgren
5a665a0956 Bug 706889 - Apply font-inflation to checkboxes and radio buttons. r=dbaron 2012-01-30 18:48:46 +01:00
Mats Palmgren
0d832e174e Bug 706889 - reftest. 2012-01-30 18:48:46 +01:00
Bas Schouten
f249bf7924 Bug 712630: Mark some tests random when D2D is used. r=roc 2012-01-31 06:16:59 +01:00
Brian Birtles
1448c0e63c Bug 728758 - Detect animations removed from top of compositor stack and recomposite; r=dholbert 2012-02-24 09:45:40 +09:00
Zack Weinberg
15a9a210d0 Bug 729142 - Convert layout/style to MOZ_STATIC_ASSERT. r=dbaron 2012-02-23 08:19:00 -08:00
Aryeh Gregor
0afeab2129 Bug 719503 - selection.deleteFromDocument() throws for collapsed selection; r=ehsan 2012-02-22 10:38:25 -05:00
Lazar Sumar
8c65a0951d Bug 729126 - Make NS_ABORT_IF_FALSE fire on failure for only some callers of AddCSSValuePixelPercentCalc (the existing ones, and not the new ones added in bug 522607). r=dbaron 2012-02-23 11:40:41 +13:00
Jonathan Watt
7366431be2 Bug 726400 - Intermittent one pixel failure for svg/smil/anim-path-d-01.svg on mozilla-inbound, WinXP - mark test as fuzzy on WinXP. r=dholbert 2012-02-22 16:40:18 -08:00
Ed Morley
dcb3bd0b4f Backout 5f235a1502dd (bug 726400) for reftest orange 2012-02-23 01:16:35 +00:00
Ed Morley
ef395cb269 Merge mozilla-central to mozilla-inbound 2012-02-23 01:03:16 +00:00
Jonathan Watt
d3ae27c3f1 Bug 726400 - Intermittent one pixel failure for svg/smil/anim-path-d-01.svg on mozilla-inbound, WinXP - mark test as fuzzy on WinXP. r=dholbert 2012-02-22 16:40:18 -08:00
Ed Morley
d3e7abd696 Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-02-22 22:20:54 +00:00
L. David Baron
b71be23363 Drop support for -moz-box-shadow and -moz-border-radius-* now that we've supported the unprefixed versions since Firefox 4. (Bug 693510) r=bzbarsky 2012-02-22 14:14:52 -08:00
L. David Baron
a36ec05ea2 Unprefix uses of -moz-box-shadow and -moz-border-radius that have crept back in to the tree, prior to removing support for the prefixed forms. (Bug 693510) r=Mossop 2012-02-22 14:14:51 -08:00
Mats Palmgren
4ac8d2dffb Bug 726258 - Don't suppress the scrollbar because of a too small size in the scollbar minor direction. r=bz 2012-02-22 17:23:47 +01:00
Jeff Hammel
3806f8dd6c Bug 727705 - remove two copies of pageloader from m-c. r=jmaher 2012-02-22 09:24:29 -05:00
Andrew Quartey
cfe294b170 Bug 691267 - Remove nsHTMLButtonAccessible duplication, r=surkov 
--HG--
rename : accessible/tests/mochitest/actions/test_inputs.html => accessible/tests/mochitest/actions/test_controls.html
 2012-02-22 20:33:37 +09:00
Simon Montagu
2aa4cce792 Make elements with unicode-bidi: plaintext and no strong directional characters default to left-to-right. Bug 726420, r=ehsan 2012-02-22 00:30:32 -08:00
Simon Montagu
124bf390cd Reftest for bug 726420, r=ehsan 2012-02-22 00:30:32 -08:00
Robert O'Callahan
01d0e1b487 Bug 721627. Don't return nsRefPtr/nsCOMPtr from nsDisplayImage methods. nsDisplayImage::GetImage is unused anyway. r=mats 2012-01-30 18:16:54 +13:00
Daniel Holbert
e579af5a86 Bug 722510: Remove unused argument from nsBlockFrame::DrainOverflowLines. r=roc 2012-01-30 15:35:03 -08:00
Scott Johnson
d896cba482 Backout 648e5e5b9dd3 for bustage on windows. 2012-01-30 18:49:33 -06:00
Scott Johnson
71fdb90d5d Backout 656500fc5e79 for windows bustage. 2012-01-30 18:48:33 -06:00
Kan-Ru Chen
c3d70d243a Bug 709585 - Part 4/6, Dummy PowerManager DOM code. r=sicking 
--HG--
extra : rebase_source : f83eef1e296a6c006032a7e30e26bd7ca32b4490
 2012-01-30 17:02:49 -06:00
Kan-Ru Chen
b7447a1204 Bug 709585 - Part 3/6, Plug mozPower into navigator object. r=sicking 
--HG--
extra : rebase_source : ec26dca3f0adf92da1940a42e80b6dc4398bf12b
 2012-01-30 17:02:46 -06:00
Scott Johnson
f1c74e3e8a Bug 706198 - Disable font inflation on sites optimized for mobile to avoid strangely inflated text. [r=mbrubeck,dbaron] 
--HG--
extra : rebase_source : 60d764b0a76ae87515a3e669ba76adc61926c862
 2012-01-30 16:52:11 -06:00
Robert Longson
6d028c1044 Bug 722003 - Fix crash calling getClientRects on non-rendered foreignObject. r=roc 2012-01-29 08:56:20 +00:00
Mats Palmgren
5b436fdeea Bug 722117 - "ASSERTION: CalcDifference() returned bigger hint than MaxDifference()" with blink. r=roc 2012-01-29 09:48:20 +01:00
Jonathan Kew
7f3403a89e bug 722014 - backout changeset c8ea6b7164bc (test from bug 698652) due to intermittent reftest oranges on OS X and WinXP. 2012-01-28 16:10:02 +00:00
David Zbarsky
452eb69c4e Bug 682611 - Part 3: Remove ns(I)RangeUtils; r=smaug 2012-01-28 16:42:14 +01:00
Robert Longson
8e2da6f3bf Bug 649114 - Text-anchor middle is not computed correctly for element scaled to 0. r=jwatt 2012-01-28 13:58:17 +00:00
Jonathan Watt
e194684af6 Bug 716527 - Prevent nsSVGForeignObjectFrame::PaintSVG from dereference null aDirtyRect. r=roc 2012-01-28 10:42:59 +00:00
Chris Jones
3adc379405 Bug 698652: Test that minimum font size is ignored in canvas. r=dbaron 2012-01-27 22:00:36 -08:00
Robert O'Callahan
f4872369b6 Bug 721294. Only call nsIPresShell::WillPaint for the root presshell. Pass aWilLSendDidPaint correctly to nsIPresShell::Paint. Remove aPaintDefaultBackground from nsIPresShell::Paint. r=mats 2012-01-28 16:36:23 +13:00
Phil Ringnalda
124120bf61 Back out eb80ab6ee07b (bug 721627) and 06d02e7132b2 (bug 721294) for orange and red 2012-01-27 20:31:29 -08:00
Robert O'Callahan
e7fe111cd2 Bug 721627. Don't return nsRefPtr/nsCOMPtr from nsDisplayImage methods. nsDisplayImage::GetImage is unused anyway. r=mats 
--HG--
extra : rebase_source : 113647a8bf8101b7c4d7058bd205be734f38125d
 2012-01-28 16:36:49 +13:00
Robert O'Callahan
5cea7f8aa0 Bug 721294. Only call nsIPresShell::WillPaint for the root presshell. Pass aWilLSendDidPaint correctly to nsIPresShell::Paint. Remove aPaintDefaultBackground from nsIPresShell::Paint. r=mats 
--HG--
extra : rebase_source : f54afeed8d3d41d3e8f9118386e4a67cfac82a98
 2012-01-28 16:36:23 +13:00
Mats Palmgren
c7e06fddef Bug 672944 - Test -moz-box text-overflow. r=roc 2012-01-28 04:35:59 +01:00
Mats Palmgren
530ea96a92 Bug 672944 - Setup overflow areas for the scrolled block frame in a XUL scroll frame for the benefit of text-overflow; Make the text-overflow code grok the extra wrapper frame in this case. r=roc 2012-01-28 04:35:59 +01:00
Mats Palmgren
155be9b81d Bug 719177 - Changes to 'clip' only needs to update the overflow areas and repaint but does not need a reflow. r=roc 2012-01-28 04:35:59 +01:00
Mats Palmgren
5665a9115e Bug 719177 - Changes to 'border-image-outset' only needs to update the overflow areas and repaint but does not need a reflow. r=roc 2012-01-28 04:35:59 +01:00
Mats Palmgren
f61be142f3 Bug 719177 - Introduce NS_STYLE_HINT_UPDATE_OVERFLOW as a short-hand for nsChangeHint(nsChangeHint_RepaintFrame | nsChangeHint_UpdateOverflow). r=roc 2012-01-28 04:35:59 +01:00
Mats Palmgren
bac462faec Bug 719177 - Changes to '-moz-text-blink' and some 'text-decoration-style' values only need to update the overflow areas and repaint, not reflow. r=roc 2012-01-28 04:35:58 +01:00
Mats Palmgren
e1cd471539 Bug 719177 - Replace all NS_STYLE_HINT_VISUAL with nsChangeHint_RepaintFrame except for 'visibility' and 'z-index' which are the only ones that need SyncFrameView. r=roc 2012-01-28 04:35:58 +01:00
Mats Palmgren
64d8164f9c Bug 719177 - Changes to 'text-shadow' and 'box-shadow' only needs to update the overflow areas and repaint, not reflow. Changes to border style/color/etc only needs repaint, not SyncFrameView. r=roc 2012-01-28 04:35:58 +01:00
Mats Palmgren
37be13d7c9 Bug 720987 - Don't use the existing overflow areas when calculating the new overflow areas after a style change. r=roc 2012-01-28 04:35:58 +01:00
Jonathan Watt
37c1301be5 Bug 701060 - Fix race condition with pref observers causing test orange. r=ehsan. 2012-01-27 22:16:44 +00:00
Bas Schouten
d801bd5d13 Bug 712630: Adjust several reftests passing criteria. r=joedrew 2012-03-15 20:27:19 +00:00
Alexander Surkov
5fe5777d40 Bug 732389 - image map accessible tree is not updated when image map is changed, r=bz, tbsaunde 2012-03-15 16:16:02 -04:00
Stefan
3886a3d46b Bug 734490: fix build failures with Clang and GCC 4.7 in TestPoisonArea.cpp. r=zwol 2012-03-15 11:01:08 -07:00
Aryeh Gregor
d0cb80ca7b Bug 719518 - Selection.extend() with no ranges should throw standard exception type; r=ehsan 2012-03-14 14:27:30 -04:00
Robert Longson
9c2b5601f7 Bug 736031 - getBBox returns incorrect results with empty containers. r=jwatt 2012-03-15 11:42:54 +00:00
Jonathan Kew
68cac941b5 bug 731536 - followup, add a reftest for Deseret text capitalization with punctuation marks. r=smontagu 2012-03-15 09:11:49 +00:00
Jonathan Kew
384de9b74a bug 735583 - eliminate font constant synonyms and use the standard forms everywhere. r=jdaggett 2012-03-15 09:04:46 +00:00
Jonathan Kew
f58d29af3c bug 735419 - eliminate unused parameter in the gfxTextRun constructor. r=jdaggett 2012-03-15 09:03:51 +00:00
Jonathan Kew
8d2d4e784c bug 735647 - use larger buffers for key strings in ReflowCountMgr, and fix leakage & allocator mismatch. r=matspal 2012-03-15 09:00:25 +00:00
Mats Palmgren
9e2989826f Bug 725376 - Don't do column balancing deeper than 2 nested levels to avoid hang. r=roc 2012-02-18 02:34:21 +01:00
Mats Palmgren
9962f6b70f Bug 728255 - Replace nsLineBox::LastChild() calls with O(1) equivalents where possible. r=bz 2012-02-18 02:34:20 +01:00
Daniel Holbert
678a7cf0f3 Bug 728480: Wrap MOZ_TOUCH-specific code in #ifdefs, to prevent unused-function build warnings. r=wesj 2012-02-17 17:27:39 -08:00
Ed Morley
9615249973 Merge mozilla-central to mozilla-inbound 2012-02-18 00:36:09 +00:00
Daniel Holbert
624d78bbb4 Bug 725918 patch 3: Use getter_AddRefs instead of passing a pointer-to-nsRefPtr. r=jwatt 2012-02-17 16:33:24 -08:00
Edwin Flores
02658feb78 Bug 725918 patch 2: Fixed wrong assertion in nsSVGGlyphFrame. r=longsonr 2012-02-17 16:33:23 -08:00
Edwin Flores
b227f604c9 Bug 725918 patch 1: Fixed code style in nsSVGGlyphFrame::SetupCairoState. r=longsonr 2012-02-17 16:33:00 -08:00
Ed Morley
f0c6a1f047 Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-02-18 00:16:22 +00:00
Kyle Machulis
fc01ae2278 Back out bug 711601 (changeset 4c8aa2b0ca1c) due to qemu breakage 2012-02-17 15:54:27 -08:00
Josh Aas
5fbfe94a5b Bug 724717: Fix crash at nsPluginInstanceOwner::CARefresh. r=benwa 2012-02-16 21:27:37 -05:00
Alexander Surkov
b34485ff9f Bug 677154 - fix a typo 2012-02-18 02:51:29 +09:00
Alexander Surkov
b79d3bc706 Bug 677154 - Detached document accessibility tree, r=bz, marcoz 2012-02-18 02:38:43 +09:00
Jonathan Watt
b63e9750b0 Bug 660216, part 3 - getBBox and getCTM on foreignObject should/should not include 'x'/'y' offsets respectively. r=heycam. 2012-02-17 08:12:47 +00:00
Jonathan Watt
5913361070 Bug 660216, part 1 - Rename PrependLocalTransformTo to PrependLocalTransformsTo. r=heycam. 2012-02-17 08:12:47 +00:00
Jonathan Watt
738cd09b8c Bug 727805 - Give aFactor in nsDisplayList.cpp a more meaningful name. r=mattwoodrow. 2012-02-17 06:08:33 +00:00
Jonathan Watt
2421fe28eb Bug 726928 - UpdateCoveredRegion needs to convert 'extent' from CSS px now, not Dex px, otherwise painting invalidation is broken. r=dholbert. 2012-02-17 06:07:51 +00:00
Bill McCloskey
c6cd982f05 Bug 641025 - Incremental GC (r=igor,smaug,roc,cdleary,gregor) 2012-02-17 14:35:20 -08:00
Ed Morley
66df778f8d Backout 6c1ded13556d (bug 720643), 5cf0a12c1cf0, ac771e54d7ca & 3bb24b12b0d6 (bug 720632) for Android build failures 2012-02-16 23:18:45 +00:00
Philipp von Weitershausen
e7380e90f3 Bug 720632 - Part 3: Register SmsRequestManager. r=cjones 2012-02-16 14:50:52 -08:00
Andrew McCreight
f077433bff Bug 727625 - remove childless nsDOMCSSAttributeDeclaration from the purple buffer. r=smaug 2012-02-16 08:45:19 -08:00
Aryeh Gregor
79ae565fb2 Bug 724750 - 3D transform backface-visibility has no effect when applied to an element with display:table. r=roc 
--HG--
rename : layout/reftests/transform-3d/backface-visibility-1b.html => layout/reftests/transform-3d/backface-visibility-1c.html
extra : rebase_source : 8e878d9729f49b3adc0107b6760f618b8025f390
 2012-02-16 14:30:34 +01:00
Daniel Levin
826612158f Bug 710973 - Validate aYResolution in PresShell::SetResolution, don't validate aXResolution twice. r=tn 
--HG--
extra : rebase_source : 995ad8ddd8edac814bc2bfb8dd3891430b8704cb
 2012-02-16 14:29:05 +01:00
Aryeh Gregor
bab8fcddb2 Bug 655478 - CSSStyleDeclaration.setProperty shouldn't require the third parameter to be set; r=bzbarsky 
--HG--
extra : rebase_source : 131b879a0190c1979ee563cc102b5a548bf6986d
 2012-02-15 16:31:40 -05:00
Marco Bonardo
baaaa63f39 Merge central to inbound 2012-02-16 11:47:36 +01:00
Aryeh Gregor
3e409df529 Bug 722463 - Transforms should not work on non-replaced inline elements. r=roc 2012-02-14 15:33:06 -05:00
Bas Schouten
7d77651df1 Bug 726951 - Reftest: Test for shadow clips working correctly in non-rectangular canvases. r=jrmuizel 2012-02-16 04:08:12 +01:00
Nathan Froyd
f91f1654b1 Bug 700659 - Slay nsHashSets in layout. r=dbaron 2011-11-08 15:24:37 -05:00
Aryeh Gregor
567854dcfc Bug 724614 - 3D scaling makes text blurry. r=mattw 
--HG--
rename : layout/reftests/transform-3d/preserve3d-1a.html => layout/reftests/transform-3d/preserve3d-5a.html
rename : layout/reftests/transform-3d/scale3d-2-ref.html => layout/reftests/transform-3d/scale3d-all-separate.html
 2012-02-23 13:03:27 -05:00
Jeff Muizelaar
7edc099e21 Bug 729850. CG: Get the point order correct when transforming a path. r=mwoodrow 2012-02-25 00:35:41 -05:00
Jeff Muizelaar
617ed39964 Bug 728028. CG: Avoid double transforming filled gradients. r=mwoodrow 
When we fixed transformed clips it caused us to double transform gradients. We
fix this by avoiding ::PushClip when drawing gradients. This has the advantage
of saving a save and restore pair and it makes Fill() more closely match
Stroke()
 2012-02-25 00:35:39 -05:00
Lazar Sumar
b17d132eb3 Bug 548375 - Add tests for background-repeat taking two values (css3-background). r=dbaron 2012-02-24 21:23:14 -08:00
Lazar Sumar
da2c684917 Bug 548375 - Implement css3-background background-repeat property two value syntax. r=dbaron 2012-02-24 21:23:14 -08:00
L. David Baron
cc3e5b6ca9 Remove the CSS2Properties aliases for MozOutline* and MozOpacity for CSS properties whose CSS aliases were removed long ago (but temporarily readded in the previous changeset). (Bug 730532, patch 2) r=bzbarsky 2012-02-24 21:23:14 -08:00
L. David Baron
5c4dc186ed Add a header file for CSS property aliases (and temporarily resurrect the aliases whose DOM properties we forgot to remove). (Bug 730532, patch 1) r=bzbarsky 2012-02-24 21:23:14 -08:00
L. David Baron
7b3ddee6e5 Make nsStyleCoord's member variables private, as they should have been. (Bug 730240) r=bzbarsky 2012-02-24 21:23:14 -08:00
L. David Baron
095914432d Depend on assignment and copy construction of unions in nsStyleCoord. (Bug 730240) r=bzbarsky 2012-02-24 21:23:14 -08:00
Boris Zbarsky
6dca540e59 Bug 640917. Treat foreignObject as a fixed position containing block. r=jwatt 
--HG--
rename : layout/reftests/svg/foreignObject-dynamic-abspos-01.html => layout/reftests/svg/foreignObject-dynamic-fixedpos-01.html
rename : layout/reftests/svg/foreignObject-dynamic-abspos-01-ref.html => layout/reftests/svg/foreignObject-fixedpos-01.html
 2012-02-21 18:01:41 -05:00
Boris Zbarsky
11c8d77a1c Bug 728516. Refactor frame construction for things that want to wrap kids in a block. r=roc 2012-02-21 18:01:40 -05:00
Boris Zbarsky
519881edb7 Bug 728111. Fix the block inside foreignObject to really be the absolute containing block for its kids. r=roc 2012-02-21 18:01:40 -05:00
Ed Morley
465164e131 Merge mozilla-central to mozilla-inbound 2012-02-21 14:15:58 +00:00
Ed Morley
4616e748a8 Backout 5ba9a4f41128 (bug 724614) for OS X reftest failures 
--HG--
rename : layout/reftests/transform-3d/scale3d-all-separate.html => layout/reftests/transform-3d/scale3d-2-ref.html
 2012-02-21 13:53:11 +00:00
Ed Morley
ec5a7c5b3d Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-02-21 11:59:33 +00:00
Ms2ger
610afb31c2 Bug 725918 - Part 4: Use forget(); r=dholbert 2012-02-21 10:34:02 +01:00
Zack Weinberg
58cb765cfa Bug 96971: Move GetSystemFont from nsDeviceContext to mozilla::LookAndFeel. r=roc 2012-02-20 15:19:48 -08:00
Ed Morley
efe21ddd01 Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-02-20 12:08:28 +00:00
Philipp von Weitershausen
6a8f5db3b4 Bug 720632 - Part 3: Register SmsRequestManager. r=cjones 2012-02-20 00:44:29 +01:00
Jonathan Watt
83728fb808 Bug 721920 - Honor the 'lang' and 'xml:lang' attributes in SVG as we do in HTML. r=bz. 2012-02-19 20:49:34 +00:00
Jesse Ruderman
8e30b02deb Bug 728717 - Make the 'Some pres arena objects were not freed' assertion fatal. r=bz 2012-02-19 12:40:14 -08:00
William Chen
294b37acb2 Bug 522607 - Tests for new css3-background background-position syntax. r=dbaron 2012-02-20 12:16:11 +13:00
Lazar Sumar
1396c14469 Bug 522607 - New css3-background background-position syntax. r=dbaron 2012-02-20 13:14:42 +13:00
Robert Longson
58b3d6c3ae Bug 728665 - SVGTests interface missing from foreignObject elements. r=jwatt 2012-02-20 19:34:04 +00:00
Simon Montagu
7c322ee91d Mark the last line in the block dirty when text-align-last resolves to something other than left. Bug 726392, r=dbaron 2012-02-20 08:49:44 -08:00
Simon Montagu
caa06fea50 Reftests for bug 726392, r=dbaron 2012-02-20 08:49:44 -08:00
Kyle Machulis
0ec84a60d2 Bug 711601 - B2G Bluetooth Boiler Plate r=bent 2012-02-20 16:15:19 +01:00
Aryeh Gregor
dd0a23ced4 Bug 724614 - 3D scaling makes text blurry. r=mattw 
--HG--
rename : layout/reftests/transform-3d/scale3d-2-ref.html => layout/reftests/transform-3d/scale3d-all-separate.html
 2012-02-09 10:09:39 -05:00
Masayuki Nakano
b18d48114e Bug 707859 PresShell shouldn't synthesize mousemove events during drag r=smaug 2012-02-21 12:19:18 +09:00
Jonathan Watt
8178523710 Bug 416581, part 2 - Pay attention to the 'lang' attribute when fetching the user's font prefs for the CSS cascade. r=dbaron. 2012-01-25 23:52:26 +00:00
Daniel Holbert
54a9b90060 Bug 728462: Remove declaration of no-longer-used 'GfxTextrunWordCacheMallocSizeOf'. r=jfkthame 2012-02-18 09:47:52 -08:00
Robert Longson
432921c50c Bug 725918 - tests for fill and stroke on text 2012-02-18 16:05:21 +00:00
Chris Lord
5215455da7 Bug 726817 - Add nsIFrameLoaderOwner.clampScrollPosition. r=roc 
Add an attribute to nsIFrameLoaderOwner that allows the clamping of set scroll
positions to be toggled.
 2012-02-17 23:41:13 +00:00
Ed Morley
b9befea8b7 Backout 9062b3e04318 (bug 718516) for reftest failures 2012-02-08 00:56:56 +00:00
Scott Johnson
644bab262b Bug 718516: Remove call to FinishReflowWithAbsoluteFrames until nsColumnSetFrame is fully implemented as an absolute container. [r=ehsan] 2012-02-07 17:21:48 -06:00
Robert O'Callahan
4146c611c0 Bug 724502. Ensure that UpdateTransformLayer and UpdateOpacityLayer change hints generate a new change list entry for every frame whose style asks for them. r=matspal 2012-02-08 11:52:59 +13:00
Robert O'Callahan
e1d954ff3b Bug 722923. Part 1: Strip opacity/transform update hints when we recursively invalidate over our children. r=mats 2012-02-08 11:52:59 +13:00
Robert O'Callahan
5c0eba1b31 Bug 722923. Part 0: Add reftest for opacity and out-of-flow needing to invalidate the out-of-flow. r=matspal 2012-02-08 11:52:59 +13:00
Neil Deakin
823eadc291 Bug 707386, remove use of drag session from treebodyframe, r=neil 2012-02-07 13:02:33 -05:00
Jignesh Kakadiya
3d1848660e Bug 596515 - Add a possibility of styling form:invalid. r=mounir 2012-02-07 13:51:49 +01:00
Mounir Lamouri
237bb2775e Bug 724839 - Use input:invalid in tests style instead of :invalid. r=smaug 2012-02-07 13:53:21 +01:00
Mats Palmgren
78c681b88a Bug 724432 - Skip UpdateOverflow if we did Reflow. Don't propagate UpdateOverflow in ReResolveStyleContext. r=roc 2012-02-07 12:31:47 +01:00
Mats Palmgren
ef1bc3cb18 merge backout 2012-02-07 12:31:44 +01:00
Mats Palmgren
3851b75d5a Backout Part 4 of bug 524925 (73eaf1199ff0). r=roc 2012-02-07 12:31:37 +01:00
Mats Palmgren
a331194ebb merge backout 2012-02-07 12:31:30 +01:00
Mats Palmgren
b9dc5684a2 Backout bug 719177 (2cae7e5c62ae,07bd73451aa4,13739446fc8e,0246973f2513,f222fbece983,8f11aaac24dc). r=roc 2012-02-07 12:31:24 +01:00
Mats Palmgren
7bf2f236e2 merge backout 2012-02-07 12:31:19 +01:00
Mats Palmgren
552d7fe311 Backout bug 722117 (a5569fc4c390). r=roc 2012-02-07 12:31:14 +01:00
Mats Palmgren
8d93bc8689 merge backout 2012-02-07 12:31:08 +01:00