Commit Graph

18401 Commits

Author SHA1 Message Date
Masayuki Nakano
715f30b959 Bug 912956 part.14 mozilla/MouseEvents.h should be included directly r=roc 2013-09-25 20:21:18 +09:00
Masayuki Nakano
a362049807 Bug 912956 part.13 mozilla/TouchEvents.h should be included directly r=roc 2013-09-25 20:21:16 +09:00
Cameron McCormack
9b8ec41c8b Bug 916704 - Always initialize SVGTextContentPaint::Paint and check SetupCairoState return value in nsSVGTextFrame2::PaintSVG. r=longsonr 2013-09-25 17:18:41 +10:00
Daniel Holbert
e999460fd0 Bug 919871: Make .cpp files in layout/generic #include their corresponding .h file first. r=mats 2013-09-24 18:43:43 -07:00
Phil Ringnalda
a56199700e Merge m-c to a CLOSED TREE m-i 2013-09-24 21:22:56 -07:00
Wes Kocher
07d04fc163 Merge b2g-i to m-c 2013-09-24 19:58:09 -07:00
Michael Wu
76f255f022 Bug 919845 - Really make Fira Sans the default font, r=jfkthame 2013-09-24 10:57:25 -07:00
Benoit Jacob
0f90257361 Bug 913872 - Take nested enums out of gfxASurface - 1/3 : automatic changes - r=jrmuizel
Generated by these regexes:

find . -name '*.h' -o -name '*.cpp' -o -name '*.mm' | grep -v '\.hg' | grep -v '^\.\/obj' | xargs sed -i 's/gfx[A-Za-z0-9_]*Surface\:\:[a-z]*\(\(ImageFormat\|SurfaceType\|ContentType\|MemoryLocation\)[0-9A-Za-z_]*\)/gfx\1/g'

find . -name '*.h' -o -name '*.cpp' -o -name '*.mm' | grep -v '\.hg' | grep -v '^\.\/obj' | xargs sed -i 's/gfx[A-Za-z0-9_]*Surface\:\:[a-z]*\(\(CONTENT_\|MEMORY_\)[0-9A-Za-z_]*\)/GFX_\1/g'

find . -name '*.h' -o -name '*.cpp' -o -name '*.mm' | grep -v '\.hg' | grep -v '^\.\/obj' | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)\(CONTENT_COLOR\|CONTENT_ALPHA\|CONTENT_COLOR_ALPHA\|CONTENT_SENTINEL\|MEMORY_IN_PROCESS_HEAP\|MEMORY_IN_PROCESS_NONHEAP\|MEMORY_OUT_OF_PROCESS\)\($\|[^A-Za-z0-9_]\)/\1GFX_\2\3/g'

find . -name '*.h' -o -name '*.cpp' -o -name '*.mm' | grep -v '\.hg' | grep -v '^\.\/obj' | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)\(ImageFormatARGB32\|ImageFormatRGB24\|ImageFormatA8\|ImageFormatA1\|ImageFormatRGB16_565\|ImageFormatUnknown\|SurfaceTypeImage\|SurfaceTypePDF\|SurfaceTypePS\|SurfaceTypeXlib\|SurfaceTypeXcb\|SurfaceTypeGlitz\|SurfaceTypeQuartz\|SurfaceTypeWin32\|SurfaceTypeBeOS\|SurfaceTypeDirectFB\|SurfaceTypeSVG\|SurfaceTypeOS2\|SurfaceTypeWin32Printing\|SurfaceTypeQuartzImage\|SurfaceTypeScript\|SurfaceTypeQPainter\|SurfaceTypeRecording\|SurfaceTypeVG\|SurfaceTypeGL\|SurfaceTypeDRM\|SurfaceTypeTee\|SurfaceTypeXML\|SurfaceTypeSkia\|SurfaceTypeSubsurface\|SurfaceTypeD2D\|SurfaceTypeMax\)\($\|[^A-Za-z0-9_]\)/\1gfx\2\3/g'
2013-09-24 16:45:13 -04:00
Jonathan Watt
f407fab903 Bug 919263 - Remove bogus assertion from nsRangeFrame::AttributeChanged. r=dholbert
--HG--
extra : rebase_source : a713be35993eb58e44e2bb4f506587831986c57e
2013-09-24 21:29:31 +01:00
Jonathan Watt
a4bbce1e0f Bug 920158 - Make nsCSSFrameConstructor::ConstructFrameFromItemInternal handle frames that should suppress floating of descendants. r=bz
--HG--
extra : rebase_source : 3f0b806dad1c1381bd30bd25e943866415e226f2
2013-09-24 21:29:29 +01:00
Jonathan Watt
602832e7f6 Bug 920154 - Rename nsIContent's SetNativeAnonymous method to SetIsNativeAnonymousRoot to be clear that it should only be called for the root native anonymous element. r=bz
--HG--
extra : rebase_source : 9be498a3ae51a4a4587c8035cb7bc58002b3a268
2013-09-24 21:29:27 +01:00
Jonathan Watt
8ee1e8e7cf Bug 920146 - Rename NODE_IS_ANONYMOUS to NODE_IS_ANONYMOUS_ROOT to avoid misinterpretation and for symmetry with NODE_IS_NATIVE_ANONYMOUS_ROOT. r=bz
--HG--
extra : rebase_source : ea8c2377f1f85248239a3f6b0f6f64bfe40e44ea
2013-09-24 20:28:32 +01:00
Ryan VanderMeulen
ddd5c1bb75 Backed out changeset dec7ac293e74 (bug 782546) for breaking the test it was trying to annotate. 2013-09-24 13:45:59 -04:00
Randell Jesup
d187db8b95 Bug 917491: Guarantee cleanup of AsyncLatencyLogger on xpcom-shutdown r=bsmedberg 2013-09-24 22:10:24 -04:00
Ehsan Akhgari
9890a8c148 Bug 919505 - Minimize the #includes in dom/ipc; r=jst 2013-09-23 17:30:40 -04:00
Ryan VanderMeulen
f77362bbb1 Merge inbound to m-c. 2013-09-23 17:01:29 -04:00
Martin Stransky
4a7567357a Bug 914607 - Remove MOZ_WIDGET_GTK2. r=karlt 2013-09-23 09:21:35 -04:00
Ryan VanderMeulen
d17cc33501 Bug 782546 - Mark test_transformed_scrolling_repaints_3.html as random on Linux 64. 2013-09-24 11:56:29 -04:00
Masayuki Nakano
224a14c928 Bug 912956 part.12 All event utils (macros and inline methods) should be methods of mozilla::WidgetEvent r=roc 2013-09-24 19:04:16 +09:00
Masayuki Nakano
0b6d808310 Bug 912956 part.2 Rename nsEvent.h to mozilla/EventForwards.h and sort out it r=roc
--HG--
rename : widget/nsEvent.h => widget/EventForwards.h
2013-09-24 19:04:14 +09:00
Jeff Muizelaar
035e883752 Bug 916535. Avoid using repeating gradients for tiling when it won't work. r=roc
Avoiding normalization introduced in bug 895135 caused gradientStart/Stop to
not correspond to the firstStop and lastStop. This can cause us to incorrectly
decide to use the repeat fast path. This patch switches takes us back to the
same condition as we had before the regression.

--HG--
extra : rebase_source : f335e1db9166213115354eb14dbe90b09127a68b
2013-09-24 00:04:36 -04:00
Daniel Holbert
39c340ae62 (no bug) Replace two c-style casts in nsFrame.cpp with const_cast<>. (no review; trivial/non-functional) 2013-09-23 21:04:08 -07:00
Makoto Kato
41da4e36b5 Backout changeset 28aab9d91f12 (Bug 916071) 2013-09-24 12:55:46 +09:00
Makoto Kato
24d417be72 Bug 916071 - Detect RemoteFX on reftest. r=vlad 2013-09-24 10:20:39 +09:00
Ehsan Akhgari
830d4e9911 Bug 919326 - Minimize the #includes in layout/ IDL files; r=roc
--HG--
extra : rebase_source : ec8cdff9466ff75463841818537ecead2cb57e62
2013-09-22 19:24:27 -04:00
Phil Ringnalda
6444cc88b4 Backed out 6 changesets (bug 881804) for frequent Android reftest and jsreftest timeouts
Backed out changeset 61972f55702b (bug 881804)
Backed out changeset 0a24b77d4ffb (bug 881804)
Backed out changeset 9fbcf4c3ab2b (bug 881804)
Backed out changeset 2d35068ec2f5 (bug 881804)
Backed out changeset 757790e5cd9f (bug 881804)
Backed out changeset d8a172fa4b20 (bug 881804)
2013-09-21 17:59:14 -07:00
Timothy Nikkel
3d5bc6688c Bug 919129. Fix nsLayoutUtils::UpdateImageVisibilityForFrame so that it doesn't expand the image rect so much by replacing it with the scroll port rect. r=matspal 2013-09-21 16:20:22 -05:00
Nicholas Hurley
d66aed1f86 Bug 881804 (part 4) - Plumb layout into predictive network actions. r=bz 2013-09-20 15:24:07 -07:00
Daniel Holbert
57bae80d73 Bug 918519 part 2: Replace GetMainComponent/GetCrossComponent invocations with macros to avoid unnecessarily constructing nsSize() on-the-fly. r=mats 2013-09-20 13:26:52 -07:00
Daniel Holbert
dfd15fcdd9 Bug 918519 part 1: Add macros GET_MAIN_COMPONENT and GET_FLEX_COMPONENT to nsFlexContainerFrame.cpp, and use them to implement existing utility methods. r=mats 2013-09-20 13:26:52 -07:00
Martijn Wargers
ec23e641fa Bug 917056 - Make zoomed-svg-with-viewBox-01.svg use reftest-zoom. r=longsonr 2013-09-18 01:05:03 +02:00
Matt Woodrow
bec09ce09b Bug 907926 - Try avoid having multiple path objects around since this is slow with DrawTargetCairo. r=Bas 2013-09-19 17:23:30 +12:00
Honza Bambas
da53acf440 Bug 913807 - HTTP cache v2: API+top service+integration+tests, off by default, r=michal+ehsan+mark.finkle+fabrice+mhammond+gavin 2013-09-20 11:11:25 +02:00
Robert O'Callahan
c2f9462ad3 Bug 913438. Remove mAnchor check since it doesn't help correct inconsistency between ImageLayer snapping and regular snapped image drawing, and can hurt performance. r=tnikkel
--HG--
extra : rebase_source : 5f62e052d20a9acb0a428b988e2d9b16c7b19dbc
2013-09-09 17:08:41 -07:00
Phil Ringnalda
59e3df3c1e Backed out 2 changesets (bug 918176) for assertions
CLOSED TREE

Backed out changeset 9d5728797e77
Backed out changeset 1a895d95c88b (bug 918176)
2013-09-19 19:56:02 -07:00
Cameron McCormack
4245a25bb3 Fix assertion text typo; no bug. rs=dholbert 2013-09-20 11:24:04 +10:00
Cameron McCormack
1c1fbf5ef6 Bug 918176 - Silence uninitialized variable warning in nsRuleNode::ComputeContentData. r=dholbert 2013-09-20 11:24:04 +10:00
Wes Kocher
b03b0b7668 Backed out 5 changesets (bug 907926, bug 911393, bug 917703) due to OSX reftest bustage during an unrelated CLOSED TREE
Backed out changeset 94a6733b01dc (bug 907926)
Backed out changeset 44108fb6f7cc (bug 917703)
Backed out changeset f2dd2a27af69 (bug 911393)
Backed out changeset fdb0d1053128 (bug 907926)
Backed out changeset b3616b786e8f (bug 907926)
2013-09-19 17:56:18 -07:00
Matt Woodrow
989c6f730f Bug 907926 - Try avoid having multiple path objects around since this is slow with DrawTargetCairo. r=Bas 2013-09-19 17:23:30 +12:00
Rik Cabanier
8614b1d5ca Bug 917943 - Fix color-burn and color-dodge blend modes for Direct2D. r=Bas 2013-09-19 14:48:30 -04:00
Ehsan Akhgari
36f0a2afa0 Bug 886781 follow-up: Disable the test properly, we can't return from the global scope
Landed on a CLOSED TREE
2013-09-19 11:49:04 -04:00
Ryan VanderMeulen
9c958fd45f Backed out changeset 98271bb483eb (bug 914607) for crashtest/reftest crashes.
CLOSED TREE
2013-09-19 11:27:50 -04:00
Ed Morley
68a437c70a Bug 907903 - Mark 759036-2.html as random-if on Android 2.2 for too many intermittent failures 2013-09-19 15:11:03 +01:00
Ed Morley
775690787d Bug 907899 - Mark 759036-1.html as random-if on Android 2.2 for too many intermittent failures 2013-09-19 15:09:59 +01:00
Ed Morley
e945175b55 Bug 886781 - Disable test_movement_by_characters.html on Windows 8 for too many intermittent failures
--HG--
extra : rebase_source : 608a5680e1e7bcd9ab87b732b0366512abbc1529
2013-09-19 14:25:23 +01:00
Benoit Jacob
43fcdc2ede Bug 913847 - Include MainThreadUtils.h instead of nsThreadUtils.h - r=ehsan 2013-09-19 09:54:42 -04:00
Dan Minor
da2b9304d4 Bug 907351 - Android pandaboard reftests run significantly slower; r=gbrown 2013-09-19 09:12:48 -04:00
Martin Stransky
a2a96d9b69 Bug 914607 - Remove MOZ_WIDGET_GTK2. r=karlt 2013-09-19 09:10:04 -04:00
Birunthan Mohanathas
2b61a1f0c4 Bug 264517 - Move the _LAYOUT variant of COMPUTED_STYLE_MAP_ENTRY into a property bit. r=dbaron 2013-09-23 09:28:55 -04:00
Ehsan Akhgari
39c223b372 Bug 919355 - Part 2: Don't #include nsDeviceContext.h in Units.h; r=roc 2013-09-23 07:55:35 -04:00
Ehsan Akhgari
5dc78a019a Bug 919355 - Part 1: Don't #include nsDeviceContext.h in nsPresContext.h; r=roc 2013-09-23 07:52:25 -04:00
Ed Morley
fcecbde3ce Bug 917817 - Make several more python test harness failure modes TBPL parsable; r=jmaher 2013-09-19 13:20:17 +01:00
Phil Ringnalda
059782fbe5 Merge m-c to m-i 2013-09-18 23:28:41 -07:00
Phil Ringnalda
fbd6eb9d18 Backed out 10 changesets (bug 907926, bug 911393, bug 740200, bug 917703) for b2g build bustage
CLOSED TREE

Backed out changeset ae02054863f7 (bug 907926)
Backed out changeset 8fcdbbc2dac2 (bug 917703)
Backed out changeset aa253a1fd7e5 (bug 911393)
Backed out changeset ec63e6d6d874 (bug 907926)
Backed out changeset 0042a2722aab (bug 907926)
Backed out changeset dc8bddfca5f1 (bug 740200)
Backed out changeset 439ff7e64d35 (bug 740200)
Backed out changeset d871c0d61510 (bug 740200)
Backed out changeset 3b248c5a0dc2 (bug 740200)
Backed out changeset 3466e81d3a41 (bug 740200)
2013-09-18 23:08:41 -07:00
Wes Kocher
0d414f78a1 Merge inbound to m-c 2013-09-18 16:48:24 -07:00
Matt Woodrow
f4321dd17a Bug 907926 - Try avoid having multiple path objects around since this is slow with DrawTargetCairo. r=Bas 2013-09-19 17:23:30 +12:00
Robert O'Callahan
9accbe655b Address review comments for bug 905909. r=dholbert 2013-09-19 16:30:30 +12:00
Robert O'Callahan
294cedd09d Bug 918185. When Range.getBoundingClientRect/getClientRects needs a textframe for a node, create one if the textframe was optimized away. r=bz 2013-09-19 16:23:48 +12:00
Paul Rouget
dc3c24c2ef Backed out changeset 184a0076278b (bug 890195). Almost-perma orange 2013-09-18 17:53:15 +02:00
Jesse Ruderman
f4099a7205 Crashtest for bug 861489. 2013-09-17 20:46:17 -07:00
L. David Baron
0f7222c881 Bug 861489: Fix SkipAnimationRule to do the right thing in the presence of new cascading rules. r=bzbarsky 2013-09-17 20:46:17 -07:00
Phil Ringnalda
afee847b66 Backed out changeset 505e8f8480d2 (bug 913597) for Android failure
--HG--
extra : rebase_source : d9ffe836559fb5a63d895d40b4f89324c2932216
2013-09-17 20:45:48 -07:00
Ryan VanderMeulen
8a6a806c2a Merge m-c to inbound. 2013-09-17 22:47:28 -04:00
Ryan VanderMeulen
5be5179c2d Merge m-c to fx-team on a CLOSED TREE. 2013-09-17 20:27:03 -04:00
Martijn Wargers
0b217fe87f Bug 916086 - Remove some more enablePrivilege calls. r=jmaher
CLOSED TREE

--HG--
rename : layout/base/tests/test_bug458898.html => layout/base/tests/chrome/test_bug458898.html
2013-09-16 22:12:29 +02:00
Bobby Holley
0b7c983dea Bug 905909 - Avoid infinite recursion in nsTreeBodyFrame. v1
--HG--
extra : rebase_source : ed9efcd923249d5c7efebf9185ea431140878efc
2013-09-13 04:02:30 -07:00
Daniel Holbert
fc2f41d897 Bug 918109: Move some null-initialized static variables in nsLayoutUtils.cpp to function-scope. r=mats 2013-09-18 19:19:23 -07:00
Cameron McCormack
3c21650d5f Bug 918156 - Silence uninitialized variable warning in an unreachable branch of nsStyleUtil::ComputeFunctionalAlternates. r=jdaggett 2013-09-19 11:35:22 +10:00
Cameron McCormack
25896b003f Bug 915439 - Use longer timeouts for test_value_computation.html and test_value_storage.html. r=bzbarsky 2013-09-19 11:35:19 +10:00
Wes Kocher
ee41ec25e3 Backed out changeset 040522aacba4 (bug 913847) 2013-09-18 17:18:56 -07:00
Benoit Jacob
af97fdd40d Bug 913847 - Include MainThreadUtils.h instead of nsThreadUtils.h - r=ehsan 2013-09-18 18:50:32 -04:00
Mike Hommey
7371888973 Bug 917086 - Disallow DIRS, PARALLEL_DIRS and TEST_DIRS under TOOL_DIRS and TEST_TOOL_DIRS, and adapt moz.build files accordingly. r=gps
Also mark TOOL_DIRS/TEST_TOOL_DIRS directories in backend.mk and recurse them normally instead of forcing make -C dir libs for them.
2013-09-19 07:43:02 +09:00
Dan Glastonbury
c3402e1573 Bug 913597 - Remove support for obsolete 'moz-webgl' name for creation of WebGL contexts. r=jgilbert 2013-09-17 20:45:48 -04:00
Steven Michaud
366bf6eb2c Bug 909678 - Send right-mouse-dragged and other-mouse-dragged events to plugins. r=spohl,roc 2013-09-17 18:36:03 -05:00
Corey Ford
92841b7169 Bug 915475 - Don't sticky position frames with NS_FRAME_IS_NONDISPLAY. r=dholbert 2013-09-17 14:11:12 -07:00
Masatoshi Kimura
db96aec3fb Bug 916871 - Remove classinfo bits for CSSGroupRuleRuleList. r=bz 2013-09-18 07:56:41 +09:00
Daniel Holbert
8fdf7cea57 Bug 917032 part 3: Move flex item physicalPosn computation up a bit higher. r=mats 2013-09-17 14:54:07 -07:00
Daniel Holbert
c3219fdda3 Bug 917032 part 2: Make PhysicalPositionFromLogicalPosition() take the content-box size, so it can do polarity-flipping if necessary. r=mats 2013-09-17 14:54:02 -07:00
Daniel Holbert
0bb827fb1b Bug 917032 part 1: Do flex layout in content-box space, rather than in frame-rect (border-box) space, and adjust for border/padding at the end of reflow. r=mats 2013-09-17 14:53:56 -07:00
Ryan VanderMeulen
05eb87df87 Backed out changeset 8c85c4d93fb7 (bug 907351) for Android 2.2 reftest failures.
CLOSED TREE
2013-09-17 13:38:39 -04:00
Ehsan Akhgari
a92a47810e Bug 917301 - Remove some dead code in layout/; r=dholbert 2013-09-17 13:02:02 -04:00
Eitan Isaacson
0be41e0d7e Bug 904687 - Introduce Svox Pico speech synthesis service. r=smaug f=gps
- moz.build updates.
 - Use nsISupports thread-safe decleration macros.
 - Also with PicoVoice, changed to thread-safe add/remove ref macro. We are now creating them off main thread.
 - Do initialization off main thread, but go back to main thread to register the voices.
2013-09-17 09:40:07 -07:00
Dan Minor
27647137dc Bug 907351 - Android pandaboard reftests run significantly slower; r=gbrown 2013-09-16 06:54:39 -04:00
Daniel Holbert
df2805989e Bug 904197 followup: make reftests use Ahem font, to avoid pixel-alignment difference between block vs. inline elements. (test-only)
--HG--
rename : layout/reftests/flexbox/ahem.css => layout/reftests/position-sticky/ahem.css
2013-09-18 08:36:27 -07:00
Corey Ford
3fc43261c7 Bug 904197 - Use the union of continuations' rects in sticky positioning calculations. r=dholbert
Reftest inline-3.html fails because handling the sticky element's margin correctly will take more work; similarly, border/padding on containing-block continuations won't be handled quite right. Reftest column-contain-1a fails because some of the anonymous blocks inside an nsColumnSetFrame have 0 height.
2013-09-13 16:53:48 -07:00
L. David Baron
43f9903e53 Bug 911786 part 3: Add an assertion to check that part 2 only changes things for position:sticky. r=dholbert
I'm worried that part 2 was the cause of bug 916751.  If it was, I think
this assertion should catch the problem.  Even if it's not, I think it's
a good assertion to have.
2013-09-17 04:44:16 -07:00
L. David Baron
4d67f6dd65 Bug 916751: Do not use nsIFrame::MovePositionBy from nsLineLayout. r=dholbert
Since bug 916751 is hard (for me) to test, I haven't confirmed for sure
that this fixes the bug.

However, it fixes the assertions that bug 911786 part 3 triggers in
layout/base/crashtests/317934-1.html through this codepath.
2013-09-17 04:44:16 -07:00
L. David Baron
2ccf55e3f6 Bug 917021: We should not store the NormalPositionProperty on all frames, only relatively positioned ones. r=dholbert
This also fixes nsHTMLReflowState::ApplyRelativePositioning to no-op for
svg:text, as it should (since nsIFrame::IsRelativelyPositioned() checks
more than nsStyleDisplay::IsRelativelyPositionedStyle()).
2013-09-17 04:44:16 -07:00
L. David Baron
eea4b28546 Bug 915053: Remove quirk allowing {} around style attribute. r=heycam
The tests pass with the patch; without the patch
test_style_attribute_quirks.html fails 2 tests.
2013-09-17 04:44:15 -07:00
Cameron McCormack
ec1a5c3498 Bug 893319 - Remove -moz-rgba() and -moz-hsla(). r=bz 2013-09-16 10:43:56 +10:00
Cameron McCormack
0127877d37 Bug 874507 - Make clip-path, filter, mask and opacity work on <marker> elements. r=longsonr 2013-09-16 15:06:29 +10:00
Rik Cabanier
a160602f49 Bug 902525 - Part 7: fix to turn off text anti-aliasing r=roc 2013-09-15 16:48:14 -07:00
Rik Cabanier
b3a5b53c43 Bug 902525 - Part 6: some basic test files for HTML blending r=roc 2013-09-15 16:43:12 -07:00
Rik Cabanier
2e9e25f6c3 Bug 902525 - Part 4: first set of testfiles for SVG blending r=roc 2013-09-16 13:21:00 +10:00
Rik Cabanier
f7c9c54b27 Bug 902525 - Part 3: create a layer for content that stores the blend mode r=roc 2013-09-14 20:40:11 -07:00
Rik Cabanier
8c970079ca Bug 902525 - Part 2: Create layers for isolated groups when blending is involved r=roc 2013-09-14 20:30:00 -07:00
Nicholas Cameron
815a1d4a19 Bug 917576. Parse non-string pref values. r=ahal 2013-09-19 07:25:20 +12:00
Paul Rouget
9492494622 Bug 890195 - device-width media queries should use the page width, not the actual device width. r=bz 2013-07-17 05:08:00 +02:00
Phil Ringnalda
c396549686 Backed out 5 changesets (bug 904720, bug 915757, bug 902909) for b2g bustage
CLOSED TREE

Backed out changeset 2980ed8667f3 (bug 902909)
Backed out changeset 8c6ea94c7a9e (bug 902909)
Backed out changeset 2cd9d6be6dc2 (bug 902909)
Backed out changeset c00c7a77c130 (bug 904720)
Backed out changeset e385645fb787 (bug 915757)
2013-09-15 22:48:30 -07:00
Ryan VanderMeulen
94d8239afc Merge m-c to inbound. 2013-09-15 22:05:23 -04:00