зеркало из https://github.com/mozilla/gecko-dev.git
enable OJI on unix.
This commit is contained in:
Родитель
8025cdb11b
Коммит
013c6b4651
|
@ -27,7 +27,7 @@
|
||||||
#include "nsFileSpec.h"
|
#include "nsFileSpec.h"
|
||||||
#include "nsCOMPtr.h"
|
#include "nsCOMPtr.h"
|
||||||
|
|
||||||
#if defined(OJI) && !defined(XP_UNIX)
|
#if defined(OJI)
|
||||||
#include "nsIDocument.h"
|
#include "nsIDocument.h"
|
||||||
#include "nsIScriptContextOwner.h"
|
#include "nsIScriptContextOwner.h"
|
||||||
#include "nsIScriptGlobalObject.h"
|
#include "nsIScriptGlobalObject.h"
|
||||||
|
@ -761,7 +761,7 @@ NS_IMETHODIMP nsPluginInstancePeerImpl::GetJSWindow(JSObject* *outJSWindow)
|
||||||
{
|
{
|
||||||
*outJSWindow = NULL;
|
*outJSWindow = NULL;
|
||||||
nsresult rv = NS_ERROR_FAILURE;
|
nsresult rv = NS_ERROR_FAILURE;
|
||||||
#if defined(OJI) && !defined(XP_UNIX)
|
#if defined(OJI)
|
||||||
nsIDocument* document = nsnull;
|
nsIDocument* document = nsnull;
|
||||||
if (mOwner->GetDocument(&document) == NS_OK) {
|
if (mOwner->GetDocument(&document) == NS_OK) {
|
||||||
nsIScriptContextOwner* contextOwner = document->GetScriptContextOwner();
|
nsIScriptContextOwner* contextOwner = document->GetScriptContextOwner();
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#include "nsFileSpec.h"
|
#include "nsFileSpec.h"
|
||||||
#include "nsCOMPtr.h"
|
#include "nsCOMPtr.h"
|
||||||
|
|
||||||
#if defined(OJI) && !defined(XP_UNIX)
|
#if defined(OJI)
|
||||||
#include "nsIDocument.h"
|
#include "nsIDocument.h"
|
||||||
#include "nsIScriptContextOwner.h"
|
#include "nsIScriptContextOwner.h"
|
||||||
#include "nsIScriptGlobalObject.h"
|
#include "nsIScriptGlobalObject.h"
|
||||||
|
@ -761,7 +761,7 @@ NS_IMETHODIMP nsPluginInstancePeerImpl::GetJSWindow(JSObject* *outJSWindow)
|
||||||
{
|
{
|
||||||
*outJSWindow = NULL;
|
*outJSWindow = NULL;
|
||||||
nsresult rv = NS_ERROR_FAILURE;
|
nsresult rv = NS_ERROR_FAILURE;
|
||||||
#if defined(OJI) && !defined(XP_UNIX)
|
#if defined(OJI)
|
||||||
nsIDocument* document = nsnull;
|
nsIDocument* document = nsnull;
|
||||||
if (mOwner->GetDocument(&document) == NS_OK) {
|
if (mOwner->GetDocument(&document) == NS_OK) {
|
||||||
nsIScriptContextOwner* contextOwner = document->GetScriptContextOwner();
|
nsIScriptContextOwner* contextOwner = document->GetScriptContextOwner();
|
||||||
|
|
Загрузка…
Ссылка в новой задаче