roytam1/palemoon27
1
0
Fork 0
mirror of https://github.com/roytam1/palemoon27.git synced 2026-05-26 14:18:48 +00:00
Code Issues Projects Releases Wiki Activity

import change from `dev' branch of rmottola/Arctic-Fox:

Browse Source 
- goanna -> gecko (cac9263ee)
This commit is contained in:
Roy Tam
2020-07-11 08:42:58 +08:00
parent c7f8abfdb0
commit 30dd322d5a
773 changed files with 2295 additions and 3890 deletions
Download Patch File Download Diff File Expand all files Collapse all files
accessible/atk/AccessibleWrap.cpp
+3 -3
View File
@@ -966,7 +966,7 @@ refRelationSetCB(AtkObject *aAtkObj)
ATK_OBJECT_CLASS(parent_class)->ref_relation_set(aAtkObj);
const AtkRelationType typeMap[] = {
#define RELATIONTYPE(goanna, s, atk, m, i) atk,
#define RELATIONTYPE(gecko, s, atk, m, i) atk,
#include "RelationTypeMap.h"
#undef RELATIONTYPE
};
@@ -1003,8 +1003,8 @@ refRelationSetCB(AtkObject *aAtkObj)
if (!accWrap)
return relation_set;
#define RELATIONTYPE(goannaType, goannaTypeName, atkType, msaaType, ia2Type) \
UpdateAtkRelation(RelationType::goannaType, accWrap, atkType, relation_set);
#define RELATIONTYPE(geckoType, geckoTypeName, atkType, msaaType, ia2Type) \
UpdateAtkRelation(RelationType::geckoType, accWrap, atkType, relation_set);
#include "RelationTypeMap.h"
accessible/atk/ApplicationAccessibleWrap.cpp
+6 -6
View File
@@ -36,10 +36,10 @@ toplevel_event_watcher(GSignalInvocationHint* ihint,
const GValue* param_values,
gpointer data)
{
static GQuark sQuark_goanna_acc_obj = 0;
static GQuark sQuark_gecko_acc_obj = 0;
if (!sQuark_goanna_acc_obj)
sQuark_goanna_acc_obj = g_quark_from_static_string("GoannaAccObj");
if (!sQuark_gecko_acc_obj)
sQuark_gecko_acc_obj = g_quark_from_static_string("GeckoAccObj");
if (nsAccessibilityService::IsShutdown())
return TRUE;
@@ -58,7 +58,7 @@ toplevel_event_watcher(GSignalInvocationHint* ihint,
// Attach the dialog accessible to app accessible tree
Accessible* windowAcc = GetAccService()->AddNativeRootAccessible(child);
g_object_set_qdata(G_OBJECT(child), sQuark_goanna_acc_obj,
g_object_set_qdata(G_OBJECT(child), sQuark_gecko_acc_obj,
reinterpret_cast<gpointer>(windowAcc));
} else {
@@ -66,10 +66,10 @@ toplevel_event_watcher(GSignalInvocationHint* ihint,
// Deattach the dialog accessible
Accessible* windowAcc =
reinterpret_cast<Accessible*>
(g_object_get_qdata(G_OBJECT(child), sQuark_goanna_acc_obj));
(g_object_get_qdata(G_OBJECT(child), sQuark_gecko_acc_obj));
if (windowAcc) {
GetAccService()->RemoveNativeRootAccessible(windowAcc);
g_object_set_qdata(G_OBJECT(child), sQuark_goanna_acc_obj, nullptr);
g_object_set_qdata(G_OBJECT(child), sQuark_gecko_acc_obj, nullptr);
}
}
accessible/atk/UtilInterface.cpp
+1 -1
View File
@@ -20,7 +20,7 @@ typedef AtkUtil MaiUtil;
typedef AtkUtilClass MaiUtilClass;
#define MAI_VERSION MOZILLA_VERSION
#define MAI_NAME "Goanna"
#define MAI_NAME "Gecko"
extern "C" {
static guint (*gail_add_global_event_listener)(GSignalEmissionHook listener,
accessible/base/Asserts.cpp
+3 -3
View File
@@ -18,9 +18,9 @@ using namespace mozilla::a11y;
#include "RoleMap.h"
#undef ROLE
#define RELATIONTYPE(goannaType, stringType, atkType, msaaType, ia2Type) \
static_assert(static_cast<uint32_t>(RelationType::goannaType) \
== static_cast<uint32_t>(nsIAccessibleRelation::RELATION_ ## goannaType), \
#define RELATIONTYPE(geckoType, stringType, atkType, msaaType, ia2Type) \
static_assert(static_cast<uint32_t>(RelationType::geckoType) \
== static_cast<uint32_t>(nsIAccessibleRelation::RELATION_ ## geckoType), \
"internal and xpcom relations differ!");
#include "RelationTypeMap.h"
#undef RELATIONTYPE
accessible/base/RelationTypeMap.h
+1 -1
View File
@@ -6,7 +6,7 @@
/**
* Usage: declare the macro RELATIONTYPE()with the following arguments:
* RELATIONTYPE(goannaType, goannaTypeName, atkType, msaaType, ia2Type)
* RELATIONTYPE(geckoType, geckoTypeName, atkType, msaaType, ia2Type)
*/
RELATIONTYPE(LABELLED_BY,
accessible/base/nsAccessibilityService.cpp
+3 -3
View File
@@ -844,9 +844,9 @@ nsAccessibilityService::GetStringRelationType(uint32_t aRelationType,
{
NS_ENSURE_ARG(aRelationType <= static_cast<uint32_t>(RelationType::LAST));
#define RELATIONTYPE(goannaType, goannaTypeName, atkType, msaaType, ia2Type) \
case RelationType::goannaType: \
aString.AssignLiteral(goannaTypeName); \
#define RELATIONTYPE(geckoType, geckoTypeName, atkType, msaaType, ia2Type) \
case RelationType::geckoType: \
aString.AssignLiteral(geckoTypeName); \
return NS_OK;
RelationType relationType = static_cast<RelationType>(aRelationType);
accessible/generic/ApplicationAccessible.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ ApplicationAccessible::Name(nsString& aName)
getter_Copies(appName));
if (NS_FAILED(rv) || appName.IsEmpty()) {
NS_WARNING("brandShortName not found, using default app name");
appName.AssignLiteral("Goanna based application");
appName.AssignLiteral("Gecko based application");
}
aName.Assign(appName);
accessible/generic/ApplicationAccessible.h
+1 -1
View File
@@ -74,7 +74,7 @@ public:
void PlatformName(nsAString& aName) const
{
aName.AssignLiteral("Goanna");
aName.AssignLiteral("Gecko");
}
void PlatformVersion(nsAString& aVersion) const
accessible/generic/HyperTextAccessible.cpp
+1 -1
View File
@@ -1317,7 +1317,7 @@ HyperTextAccessible::GetCaretRect(nsIWidget** aWidget)
// Correct for character size, so that caret always matches the size of
// the character. This is important for font size transitions, and is
// necessary because the Goanna caret uses the previous character's size as
// necessary because the Gecko caret uses the previous character's size as
// the user moves forward in the text by character.
nsIntRect charRect = CharBounds(CaretOffset(),
nsIAccessibleCoordinateType::COORDTYPE_SCREEN_RELATIVE);
accessible/interfaces/ia2/moz.build
+1 -1
View File
@@ -4,7 +4,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
GoannaSharedLibrary('IA2Marshal', linkage=None)
GeckoSharedLibrary('IA2Marshal', linkage=None)
DEFINES['REGISTER_PROXY_DLL'] = True
accessible/interfaces/msaa/ISimpleDOMNode.idl
+1 -1
View File
@@ -84,7 +84,7 @@ cpp_quote("//")
cpp_quote("//")
cpp_quote("// get_localInterface(/* [out] */ void **localInterface);")
cpp_quote("// ---------------------------------------------------------------------------------------------------=")
cpp_quote("// Only available in Goanna's process")
cpp_quote("// Only available in Gecko's process")
cpp_quote("//")
cpp_quote("//")
cpp_quote("// get_language(/* [out] */ BSTR *htmlText);")
accessible/interfaces/msaa/moz.build
+1 -1
View File
@@ -4,7 +4,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
GoannaSharedLibrary('AccessibleMarshal', linkage=None)
GeckoSharedLibrary('AccessibleMarshal', linkage=None)
GENERATED_SOURCES += [
'dlldata.c',
accessible/interfaces/nsIAccessibleDocument.idl
+1 -1
View File
@@ -12,7 +12,7 @@ interface nsIDOMWindow;
/**
* An interface for in-process accessibility clients
* that wish to retrieve information about a document.
* When accessibility is turned on in Goanna,
* When accessibility is turned on in Gecko,
* there is an nsIAccessibleDocument for each document
* whether it is XUL, HTML or whatever.
* You can QueryInterface to nsIAccessibleDocument from the nsIAccessible for
accessible/interfaces/nsIAccessibleRole.idl
+1 -1
View File
@@ -6,7 +6,7 @@
#include "nsISupports.idl"
/**
* Defines cross platform (Goanna) roles.
* Defines cross platform (Gecko) roles.
*/
[scriptable, uuid(55581ec3-ba6e-4805-8108-260ed34cdcbb)]
interface nsIAccessibleRole : nsISupports
accessible/ipc/DocAccessibleChild.cpp
+1 -1
View File
@@ -244,7 +244,7 @@ DocAccessibleChild::RecvRelations(const uint64_t& aID,
if (!aID)
return false;
#define RELATIONTYPE(goanna, s, a, m, i) AddRelation(acc, RelationType::goanna, aRelations);
#define RELATIONTYPE(gecko, s, a, m, i) AddRelation(acc, RelationType::gecko, aRelations);
#include "RelationTypeMap.h"
#undef RELATIONTYPE
accessible/jsat/AccessFu.jsm
+3 -3
View File
@@ -33,7 +33,7 @@ this.AccessFu = { // jshint ignore:line
Utils.init(aWindow);
try {
Services.androidBridge.handleGoannaMessage(
Services.androidBridge.handleGeckoMessage(
{ type: 'Accessibility:Ready' });
Services.obs.addObserver(this, 'Accessibility:Settings', false);
} catch (x) {
@@ -611,7 +611,7 @@ var Output = {
androidEvent.brailleOutput);
break;
}
this.androidBridge.handleGoannaMessage(androidEvent);
this.androidBridge.handleGeckoMessage(androidEvent);
}
},
@@ -801,7 +801,7 @@ var Input = {
if (Utils.MozBuildApp == 'mobile/android') {
// Return focus to native Android browser chrome.
Services.androidBridge.handleGoannaMessage(
Services.androidBridge.handleGeckoMessage(
{ type: 'ToggleChrome:Focus' });
}
break;
accessible/mac/Platform.mm
+2 -2
View File
@@ -50,11 +50,11 @@ ProxyEvent(ProxyAccessible*, uint32_t)
}
}
@interface GoannaNSApplication(a11y)
@interface GeckoNSApplication(a11y)
-(void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute;
@end
@implementation GoannaNSApplication(a11y)
@implementation GeckoNSApplication(a11y)
-(void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute
{
accessible/mac/mozAccessible.h
+5 -5
View File
@@ -24,7 +24,7 @@ GetObjectOrRepresentedView(id <mozAccessible> aObject)
}
inline mozAccessible*
GetNativeFromGoannaAccessible(mozilla::a11y::Accessible* aAccessible)
GetNativeFromGeckoAccessible(mozilla::a11y::Accessible* aAccessible)
{
mozAccessible* native = nil;
aAccessible->GetNativeInterface((void**)&native);
@@ -36,7 +36,7 @@ GetNativeFromGoannaAccessible(mozilla::a11y::Accessible* aAccessible)
/**
* Weak reference; it owns us.
*/
mozilla::a11y::AccessibleWrap* mGoannaAccessible;
mozilla::a11y::AccessibleWrap* mGeckoAccessible;
/**
* Strong ref to array of children
@@ -49,13 +49,13 @@ GetNativeFromGoannaAccessible(mozilla::a11y::Accessible* aAccessible)
mozAccessible* mParent;
/**
* The role of our goanna accessible.
* The role of our gecko accessible.
*/
mozilla::a11y::role mRole;
}
// inits with the goanna owner.
- (id)initWithAccessible:(mozilla::a11y::AccessibleWrap*)goannaParent;
// inits with the gecko owner.
- (id)initWithAccessible:(mozilla::a11y::AccessibleWrap*)geckoParent;
// our accessible parent (AXParent)
- (id <mozAccessible>)parent;
accessible/mac/mozAccessible.mm
+45 -45
View File
@@ -60,13 +60,13 @@ GetClosestInterestingAccessible(id anObject)
@implementation mozAccessible
- (id)initWithAccessible:(AccessibleWrap*)goannaAccessible
- (id)initWithAccessible:(AccessibleWrap*)geckoAccessible
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if ((self = [super init])) {
mGoannaAccessible = goannaAccessible;
mRole = goannaAccessible->Role();
mGeckoAccessible = geckoAccessible;
mRole = geckoAccessible->Role();
}
return self;
@@ -92,8 +92,8 @@ GetClosestInterestingAccessible(id anObject)
// unknown (either unimplemented, or irrelevant) elements are marked as ignored
// as well as expired elements.
return !mGoannaAccessible || ([[self role] isEqualToString:NSAccessibilityUnknownRole] &&
!(mGoannaAccessible->InteractiveState() & states::FOCUSABLE));
return !mGeckoAccessible || ([[self role] isEqualToString:NSAccessibilityUnknownRole] &&
!(mGeckoAccessible->InteractiveState() & states::FOCUSABLE));
NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NO);
}
@@ -103,7 +103,7 @@ GetClosestInterestingAccessible(id anObject)
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
// if we're expired, we don't support any attributes.
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return [NSArray array];
static NSArray *generalAttributes = nil;
@@ -141,7 +141,7 @@ GetClosestInterestingAccessible(id anObject)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
#if DEBUG
@@ -183,9 +183,9 @@ GetClosestInterestingAccessible(id anObject)
if ([attribute isEqualToString:NSAccessibilityTitleAttribute])
return [self title];
if ([attribute isEqualToString:NSAccessibilityTitleUIElementAttribute]) {
Relation rel = mGoannaAccessible->RelationByType(RelationType::LABELLED_BY);
Relation rel = mGeckoAccessible->RelationByType(RelationType::LABELLED_BY);
Accessible* tempAcc = rel.Next();
return tempAcc ? GetNativeFromGoannaAccessible(tempAcc) : nil;
return tempAcc ? GetNativeFromGeckoAccessible(tempAcc) : nil;
}
if ([attribute isEqualToString:NSAccessibilityHelpAttribute])
return [self help];
@@ -227,23 +227,23 @@ GetClosestInterestingAccessible(id anObject)
- (id)accessibilityHitTest:(NSPoint)point
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
// Convert the given screen-global point in the cocoa coordinate system (with
// origin in the bottom-left corner of the screen) into point in the Goanna
// origin in the bottom-left corner of the screen) into point in the Gecko
// coordinate system (with origin in a top-left screen point).
NSScreen* mainView = [[NSScreen screens] objectAtIndex:0];
NSPoint tmpPoint = NSMakePoint(point.x,
[mainView frame].size.height - point.y);
nsIntPoint goannaPoint = nsCocoaUtils::
nsIntPoint geckoPoint = nsCocoaUtils::
CocoaPointsToDevPixels(tmpPoint, nsCocoaUtils::GetBackingScaleFactor(mainView));
Accessible* child = mGoannaAccessible->ChildAtPoint(goannaPoint.x, goannaPoint.y,
Accessible* child = mGeckoAccessible->ChildAtPoint(geckoPoint.x, geckoPoint.y,
Accessible::eDeepestChild);
if (child) {
mozAccessible* nativeChild = GetNativeFromGoannaAccessible(child);
mozAccessible* nativeChild = GetNativeFromGeckoAccessible(child);
if (nativeChild)
return GetClosestInterestingAccessible(nativeChild);
}
@@ -270,12 +270,12 @@ GetClosestInterestingAccessible(id anObject)
- (id)accessibilityFocusedUIElement
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
Accessible* focusedGeckoChild = mGoannaAccessible->FocusedChild();
Accessible* focusedGeckoChild = mGeckoAccessible->FocusedChild();
if (focusedGeckoChild) {
mozAccessible *focusedChild = GetNativeFromGoannaAccessible(focusedGeckoChild);
mozAccessible *focusedChild = GetNativeFromGeckoAccessible(focusedGeckoChild);
if (focusedChild)
return GetClosestInterestingAccessible(focusedChild);
}
@@ -290,9 +290,9 @@ GetClosestInterestingAccessible(id anObject)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
Accessible* accessibleParent = mGoannaAccessible->GetUnignoredParent();
Accessible* accessibleParent = mGeckoAccessible->GetUnignoredParent();
if (accessibleParent) {
id nativeParent = GetNativeFromGoannaAccessible(accessibleParent);
id nativeParent = GetNativeFromGeckoAccessible(accessibleParent);
if (nativeParent)
return GetClosestInterestingAccessible(nativeParent);
}
@@ -303,7 +303,7 @@ GetClosestInterestingAccessible(id anObject)
//
// get the native root accessible, and tell it to return its first parent unignored accessible.
id nativeParent =
GetNativeFromGoannaAccessible(mGoannaAccessible->RootAccessible());
GetNativeFromGeckoAccessible(mGeckoAccessible->RootAccessible());
NSAssert1 (nativeParent, @"!!! we can't find a parent for %@", self);
return GetClosestInterestingAccessible(nativeParent);
@@ -332,21 +332,21 @@ GetClosestInterestingAccessible(id anObject)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if (mChildren || !mGoannaAccessible->AreChildrenCached())
if (mChildren || !mGeckoAccessible->AreChildrenCached())
return mChildren;
mChildren = [[NSMutableArray alloc] init];
// get the array of children.
nsAutoTArray<Accessible*, 10> childrenArray;
mGoannaAccessible->GetUnignoredChildren(&childrenArray);
mGeckoAccessible->GetUnignoredChildren(&childrenArray);
// now iterate through the children array, and get each native accessible.
uint32_t totalCount = childrenArray.Length();
for (uint32_t idx = 0; idx < totalCount; idx++) {
Accessible* curAccessible = childrenArray.ElementAt(idx);
if (curAccessible) {
mozAccessible *curNative = GetNativeFromGoannaAccessible(curAccessible);
mozAccessible *curNative = GetNativeFromGeckoAccessible(curAccessible);
if (curNative)
[mChildren addObject:GetObjectOrRepresentedView(curNative)];
}
@@ -370,10 +370,10 @@ GetClosestInterestingAccessible(id anObject)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
nsIntRect rect = mGoannaAccessible->Bounds();
nsIntRect rect = mGeckoAccessible->Bounds();
NSScreen* mainView = [[NSScreen screens] objectAtIndex:0];
CGFloat scaleFactor = nsCocoaUtils::GetBackingScaleFactor(mainView);
@@ -389,10 +389,10 @@ GetClosestInterestingAccessible(id anObject)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
nsIntRect rect = mGoannaAccessible->Bounds();
nsIntRect rect = mGeckoAccessible->Bounds();
CGFloat scaleFactor =
nsCocoaUtils::GetBackingScaleFactor([[NSScreen screens] objectAtIndex:0]);
return [NSValue valueWithSize:NSMakeSize(static_cast<CGFloat>(rect.width) / scaleFactor,
@@ -403,11 +403,11 @@ GetClosestInterestingAccessible(id anObject)
- (NSString*)role
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
#ifdef DEBUG_A11Y
NS_ASSERTION(nsAccUtils::IsTextInterfaceSupportCorrect(mGoannaAccessible),
NS_ASSERTION(nsAccUtils::IsTextInterfaceSupportCorrect(mGeckoAccessible),
"Does not support Text when it should");
#endif
@@ -427,7 +427,7 @@ GetClosestInterestingAccessible(id anObject)
- (NSString*)subrole
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
nsIAtom* landmark = mGeckoAccessible->LandmarkRole();
@@ -457,7 +457,7 @@ GetClosestInterestingAccessible(id anObject)
return @"AXContentList"; // 10.6+ NSAccessibilityContentListSubrole;
case roles::ENTRY:
if (mGoannaAccessible->IsSearchbox())
if (mGeckoAccessible->IsSearchbox())
return @"AXSearchField";
break;
@@ -528,7 +528,7 @@ struct RoleDescrComparator
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
nsAutoString title;
mGoannaAccessible->Name(title);
mGeckoAccessible->Name(title);
return nsCocoaUtils::ToNSString(title);
NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
@@ -539,7 +539,7 @@ struct RoleDescrComparator
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
nsAutoString value;
mGoannaAccessible->Value(value);
mGeckoAccessible->Value(value);
return value.IsEmpty() ? nil : [NSString stringWithCharacters:reinterpret_cast<const unichar*>(value.BeginReading())
length:value.Length()];
@@ -568,11 +568,11 @@ struct RoleDescrComparator
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if (mGoannaAccessible->IsDefunct())
if (mGeckoAccessible->IsDefunct())
return nil;
nsAutoString desc;
mGoannaAccessible->Description(desc);
mGeckoAccessible->Description(desc);
return nsCocoaUtils::ToNSString(desc);
@@ -584,7 +584,7 @@ struct RoleDescrComparator
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
nsAutoString helpText;
mGoannaAccessible->Help(helpText);
mGeckoAccessible->Help(helpText);
return helpText.IsEmpty() ? nil : [NSString stringWithCharacters:reinterpret_cast<const unichar*>(helpText.BeginReading())
length:helpText.Length()];
@@ -603,26 +603,26 @@ struct RoleDescrComparator
- (BOOL)isFocused
{
return FocusMgr()->IsFocused(mGoannaAccessible);
return FocusMgr()->IsFocused(mGeckoAccessible);
}
- (BOOL)canBeFocused
{
return mGoannaAccessible && (mGoannaAccessible->InteractiveState() & states::FOCUSABLE);
return mGeckoAccessible && (mGeckoAccessible->InteractiveState() & states::FOCUSABLE);
}
- (BOOL)focus
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return NO;
mGoannaAccessible->TakeFocus();
mGeckoAccessible->TakeFocus();
return YES;
}
- (BOOL)isEnabled
{
return mGoannaAccessible && ((mGoannaAccessible->InteractiveState() & states::UNAVAILABLE) == 0);
return mGeckoAccessible && ((mGeckoAccessible->InteractiveState() & states::UNAVAILABLE) == 0);
}
// The root accessible calls this when the focused node was
@@ -645,7 +645,7 @@ struct RoleDescrComparator
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
AccessibleWrap* accWrap = static_cast<AccessibleWrap*>(mGoannaAccessible);
AccessibleWrap* accWrap = static_cast<AccessibleWrap*>(mGeckoAccessible);
// Get a pointer to the native window (NSWindow) we reside in.
NSWindow *nativeWindow = nil;
@@ -676,7 +676,7 @@ struct RoleDescrComparator
if (!mChildren)
return;
mozAccessible *curNative = GetNativeFromGoannaAccessible(aAccessible);
mozAccessible *curNative = GetNativeFromGeckoAccessible(aAccessible);
if (curNative)
[mChildren addObject:GetObjectOrRepresentedView(curNative)];
}
@@ -687,14 +687,14 @@ struct RoleDescrComparator
[self invalidateChildren];
mGoannaAccessible = nullptr;
mGeckoAccessible = nullptr;
NS_OBJC_END_TRY_ABORT_BLOCK;
}
- (BOOL)isExpired
{
return !mGoannaAccessible;
return !mGeckoAccessible;
}
#pragma mark -
accessible/mac/mozActionElements.mm
+12 -12
View File
@@ -73,7 +73,7 @@ enum CheckboxValue {
- (BOOL)accessibilityIsIgnored
{
return !mGoannaAccessible;
return !mGeckoAccessible;
}
- (NSArray*)accessibilityActionNames
@@ -118,12 +118,12 @@ enum CheckboxValue {
{
// both buttons and checkboxes have only one action. we should really stop using arbitrary
// arrays with actions, and define constants for these actions.
mGoannaAccessible->DoAction(0);
mGeckoAccessible->DoAction(0);
}
- (BOOL)isTab
{
return (mGoannaAccessible && (mGoannaAccessible->Role() == roles::PAGETAB));
return (mGeckoAccessible && (mGeckoAccessible->Role() == roles::PAGETAB));
}
@end
@@ -148,7 +148,7 @@ enum CheckboxValue {
- (int)isChecked
{
uint64_t state = mGoannaAccessible->NativeState();
uint64_t state = mGeckoAccessible->NativeState();
// check if we're checked or in a mixed state
if (state & states::CHECKED) {
@@ -292,10 +292,10 @@ enum CheckboxValue {
*/
- (id)value
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
Accessible* accessible = mGoannaAccessible->GetSelectedItem(0);
Accessible* accessible = mGeckoAccessible->GetSelectedItem(0);
if (!accessible)
return nil;
@@ -339,33 +339,33 @@ enum CheckboxValue {
- (NSUInteger)accessibilityArrayAttributeCount:(NSString*)attribute
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return 0;
// By default this calls -[[mozAccessible children] count].
// Since we don't cache mChildren. This is faster.
if ([attribute isEqualToString:NSAccessibilityChildrenAttribute])
return mGoannaAccessible->ChildCount() ? 1 : 0;
return mGeckoAccessible->ChildCount() ? 1 : 0;
return [super accessibilityArrayAttributeCount:attribute];
}
- (NSArray*)children
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
nsDeckFrame* deckFrame = do_QueryFrame(mGoannaAccessible->GetFrame());
nsDeckFrame* deckFrame = do_QueryFrame(mGeckoAccessible->GetFrame());
nsIFrame* selectedFrame = deckFrame ? deckFrame->GetSelectedBox() : nullptr;
Accessible* selectedAcc = nullptr;
if (selectedFrame) {
nsINode* node = selectedFrame->GetContent();
selectedAcc = mGoannaAccessible->Document()->GetAccessible(node);
selectedAcc = mGeckoAccessible->Document()->GetAccessible(node);
}
if (selectedAcc) {
mozAccessible *curNative = GetNativeFromGoannaAccessible(selectedAcc);
mozAccessible *curNative = GetNativeFromGeckoAccessible(selectedAcc);
if (curNative)
return [NSArray arrayWithObjects:GetObjectOrRepresentedView(curNative), nil];
}
accessible/mac/mozDocAccessible.mm
+2 -2
View File
@@ -33,7 +33,7 @@ getNativeViewFromRootAccessible(Accessible* aAccessible)
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
// if we're expired, we don't support any attributes.
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return [NSArray array];
// standard attributes that are shared and supported by root accessible (AXMain) elements.
@@ -95,7 +95,7 @@ getNativeViewFromRootAccessible(Accessible* aAccessible)
if (mParallelView)
return (id)mParallelView;
mParallelView = getNativeViewFromRootAccessible (mGoannaAccessible);
mParallelView = getNativeViewFromRootAccessible (mGeckoAccessible);
NSAssert(mParallelView, @"can't return root accessible's native parallel view.");
return mParallelView;
accessible/mac/mozHTMLAccessible.mm
+9 -9
View File
@@ -20,17 +20,17 @@
mozilla::ErrorResult rv;
// XXX use the flattening API when there are available
// see bug 768298
mGoannaAccessible->GetContent()->GetTextContent(title, rv);
mGeckoAccessible->GetContent()->GetTextContent(title, rv);
return nsCocoaUtils::ToNSString(title);
}
- (id)value
{
if (!mGoannaAccessible || !mGoannaAccessible->IsHyperText())
if (!mGeckoAccessible || !mGeckoAccessible->IsHyperText())
return nil;
uint32_t level = mGoannaAccessible->AsHyperText()->GetLevelInternal();
uint32_t level = mGeckoAccessible->AsHyperText()->GetLevelInternal();
return [NSNumber numberWithInt:level];
}
@@ -45,7 +45,7 @@
- (NSArray*)accessibilityAttributeNames
{
// if we're expired, we don't support any attributes.
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return [NSArray array];
static NSMutableArray* attributes = nil;
@@ -69,7 +69,7 @@
- (NSArray*)accessibilityActionNames
{
// if we're expired, we don't support any attributes.
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return [NSArray array];
static NSArray* actionNames = nil;
@@ -84,11 +84,11 @@
- (void)accessibilityPerformAction:(NSString*)action
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return;
if ([action isEqualToString:NSAccessibilityPressAction])
mGoannaAccessible->DoAction(0);
mGeckoAccessible->DoAction(0);
else
[super accessibilityPerformAction:action];
}
@@ -105,11 +105,11 @@
- (NSURL*)url
{
if (!mGoannaAccessible || mGoannaAccessible->IsDefunct())
if (!mGeckoAccessible || mGeckoAccessible->IsDefunct())
return nil;
nsAutoString value;
mGoannaAccessible->Value(value);
mGeckoAccessible->Value(value);
NSString* urlString = value.IsEmpty() ? nil : nsCocoaUtils::ToNSString(value);
if (!urlString)
accessible/mac/mozTextAccessible.h
+2 -2
View File
@@ -8,9 +8,9 @@
@interface mozTextAccessible : mozAccessible
{
// both of these are the same old mGoannaAccessible, but already
// both of these are the same old mGeckoAccessible, but already
// QI'd for us, to the right type, for convenience.
mozilla::a11y::HyperTextAccessible* mGoannaTextAccessible; // strong
mozilla::a11y::HyperTextAccessible* mGeckoTextAccessible; // strong
}
@end
accessible/mac/mozTextAccessible.mm
+41 -41
View File
@@ -58,7 +58,7 @@ ToNSString(id aValue)
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if ((self = [super initWithAccessible:accessible])) {
mGoannaTextAccessible = accessible->AsHyperText();
mGeckoTextAccessible = accessible->AsHyperText();
}
return self;
@@ -67,7 +67,7 @@ ToNSString(id aValue)
- (BOOL)accessibilityIsIgnored
{
return !mGoannaAccessible;
return !mGeckoAccessible;
}
- (NSArray*)accessibilityAttributeNames
@@ -127,10 +127,10 @@ ToNSString(id aValue)
}
if ([attribute isEqualToString:@"AXRequired"])
return [NSNumber numberWithBool:!!(mGoannaAccessible->State() & states::REQUIRED)];
return [NSNumber numberWithBool:!!(mGeckoAccessible->State() & states::REQUIRED)];
if ([attribute isEqualToString:@"AXInvalid"])
return [NSNumber numberWithBool:!!(mGoannaAccessible->State() & states::INVALID)];
return [NSNumber numberWithBool:!!(mGeckoAccessible->State() & states::INVALID)];
if ([attribute isEqualToString:NSAccessibilityVisibleCharacterRangeAttribute])
return [self visibleCharacterRange];
@@ -166,7 +166,7 @@ ToNSString(id aValue)
- (id)accessibilityAttributeValue:(NSString*)attribute forParameter:(id)parameter
{
if (!mGoannaTextAccessible)
if (!mGeckoTextAccessible)
return nil;
if ([attribute isEqualToString:NSAccessibilityStringForRangeParameterizedAttribute]) {
@@ -214,9 +214,9 @@ ToNSString(id aValue)
int32_t start = range.location;
int32_t end = start + range.length;
nsIntRect bounds = mGoannaTextAccessible->TextBounds(start, end);
nsIntRect bounds = mGeckoTextAccessible->TextBounds(start, end);
return [NSValue valueWithRect:nsCocoaUtils::GoannaRectToCocoaRect(bounds)];
return [NSValue valueWithRect:nsCocoaUtils::GeckoRectToCocoaRect(bounds)];
}
#if DEBUG
@@ -247,7 +247,7 @@ ToNSString(id aValue)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
if (!mGoannaTextAccessible)
if (!mGeckoTextAccessible)
return;
if ([attribute isEqualToString:NSAccessibilityValueAttribute]) {
@@ -262,12 +262,12 @@ ToNSString(id aValue)
return;
int32_t start = 0, end = 0;
mGoannaTextAccessible->SelectionBoundsAt(0, &start, &end);
mGoannaTextAccessible->DeleteText(start, end - start);
mGeckoTextAccessible->SelectionBoundsAt(0, &start, &end);
mGeckoTextAccessible->DeleteText(start, end - start);
nsString text;
nsCocoaUtils::GetStringForNSString(stringValue, text);
mGoannaTextAccessible->InsertText(text, start);
mGeckoTextAccessible->InsertText(text, start);
}
if ([attribute isEqualToString:NSAccessibilitySelectedTextRangeAttribute]) {
@@ -275,7 +275,7 @@ ToNSString(id aValue)
if (!ToNSRange(value, &range))
return;
mGoannaTextAccessible->SetSelectionBoundsAt(0, range.location,
mGeckoTextAccessible->SetSelectionBoundsAt(0, range.location,
range.location + range.length);
return;
}
@@ -285,7 +285,7 @@ ToNSString(id aValue)
if (!ToNSRange(value, &range))
return;
mGoannaTextAccessible->ScrollSubstringTo(range.location, range.location + range.length,
mGeckoTextAccessible->ScrollSubstringTo(range.location, range.location + range.length,
nsIAccessibleScrollType::SCROLL_TYPE_TOP_EDGE);
return;
}
@@ -307,7 +307,7 @@ ToNSString(id aValue)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
mGoannaTextAccessible = nullptr;
mGeckoTextAccessible = nullptr;
[super expire];
NS_OBJC_END_TRY_ABORT_BLOCK;
@@ -322,8 +322,8 @@ ToNSString(id aValue)
if ([[self role] isEqualToString:NSAccessibilityStaticTextRole])
return YES;
if (mGoannaTextAccessible)
return (mGoannaAccessible->State() & states::READONLY) == 0;
if (mGeckoTextAccessible)
return (mGeckoAccessible->State() & states::READONLY) == 0;
return NO;
@@ -332,8 +332,8 @@ ToNSString(id aValue)
- (NSNumber*)caretLineNumber
{
int32_t lineNumber = mGoannaTextAccessible ?
mGoannaTextAccessible->CaretLineNumber() - 1 : -1;
int32_t lineNumber = mGeckoTextAccessible ?
mGeckoTextAccessible->CaretLineNumber() - 1 : -1;
return (lineNumber >= 0) ? [NSNumber numberWithInt:lineNumber] : nil;
}
@@ -342,10 +342,10 @@ ToNSString(id aValue)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
if (mGoannaTextAccessible) {
if (mGeckoTextAccessible) {
nsString text;
nsCocoaUtils::GetStringForNSString(aNewString, text);
mGoannaTextAccessible->ReplaceText(text);
mGeckoTextAccessible->ReplaceText(text);
}
NS_OBJC_END_TRY_ABORT_BLOCK;
@@ -353,7 +353,7 @@ ToNSString(id aValue)
- (NSString*)text
{
if (!mGoannaAccessible || !mGoannaTextAccessible)
if (!mGeckoAccessible || !mGeckoTextAccessible)
return nil;
// A password text field returns an empty value
@@ -361,7 +361,7 @@ ToNSString(id aValue)
return @"";
nsAutoString text;
mGoannaTextAccessible->TextSubstring(0,
mGeckoTextAccessible->TextSubstring(0,
nsIAccessibleText::TEXT_OFFSET_END_OF_TEXT,
text);
return nsCocoaUtils::ToNSString(text);
@@ -371,10 +371,10 @@ ToNSString(id aValue)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
if (!mGoannaAccessible || !mGoannaTextAccessible)
if (!mGeckoAccessible || !mGeckoTextAccessible)
return 0;
return mGoannaTextAccessible ? mGoannaTextAccessible->CharacterCount() : 0;
return mGeckoTextAccessible ? mGeckoTextAccessible->CharacterCount() : 0;
NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(0);
}
@@ -383,9 +383,9 @@ ToNSString(id aValue)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
if (mGoannaTextAccessible) {
if (mGeckoTextAccessible) {
int32_t start = 0, end = 0;
mGoannaTextAccessible->SelectionBoundsAt(0, &start, &end);
mGeckoTextAccessible->SelectionBoundsAt(0, &start, &end);
return (end - start);
}
return 0;
@@ -397,12 +397,12 @@ ToNSString(id aValue)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if (mGoannaTextAccessible) {
if (mGeckoTextAccessible) {
int32_t start = 0, end = 0;
mGoannaTextAccessible->SelectionBoundsAt(0, &start, &end);
mGeckoTextAccessible->SelectionBoundsAt(0, &start, &end);
if (start != end) {
nsAutoString selText;
mGoannaTextAccessible->TextSubstring(start, end, selText);
mGeckoTextAccessible->TextSubstring(start, end, selText);
return nsCocoaUtils::ToNSString(selText);
}
}
@@ -415,17 +415,17 @@ ToNSString(id aValue)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if (mGoannaTextAccessible) {
if (mGeckoTextAccessible) {
int32_t start = 0;
int32_t end = 0;
int32_t count = mGoannaTextAccessible->SelectionCount();
int32_t count = mGeckoTextAccessible->SelectionCount();
if (count) {
mGoannaTextAccessible->SelectionBoundsAt(0, &start, &end);
mGeckoTextAccessible->SelectionBoundsAt(0, &start, &end);
return [NSValue valueWithRange:NSMakeRange(start, end - start)];
}
start = mGoannaTextAccessible->CaretOffset();
start = mGeckoTextAccessible->CaretOffset();
return [NSValue valueWithRange:NSMakeRange(start != -1 ? start : 0, 0)];
}
return [NSValue valueWithRange:NSMakeRange(0, 0)];
@@ -438,8 +438,8 @@ ToNSString(id aValue)
// XXX this won't work with Textarea and such as we actually don't give
// the visible character range.
return [NSValue valueWithRange:
NSMakeRange(0, mGoannaTextAccessible ?
mGoannaTextAccessible->CharacterCount() : 0)];
NSMakeRange(0, mGeckoTextAccessible ?
mGeckoTextAccessible->CharacterCount() : 0)];
}
- (void)valueDidChange
@@ -460,10 +460,10 @@ ToNSString(id aValue)
- (NSString*)stringFromRange:(NSRange*)range
{
NS_PRECONDITION(mGoannaTextAccessible && range, "no Goanna text accessible or range");
NS_PRECONDITION(mGeckoTextAccessible && range, "no Gecko text accessible or range");
nsAutoString text;
mGoannaTextAccessible->TextSubstring(range->location,
mGeckoTextAccessible->TextSubstring(range->location,
range->location + range->length, text);
return nsCocoaUtils::ToNSString(text);
}
@@ -496,18 +496,18 @@ ToNSString(id aValue)
- (NSString*)text
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
return nsCocoaUtils::ToNSString(mGoannaAccessible->AsTextLeaf()->Text());
return nsCocoaUtils::ToNSString(mGeckoAccessible->AsTextLeaf()->Text());
}
- (long)textLength
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return 0;
return mGoannaAccessible->AsTextLeaf()->Text().Length();
return mGeckoAccessible->AsTextLeaf()->Text().Length();
}
@end
accessible/tests/mochitest/elm/test_nsApplicationAcc.html
+2 -2
View File
@@ -41,14 +41,14 @@
}
if (applicationName == "")
applicationName = "Goanna based application";
applicationName = "Gecko based application";
}
is (accessible.name, applicationName, "wrong application accessible name");
// nsIAccessibleApplication
is(accessible.appName, appInfo.name, "Wrong application name");
is(accessible.appVersion, appInfo.version, "Wrong application version");
is(accessible.platformName, "Goanna", "Wrong platform name");
is(accessible.platformName, "Gecko", "Wrong platform name");
is(accessible.platformVersion, appInfo.platformVersion,
"Wrong platform version");
accessible/tests/mochitest/events/test_valuechange.html
+1 -1
View File
@@ -50,7 +50,7 @@
return;
// Note: always test against valuetext first because the existence of
// aria-valuetext takes precedence over aria-valuenow in goanna.
// aria-valuetext takes precedence over aria-valuenow in gecko.
is(acc.value, (aValuetext != undefined)? aValuetext : aValuenow,
"Wrong value of " + prettyName(aNodeOrID));
}
accessible/tests/mochitest/role/test_general.html
+2 -2
View File
@@ -169,8 +169,8 @@
<h6 id="head6">A heading level 6</h6>
<dl id="definitionlist">
<dt id="definitionterm">goanna</dt>
<dd id="definitiondescription">goannas have sticky toes</dd>
<dt id="definitionterm">gecko</dt>
<dd id="definitiondescription">geckos have sticky toes</dd>
</dl>
<span id="span1" onclick="">clickable span</span>
accessible/windows/ia2/ia2Accessible.cpp
+1 -1
View File
@@ -368,7 +368,7 @@ ia2Accessible::get_states(AccessibleStates* aStates)
if (state & states::REQUIRED)
*aStates |= IA2_STATE_REQUIRED;
// The following IA2 states are not supported by Goanna
// The following IA2 states are not supported by Gecko
// IA2_STATE_ARMED
// IA2_STATE_MANAGES_DESCENDANTS
// IA2_STATE_ICONIFIED
accessible/windows/ia2/ia2AccessibleRelation.cpp
+2 -2
View File
@@ -41,8 +41,8 @@ ia2AccessibleRelation::get_relationType(BSTR* aRelationType)
*aRelationType = nullptr;
#define RELATIONTYPE(goannaType, goannaTypeName, atkType, msaaType, ia2Type) \
case RelationType::goannaType: \
#define RELATIONTYPE(geckoType, geckoTypeName, atkType, msaaType, ia2Type) \
case RelationType::geckoType: \
*aRelationType = ::SysAllocString(ia2Type); \
break;
accessible/windows/ia2/ia2AccessibleRelation.h
+3 -3
View File
@@ -64,13 +64,13 @@ private:
/**
* Goanna to IAccessible2 relation types map.
* Gecko to IAccessible2 relation types map.
*/
const WCHAR *const IA2_RELATION_NULL = L"";
#define RELATIONTYPE(goannaType, name, atkType, msaaType, ia2Type) \
std::pair<RelationType, const WCHAR *const>(RelationType::goannaType, ia2Type),
#define RELATIONTYPE(geckoType, name, atkType, msaaType, ia2Type) \
std::pair<RelationType, const WCHAR *const>(RelationType::geckoType, ia2Type),
static const std::pair<RelationType, const WCHAR *const> sRelationTypePairs[] = {
#include "RelationTypeMap.h"
accessible/windows/ia2/ia2AccessibleText.cpp
+4 -4
View File
@@ -289,7 +289,7 @@ ia2AccessibleText::get_textBeforeOffset(long aOffset,
endOffset = textAcc->CharacterCount();
textAcc->TextSubstring(startOffset, endOffset, text);
} else {
AccessibleTextBoundary boundaryType = GetGoannaTextBoundary(aBoundaryType);
AccessibleTextBoundary boundaryType = GetGeckoTextBoundary(aBoundaryType);
if (boundaryType == -1)
return S_FALSE;
@@ -338,7 +338,7 @@ ia2AccessibleText::get_textAfterOffset(long aOffset,
endOffset = textAcc->CharacterCount();
textAcc->TextSubstring(startOffset, endOffset, text);
} else {
AccessibleTextBoundary boundaryType = GetGoannaTextBoundary(aBoundaryType);
AccessibleTextBoundary boundaryType = GetGeckoTextBoundary(aBoundaryType);
if (boundaryType == -1)
return S_FALSE;
textAcc->TextAfterOffset(aOffset, boundaryType, &startOffset, &endOffset, text);
@@ -384,7 +384,7 @@ ia2AccessibleText::get_textAtOffset(long aOffset,
endOffset = textAcc->CharacterCount();
textAcc->TextSubstring(startOffset, endOffset, text);
} else {
AccessibleTextBoundary boundaryType = GetGoannaTextBoundary(aBoundaryType);
AccessibleTextBoundary boundaryType = GetGeckoTextBoundary(aBoundaryType);
if (boundaryType == -1)
return S_FALSE;
textAcc->TextAtOffset(aOffset, boundaryType, &startOffset, &endOffset, text);
@@ -591,7 +591,7 @@ ia2AccessibleText::GetModifiedText(bool aGetInsertedText,
}
AccessibleTextBoundary
ia2AccessibleText::GetGoannaTextBoundary(enum IA2TextBoundaryType aBoundaryType)
ia2AccessibleText::GetGeckoTextBoundary(enum IA2TextBoundaryType aBoundaryType)
{
switch (aBoundaryType) {
case IA2_TEXT_BOUNDARY_CHAR:
accessible/windows/ia2/ia2AccessibleText.h
+1 -1
View File
@@ -120,7 +120,7 @@ protected:
private:
HRESULT GetModifiedText(bool aGetInsertedText, IA2TextSegment *aNewText);
AccessibleTextBoundary GetGoannaTextBoundary(enum IA2TextBoundaryType coordinateType);
AccessibleTextBoundary GetGeckoTextBoundary(enum IA2TextBoundaryType coordinateType);
};
} // namespace a11y
accessible/windows/msaa/AccessibleWrap.cpp
+5 -5
View File
@@ -516,7 +516,7 @@ AccessibleWrap::get_accState(
// MSAA only has 31 states and the lowest 31 bits of our state bit mask
// are the same states as MSAA.
// Note: we map the following Goanna states to different MSAA states:
// Note: we map the following Gecko states to different MSAA states:
// REQUIRED -> ALERT_LOW
// ALERT -> ALERT_MEDIUM
// INVALID -> ALERT_HIGH
@@ -968,9 +968,9 @@ AccessibleWrap::accNavigate(
Accessible* navAccessible = nullptr;
Maybe<RelationType> xpRelation;
#define RELATIONTYPE(goannaType, stringType, atkType, msaaType, ia2Type) \
#define RELATIONTYPE(geckoType, stringType, atkType, msaaType, ia2Type) \
case msaaType: \
xpRelation.emplace(RelationType::goannaType); \
xpRelation.emplace(RelationType::geckoType); \
break;
switch(navDir) {
@@ -1361,7 +1361,7 @@ AccessibleWrap::GetXPAccessibleFor(const VARIANT& aVarChild)
return nullptr;
}
// Goanna child indices are 0-based in contrast to indices used in MSAA.
// Gecko child indices are 0-based in contrast to indices used in MSAA.
return GetChildAt(aVarChild.lVal - 1);
}
@@ -1384,7 +1384,7 @@ AccessibleWrap::UpdateSystemCaretFor(Accessible* aAccessible)
}
// Create invisible bitmap for caret, otherwise its appearance interferes
// with Goanna caret
// with Gecko caret
HBITMAP caretBitMap = CreateBitmap(1, caretRect.height, 1, 1, nullptr);
if (::CreateCaret(caretWnd, caretBitMap, 1, caretRect.height)) { // Also destroys the last caret
::ShowCaret(caretWnd);
accessible/windows/msaa/AccessibleWrap.h
+1 -1
View File
@@ -162,7 +162,7 @@ public: // construction, destruction
* The system caret works more universally than the MSAA caret
* For example, Window-Eyes, JAWS, ZoomText and Windows Tablet Edition use it
* We will use an invisible system caret.
* Goanna is still responsible for drawing its own caret
* Gecko is still responsible for drawing its own caret
*/
void UpdateSystemCaretFor(Accessible* aAccessible);
accessible/windows/msaa/HTMLWin32ObjectAccessible.h
+1 -1
View File
@@ -18,7 +18,7 @@ class HTMLWin32ObjectOwnerAccessible : public AccessibleWrap
public:
// This will own the HTMLWin32ObjectAccessible. We create this where the
// <object> or <embed> exists in the tree, so that get_accNextSibling() etc.
// will still point to Goanna accessible sibling content. This is necessary
// will still point to Gecko accessible sibling content. This is necessary
// because the native plugin accessible doesn't know where it exists in the
// Mozilla tree, and returns null for previous and next sibling. This would
// have the effect of cutting off all content after the plugin.
b2g/app/B2GLoader.cpp
+1 -1
View File
@@ -279,7 +279,7 @@ main(int argc, const char* argv[])
ReserveFileDescriptors(reservedFds);
/*
* Before fork(), libxul and static data of Goanna are loaded for
* Before fork(), libxul and static data of Gecko are loaded for
* sharing.
*/
bool ok = LoadStaticData(argc, argv);
b2g/app/b2g.js
+1 -1
View File
@@ -792,7 +792,7 @@ pref("browser.prompt.allowNative", false);
// a restart is required to enable a new value.
pref("network.activity.blipIntervalMilliseconds", 250);
// By default we want the NetworkManager service to manage Goanna's offline
// By default we want the NetworkManager service to manage Gecko's offline
// status for us according to the state of Wifi/cellular data connections.
// In some environments, such as the emulator or hardware with other network
// connectivity, this is not desireable, however, in which case this pref
b2g/app/macbuild/Contents/Info.plist.in
+1 -1
View File
@@ -31,6 +31,6 @@
<key>NSHighResolutionCapable</key>
<true/>
<key>NSPrincipalClass</key>
<string>GoannaNSApplication</string>
<string>GeckoNSApplication</string>
</dict>
</plist>
b2g/app/moz.build
+2 -2
View File
@@ -6,9 +6,9 @@
if not CONFIG['LIBXUL_SDK']:
if CONFIG['GAIADIR']:
GoannaProgram(CONFIG['MOZ_APP_NAME'] + "-bin")
GeckoProgram(CONFIG['MOZ_APP_NAME'] + "-bin")
else:
GoannaProgram(CONFIG['MOZ_APP_NAME'])
GeckoProgram(CONFIG['MOZ_APP_NAME'])
if CONFIG['MOZ_B2G_LOADER']:
SOURCES += [
'B2GLoader.cpp',
b2g/app/nsBrowserApp.cpp
+1 -1
View File
@@ -231,7 +231,7 @@ int main(int argc, _CONST char* argv[])
DllBlocklist_Initialize();
#endif
// B2G loader has already initialized Goanna so we can't initialize
// B2G loader has already initialized Gecko so we can't initialize
// it again here.
#ifndef MOZ_B2G_LOADER
// We do this because of data in bug 771745
b2g/app/ua-update.json.in
+2 -2
View File
@@ -4,7 +4,7 @@
// evangelism are included.
{
// bug 826347, msn.com
"msn.com": "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Goanna) Chrome/18.0.1025.133 Mobile Safari/535.19",
"msn.com": "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19",
// bug 826353, itau.com.br
"itau.com.br": "\\(Mobile#(Android; Mobile",
// bug 826510, r7.com
@@ -24,7 +24,7 @@
// bug 827573, webmotors.com.br
"webmotors.com.br": "\\(Mobile#(Android; Mobile",
// bug 827670, elpais.com.co
"elpais.com.co": "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Goanna) Chrome/18.0.1025.133 Mobile Safari/535.19",
"elpais.com.co": "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19",
// bug 827674, avianca.com
"avianca.com": "\\(Mobile#(Android; Mobile",
// bug 827678, marca.com
b2g/chrome/content/devtools/debugger.js
+1 -1
View File
@@ -323,7 +323,7 @@ let WiFiRemoteDebugger = {
let devtoolsWiFi = false;
// Keep the old setting to not break people that won't have updated
// gaia and goanna.
// gaia and gecko.
SettingsListener.observe("devtools.debugger.remote-enabled", false,
function(value) {
devtoolsUSB = value;
b2g/chrome/content/identity.js
+3 -3
View File
@@ -62,13 +62,13 @@ function identityCall(message) {
}
/*
* To close the dialog, we first tell the goanna SignInToWebsite manager that it
* To close the dialog, we first tell the gecko SignInToWebsite manager that it
* can clean up. Then we tell the gaia component that we are finished. It is
* necessary to notify goanna first, so that the message can be sent before gaia
* necessary to notify gecko first, so that the message can be sent before gaia
* destroys our context.
*/
function closeIdentityDialog() {
// tell goanna we're done.
// tell gecko we're done.
func = null; options = null;
sendAsyncMessage(kIdentityDelegateFinished);
}
b2g/chrome/content/settings.js
+11 -11
View File
@@ -320,7 +320,7 @@ setUpdateTrackingId();
//In order of precedence they are:
//
//1. mozSettings "layers.composer.enabled"
//2. a goanna pref "layers.composer.enabled"
//2. a gecko pref "layers.composer.enabled"
//3. presence of ro.display.colorfill at the Gonk level
var req = navigator.mozSettings.createLock().get('layers.composer2d.enabled');
@@ -384,11 +384,11 @@ setUpdateTrackingId();
// =================== Telemetry ======================
(function setupTelemetrySettings() {
let gaiaSettingName = 'debug.performance_data.shared';
let goannaPrefName = 'toolkit.telemetry.enabled';
let geckoPrefName = 'toolkit.telemetry.enabled';
SettingsListener.observe(gaiaSettingName, null, function(value) {
if (value !== null) {
// Gaia setting has been set; update Goanna pref to that.
Services.prefs.setBoolPref(goannaPrefName, value);
// Gaia setting has been set; update Gecko pref to that.
Services.prefs.setBoolPref(geckoPrefName, value);
return;
}
// Gaia setting has not been set; set the gaia setting to default.
@@ -398,7 +398,7 @@ setUpdateTrackingId();
let prefValue = false;
#endif
try {
prefValue = Services.prefs.getBoolPref(goannaPrefName);
prefValue = Services.prefs.getBoolPref(geckoPrefName);
} catch (e) {
// Pref not set; use default value.
}
@@ -410,14 +410,14 @@ setUpdateTrackingId();
// =================== Low-precision buffer ======================
(function setupLowPrecisionSettings() {
// The gaia setting layers.low-precision maps to two goanna prefs
// The gaia setting layers.low-precision maps to two gecko prefs
SettingsListener.observe('layers.low-precision', null, function(value) {
if (value !== null) {
// Update goanna from the new Gaia setting
// Update gecko from the new Gaia setting
Services.prefs.setBoolPref('layers.low-precision-buffer', value);
Services.prefs.setBoolPref('layers.progressive-paint', value);
} else {
// Update gaia setting from goanna value
// Update gaia setting from gecko value
try {
let prefValue = Services.prefs.getBoolPref('layers.low-precision-buffer');
let setting = { 'layers.low-precision': prefValue };
@@ -428,13 +428,13 @@ setUpdateTrackingId();
}
});
// The gaia setting layers.low-opacity maps to a string goanna pref (0.5/1.0)
// The gaia setting layers.low-opacity maps to a string gecko pref (0.5/1.0)
SettingsListener.observe('layers.low-opacity', null, function(value) {
if (value !== null) {
// Update goanna from the new Gaia setting
// Update gecko from the new Gaia setting
Services.prefs.setCharPref('layers.low-precision-opacity', value ? '0.5' : '1.0');
} else {
// Update gaia setting from goanna value
// Update gaia setting from gecko value
try {
let prefValue = Services.prefs.getCharPref('layers.low-precision-opacity');
let setting = { 'layers.low-opacity': (prefValue == '0.5') };
b2g/components/LogShake.jsm
+1 -1
View File
@@ -219,7 +219,7 @@ let LogShake = {
Cu.reportError("Unable to get device properties: " + ex);
}
// Let Goanna perfom the dump to a file, and just collect it
// Let Gecko perfom the dump to a file, and just collect it
try {
LogCapture.readAboutMemory().then(aboutMemory => {
let file = OS.Path.basename(aboutMemory);
b2g/components/SystemAppProxy.jsm
+1 -1
View File
@@ -51,7 +51,7 @@ let SystemAppProxy = {
/*
* Common way to send an event to the system app.
*
* // In goanna code:
* // In gecko code:
* SystemAppProxy.sendCustomEvent('foo', { data: 'bar' });
* // In system app:
* window.addEventListener('foo', function (event) {
b2g/components/UpdatePrompt.js
+3 -3
View File
@@ -214,10 +214,10 @@ UpdatePrompt.prototype = {
setUpdateStatus: function UP_setUpdateStatus(aStatus) {
if (useSettings()) {
log("Setting goanna.updateStatus: " + aStatus);
log("Setting gecko.updateStatus: " + aStatus);
let lock = Services.settings.createLock();
lock.set("goanna.updateStatus", aStatus, null);
lock.set("gecko.updateStatus", aStatus, null);
}
},
@@ -364,7 +364,7 @@ UpdatePrompt.prototype = {
finishUpdate: function UP_finishUpdate() {
if (!this._update.isOSUpdate) {
// Standard goanna+gaia updates will just need to restart the process
// Standard gecko+gaia updates will just need to restart the process
this.restartProcess();
return;
}
b2g/config/dolphin-512/config.json
+3 -3
View File
@@ -22,9 +22,9 @@
"{workdir}/.config",
"{workdir}/sources.xml",
"{workdir}/profile.sh",
["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"],
["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"],
["{workdir}/scripts/profile-symbolicate.py", "scripts/"],
["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"]
["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"]
],
"env": {
"VARIANT": "user",
@@ -33,7 +33,7 @@
"b2g_manifest": "dolphin-512.xml",
"b2g_manifest_intree": true,
"additional_source_tarballs": [],
"goanna_l10n_root": "https://hg.mozilla.org/l10n-central",
"gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
"gaia": {
"l10n": {
"vcs": "hgtool",
b2g/config/dolphin/config.json
+3 -3
View File
@@ -24,9 +24,9 @@
"{workdir}/.config",
"{workdir}/sources.xml",
"{workdir}/profile.sh",
["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"],
["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"],
["{workdir}/scripts/profile-symbolicate.py", "scripts/"],
["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"]
["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"]
],
"env": {
"VARIANT": "user",
@@ -36,7 +36,7 @@
"b2g_manifest": "dolphin.xml",
"b2g_manifest_intree": true,
"additional_source_tarballs": [],
"goanna_l10n_root": "https://hg.mozilla.org/l10n-central",
"gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
"gaia": {
"l10n": {
"vcs": "hgtool",
b2g/config/emulator-ics/config.json
+1 -1
View File
@@ -16,7 +16,7 @@
"{workdir}/sources.xml"
],
"upload_platform": "emulator-ics",
"goanna_l10n_root": "https://hg.mozilla.org/l10n-central",
"gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
"gaia": {
"l10n": {
"vcs": "hgtool",
b2g/config/emulator-jb/config.json
+1 -1
View File
@@ -21,7 +21,7 @@
"{workdir}/sources.xml"
],
"upload_platform": "emulator-jb",
"goanna_l10n_root": "https://hg.mozilla.org/l10n-central",
"gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
"gaia": {
"l10n": {
"vcs": "hgtool",
b2g/config/emulator-kk/config.json
+1 -1
View File
@@ -21,7 +21,7 @@
"{workdir}/sources.xml"
],
"upload_platform": "emulator-kk",
"goanna_l10n_root": "https://hg.mozilla.org/l10n-central",
"gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
"gaia": {
"l10n": {
"vcs": "hgtool",
b2g/config/emulator/config.json
+1 -1
View File
@@ -21,7 +21,7 @@
"{objdir}/dist/b2g-*.tar.gz",
"{workdir}/sources.xml"
],
"goanna_l10n_root": "https://hg.mozilla.org/l10n-central",
"gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
"gaia": {
"l10n": {
"vcs": "hgtool",
b2g/config/flame-kk/config.json
+3 -3
View File
@@ -26,9 +26,9 @@
"{workdir}/.config",
"{workdir}/sources.xml",
"{workdir}/profile.sh",
["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"],
["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"],
["{workdir}/scripts/profile-symbolicate.py", "scripts/"],
["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"]
["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"]
],
"env": {
"VARIANT": "user",
@@ -40,7 +40,7 @@
"b2g_manifest": "flame-kk.xml",
"b2g_manifest_intree": true,
"additional_source_tarballs": ["backup-flame.tar.xz"],
"goanna_l10n_root": "https://hg.mozilla.org/l10n-central",
"gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
"gaia": {
"l10n": {
"vcs": "hgtool",
b2g/config/flame/config.json
+3 -3
View File
@@ -25,9 +25,9 @@
"{workdir}/.config",
"{workdir}/sources.xml",
"{workdir}/profile.sh",
["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"],
["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"],
["{workdir}/scripts/profile-symbolicate.py", "scripts/"],
["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"]
["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"]
],
"env": {
"VARIANT": "user",
@@ -39,7 +39,7 @@
"b2g_manifest": "flame.xml",
"b2g_manifest_intree": true,
"additional_source_tarballs": ["backup-flame.tar.xz"],
"goanna_l10n_root": "https://hg.mozilla.org/l10n-central",
"gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
"gaia": {
"l10n": {
"vcs": "hgtool",
b2g/config/hamachi/config.json
+3 -3
View File
@@ -19,9 +19,9 @@
],
"zip_files": [
"{workdir}/profile.sh",
["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"],
["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"],
["{workdir}/scripts/profile-symbolicate.py", "scripts/"],
["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"]
["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"]
],
"env": {
"VARIANT": "user",
@@ -32,7 +32,7 @@
"b2g_manifest": "hamachi.xml",
"b2g_manifest_intree": true,
"additional_source_tarballs": ["backup-hamachi.tar.xz"],
"goanna_l10n_root": "https://hg.mozilla.org/l10n-central",
"gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
"gaia": {
"l10n": {
"vcs": "hgtool",
b2g/config/hamachi/limited-memory-config.json
+1 -1
View File
@@ -26,7 +26,7 @@
"b2g_manifest": "hamachi.xml",
"b2g_manifest_branch": "master",
"additional_source_tarballs": ["backup-hamachi.tar.xz"],
"goanna_l10n_root": "https://hg.mozilla.org/l10n-central",
"gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
"gaia": {
"l10n": {
"vcs": "hgtool",
b2g/config/helix/config.json
+3 -3
View File
@@ -24,9 +24,9 @@
"{workdir}/.config",
"{workdir}/sources.xml",
"{workdir}/profile.sh",
["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"],
["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"],
["{workdir}/scripts/profile-symbolicate.py", "scripts/"],
["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"]
["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"]
],
"env": {
"VARIANT": "user",
@@ -38,7 +38,7 @@
"b2g_manifest": "helix.xml",
"b2g_manifest_intree": true,
"additional_source_tarballs": ["helix-ics.tar.xz"],
"goanna_l10n_root": "https://hg.mozilla.org/l10n-central",
"gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
"gaia": {
"l10n": {
"vcs": "hgtool",
b2g/config/nexus-4/config.json
+3 -3
View File
@@ -25,9 +25,9 @@
"{workdir}/.config",
"{workdir}/sources.xml",
"{workdir}/profile.sh",
["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"],
["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"],
["{workdir}/scripts/profile-symbolicate.py", "scripts/"],
["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"]
["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"]
],
"env": {
"VARIANT": "user",
@@ -38,7 +38,7 @@
"b2g_manifest": "nexus-4.xml",
"b2g_manifest_intree": true,
"additional_source_tarballs": [],
"goanna_l10n_root": "https://hg.mozilla.org/l10n-central",
"gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
"gaia": {
"l10n": {
"vcs": "hgtool",
b2g/config/nexus-5-l/config.json
+3 -3
View File
@@ -25,9 +25,9 @@
"{workdir}/.config",
"{workdir}/sources.xml",
"{workdir}/profile.sh",
["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"],
["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"],
["{workdir}/scripts/profile-symbolicate.py", "scripts/"],
["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"]
["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"]
],
"env": {
"VARIANT": "userdebug",
@@ -38,7 +38,7 @@
"b2g_manifest": "nexus-5-l.xml",
"b2g_manifest_intree": true,
"additional_source_tarballs": [],
"goanna_l10n_root": "https://hg.mozilla.org/l10n-central",
"gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
"gaia": {
"l10n": {
"vcs": "hgtool",
b2g/config/wasabi/config.json
+3 -3
View File
@@ -20,9 +20,9 @@
"{workdir}/.config",
"{workdir}/sources.xml",
"{workdir}/profile.sh",
["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"],
["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"],
["{workdir}/scripts/profile-symbolicate.py", "scripts/"],
["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"]
["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"]
],
"env": {
"VARIANT": "user",
@@ -32,7 +32,7 @@
"b2g_manifest": "wasabi.xml",
"b2g_manifest_intree": true,
"additional_source_tarballs": ["backup-wasabi.tar.gz"],
"goanna_l10n_root": "https://hg.mozilla.org/l10n-central",
"gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
"gaia": {
"l10n": {
"vcs": "hgtool",
b2g/confvars.sh
+1 -1
View File
@@ -11,7 +11,7 @@ MOZ_APP_UA_NAME=Firefox
MOZ_UA_OS_AGNOSTIC=1
MOZ_B2G_VERSION=3.0.0.0-prerelease
MOZ_B2G_OS_NAME=Boot2Goanna
MOZ_B2G_OS_NAME=Boot2Gecko
MOZ_BRANDING_DIRECTORY=b2g/branding/unofficial
MOZ_OFFICIAL_BRANDING_DIRECTORY=b2g/branding/official
b2g/locales/Makefile.in
+1 -1
View File
@@ -134,7 +134,7 @@ endif
ident:
@printf 'goanna_revision '
@printf 'gecko_revision '
@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(GECKO_PLATFORM_INI_PATH) Build SourceStamp
@printf 'b2g_revision '
@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(B2G_APPLICATION_INI_PATH) App SourceStamp
browser/app/macbuild/Contents/Info.plist.in
+1 -1
View File
@@ -224,6 +224,6 @@
<key>NSSupportsAutomaticGraphicsSwitching</key>
<true/>
<key>NSPrincipalClass</key>
<string>GoannaNSApplication</string>
<string>GeckoNSApplication</string>
</dict>
</plist>
browser/app/moz.build
+2 -2
View File
@@ -8,9 +8,9 @@ DIRS += ['profile/extensions']
if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['MOZ_ASAN']:
GoannaProgram(CONFIG['MOZ_APP_NAME'])
GeckoProgram(CONFIG['MOZ_APP_NAME'])
else:
GoannaProgram(CONFIG['MOZ_APP_NAME'], msvcrt='static')
GeckoProgram(CONFIG['MOZ_APP_NAME'], msvcrt='static')
JS_PREFERENCE_FILES += [
'profile/palemoon.js',
browser/base/content/browser-fullScreen.js
+1 -1
View File
@@ -315,7 +315,7 @@ var FullScreen = {
Services.perms.EXPIRE_NEVER);
else if (isApproved) {
// The user has only temporarily approved fullscren for this fullscreen
// session only. Add the permission (so Goanna knows to approve any further
// session only. Add the permission (so Gecko knows to approve any further
// fullscreen requests for this host in this fullscreen session) but add
// a listener to revoke the permission when the chrome document exits
// fullscreen.
browser/base/content/browser.js
+1 -1
View File
@@ -5122,7 +5122,7 @@ function handleDroppedLink(event, url, name)
loadURI(uri, null, postData.value, false);
// Keep the event from being handled by the dragDrop listeners
// built-in to goanna if they happen to be above us.
// built-in to gecko if they happen to be above us.
event.preventDefault();
};
browser/components/feeds/WebContentConverter.js
+1 -1
View File
@@ -63,7 +63,7 @@ const PREF_SELECTED_WEB = "browser.feeds.handlers.webservice";
const PREF_SELECTED_ACTION = "browser.feeds.handler";
const PREF_SELECTED_READER = "browser.feeds.handler.default";
const PREF_HANDLER_EXTERNAL_PREFIX = "network.protocol-handler.external";
const PREF_ALLOW_DIFFERENT_HOST = "goanna.handlerService.allowRegisterFromDifferentHost";
const PREF_ALLOW_DIFFERENT_HOST = "gecko.handlerService.allowRegisterFromDifferentHost";
const STRING_BUNDLE_URI = "chrome://browser/locale/feeds/subscribe.properties";
browser/components/nsBrowserContentHandler.js
+2 -2
View File
@@ -94,9 +94,9 @@ const OVERRIDE_NEW_BUILD_ID = 3;
* Returns:
* OVERRIDE_NEW_PROFILE if this is the first run with a new profile.
* OVERRIDE_NEW_MSTONE if this is the first run with a build with a different
* Goanna milestone (i.e. right after an upgrade).
* Gecko milestone (i.e. right after an upgrade).
* OVERRIDE_NEW_BUILD_ID if this is the first run with a new build ID of the
* same Goanna milestone (i.e. after a nightly upgrade).
* same Gecko milestone (i.e. after a nightly upgrade).
* OVERRIDE_NONE otherwise.
*/
function needHomepageOverride(prefb) {
browser/components/nsBrowserGlue.js
+1 -1
View File
@@ -541,7 +541,7 @@ BrowserGlue.prototype = {
cookies = aHttpChannel.getRequestHeader("Cookie");
} catch (e) { /* no cookie sent */ }
if (cookies && cookies.indexOf("MoodleSession") > -1)
return aOriginalUA.replace(/Goanna\/[^ ]*/, "Goanna/20100101");
return aOriginalUA.replace(/Gecko\/[^ ]*/, "Gecko/20100101");
return null;
});
}
browser/installer/windows/nsis/shared.nsh
+1 -1
View File
@@ -455,7 +455,7 @@
${WriteRegStr2} $TmpVal "$0" "Plugins" "$8\plugins" 0
StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}"
${WriteRegStr2} $TmpVal "$0" "GoannaVer" "${GREVersion}" 0
${WriteRegStr2} $TmpVal "$0" "GeckoVer" "${GREVersion}" 0
StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}"
${WriteRegStr2} $TmpVal "$0" "" "${GREVersion}" 0
browser/locales/en-US/chrome/browser-region/region.properties
+11 -11
View File
@@ -22,22 +22,22 @@ browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
# profile database. Note that "new" is defined as "has a different URL"; this
# means that it's not possible to update the name of existing handler, so
# don't make any spelling errors here.
goanna.handlerService.defaultHandlersVersion=3
gecko.handlerService.defaultHandlersVersion=3
# The default set of protocol handlers for webcal:
goanna.handlerService.schemes.webcal.0.name=30 Boxes
goanna.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
gecko.handlerService.schemes.webcal.0.name=30 Boxes
gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
# The default set of protocol handlers for mailto:
goanna.handlerService.schemes.mailto.0.name=Yahoo! Mail
goanna.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s
goanna.handlerService.schemes.mailto.1.name=Gmail
goanna.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s
gecko.handlerService.schemes.mailto.1.name=Gmail
gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
# The default set of protocol handlers for irc:
goanna.handlerService.schemes.irc.0.name=Mibbit
goanna.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
gecko.handlerService.schemes.irc.0.name=Mibbit
gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
# The default set of protocol handlers for ircs:
goanna.handlerService.schemes.ircs.0.name=Mibbit
goanna.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
gecko.handlerService.schemes.ircs.0.name=Mibbit
gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
browser/locales/filter.py
+2 -2
View File
@@ -33,5 +33,5 @@ def test(mod, path, entity = None):
return not (re.match(r"browser\.search\.order\.[1-9]", entity) or
re.match(r"browser\.contentHandlers\.types\.[0-5]", entity) or
re.match(r"goanna\.handlerService\.schemes\.", entity) or
re.match(r"goanna\.handlerService\.defaultHandlersVersion", entity))
re.match(r"gecko\.handlerService\.schemes\.", entity) or
re.match(r"gecko\.handlerService\.defaultHandlersVersion", entity))
build/annotationProcessors/AnnotationInfo.java
+1 -1
View File
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.goanna.annotationProcessors;
package org.mozilla.gecko.annotationProcessors;
/**
* Object holding annotation data. Used by GeneratableElementIterator.
build/annotationProcessors/AnnotationProcessor.java
+5 -5
View File
@@ -2,12 +2,12 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.goanna.annotationProcessors;
package org.mozilla.gecko.annotationProcessors;
import org.mozilla.goanna.annotationProcessors.classloader.AnnotatableEntity;
import org.mozilla.goanna.annotationProcessors.classloader.ClassWithOptions;
import org.mozilla.goanna.annotationProcessors.classloader.IterableJarLoadingURLClassLoader;
import org.mozilla.goanna.annotationProcessors.utils.GeneratableElementIterator;
import org.mozilla.gecko.annotationProcessors.classloader.AnnotatableEntity;
import org.mozilla.gecko.annotationProcessors.classloader.ClassWithOptions;
import org.mozilla.gecko.annotationProcessors.classloader.IterableJarLoadingURLClassLoader;
import org.mozilla.gecko.annotationProcessors.utils.GeneratableElementIterator;
import java.io.FileOutputStream;
import java.io.IOException;
build/annotationProcessors/CodeGenerator.java
+4 -4
View File
@@ -2,11 +2,11 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.goanna.annotationProcessors;
package org.mozilla.gecko.annotationProcessors;
import org.mozilla.goanna.annotationProcessors.classloader.AnnotatableEntity;
import org.mozilla.goanna.annotationProcessors.classloader.ClassWithOptions;
import org.mozilla.goanna.annotationProcessors.utils.Utils;
import org.mozilla.gecko.annotationProcessors.classloader.AnnotatableEntity;
import org.mozilla.gecko.annotationProcessors.classloader.ClassWithOptions;
import org.mozilla.gecko.annotationProcessors.utils.Utils;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
build/annotationProcessors/SDKProcessor.java
+6 -6
View File
@@ -2,16 +2,16 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.goanna.annotationProcessors;
package org.mozilla.gecko.annotationProcessors;
import com.android.tools.lint.checks.ApiLookup;
import com.android.tools.lint.LintCliClient;
import org.mozilla.goanna.annotationProcessors.classloader.AnnotatableEntity;
import org.mozilla.goanna.annotationProcessors.classloader.ClassWithOptions;
import org.mozilla.goanna.annotationProcessors.classloader.IterableJarLoadingURLClassLoader;
import org.mozilla.goanna.annotationProcessors.utils.GeneratableElementIterator;
import org.mozilla.goanna.annotationProcessors.utils.Utils;
import org.mozilla.gecko.annotationProcessors.classloader.AnnotatableEntity;
import org.mozilla.gecko.annotationProcessors.classloader.ClassWithOptions;
import org.mozilla.gecko.annotationProcessors.classloader.IterableJarLoadingURLClassLoader;
import org.mozilla.gecko.annotationProcessors.utils.GeneratableElementIterator;
import org.mozilla.gecko.annotationProcessors.utils.Utils;
import java.io.File;
import java.io.FileInputStream;
build/annotationProcessors/classloader/AnnotatableEntity.java
+2 -2
View File
@@ -2,9 +2,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.goanna.annotationProcessors.classloader;
package org.mozilla.gecko.annotationProcessors.classloader;
import org.mozilla.goanna.annotationProcessors.AnnotationInfo;
import org.mozilla.gecko.annotationProcessors.AnnotationInfo;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
build/annotationProcessors/classloader/ClassWithOptions.java
+1 -1
View File
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.goanna.annotationProcessors.classloader;
package org.mozilla.gecko.annotationProcessors.classloader;
public class ClassWithOptions {
public final Class<?> wrappedClass;
build/annotationProcessors/classloader/IterableJarLoadingURLClassLoader.java
+1 -1
View File
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.goanna.annotationProcessors.classloader;
package org.mozilla.gecko.annotationProcessors.classloader;
import java.io.File;
import java.io.IOException;
build/annotationProcessors/classloader/JarClassIterator.java
+1 -1
View File
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.goanna.annotationProcessors.classloader;
package org.mozilla.gecko.annotationProcessors.classloader;
import java.util.Iterator;
build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java
+1 -1
View File
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.goanna.annotationProcessors.utils;
package org.mozilla.gecko.annotationProcessors.utils;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
build/annotationProcessors/utils/GeneratableElementIterator.java
+5 -5
View File
@@ -2,10 +2,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.goanna.annotationProcessors.utils;
package org.mozilla.gecko.annotationProcessors.utils;
import org.mozilla.goanna.annotationProcessors.AnnotationInfo;
import org.mozilla.goanna.annotationProcessors.classloader.AnnotatableEntity;
import org.mozilla.gecko.annotationProcessors.AnnotationInfo;
import org.mozilla.gecko.annotationProcessors.classloader.AnnotatableEntity;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
@@ -50,7 +50,7 @@ public class GeneratableElementIterator implements Iterator<AnnotatableEntity> {
// Check for "Wrap ALL the things" flag.
for (Annotation annotation : aClass.getDeclaredAnnotations()) {
final String annotationTypeName = annotation.annotationType().getName();
if (annotationTypeName.equals("org.mozilla.goanna.mozglue.generatorannotations.WrapEntireClassForJNI")) {
if (annotationTypeName.equals("org.mozilla.gecko.mozglue.generatorannotations.WrapEntireClassForJNI")) {
mIterateEveryEntry = true;
break;
}
@@ -71,7 +71,7 @@ public class GeneratableElementIterator implements Iterator<AnnotatableEntity> {
// WrappedJNIMethod has parameters. Use Reflection to obtain them.
Class<? extends Annotation> annotationType = annotation.annotationType();
final String annotationTypeName = annotationType.getName();
if (annotationTypeName.equals("org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI")) {
if (annotationTypeName.equals("org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI")) {
String stubName = null;
boolean isMultithreadedStub = false;
boolean noThrow = false;
build/annotationProcessors/utils/Utils.java
+2 -2
View File
@@ -2,9 +2,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.goanna.annotationProcessors.utils;
package org.mozilla.gecko.annotationProcessors.utils;
import org.mozilla.goanna.annotationProcessors.AnnotationInfo;
import org.mozilla.gecko.annotationProcessors.AnnotationInfo;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
build/appini_header.py
+3 -3
View File
@@ -24,7 +24,7 @@ def main(file):
appdata['flags'] = ' | '.join(flags) if flags else '0'
appdata['App:profile'] = '"%s"' % appdata['App:profile'] if 'App:profile' in appdata else 'NULL'
expected = ('App:vendor', 'App:name', 'App:remotingname', 'App:version', 'App:buildid',
'App:id', 'Goanna:minversion', 'Goanna:maxversion')
'App:id', 'Gecko:minversion', 'Gecko:maxversion')
missing = [var for var in expected if var not in appdata]
if missing:
print >>sys.stderr, \
@@ -47,8 +47,8 @@ def main(file):
NULL, // copyright
%(flags)s,
NULL, // xreDirectory
"%(Goanna:minversion)s",
"%(Goanna:maxversion)s",
"%(Gecko:minversion)s",
"%(Gecko:maxversion)s",
"%(Crash Reporter:serverurl)s",
%(App:profile)s
};''' % appdata
build/application.ini
+1 -1
View File
@@ -43,7 +43,7 @@ SourceStamp=@MOZ_SOURCE_STAMP@
#endif
ID=@MOZ_APP_ID@
[Goanna]
[Gecko]
MinVersion=@GRE_MILESTONE@
MaxVersion=@GRE_MILESTONE@
build/autoconf/config.status.m4
+1 -1
View File
@@ -177,7 +177,7 @@ cat >> $CONFIG_STATUS <<EOF
__all__ = ['topobjdir', 'topsrcdir', 'defines', 'non_global_defines', 'substs']
EOF
# We don't want js/src/config.status to do anything in goanna builds.
# We don't want js/src/config.status to do anything in gecko builds.
if test -z "$BUILDING_JS" -o -n "$JS_STANDALONE"; then
cat >> $CONFIG_STATUS <<EOF
build/docs/defining-binaries.rst
+13 -13
View File
@@ -290,26 +290,26 @@ On e.g. Linux, the above ``myprog`` will have DT_NEEDED markers for
requirement for ``myprog`` is ``libfoo.so`` instead of ``libotherlib.so``.
Goanna-related binaries
Gecko-related binaries
======================
Some programs or libraries are totally independent of Goanna, and can use the
above mentioned templates. Others are Goanna-related in some way, and may
Some programs or libraries are totally independent of Gecko, and can use the
above mentioned templates. Others are Gecko-related in some way, and may
need XPCOM linkage, mozglue. These things are tedious. A set of additional
templates exists to ease defining such programs and libraries. They are
essentially the same as the above mentioned templates, prefixed with "Goanna":
essentially the same as the above mentioned templates, prefixed with "Gecko":
- ``GoannaProgram``
- ``GoannaSimplePrograms``
- ``GoannaCppUnitTests``
- ``GoannaSharedLibrary``
- ``GoannaFramework``
- ``GeckoProgram``
- ``GeckoSimplePrograms``
- ``GeckoCppUnitTests``
- ``GeckoSharedLibrary``
- ``GeckoFramework``
There is also ``XPCOMBinaryComponent`` for XPCOM components, which is a
special kind of library.
All the Goanna-prefixed templates take the same arguments as their
non-Goanna-prefixed counterparts, and can take a few more arguments
for non-standard cases. See the definition of ``GoannaBinary`` in
build/goanna_templates.mozbuild for more details, but most usecases
All the Gecko-prefixed templates take the same arguments as their
non-Gecko-prefixed counterparts, and can take a few more arguments
for non-standard cases. See the definition of ``GeckoBinary`` in
build/gecko_templates.mozbuild for more details, but most usecases
should not require these additional arguments.
build/docs/preprocessor.rst
+2 -2
View File
@@ -77,7 +77,7 @@ last ``#if`` was true (output was enabled), an ``#else`` makes it off
unlike the C preprocessor.
It does not matter whether any blocks before it were true. This behavior
changed on trunk (Goanna 1.9) on 2006-12-07; see Bug 277122 for details.
changed on trunk (Gecko 1.9) on 2006-12-07; see Bug 277122 for details.
::
@@ -143,7 +143,7 @@ The following two blocks are equivalent::
.. warning:: An ``#elif``, ``#elifdef``, or ``#elifndef`` is relative to
the last conditional block only (as well as the condition it implies),
unlike the C preprocessor. It does not matter whether any blocks before
it were true. This behavior changed on trunk (Goanna 1.9) on 2006-12-07.
it were true. This behavior changed on trunk (Gecko 1.9) on 2006-12-07.
See Bug 277122 for details.
File Inclusion
build/goanna_templates.mozbuild → build/gecko_templates.mozbuild
+24 -24
View File
@@ -5,8 +5,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@template
def GoannaBinary(linkage='dependent', msvcrt='dynamic', mozglue=None):
'''Template for Goanna-related binaries.
def GeckoBinary(linkage='dependent', msvcrt='dynamic', mozglue=None):
'''Template for Gecko-related binaries.
This template is meant to be used in other templates.
@@ -85,85 +85,85 @@ def GoannaBinary(linkage='dependent', msvcrt='dynamic', mozglue=None):
@template
def GoannaProgram(name, linkage='standalone', **kwargs):
'''Template for program executables related to Goanna.
def GeckoProgram(name, linkage='standalone', **kwargs):
'''Template for program executables related to Gecko.
`name` identifies the executable base name.
See the documentation for `GoannaBinary` for other possible arguments,
See the documentation for `GeckoBinary` for other possible arguments,
with the notable difference that the default for `linkage` is 'standalone'.
'''
Program(name)
kwargs.setdefault('mozglue', 'program')
GoannaBinary(linkage=linkage, **kwargs)
GeckoBinary(linkage=linkage, **kwargs)
@template
def GoannaSimplePrograms(names, **kwargs):
'''Template for simple program executables related to Goanna.
def GeckoSimplePrograms(names, **kwargs):
'''Template for simple program executables related to Gecko.
`names` identifies the executable base names for each executable.
See the documentation for `GoannaBinary` for other possible arguments.
See the documentation for `GeckoBinary` for other possible arguments.
'''
SimplePrograms(names)
kwargs.setdefault('mozglue', 'program')
GoannaBinary(**kwargs)
GeckoBinary(**kwargs)
@template
def GoannaCppUnitTests(names, **kwargs):
'''Template for C++ unit tests related to Goanna.
def GeckoCppUnitTests(names, **kwargs):
'''Template for C++ unit tests related to Gecko.
`names` identifies the executable base names for each executable.
See the documentation for `GoannaBinary` for other possible arguments.
See the documentation for `GeckoBinary` for other possible arguments.
'''
CppUnitTests(names)
kwargs.setdefault('mozglue', 'program')
GoannaBinary(**kwargs)
GeckoBinary(**kwargs)
@template
def GoannaSharedLibrary(name, **kwargs):
'''Template for shared libraries related to Goanna.
def GeckoSharedLibrary(name, **kwargs):
'''Template for shared libraries related to Gecko.
`name` identifies the library base name.
See the documentation for `GoannaBinary` for other possible arguments.
See the documentation for `GeckoBinary` for other possible arguments.
'''
SharedLibrary(name)
kwargs.setdefault('mozglue', 'library')
GoannaBinary(**kwargs)
GeckoBinary(**kwargs)
@template
def GoannaFramework(name, **kwargs):
'''Template for OSX frameworks related to Goanna.
def GeckoFramework(name, **kwargs):
'''Template for OSX frameworks related to Gecko.
`name` identifies the library base name.
See the documentation for `GoannaBinary` for other possible arguments.
See the documentation for `GeckoBinary` for other possible arguments.
'''
Framework(name)
kwargs.setdefault('mozglue', 'library')
GoannaBinary(**kwargs)
GeckoBinary(**kwargs)
@template
def XPCOMBinaryComponent(name, **kwargs):
'''Template defining an XPCOM binary component for Goanna.
'''Template defining an XPCOM binary component for Gecko.
`name` is the name of the component.
'''
GoannaSharedLibrary(name, **kwargs)
GeckoSharedLibrary(name, **kwargs)
IS_COMPONENT = True
build/mobile/b2gautomation.py
+1 -1
View File
@@ -221,7 +221,7 @@ class B2GRemoteAutomation(Automation):
print 'device:', serial, 'status:', rstatus
def Process(self, cmd, stdout=None, stderr=None, env=None, cwd=None):
# On a desktop or fennec run, the Process method invokes a goanna
# On a desktop or fennec run, the Process method invokes a gecko
# process in which to the tests. For B2G, we simply
# reboot the device (which was configured with a test profile
# already), wait for B2G to start up, and then navigate to the
build/mobile/robocop/Actions.java
+6 -6
View File
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.goanna;
package org.mozilla.gecko;
import android.database.Cursor;
public interface Actions {
@@ -39,14 +39,14 @@ public interface Actions {
}
/**
* Sends an event to Goanna.
* Sends an event to Gecko.
*
* @param geckoEvent The geckoEvent JSONObject's type
*/
void sendGeckoEvent(String geckoEvent, String data);
/**
* Sends a preferences get event to Goanna.
* Sends a preferences get event to Gecko.
*
* @param requestId The id of this request.
* @param prefNames The preferences being requested.
@@ -54,7 +54,7 @@ public interface Actions {
void sendPreferencesGetEvent(int requestId, String[] prefNames);
/**
* Sends a preferences observe event to Goanna.
* Sends a preferences observe event to Gecko.
*
* @param requestId The id of this request.
* @param prefNames The preferences being requested.
@@ -62,14 +62,14 @@ public interface Actions {
void sendPreferencesObserveEvent(int requestId, String[] prefNames);
/**
* Sends a preferences remove observers event to Goanna.
* Sends a preferences remove observers event to Gecko.
*
* @param requestId The id of this request.
*/
void sendPreferencesRemoveObserversEvent(int requestid);
/**
* Listens for a goanna event to be sent from the Goanna instance.
* Listens for a gecko event to be sent from the Gecko instance.
* The returned object can be used to test if the event has been
* received. Note that only one event is listened for.
*
build/mobile/robocop/AndroidManifest.xml.in
+3 -3
View File
@@ -8,7 +8,7 @@
<uses-sdk android:minSdkVersion="8" />
<instrumentation
android:name="org.mozilla.goanna.FennecInstrumentationTestRunner"
android:name="org.mozilla.gecko.FennecInstrumentationTestRunner"
android:targetPackage="@ANDROID_PACKAGE_NAME@" />
<application
@@ -16,7 +16,7 @@
<uses-library android:name="android.test.runner" />
<!-- Fake handlers to ensure that we have some share intents to show in our share handler list -->
<activity android:name="org.mozilla.goanna.RobocopShare1"
<activity android:name="org.mozilla.gecko.RobocopShare1"
android:label="Robocop fake activity">
<intent-filter android:label="Fake robocop share handler 1">
@@ -28,7 +28,7 @@
</activity>
<activity android:name="org.mozilla.goanna.RobocopShare2"
<activity android:name="org.mozilla.gecko.RobocopShare2"
android:label="Robocop fake activity 2">
<intent-filter android:label="Fake robocop share handler 2">
build/mobile/robocop/Assert.java
+1 -1
View File
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.goanna;
package org.mozilla.gecko;
public interface Assert {
void dumpLog(String message);
build/mobile/robocop/Driver.java
+5 -5
View File
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.goanna;
package org.mozilla.gecko;
import android.app.Activity;
@@ -24,10 +24,10 @@ public interface Driver {
int getPageHeight();
int getScrollHeight();
int getHeight();
int getGoannaTop();
int getGoannaLeft();
int getGoannaWidth();
int getGoannaHeight();
int getGeckoTop();
int getGeckoLeft();
int getGeckoWidth();
int getGeckoHeight();
void startFrameRecording();
int stopFrameRecording();
build/mobile/robocop/Element.java
+1 -1
View File
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.goanna;
package org.mozilla.gecko;
/**
* Element provides access to a specific UI view (android.view.View).
build/mobile/robocop/FennecInstrumentationTestRunner.java
+1 -1
View File
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.goanna;
package org.mozilla.gecko;
import android.os.Bundle;
import android.test.InstrumentationTestRunner;
build/mobile/robocop/FennecMochitestAssert.java
+1 -1
View File
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.goanna;
package org.mozilla.gecko;
import java.io.PrintWriter;
import java.io.StringWriter;
build/mobile/robocop/FennecNativeActions.java
+8 -8
View File
@@ -2,19 +2,19 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.goanna;
package org.mozilla.gecko;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import org.json.JSONObject;
import org.mozilla.goanna.FennecNativeDriver.LogLevel;
import org.mozilla.goanna.gfx.LayerView;
import org.mozilla.goanna.gfx.LayerView.DrawListener;
import org.mozilla.goanna.mozglue.GoannaLoader;
import org.mozilla.goanna.sqlite.SQLiteBridge;
import org.mozilla.goanna.util.GeckoEventListener;
import org.mozilla.gecko.FennecNativeDriver.LogLevel;
import org.mozilla.gecko.gfx.LayerView;
import org.mozilla.gecko.gfx.LayerView.DrawListener;
import org.mozilla.gecko.mozglue.GeckoLoader;
import org.mozilla.gecko.sqlite.SQLiteBridge;
import org.mozilla.gecko.util.GeckoEventListener;
import android.app.Activity;
import android.app.Instrumentation;
@@ -37,7 +37,7 @@ public class FennecNativeActions implements Actions {
mInstr = instrumentation;
mAsserter = asserter;
GoannaLoader.loadSQLiteLibs(activity, activity.getApplication().getPackageResourcePath());
GeckoLoader.loadSQLiteLibs(activity, activity.getApplication().getPackageResourcePath());
}
class GeckoEventExpecter implements RepeatedEventExpecter {
build/mobile/robocop/FennecNativeDriver.java
+36 -36
View File
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.goanna;
package org.mozilla.gecko;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
@@ -20,9 +20,9 @@ import java.util.Map;
import org.json.JSONException;
import org.json.JSONObject;
import org.mozilla.goanna.gfx.LayerView;
import org.mozilla.goanna.gfx.PanningPerfAPI;
import org.mozilla.goanna.util.GeckoEventListener;
import org.mozilla.gecko.gfx.LayerView;
import org.mozilla.gecko.gfx.PanningPerfAPI;
import org.mozilla.gecko.util.GeckoEventListener;
import android.app.Activity;
import android.util.Log;
@@ -64,58 +64,58 @@ public class FennecNativeDriver implements Driver {
mRootPath = rootPath;
}
//Information on the location of the Goanna Frame.
private boolean mGoannaInfo = false;
private int mGoannaTop = 100;
private int mGoannaLeft = 0;
private int mGoannaHeight= 700;
private int mGoannaWidth = 1024;
//Information on the location of the Gecko Frame.
private boolean mGeckoInfo = false;
private int mGeckoTop = 100;
private int mGeckoLeft = 0;
private int mGeckoHeight= 700;
private int mGeckoWidth = 1024;
private void getGoannaInfo() {
View goannaLayout = mActivity.findViewById(R.id.goanna_layout);
if (goannaLayout != null) {
private void getGeckoInfo() {
View geckoLayout = mActivity.findViewById(R.id.gecko_layout);
if (geckoLayout != null) {
int[] pos = new int[2];
goannaLayout.getLocationOnScreen(pos);
mGoannaTop = pos[1];
mGoannaLeft = pos[0];
mGoannaWidth = goannaLayout.getWidth();
mGoannaHeight = goannaLayout.getHeight();
mGoannaInfo = true;
geckoLayout.getLocationOnScreen(pos);
mGeckoTop = pos[1];
mGeckoLeft = pos[0];
mGeckoWidth = geckoLayout.getWidth();
mGeckoHeight = geckoLayout.getHeight();
mGeckoInfo = true;
} else {
throw new RoboCopException("Unable to find view goanna_layout");
throw new RoboCopException("Unable to find view gecko_layout");
}
}
@Override
public int getGoannaTop() {
if (!mGoannaInfo) {
getGoannaInfo();
public int getGeckoTop() {
if (!mGeckoInfo) {
getGeckoInfo();
}
return mGoannaTop;
return mGeckoTop;
}
@Override
public int getGoannaLeft() {
if (!mGoannaInfo) {
getGoannaInfo();
public int getGeckoLeft() {
if (!mGeckoInfo) {
getGeckoInfo();
}
return mGoannaLeft;
return mGeckoLeft;
}
@Override
public int getGoannaHeight() {
if (!mGoannaInfo) {
getGoannaInfo();
public int getGeckoHeight() {
if (!mGeckoInfo) {
getGeckoInfo();
}
return mGoannaHeight;
return mGeckoHeight;
}
@Override
public int getGoannaWidth() {
if (!mGoannaInfo) {
getGoannaInfo();
public int getGeckoWidth() {
if (!mGeckoInfo) {
getGeckoInfo();
}
return mGoannaWidth;
return mGeckoWidth;
}
/** Find the element with given id.

Some files were not shown because too many files have changed in this diff Show More