Read-only Git mirror of the Mercurial gecko repositories at https://hg.mozilla.org. How to contribute: https://firefox-source-docs.mozilla.org/contributing/contribution_quickref.html
Go to file
L. David Baron bb57d7d42e Bug 451791 patch 2 - Report block non-empty to its parent block during margin collapsing if we encounter clearance. r=roc
The goal of ComputeCollapsedBStartMargin is to collapse all of the
margins that collapse with a block's top margin.  It does this by
scanning forward through the child list until it finds something that
blocks collapsing; it descends into children through recursion.  When we
find a non-empty block or line, we stop collapsing and report to the
parent that the child is non-empty so that it stops collapsing as well.

This patch changes our behavior when we have clearance to do the same
thing that we do for non-empty lines or blocks (which makes both
occurrences of |goto done| be preceded by the same code).  Without the
patch we would fail to report being non-empty to the parent (and instead
report emptiness based on the IsEmpty() method).  This meant that,
without the patch, if a block has a child with clearance but also has
IsEmpty() true, we would stop scanning margins in that block after the
clearance, but start searching again for margins in the block's parent,
starting with the block's bottom margin.  This patch sets *aBlockIsEmpty
to true in that case so that we do not pick up again in the block's
parent (or, potentially, grandparent, etc.).

--HG--
extra : commitid : LCMTvXvZT3G
2015-08-05 21:04:38 -07:00
accessible Bug 1187740 - Handle proxies in mozHTMLAccessible r=tbsaunde 2015-08-05 21:55:15 -04:00
addon-sdk Bug 1184005 - Remove readinglist. r=MattN,jaws,adw 2015-08-04 12:00:43 +10:00
b2g Merge m-c to inbound, a=merge 2015-08-05 16:47:52 -07:00
browser Merge m-c to inbound, a=merge 2015-08-05 16:47:52 -07:00
build Bug 1188780 - Include debug symbols in gtk3 tooltool package. r=mshal 2015-08-04 17:26:11 -04:00
caps Bug 1179557 - Add getters for userContextId. r=bholley, r=tanvi 2015-07-30 14:15:00 -04:00
chrome Bug 1161831 - Factor the sharable bits out of nsIResProtocolHandler. r=billm 2015-07-21 12:57:21 -07:00
config Bug 830801 - Part 3. Remove NOMINMAX define from cpp source. r=mshal 2015-08-03 10:07:20 +09:00
db/sqlite3 Bug 1188578 - Upgrade SQLite to version 3.8.11.1. r=mak 2015-07-30 07:49:40 -04:00
docshell Merge mozilla-central to fx-team 2015-08-05 13:36:41 +02:00
dom Bug 1189624 - Have AudioSink listen to MediaQueue events to know whether to continue playback. r=kinetik. 2015-08-06 10:16:49 +08:00
editor Bug 1156062 part 1b - Convert some callers of nsEditor::SplitNodeDeep; r=ehsan 2015-08-05 18:10:09 +03:00
embedding Bug 830801 - Part 3. Remove NOMINMAX define from cpp source. r=mshal 2015-08-03 10:07:20 +09:00
extensions Bug 1191107 - Split TYPE_XMLHTTPREQUEST and TYPE_DATAREQUEST for EventSource - IGNORE IDL (r=sicking,ehsan) 2015-08-05 12:58:05 -07:00
gfx Bug 1190950: Check mappings and surfaces for UpdateFromSurface more robustly. r=mattwoodrow 2015-08-06 02:29:47 +00:00
hal Bug 1184285 - Stop warning if RemoveObserver() is called for unregistered observer. r=dhylands 2015-07-24 12:08:26 -07:00
image Bug 1191100 - Remove XPIDL signature comments in .cpp files. r=ehsan 2015-08-04 16:17:36 -07:00
intl Bug 1191100 - Remove XPIDL signature comments in .cpp files. r=ehsan 2015-08-04 16:17:36 -07:00
ipc Merge mozilla-central to b2g-inbound 2015-08-03 16:20:10 +02:00
js Bug 187773 - Don't include heapapi.h from js/public. r=jorendorff 2015-08-06 11:48:46 +09:00
layout Bug 451791 patch 2 - Report block non-empty to its parent block during margin collapsing if we encounter clearance. r=roc 2015-08-05 21:04:38 -07:00
media Bug 1185115 - Ensure we have enough memory to allocate required capacity. r=kentuckyfriedtakahe 2015-08-04 13:43:17 -04:00
memory Bug 830801 - Part 3. Remove NOMINMAX define from cpp source. r=mshal 2015-08-03 10:07:20 +09:00
mfbt Bug 1188895 - Replace U+0A00 with U+0200 in MacroForEach.h. r=Ms2ger 2015-08-01 00:36:00 -04:00
mobile Merge m-c to inbound, a=merge 2015-08-05 16:47:52 -07:00
modules Backed out changeset 621a6c6aa375 (bug 1007063) for Windows XP test failures/crashes. 2015-08-05 12:20:17 -04:00
mozglue Bug 1186467 - Update generated JNI bindings; r=me 2015-08-04 17:47:28 -04:00
netwerk Merge m-c to inbound, a=merge 2015-08-05 16:47:52 -07:00
nsprpub Bug 1191269, Update Mozilla 42 to NSPR 4.10.9, landing NSPR_4_10_9_BETA3, r=ted 2015-08-05 13:03:50 +02:00
other-licenses Bug 1188462 - Rename gfx/skia/trunk directory to gfx/skia/skia. r=jrmuizel 2015-07-30 11:51:29 -04:00
parser Bug 1181965. Remove uses of mozRequestAnimationFrame from dom and parser tests. r=bkelly 2015-07-14 15:28:57 -04:00
probes Bug 1041795 - Disable system libs when generating DTrace probes. f=sfink f=ginn.chen 2014-11-04 02:01:00 +01:00
python Backed out changeset 684252f11061 (bug 1188224) for make check bustage. 2015-08-05 13:50:11 +09:00
rdf Bug 1179071 - Merge RemovingIterator into Iterator. r=froydnj. 2015-07-06 22:02:26 -07:00
security merge mozilla-inbound to mozilla-central a=merge 2015-08-03 13:56:39 +02:00
services Bug 1182740 - treat keypair and certificate as an atomic pair to avoid invalid assertions. r=stomlinson 2015-07-29 16:06:29 +10:00
startupcache Bug 1189156 (part 4) - Don't use enumeration style for nsBaseHashtable::SizeOf{In,Ex}cludingThis(). r=erahm,jfkthame. 2015-07-30 21:19:57 -07:00
storage Bug 1184564 part 2 - Use Value instead of jsval in dom/ and storage/. r=bz 2015-07-18 21:45:35 +02:00
testing merge mozilla-inbound to mozilla-central a=merge 2015-08-05 13:12:59 +02:00
toolkit Merge m-c to inbound, a=merge 2015-08-05 16:47:52 -07:00
tools Bug 1189465 - Make LULStats constructor explicit; r=BenWa 2015-07-30 20:31:08 -04:00
uriloader Bug 1191100 - Remove XPIDL signature comments in .cpp files. r=ehsan 2015-08-04 16:17:36 -07:00
view Bug 1157941 - If the current PresShell is suppressed, paint the old one if it is available r=tn,Enn 2015-07-21 21:09:02 -04:00
webapprt Bug 1185637 - part 1 - move APP_VERSION defines into moz.build; r=glandium 2015-07-20 14:35:31 -04:00
widget Merge m-c to inbound, a=merge 2015-08-05 16:47:52 -07:00
xpcom Bug 1189156 (part 4) - Don't use enumeration style for nsBaseHashtable::SizeOf{In,Ex}cludingThis(). r=erahm,jfkthame. 2015-07-30 21:19:57 -07:00
xpfe Bug 1191100 - Remove XPIDL signature comments in .cpp files. r=ehsan 2015-08-04 16:17:36 -07:00
xulrunner Bug 1181040 - Include mozconfig.cache after mozconfig.common.override. r=mshal 2015-07-11 06:26:20 +09:00
.clang-format Bug 961541 - Make Clang-Format ignore all comments. r=mystor 2015-06-26 12:38:44 -07:00
.clang-format-ignore
.gdbinit Backed out changeset 047d21f101de (bug 846018) 2014-11-13 17:11:25 -05:00
.gitignore No bug; add .pdb to gitignore 2015-04-01 16:02:20 -04:00
.hgignore Bug 1186963 - Ignore files generated by running a Mozharness script. DONTBUILD. r=gps 2015-07-24 09:30:18 -04:00
.hgtags No bug - Tagging mozilla-central 312c68b16549 with FIREFOX_AURORA_41_BASE a=release DONTBUILD CLOSED TREE 2015-06-29 13:29:11 -07:00
.lldbinit
.ycm_extra_conf.py Bug 1162714 - Don't let YCM generate machc. r=ehsan 2015-05-07 13:48:00 +02:00
aclocal.m4 bug 1163828 - build system changes to support building for iOS. r=glandium 2015-06-10 11:10:40 -04:00
Android.mk
AUTHORS Bug 1119560 - remove unused browser.search.param.yahoo-fr* prefs. r=gavin 2015-01-13 03:27:00 +01:00
client.mk Bug 1176533 - Rename the variable MOZ_APP_VERSION_ABOUT for something more general r=glandium 2015-07-11 19:37:54 -06:00
client.py
CLOBBER Bug 1190353 - "Touch Clobber to fix Bug 1190180". r=tomcat a=tomcat 2015-08-03 05:41:00 +02:00
configure.in Bug 830801 - Part 1. Set NOMINMAX define as default. r=mshal 2015-08-03 10:05:05 +09:00
GNUmakefile Bug 794723 - Add a default makefile which wraps mach. r=gps 2015-02-06 10:26:00 -08:00
LEGAL
LICENSE
mach Bug 1058923 - Package mach in tests.zip; create bootstrap script for test package, r=gps 2015-05-01 12:20:55 -04:00
Makefile.in bug 1168535 - print error response body in upload_symbols.py. r=gps 2015-05-27 13:50:04 -04:00
moz.build Bug 1134110 - other-license/android is unnecessary if Android minimum version is 11 or later. f=esawin, r=sworkman 2015-05-14 15:38:18 +09:00
mozilla-config.h.in Bug 1167474 - Remove ELFHACK_BUILD hack. r=mshal 2015-05-26 16:17:55 +09:00
README.txt Bug 1163484 - Remove extra chars from readme. r=lightsofapollo 2015-05-10 21:56:00 +02:00

An explanation of the Mozilla Source Code Directory Structure and links to
project pages with documentation can be found at:

    https://developer.mozilla.org/en/Mozilla_Source_Code_Directory_Structure

For information on how to build Mozilla from the source code, see:

    http://developer.mozilla.org/en/docs/Build_Documentation

To have your bug fix / feature added to Mozilla, you should create a patch and
submit it to Bugzilla (https://bugzilla.mozilla.org). Instructions are at:

    http://developer.mozilla.org/en/docs/Creating_a_patch
    http://developer.mozilla.org/en/docs/Getting_your_patch_in_the_tree

If you have a question about developing Mozilla, and can't find the solution
on http://developer.mozilla.org, you can try asking your question in a
mozilla.* Usenet group, or on IRC at irc.mozilla.org. [The Mozilla news groups
are accessible on Google Groups, or news.mozilla.org with a NNTP reader.]

You can download nightly development builds from the Mozilla FTP server.
Keep in mind that nightly builds, which are used by Mozilla developers for
testing, may be buggy. Firefox nightlies, for example, can be found at:

    ftp://ftp.mozilla.org/pub/firefox/nightly/latest-trunk/
            - or -
    http://nightly.mozilla.org/