← Back to branch summary

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

« back to all changes in this revision

Viewing changes to layout/generic/nsPageFrame.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/generic/nsPageFrame.cpp
160
160
      // Create a continuing child of the previous page's last child
161
161
      nsIFrame*     newFrame;
162
162
 
163
 
      aPresContext->PresShell()->FrameConstructor()->
 
163
      nsresult rv = aPresContext->PresShell()->FrameConstructor()->
164
164
        CreateContinuingFrame(aPresContext, prevLastChild,
165
165
                              contentPage, &newFrame);
166
 
 
 
166
      if (NS_FAILED(rv)) {
 
167
        return rv;
 
168
      }
167
169
      // Make the new area frame the 1st child of the page content frame. There may already be
168
170
      // children placeholders which don't get reflowed but must not be destroyed until the 
169
171
      // page content frame is destroyed.