Merge lp:~micahg/xulrunner/xul-1.9.1.head.fixlp327863 into lp:~mozillateam/xulrunner/xulrunner-1.9.1.head

[Micah Gersten]

[Micah Gersten (micahg)]

Patch built successfully in my ppa. Tested by LLStarks.

Unmerged revisions

500. By Micah Gersten on 2009-09-30

 * fix LP: #327863
   - added debian/patches/bz486065_att388372_fix_gtk_borders.patch
   - updated debian/patches/series

=== added file 'debian/patches/bz486065_att388372_fix_gtk_borders.patch'
--- debian/patches/bz486065_att388372_fix_gtk_borders.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/bz486065_att388372_fix_gtk_borders.patch	2009-09-30 01:50:20 +0000
@@ -0,0 +1,35 @@
+--- a/layout/generic/nsHTMLReflowState.cpp	Wed Jul 29 18:10:50 2009 -0400
++++ b/layout/generic/nsHTMLReflowState.cpp	Thu Jul 30 15:43:22 2009 +1200
+@@ -1925,7 +1925,8 @@ nsCSSOffsetState::InitOffsets(nscoord aC
+   }
+   mComputedBorderPadding += mComputedPadding;
+ 
+-  if (frame->GetType() == nsGkAtoms::tableFrame) {
++  nsIAtom* frameType = frame->GetType();
++  if (frameType == nsGkAtoms::tableFrame) {
+     nsTableFrame *tableFrame = static_cast<nsTableFrame*>(frame);
+ 
+     if (tableFrame->IsBorderCollapse()) {
+@@ -1936,6 +1937,23 @@ nsCSSOffsetState::InitOffsets(nscoord aC
+       mComputedPadding.SizeTo(0,0,0,0);
+       mComputedBorderPadding = tableFrame->GetIncludedOuterBCBorder();
+     }
++  } else if (frameType == nsGkAtoms::scrollbarFrame) {
++    // scrollbars may have had their width or height smashed to zero
++    // by the associated scrollframe, in which case we must not report
++    // any padding or border on that axis.
++    nsSize size(frame->GetSize());
++    if (size.width == 0) {
++      mComputedPadding.left = 0;
++      mComputedPadding.right = 0;
++      mComputedBorderPadding.left = 0;
++      mComputedBorderPadding.right = 0;
++    }
++    if (size.height == 0) {
++      mComputedPadding.top = 0;
++      mComputedPadding.bottom = 0;
++      mComputedBorderPadding.top = 0;
++      mComputedBorderPadding.bottom = 0;
++    }
+   }
+ }

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-09-24 00:42:26 +0000
+++ debian/patches/series	2009-09-30 01:50:20 +0000
@@ -18,3 +18,4 @@
 bzXXX_fix_python_dom_pyxultest.patch
 testsuite_skip_tests_depending_on_utf8.patch
 bz473629_lp319480_leak_setenv_apprunner.patch
+bz486065_att388372_fix_gtk_borders.patch