From 2e9c6662cc4eaedd435967acc8a3d478bd91f8a8 Mon Sep 17 00:00:00 2001
From: "scc%mozilla.org" <scc%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 7 Nov 2000 05:22:03 +0000
Subject: [PATCH] bug #39621, r=kmcclusky@netscape.com,
 sr=blizzard@mozilla.org.  Enable the new view manager with a pref
 "nglayout.debug.enable_scary_view_manager".  Just being the mac buddy for
 blizzard and roc.

git-svn-id: svn://10.0.0.236/trunk@82373 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/view/macbuild/view.mcp     | Bin 100976 -> 100976 bytes
 mozilla/view/src/nsViewFactory.cpp |  13 ++++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/mozilla/view/macbuild/view.mcp b/mozilla/view/macbuild/view.mcp
index 69ca9eeec56ef0bf181347f82c90ed4f232c2aa9..d18e30e12100bef3bc150112357db7531901e075 100644
GIT binary patch
delta 276
zcmew`h3&%>whh6Iyu1ty3?eK*f`x(c_2dLbZ%G~?hZTs~ftUk`If0l9h`A>pVKj%R
z2T8L6)o<oty6q>(=H}_+3e<iZO23}`Cg7bIi^2c@-!3qSFtvlt7X#8_%xaU@Hz!Yy
z4(bBxeHLWF$gxf5$8rV+E5*%fAu^_{uNfGa_$Pf6-yGLz!-&Trit}YQpYLj80&4#r
z_W%DPvCWPlzZfTn_lto=7#NDRfFeH`H|I@k;ssjuao&VbxZ#uKIyg5k`@-4BXfl06
P6Jt4}$##uqMh|uXo778i

delta 222
zcmew`h3&%>whh6IygUpH3?eK*f`x(c)#L<5@5$>KB_=D(=a_t&(EuXL3Y299%5LUh
zy6wlw>gMU=3RHZ1@|S>ja-AK*3w{XRDY&_M%X-#JMNNDnF&kwzcRl^pnX;5$XY%^y
z<jK)NT|m9hf-D$0wr-Hj`2T;V-Db5A8Pmy9of@07It>`1Hp*^3-_^#%v31>lW}s_2
zH#>&>Vw@b_F9sI*|Nj_2P~<1$=Ddkbyg>6l&YKWAIr59f=9ORA`WOwSZ)jpHXEfNZ
J(ah+<4gj_5RcinM

diff --git a/mozilla/view/src/nsViewFactory.cpp b/mozilla/view/src/nsViewFactory.cpp
index ba39b43aed0..2131865d56e 100644
--- a/mozilla/view/src/nsViewFactory.cpp
+++ b/mozilla/view/src/nsViewFactory.cpp
@@ -33,6 +33,7 @@
 #include "nsScrollPortView.h"
 
 #include "nsIModule.h"
+#include "nsIPref.h"
 
 static NS_DEFINE_CID(kCViewManager, NS_VIEW_MANAGER_CID);
 static NS_DEFINE_CID(kCView, NS_VIEW_CID);
@@ -43,6 +44,7 @@ static NS_DEFINE_CID(kCComponentManager, NS_COMPONENTMANAGER_CID);
 static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
 
+static const char kUseNewViewManagerPref[] = "nglayout.debug.enable_scary_view_manager";
 
 
 class nsViewFactory : public nsIFactory
@@ -109,13 +111,22 @@ nsresult nsViewFactory::LockFactory(PRBool aLock)
   return NS_OK;
 }
 
+#include "nsViewManager.h"
 #include "nsViewManager2.h"
 
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsViewManager)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsViewManager2)
 
 static NS_IMETHODIMP ViewManagerConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult)
 {
-  return nsViewManager2Constructor(aOuter, aIID, aResult);
+  PRBool useNewViewManager = PR_FALSE;
+
+  nsCOMPtr<nsIPref> prefs( do_GetService(NS_PREF_CONTRACTID) );
+  if (prefs)
+    prefs->GetBoolPref(kUseNewViewManagerPref, &useNewViewManager);
+
+  return useNewViewManager ? nsViewManagerConstructor(aOuter, aIID, aResult)
+                           : nsViewManager2Constructor(aOuter, aIID, aResult);
 }
 
 #define nsViewManagerConstructor ViewManagerConstructor