mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-07 09:54:42 +00:00
Bug 1078033 - Remove remaining Camino code. r=ted
This commit is contained in:
parent
63ccf0005a
commit
1e915ce56f
@ -32,12 +32,6 @@ else
|
|||||||
AUTOMATION_PPARGS += -DIS_LINUX=0
|
AUTOMATION_PPARGS += -DIS_LINUX=0
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(MOZ_BUILD_APP),camino)
|
|
||||||
AUTOMATION_PPARGS += -DIS_CAMINO=1
|
|
||||||
else
|
|
||||||
AUTOMATION_PPARGS += -DIS_CAMINO=0
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(host_os), cygwin)
|
ifeq ($(host_os), cygwin)
|
||||||
AUTOMATION_PPARGS += -DIS_CYGWIN=1
|
AUTOMATION_PPARGS += -DIS_CYGWIN=1
|
||||||
endif
|
endif
|
||||||
|
@ -66,7 +66,6 @@ _APP_STATUS_CERTIFIED = 3
|
|||||||
#else
|
#else
|
||||||
_IS_CYGWIN = False
|
_IS_CYGWIN = False
|
||||||
#endif
|
#endif
|
||||||
#expand _IS_CAMINO = __IS_CAMINO__ != 0
|
|
||||||
#expand _BIN_SUFFIX = __BIN_SUFFIX__
|
#expand _BIN_SUFFIX = __BIN_SUFFIX__
|
||||||
|
|
||||||
#expand _DEFAULT_APP = "./" + __BROWSER_PATH__
|
#expand _DEFAULT_APP = "./" + __BROWSER_PATH__
|
||||||
@ -140,7 +139,6 @@ class Automation(object):
|
|||||||
IS_MAC = _IS_MAC
|
IS_MAC = _IS_MAC
|
||||||
IS_LINUX = _IS_LINUX
|
IS_LINUX = _IS_LINUX
|
||||||
IS_CYGWIN = _IS_CYGWIN
|
IS_CYGWIN = _IS_CYGWIN
|
||||||
IS_CAMINO = _IS_CAMINO
|
|
||||||
BIN_SUFFIX = _BIN_SUFFIX
|
BIN_SUFFIX = _BIN_SUFFIX
|
||||||
|
|
||||||
UNIXISH = not IS_WIN32 and not IS_MAC
|
UNIXISH = not IS_WIN32 and not IS_MAC
|
||||||
@ -750,7 +748,7 @@ class Automation(object):
|
|||||||
""" build the application command line """
|
""" build the application command line """
|
||||||
|
|
||||||
cmd = os.path.abspath(app)
|
cmd = os.path.abspath(app)
|
||||||
if self.IS_MAC and not self.IS_CAMINO and os.path.exists(cmd + "-bin"):
|
if self.IS_MAC and os.path.exists(cmd + "-bin"):
|
||||||
# Prefer 'app-bin' in case 'app' is a shell script.
|
# Prefer 'app-bin' in case 'app' is a shell script.
|
||||||
# We can remove this hack once bug 673899 etc are fixed.
|
# We can remove this hack once bug 673899 etc are fixed.
|
||||||
cmd += "-bin"
|
cmd += "-bin"
|
||||||
@ -772,9 +770,6 @@ class Automation(object):
|
|||||||
|
|
||||||
args.extend(("-no-remote", "-profile", profileDirectory))
|
args.extend(("-no-remote", "-profile", profileDirectory))
|
||||||
if testURL is not None:
|
if testURL is not None:
|
||||||
if self.IS_CAMINO:
|
|
||||||
args.extend(("-url", testURL))
|
|
||||||
else:
|
|
||||||
args.append((testURL))
|
args.append((testURL))
|
||||||
args.extend(extraArgs)
|
args.extend(extraArgs)
|
||||||
return cmd, args
|
return cmd, args
|
||||||
|
@ -12,12 +12,8 @@ endif
|
|||||||
|
|
||||||
TARGET_DIST = $(TARGET_DEPTH)/dist
|
TARGET_DIST = $(TARGET_DEPTH)/dist
|
||||||
|
|
||||||
ifeq ($(MOZ_BUILD_APP),camino)
|
|
||||||
browser_path = $(TARGET_DIST)/Camino.app/Contents/MacOS/Camino
|
|
||||||
else
|
|
||||||
ifeq ($(OS_ARCH),Darwin)
|
ifeq ($(OS_ARCH),Darwin)
|
||||||
browser_path = $(TARGET_DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(program)
|
browser_path = $(TARGET_DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(program)
|
||||||
else
|
else
|
||||||
browser_path = $(TARGET_DIST)/bin/$(program)
|
browser_path = $(TARGET_DIST)/bin/$(program)
|
||||||
endif
|
endif
|
||||||
endif
|
|
||||||
|
@ -1596,12 +1596,7 @@ nsComboboxControlFrame::RestoreState(nsPresState* aState)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//
|
// Fennec uses a custom combobox built-in widget.
|
||||||
// Camino uses a native widget for the combobox
|
|
||||||
// popup, which affects drawing and event
|
|
||||||
// handling here and in nsListControlFrame.
|
|
||||||
//
|
|
||||||
// Also, Fennec use a custom combobox built-in widget
|
|
||||||
//
|
//
|
||||||
|
|
||||||
/* static */
|
/* static */
|
||||||
|
@ -77,8 +77,6 @@ user_pref("geo.wifi.timeToWaitBeforeSending", 2000);
|
|||||||
user_pref("geo.wifi.scan", false);
|
user_pref("geo.wifi.scan", false);
|
||||||
user_pref("geo.wifi.logging.enabled", true);
|
user_pref("geo.wifi.logging.enabled", true);
|
||||||
|
|
||||||
user_pref("camino.warn_when_closing", false); // Camino-only, harmless to others
|
|
||||||
|
|
||||||
// Make url-classifier updates so rare that they won't affect tests
|
// Make url-classifier updates so rare that they won't affect tests
|
||||||
user_pref("urlclassifier.updateinterval", 172800);
|
user_pref("urlclassifier.updateinterval", 172800);
|
||||||
// Point the url-classifier to the local testing server for fast failures
|
// Point the url-classifier to the local testing server for fast failures
|
||||||
|
@ -166,7 +166,7 @@ nsAppShell::nsAppShell()
|
|||||||
, mNativeEventScheduledDepth(0)
|
, mNativeEventScheduledDepth(0)
|
||||||
{
|
{
|
||||||
// A Cocoa event loop is running here if (and only if) we've been embedded
|
// A Cocoa event loop is running here if (and only if) we've been embedded
|
||||||
// by a Cocoa app (like Camino).
|
// by a Cocoa app.
|
||||||
mRunningCocoaEmbedded = [NSApp isRunning] ? true : false;
|
mRunningCocoaEmbedded = [NSApp isRunning] ? true : false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -232,8 +232,8 @@ nsAppShell::Init()
|
|||||||
{
|
{
|
||||||
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
|
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
|
||||||
|
|
||||||
// No event loop is running yet (unless Camino is running, or another
|
// No event loop is running yet (unless an embedding app that uses
|
||||||
// embedding app that uses NSApplicationMain()).
|
// NSApplicationMain() is running).
|
||||||
NSAutoreleasePool* localPool = [[NSAutoreleasePool alloc] init];
|
NSAutoreleasePool* localPool = [[NSAutoreleasePool alloc] init];
|
||||||
|
|
||||||
// mAutoreleasePools is used as a stack of NSAutoreleasePool objects created
|
// mAutoreleasePools is used as a stack of NSAutoreleasePool objects created
|
||||||
@ -258,9 +258,8 @@ nsAppShell::Init()
|
|||||||
// This call initializes NSApplication unless:
|
// This call initializes NSApplication unless:
|
||||||
// 1) we're using xre -- NSApp's already been initialized by
|
// 1) we're using xre -- NSApp's already been initialized by
|
||||||
// MacApplicationDelegate.mm's EnsureUseCocoaDockAPI().
|
// MacApplicationDelegate.mm's EnsureUseCocoaDockAPI().
|
||||||
// 2) Camino is running (or another embedding app that uses
|
// 2) an embedding app that uses NSApplicationMain() is running -- NSApp's
|
||||||
// NSApplicationMain()) -- NSApp's already been initialized and
|
// already been initialized and its main run loop is already running.
|
||||||
// its main run loop is already running.
|
|
||||||
[NSBundle loadNibFile:
|
[NSBundle loadNibFile:
|
||||||
[NSString stringWithUTF8String:(const char*)nibPath.get()]
|
[NSString stringWithUTF8String:(const char*)nibPath.get()]
|
||||||
externalNameTable:
|
externalNameTable:
|
||||||
@ -297,7 +296,7 @@ nsAppShell::Init()
|
|||||||
|
|
||||||
if (!gAppShellMethodsSwizzled) {
|
if (!gAppShellMethodsSwizzled) {
|
||||||
// We should only replace the original terminate: method if we're not
|
// We should only replace the original terminate: method if we're not
|
||||||
// running in a Cocoa embedder (like Camino). See bug 604901.
|
// running in a Cocoa embedder. See bug 604901.
|
||||||
if (!mRunningCocoaEmbedded) {
|
if (!mRunningCocoaEmbedded) {
|
||||||
nsToolkit::SwizzleMethods([NSApplication class], @selector(terminate:),
|
nsToolkit::SwizzleMethods([NSApplication class], @selector(terminate:),
|
||||||
@selector(nsAppShell_NSApplication_terminate:));
|
@selector(nsAppShell_NSApplication_terminate:));
|
||||||
@ -618,8 +617,8 @@ nsAppShell::ProcessNextNativeEvent(bool aMayWait)
|
|||||||
// to be processed elsewhere (in NativeEventCallback(), called from
|
// to be processed elsewhere (in NativeEventCallback(), called from
|
||||||
// ProcessGeckoEvents()).
|
// ProcessGeckoEvents()).
|
||||||
//
|
//
|
||||||
// Camino calls [NSApp run] on its own (via NSApplicationMain()), and so
|
// Camino called [NSApp run] on its own (via NSApplicationMain()), and so
|
||||||
// doesn't call nsAppShell::Run().
|
// didn't call nsAppShell::Run().
|
||||||
//
|
//
|
||||||
// public
|
// public
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
|
@ -238,7 +238,7 @@ static void FitRectToVisibleAreaForScreen(nsIntRect &aRect, NSScreen *aScreen,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Some applications like Camino use native popup windows
|
// Some applications use native popup windows
|
||||||
// (native context menus, native tooltips)
|
// (native context menus, native tooltips)
|
||||||
static bool UseNativePopupWindows()
|
static bool UseNativePopupWindows()
|
||||||
{
|
{
|
||||||
|
@ -205,7 +205,7 @@ nsToolkit::RegisterForAllProcessMouseEvents()
|
|||||||
if (getenv("MOZ_DEBUG"))
|
if (getenv("MOZ_DEBUG"))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Don't do this for apps that (like Camino) use native context menus.
|
// Don't do this for apps that use native context menus.
|
||||||
#ifdef MOZ_USE_NATIVE_POPUP_WINDOWS
|
#ifdef MOZ_USE_NATIVE_POPUP_WINDOWS
|
||||||
return;
|
return;
|
||||||
#endif /* MOZ_USE_NATIVE_POPUP_WINDOWS */
|
#endif /* MOZ_USE_NATIVE_POPUP_WINDOWS */
|
||||||
|
@ -168,7 +168,7 @@
|
|||||||
// As best I can tell, if the notification's object has a corresponding
|
// As best I can tell, if the notification's object has a corresponding
|
||||||
// top-level widget (an nsCocoaWindow object), it has a delegate (set in
|
// top-level widget (an nsCocoaWindow object), it has a delegate (set in
|
||||||
// nsCocoaWindow::StandardCreate()) of class WindowDelegate, and otherwise
|
// nsCocoaWindow::StandardCreate()) of class WindowDelegate, and otherwise
|
||||||
// not (Camino doesn't use top-level widgets (nsCocoaWindow objects) --
|
// not (Camino didn't use top-level widgets (nsCocoaWindow objects) --
|
||||||
// only child widgets (nsChildView objects)). (The notification is sent
|
// only child widgets (nsChildView objects)). (The notification is sent
|
||||||
// to windowBecameKey: or windowBecameMain: below.)
|
// to windowBecameKey: or windowBecameMain: below.)
|
||||||
//
|
//
|
||||||
|
Loading…
Reference in New Issue
Block a user