Backing out my changes in the last few hours because Chase is tagging the tree. (the tree was open, but he was tagging)
git-svn-id: svn://10.0.0.236/trunk@175970 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -2545,10 +2545,6 @@ nsPluginHostImpl::nsPluginHostImpl()
|
||||
|
||||
mPrefService->GetBoolPref("plugin.default_plugin_disabled", &tmp);
|
||||
mDefaultPluginDisabled = tmp;
|
||||
|
||||
#ifdef WINCE
|
||||
mDefaultPluginDisabled = PR_TRUE;
|
||||
#endif
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIObserverService> obsService = do_GetService("@mozilla.org/observer-service;1");
|
||||
|
||||
@@ -129,10 +129,8 @@ public:
|
||||
virtual nsresult CallSetWindow(nsCOMPtr<nsIPluginInstance> &aPluginInstance);
|
||||
|
||||
private:
|
||||
#ifndef WINCE
|
||||
nsresult SubclassAndAssociateWindow();
|
||||
nsresult UndoSubclassAndAssociateWindow();
|
||||
#endif
|
||||
|
||||
public:
|
||||
// locals
|
||||
@@ -476,25 +474,17 @@ nsresult nsPluginNativeWindowWin::CallSetWindow(nsCOMPtr<nsIPluginInstance> &aPl
|
||||
{
|
||||
// check the incoming instance, null indicates that window is going away and we are
|
||||
// not interested in subclassing business any more, undo and don't subclass
|
||||
|
||||
// WINCE does not subclass windows. See bug 300011 for the details.
|
||||
#ifndef WINCE
|
||||
if (!aPluginInstance)
|
||||
UndoSubclassAndAssociateWindow();
|
||||
#endif
|
||||
|
||||
nsPluginNativeWindow::CallSetWindow(aPluginInstance);
|
||||
|
||||
#ifndef WINCE
|
||||
if (aPluginInstance)
|
||||
SubclassAndAssociateWindow();
|
||||
#endif
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
#ifndef WINCE
|
||||
|
||||
nsresult nsPluginNativeWindowWin::SubclassAndAssociateWindow()
|
||||
{
|
||||
if (type != nsPluginWindowType_Window)
|
||||
@@ -542,7 +532,6 @@ nsresult nsPluginNativeWindowWin::UndoSubclassAndAssociateWindow()
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
#endif // WINCE
|
||||
|
||||
nsresult PLUG_NewPluginNativeWindow(nsPluginNativeWindow ** aPluginNativeWindow)
|
||||
{
|
||||
|
||||
@@ -55,7 +55,6 @@ MOZILLA_INTERNAL_API = 1
|
||||
|
||||
ifdef MINIMO
|
||||
FORCE_SHARED_LIB = 1
|
||||
FORCE_USE_PIC = 1
|
||||
endif
|
||||
|
||||
PACKAGE_FILE = pipboot.pkg
|
||||
|
||||
@@ -56,7 +56,6 @@ MOZILLA_INTERNAL_API = 1
|
||||
|
||||
ifdef MINIMO
|
||||
FORCE_SHARED_LIB = 1
|
||||
FORCE_USE_PIC = 1
|
||||
endif
|
||||
|
||||
PACKAGE_FILE = pippki.pkg
|
||||
|
||||
@@ -56,7 +56,6 @@ MOZILLA_INTERNAL_API = 1
|
||||
|
||||
ifdef MINIMO
|
||||
FORCE_SHARED_LIB = 1
|
||||
FORCE_USE_PIC = 1
|
||||
endif
|
||||
|
||||
PACKAGE_FILE = pipnss.pkg
|
||||
|
||||
Reference in New Issue
Block a user