Correction to typo in checkin for bug 789096. Bug 983691, r=jfkthame
authorSimon Montagu <smontagu@smontagu.org>
Mon, 24 Mar 2014 02:23:12 -0700
changeset 174994 e10a3c75e704
parent 174993 0eb7e1fa8a0f
child 175002 8606b0c16697
child 175068 af1d9bca7c9c
push id26475
push usercbook@mozilla.com
push dateMon, 24 Mar 2014 14:11:33 +0000
treeherdermozilla-central@e10a3c75e704 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjfkthame
bugs789096, 983691
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Correction to typo in checkin for bug 789096. Bug 983691, r=jfkthame
layout/generic/nsLineLayout.cpp
layout/reftests/bugs/983691-1.html
layout/reftests/bugs/983691-ref.html
layout/reftests/bugs/reftest.list
--- a/layout/generic/nsLineLayout.cpp
+++ b/layout/generic/nsLineLayout.cpp
@@ -1940,17 +1940,17 @@ nsLineLayout::BlockDirAlignFrames(PerSpa
 
         case NS_STYLE_VERTICAL_ALIGN_TEXT_BOTTOM:
         {
           // The bottom of the logical box is aligned with the
           // bottom of the parent elements text.
           nscoord parentDescent = fm->MaxDescent();
           if (frameSpan) {
             pfd->mBounds.BStart(lineWM) = baselineBCoord + parentDescent -
-                                          pfd->mBounds.BStart(lineWM) +
+                                          pfd->mBounds.BSize(lineWM) +
                                           pfd->mBorderPadding.BEnd(frameWM) -
                                           frameSpan->mBEndLeading;
           }
           else {
             pfd->mBounds.BStart(lineWM) = baselineBCoord + parentDescent -
                                           pfd->mBounds.BSize(lineWM) -
                                           pfd->mMargin.BEnd(frameWM);
           }
new file mode 100644
--- /dev/null
+++ b/layout/reftests/bugs/983691-1.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <style>
+      @font-face {
+       src: url(../fonts/Ahem.ttf);
+       font-family: AhemReftest;
+      }
+      span { line-height: 1.0; font-family: AhemReftest; font-size: 30px }
+    </style>
+  </head>
+  <body>
+    <div>
+      <span>XXX
+        <span style="vertical-align:text-bottom">XXX</span>
+        <span style="vertical-align:text-top">XXX</span>
+      </span>
+    </div>
+  </body>
+</html>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/bugs/983691-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <style>
+      @font-face {
+       src: url(../fonts/Ahem.ttf);
+       font-family: AhemReftest;
+      }
+      span { line-height: 1.0; font-family: AhemReftest; font-size: 30px }
+    </style>
+  </head>
+  <body>
+    <div>
+      <span>XXX XXX XXX</span>
+    </div>
+  </body>
+</html>
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1798,8 +1798,9 @@ fuzzy-if(OSX==10.6,2,30) skip-if(B2G&&br
 == 960277-1.html 960277-1-ref.html
 pref(layout.css.overflow-clip-box.enabled,true) fuzzy(50,10) == 966992-1.html 966992-1-ref.html
 skip-if(Android) == 966510-1.html 966510-1-ref.html # scrollable elements other than the root probably won't work well on android until bug 776030 is fixed
 skip-if(Android) == 966510-2.html 966510-2-ref.html # same as above
 == 978911-1.svg 978911-1-ref.svg
 == 983084-1.html 983084-1-ref.html
 == 983084-2.html 983084-2-ref.html
 == 983084-3.html 983084-1-ref.html
+== 983691-1.html 983691-ref.html