mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
import changes from rmottola/Arctic-Fox:
- Goanna->Gecko: GoannaMediaPluginService & GoannaTouchDispatcher (1e10799bf) - Goanna->Gecko: GoannaProcess (dd671240a) - Goanna->Gecko: goannamediaplugin (2a9423ba6) - Goanna->Gecko: GoannaContentController (62e7c2f5f) - Goanna->Gecko: GoannaProfiler & GoannaTaskTracer (376c45a3c)
This commit is contained in:
@@ -31,7 +31,7 @@
|
||||
#include "nsNPAPIPlugin.h"
|
||||
#include "nsPrintfCString.h"
|
||||
#include "prsystem.h"
|
||||
#include "GoannaProfiler.h"
|
||||
#include "GeckoProfiler.h"
|
||||
#include "nsPluginTags.h"
|
||||
#include "nsUnicharUtils.h"
|
||||
|
||||
@@ -255,7 +255,7 @@ bool PluginModuleMapping::sIsLoadModuleOnStack = false;
|
||||
void
|
||||
mozilla::plugins::TerminatePlugin(uint32_t aPluginId)
|
||||
{
|
||||
MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default);
|
||||
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
|
||||
|
||||
nsRefPtr<nsPluginHost> host = nsPluginHost::GetInst();
|
||||
nsPluginTag* pluginTag = host->PluginWithId(aPluginId);
|
||||
@@ -274,7 +274,7 @@ PluginModuleContentParent::LoadModule(uint32_t aPluginId)
|
||||
PluginModuleMapping::NotifyLoadingModule loadingModule;
|
||||
nsAutoPtr<PluginModuleMapping> mapping(new PluginModuleMapping(aPluginId));
|
||||
|
||||
MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Content);
|
||||
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Content);
|
||||
|
||||
/*
|
||||
* We send a LoadPlugin message to the chrome process using an intr
|
||||
|
||||
Reference in New Issue
Block a user