← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/firefox/gutsy

« back to all changes in this revision

Viewing changes to layout/mathml/base/src/nsMathMLContainerFrame.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Ian Jackson
  • Date: 2006-10-10 18:49:32 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20061010184932-da75izt7y0e59afq
Tags: 1.99+2.0rc2+dfsg-0ubuntu1
* New upstream version 2.0rc2.
* Fix/workaround for epiphany GtkSocket lifetype crash:
  apply patch id=241087 from Mozilla Bugzilla #241535 to fix LP #63814.
* Change application name to `Firefox', as requested by mdz.
  Files changed:
    - browser/locales/en-US/chrome/branding/brand.dtd
    - browser/locales/en-US/chrome/branding/brand.properties;
  New values:
    - brandShortName and brandFullName: `Bon Echo' => `Firefox'
    - vendorShortName: `Mozilla' => `Ubuntu'
* Make preferences dialogue fit again (bah!).

Show diffs side-by-side

added added

removed removed

Lines of Context:
layout/mathml/base/src/nsMathMLContainerFrame.cpp
1031
1031
  if (aReflowState.mLineLayout)
1032
1032
    aReflowState.mLineLayout->ForgetWordFrames();
1033
1033
 
 
1034
  nsAutoSpaceManager autoSpaceManager(NS_CONST_CAST(nsHTMLReflowState &, aReflowState));
 
1035
  nsresult rv = autoSpaceManager.CreateSpaceManagerFor(aPresContext, this);
 
1036
  NS_ENSURE_SUCCESS(rv, rv);
 
1037
 
1034
1038
  // provide a local, self-contained linelayout where to reflow the nsInlineFrame
1035
1039
  nsSize availSize(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE);
1036
1040
  nsLineLayout ll(aPresContext, aReflowState.mSpaceManager, aReflowState.parentReflowState,