← Back to branch summary

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

« back to all changes in this revision

Viewing changes to toolkit/components/satchel/src/nsFormFillController.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:
toolkit/components/satchel/src/nsFormFillController.cpp
149
149
        scale = presContext->TwipsToPixels();
150
150
 
151
151
        nsIFrame* frame;
152
 
        nsresult rv = presShell->GetPrimaryFrameFor(content, &frame);
153
 
        if (NS_FAILED(rv))
 
152
        presShell->GetPrimaryFrameFor(content, &frame);
 
153
        if (!frame)
154
154
          return rect;
155
155
 
156
156
        nsIView* view;
248
248
    if (aPopupOpen) {
249
249
      // make sure input field is visible before showing popup (bug 320938)
250
250
      nsCOMPtr<nsIContent> content = do_QueryInterface(mFocusedInput);
 
251
      NS_ENSURE_STATE(content);
251
252
      nsCOMPtr<nsIDocShell> docShell = GetDocShellForInput(mFocusedInput);
 
253
      NS_ENSURE_STATE(docShell);
252
254
      nsCOMPtr<nsIPresShell> presShell;
253
255
      docShell->GetPresShell(getter_AddRefs(presShell));
 
256
      NS_ENSURE_STATE(presShell);
254
257
      nsIFrame *frame = nsnull;
255
258
      presShell->GetPrimaryFrameFor(content.get(), &frame);
256
259
      if (frame)
1113
1116
  nsCOMPtr<nsIDOMDocument> domDoc;
1114
1117
  aInput->GetOwnerDocument(getter_AddRefs(domDoc));
1115
1118
  nsCOMPtr<nsIDocument> doc = do_QueryInterface(domDoc);
1116
 
  
 
1119
  NS_ENSURE_TRUE(doc, nsnull);
1117
1120
  nsCOMPtr<nsIWebNavigation> webNav = do_GetInterface(doc->GetScriptGlobalObject());
1118
1121
  nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(webNav);
1119
1122
  return docShell;