Attachment #453936 for bug #574120

Attachment #453936: Everything else, v2 for bug #574120

View | Details | Raw Unified | Return to bug 574120
Collapse All | Expand All

(-)a/configure.in (-1 / +1 lines)

Line	Link Here

Lines 5701-5707 dnl ====================================	Link Here

5701

dnl = Disable IPC support for tabs and plugins

5701

dnl = Disable IPC support for tabs and plugins

5702

dnl ========================================================

5702

dnl ========================================================

5703

case "${target}" in

5703

case "${target}" in

5704

*-wince*|*-android*)

5704

*-wince*)

5705

    MOZ_IPC=

5705

    MOZ_IPC=

5706

;;

5706

;;

5707

esac

5707

esac

(-)a/content/base/src/nsFrameLoader.cpp (+4 lines)

Line	Link Here

Lines 817-822 nsFrameLoader::ShowRemoteFrame(nsIFrameF	Link Here

817

    // Don't create any parent/child XEmbed, because we are painting with shared memory

817

    // Don't create any parent/child XEmbed, because we are painting with shared memory

818

    mChildProcess->SendcreateWidget(0);

818

    mChildProcess->SendcreateWidget(0);

819

820

#elif defined(ANDROID)

821

  // Painting with shared memory

822

823

  mChildProcess->SendcreateWidget(0);

820

#elif defined(XP_MACOSX)

824

#elif defined(XP_MACOSX)

821

#  warning IMPLEMENT ME

825

#  warning IMPLEMENT ME

822

826

(-)a/dom/ipc/TabChild.cpp (+5 lines)

Line	Link Here

Lines 431-436 TabChild::RecvcreateWidget(const MagicWi	Link Here

431

    view->scene()->addItem(win);

431

    view->scene()->addItem(win);

432

#elif defined(XP_WIN)

432

#elif defined(XP_WIN)

433

    HWND win = parentWidget;

433

    HWND win = parentWidget;

434

#elif defined(ANDROID)

435

    // Fake pointer to make baseWindow->InitWindow work

436

    // The android widget code is mostly disabled in the child process

437

    // so it won't choke on this

438

    void *win = (void *)0x1234;

434

#elif defined(XP_MACOSX)

439

#elif defined(XP_MACOSX)

435

#  warning IMPLEMENT ME

440

#  warning IMPLEMENT ME

436

#else

441

#else

(-)a/dom/ipc/TabTypes.h (+4 lines)

Line	Link Here

Lines 23-28 typedef unsigned long MagicWindowHandle;	Link Here

#  warning This is a placeholder

#  warning This is a placeholder

typedef long MagicWindowHandle;

typedef long MagicWindowHandle;

#elif defined(ANDROID)

/* we don't really use this */

typedef unsigned long MagicWindowHandle;

#else

#else

#error Not implemented, stooge

#error Not implemented, stooge

#endif

#endif

(-)a/dom/plugins/PluginMessageUtils.h (-1 / +1 lines)

Line	Link Here

Lines 124-130 struct NPRemoteWindow	Link Here

124

typedef HWND NativeWindowHandle;

124

typedef HWND NativeWindowHandle;

125

#elif defined(MOZ_X11)

125

#elif defined(MOZ_X11)

126

typedef XID NativeWindowHandle;

126

typedef XID NativeWindowHandle;

127

#elif defined(XP_MACOSX)

127

#elif defined(XP_MACOSX) || defined(ANDROID)

128

typedef intptr_t NativeWindowHandle; // never actually used, will always be 0

128

typedef intptr_t NativeWindowHandle; // never actually used, will always be 0

129

#else

129

#else

130

#error Need NativeWindowHandle for this platform

130

#error Need NativeWindowHandle for this platform






#include "nsDirectoryServiceDefs.h"
#include "nsIFile.h"
#include "nsILocalFile.h"

#include "mozilla/ipc/BrowserProcessSubThread.h"
#include "mozilla/Omnijar.h"
#include <sys/stat.h>

#ifdef XP_WIN

#endif
    newEnvVars["LD_LIBRARY_PATH"] = path.get();
#endif
#ifdef MOZ_OMNIJAR
    // Make sure the child process can find the omnijar
    // See ScopedXPCOMStartup::Initialize in nsAppRunner.cpp
    nsCAutoString omnijarPath;
    if (mozilla::OmnijarPath())
      mozilla::OmnijarPath()->GetNativePath(omnijarPath);
    newEnvVars["OMNIJAR_PATH"] = omnijarPath.get();
#endif
  }
  else {
    exePath = FilePath(CommandLine::ForCurrentProcess()->argv()[0]);

(-)a/toolkit/library/libxul-config.mk (+2 lines)

Line	Link Here

Lines 107-114 STATIC_LIBS += ipdlunittest_s	Link Here

107

endif

107

endif

108

109

ifeq (Linux,$(OS_ARCH))

109

ifeq (Linux,$(OS_ARCH))

110

ifneq (Android,$(OS_TARGET))

110

OS_LIBS += -lrt

111

OS_LIBS += -lrt

111

endif

112

endif

113

endif

112

ifeq (WINNT,$(OS_ARCH))

114

ifeq (WINNT,$(OS_ARCH))

113

OS_LIBS += dbghelp.lib

115

OS_LIBS += dbghelp.lib

114

endif

116

endif

(-)a/toolkit/xre/nsAppRunner.cpp (-1 / +16 lines)

Line	Link Here

Lines 1135-1141 ScopedXPCOMStartup::Initialize()	Link Here

1135

  nsresult rv;

1135

  nsresult rv;

1136

#ifdef MOZ_OMNIJAR

1136

#ifdef MOZ_OMNIJAR

1137

  nsCOMPtr<nsILocalFile> lf;

1137

  nsCOMPtr<nsILocalFile> lf;

1138

  rv = XRE_GetBinaryPath(gArgv[0], getter_AddRefs(lf));

1138

  char *omnijarPath = getenv("OMNIJAR_PATH");

1139

  if (omnijarPath)

1140

    rv = NS_NewNativeLocalFile(nsDependentCString(omnijarPath), PR_TRUE, getter_AddRefs(lf));

1141

  else

1142

    rv = XRE_GetBinaryPath(gArgv[0], getter_AddRefs(lf));

1139

  if (NS_SUCCEEDED(rv))

1143

  if (NS_SUCCEEDED(rv))

1140

    mozilla::SetOmnijar(lf);

1144

    mozilla::SetOmnijar(lf);

1141

#endif

1145

#endif

Lines 3756-3761 XRE_InitCommandLine(int aArgc, char* aAr	Link Here

3756

#if defined(OS_WIN)

3760

#if defined(OS_WIN)

3757

  CommandLine::Init(aArgc, aArgv);

3761

  CommandLine::Init(aArgc, aArgv);

3758

#else

3762

#else

3763

#ifdef MOZ_OMNIJAR

3764

  nsCOMPtr<nsILocalFile> lf;

3765

  char *omnijarPath = getenv("OMNIJAR_PATH");

3766

  if (omnijarPath)

3767

    rv = NS_NewNativeLocalFile(nsDependentCString(omnijarPath), PR_TRUE, getter_AddRefs(lf));

3768

  else

3769

    rv = XRE_GetBinaryPath(gArgv[0], getter_AddRefs(lf));

3770

  if (NS_SUCCEEDED(rv))

3771

    mozilla::SetOmnijar(lf);

3772

#endif

3773

3759

  // these leak on error, but that's OK: we'll just exit()

3774

  // these leak on error, but that's OK: we'll just exit()

3760

  char** canonArgs = new char*[aArgc];

3775

  char** canonArgs = new char*[aArgc];

3761

3776

(-)a/widget/src/android/nsWindow.cpp (+4 lines)

162

    ALOG("nsWindow[%p]::Create %p [%d %d %d %d]", (void*)this, (void*)aParent, aRect.x, aRect.y, aRect.width, aRect.height);

162

    ALOG("nsWindow[%p]::Create %p [%d %d %d %d]", (void*)this, (void*)aParent, aRect.x, aRect.y, aRect.width, aRect.height);

163

    nsWindow *parent = (nsWindow*) aParent;

163

    nsWindow *parent = (nsWindow*) aParent;

164

165

    if (!AndroidBridge::Bridge()) {

166

        aNativeParent = nsnull;

167

168

165

    if (aNativeParent) {

169

    if (aNativeParent) {

166

        if (parent) {

170

        if (parent) {

167

            ALOG("Ignoring native parent on Android window [%p], since parent was specified (%p %p)", (void*)this, (void*)aNativeParent, (void*)aParent);

171

            ALOG("Ignoring native parent on Android window [%p], since parent was specified (%p %p)", (void*)this, (void*)aNativeParent, (void*)aParent);

Return to bug 574120