← Back to branch summary

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

« back to all changes in this revision

Viewing changes to layout/base/nsPresShell.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/base/nsPresShell.cpp
1975
1975
    mDocument->DeleteShell(this);
1976
1976
  }
1977
1977
 
 
1978
  // Revoke pending events.  We need to do this and cancel reflow commands
 
1979
  // before we destroy the frame manager, since apparently frame destruction
 
1980
  // sometimes spins the event queue when plug-ins are involved(!).
 
1981
  mPostedReplaces = nsnull;
 
1982
  mReflowEventQueue = nsnull;
 
1983
  nsCOMPtr<nsIEventQueue> eventQueue;
 
1984
  mEventQueueService->GetSpecialEventQueue(nsIEventQueueService::UI_THREAD_EVENT_QUEUE,
 
1985
                                           getter_AddRefs(eventQueue));
 
1986
  eventQueue->RevokeEvents(this);
 
1987
 
 
1988
  CancelAllReflowCommands();
 
1989
 
1978
1990
  // Destroy the frame manager. This will destroy the frame hierarchy
1979
1991
  mFrameConstructor->WillDestroyFrameTree();
1980
1992
  FrameManager()->Destroy();
2009
2021
    NS_RELEASE(mViewEventListener);
2010
2022
  }
2011
2023
 
2012
 
  // Revoke pending events
2013
 
  mPostedReplaces = nsnull;
2014
 
  mReflowEventQueue = nsnull;
2015
 
  nsCOMPtr<nsIEventQueue> eventQueue;
2016
 
  mEventQueueService->GetSpecialEventQueue(nsIEventQueueService::UI_THREAD_EVENT_QUEUE,
2017
 
                                           getter_AddRefs(eventQueue));
2018
 
  eventQueue->RevokeEvents(this);
2019
 
 
2020
 
  CancelAllReflowCommands();
2021
 
 
2022
2024
  RemoveDummyLayoutRequest();
2023
2025
  
2024
2026
  KillResizeEventTimer();