← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/xulrunner-1.9/jaunty

« back to all changes in this revision

Viewing changes to mozilla/layout/generic/nsFirstLetterFrame.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Fabien Tassin, Sasa Bodiroza, Fabien Tassin, Alexander Sack
  • Date: 2008-09-02 11:54:00 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20080902115400-yfy26crvszpalvg5
Tags: 1.9.0.2+build3+nobinonly-0ubuntu1
https://launchpad.net/bugs/252793
https://launchpad.net/bugs/263014
[ Sasa Bodiroza ]
* In debian/rules:
  - Set 644 chmod to png files (LP: #252793) [Patch by Paolo Naldini]

[ Fabien Tassin ]
* improve create-build-system.sh to detect build-tree directory
  when embedded tarball is used. Fix un-escaped variables.
  Create build-system.tar.gz in the debian directory to prevent
  cdbs to check and unpack it during the build
  - update debian/create-build-system.sh
* Fix variables when an embedded tarball is used
  - update debian/rules
* Fix buffer overflow in realpath() at runtime and drop -U_FORTIFY_SOURCE
  from CPPFLAGS (LP: #263014)
  - add debian/patches/bz412610_att335369_realpath_overflow.patch
  - update debian/patches/series

[ Alexander Sack <asac@jwsdot.com> ]
* introduce preferred plugins by mime-type experimental feature;
  you can now set a pref to explicitly select a plugin to serve a particilar
  mime-type; patch contains further documentation.
  - add debian/patches/bzXXX_plugin_for_mimetype_pref.patch
  - update debian/patches/series
* drop patches applied upstream
  - drop bz120380_att326044.patch (fixed by bz442629)
  - update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/layout/generic/nsFirstLetterFrame.cpp
236
236
    nsLineLayout* ll = aReflowState.mLineLayout;
237
237
    PRBool        pushedFrame;
238
238
 
 
239
    NS_ASSERTION(ll->GetFirstLetterStyleOK() || GetPrevInFlow(),
 
240
                 "First-in-flow first-letter should have first-letter style enabled in nsLineLayout!");
239
241
    ll->BeginSpan(this, &aReflowState, bp.left, availSize.width);
240
242
    ll->ReflowFrame(kid, aReflowStatus, &aMetrics, pushedFrame);
241
243
    ll->EndSpan(this);