From 43810cc9dd15d206638540279161bd1219e52db3 Mon Sep 17 00:00:00 2001
From: "michaelp%netscape.com"
 <michaelp%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 30 Sep 1998 18:59:03 +0000
Subject: [PATCH] we now defer plugin enumeration until we need to load one for
 real.

git-svn-id: svn://10.0.0.236/trunk@11579 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/docshell/base/nsWebShell.cpp | 6 +-----
 mozilla/webshell/src/nsWebShell.cpp  | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index b169e85fd5b..4c2eef9cc86 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -325,7 +325,6 @@ nsresult nsWebShell::CreatePluginHost(PRBool aAllowPlugins)
                                                     (void **)&mPluginHost))
         {
           mPluginHost->Init();
-          mPluginHost->LoadPlugins();
         }
       }
     }
@@ -382,10 +381,7 @@ nsWebShell::~nsWebShell()
   NS_IF_RELEASE(mInnerWindow);
 
   NS_IF_RELEASE(mContentViewer);
-  if (nsnull != mDeviceContext) {
-    mDeviceContext->FlushFontCache();
-    NS_RELEASE(mDeviceContext);
-  }
+  NS_IF_RELEASE(mDeviceContext);
   NS_IF_RELEASE(mPrefs);
   NS_IF_RELEASE(mContainer);
   NS_IF_RELEASE(mObserver);
diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp
index b169e85fd5b..4c2eef9cc86 100644
--- a/mozilla/webshell/src/nsWebShell.cpp
+++ b/mozilla/webshell/src/nsWebShell.cpp
@@ -325,7 +325,6 @@ nsresult nsWebShell::CreatePluginHost(PRBool aAllowPlugins)
                                                     (void **)&mPluginHost))
         {
           mPluginHost->Init();
-          mPluginHost->LoadPlugins();
         }
       }
     }
@@ -382,10 +381,7 @@ nsWebShell::~nsWebShell()
   NS_IF_RELEASE(mInnerWindow);
 
   NS_IF_RELEASE(mContentViewer);
-  if (nsnull != mDeviceContext) {
-    mDeviceContext->FlushFontCache();
-    NS_RELEASE(mDeviceContext);
-  }
+  NS_IF_RELEASE(mDeviceContext);
   NS_IF_RELEASE(mPrefs);
   NS_IF_RELEASE(mContainer);
   NS_IF_RELEASE(mObserver);