mozilla: comparison mozilla-a11y.patch

equal deleted inserted replaced

-:8891dd9439a1
+:04fc00b85b21
 # HG changeset patch
 # User Michael Gorse <mgorse@suse.com>
-# Parent d02253d1e8217008dfa26e6e2a901b6a8b75e989
+# Parent 2c115988d04c0a0a8cb75b3a597ecdb2c4c001c9
 a11y only enabled from Gnome 2's GConf setting
 https://bugzilla.novell.com/show_bug.cgi?id=732898
 https://bugzilla.mozilla.org/show_bug.cgi?id=693343
 diff --git a/accessible/src/atk/Makefile.in b/accessible/src/atk/Makefile.in
 -I$(topsrcdir)/other-licenses/atk-1.0 \
 $(NULL)
 diff --git a/accessible/src/atk/nsApplicationAccessibleWrap.cpp b/accessible/src/atk/nsApplicationAccessibleWrap.cpp
 --- a/accessible/src/atk/nsApplicationAccessibleWrap.cpp
 +++ b/accessible/src/atk/nsApplicationAccessibleWrap.cpp
-@@ -47,29 +47,27 @@
+@@ -47,29 +47,29 @@
 #include "nsIPrefBranch.h"
 #include "nsIServiceManager.h"
 #include "nsAutoPtr.h"
 #include "nsAccessibilityService.h"
 #include "AtkSocketAccessible.h"
 #include <gtk/gtk.h>
 #include <atk/atk.h>
++#ifdef MOZ_ENABLE_DBUS
 +#include <dbus/dbus.h>
++#endif
 +
 +using namespace mozilla::a11y;
 typedef GType (* AtkGetTypeType) (void);
 GType g_atk_hyperlink_impl_type = G_TYPE_INVALID;
--static bool sATKChecked = false;
+static bool sATKChecked = false;
-+static PRBool sATKChecked = PR_FALSE;
 static PRLibrary *sATKLib = nsnull;
 static const char sATKLibName[] = "libatk-1.0.so.0";
 static const char sATKHyperlinkImplGetTypeSymbol[] =
 "atk_hyperlink_impl_get_type";
 -static const char sAccEnv [] = "GNOME_ACCESSIBILITY";
 const gchar *event_type);
 static void (* gail_remove_global_event_listener) (guint remove_listener);
 static void (* gail_remove_key_event_listener) (guint remove_listener);
 static AtkObject * (*gail_get_root) (void);
-@@ -609,36 +607,17 @@ toplevel_event_watcher(GSignalInvocation
+@@ -609,36 +609,17 @@ toplevel_event_watcher(GSignalInvocation
 }
 return TRUE;
 }
-PRBool
+bool
 nsApplicationAccessibleWrap::Init()
 {
 -    // XXX following code is copied from widget/src/gtk2/nsWindow.cpp
 -    // we should put it to somewhere that can be used from both modules
 -    // see bug 390761
 -
 -    // check if accessibility enabled/disabled by environment variable
--    PRBool isGnomeATEnabled = PR_FALSE;
+-    bool isGnomeATEnabled = false;
 -    const char *envValue = PR_GetEnv(sAccEnv);
 -    if (envValue) {
 -        isGnomeATEnabled = !!atoi(envValue);
 -    } else {
 -        //check gconf-2 setting
 (*sGail.init)();
 }
 else {
 MAI_LOG_DEBUG(("Fail to load lib: %s\n", sGail.libName));
 }
-@@ -877,8 +856,129 @@ LoadGtkModule(GnomeAccessibilityModule&
+@@ -877,8 +858,129 @@ LoadGtkModule(GnomeAccessibilityModule&
 aModule.init ? aModule.shutdownName : aModule.initName,
 aModule.libName));
 PR_UnloadLibrary(aModule.lib);
 aModule.lib = NULL;
 return NS_ERROR_FAILURE;
 +
 +namespace mozilla {
 +namespace a11y {
 +
 +#ifdef MOZ_ENABLE_DBUS
-+static DBusPendingCall *a11yPendingCall = NULL;
++  static DBusPendingCall *a11yPendingCall = NULL;
 +#endif
 +
 +void
 +PreInit()
 +{
-+  static PRBool sChecked = FALSE;
++  static bool sChecked = false;
 +  if (sChecked)
 +    return;
-+  sChecked = TRUE;
++  sChecked = true;
 +  DBusError error;
 +  dbus_error_init(&error);
 +  DBusConnection* bus = dbus_bus_get(DBUS_BUS_SESSION, &error);
 +  if (!bus)
 +    return;
-+  dbus_connection_set_exit_on_disconnect(bus, FALSE);
++  dbus_connection_set_exit_on_disconnect(bus, false);
 +
 +  DBusMessage *message;
 +  message = dbus_message_new_method_call("org.a11y.Bus", "/org/a11y/bus",
 +                                         "org.freedesktop.DBus.Properties",
 +                                         "Get");
 +  if (bus)
 +    dbus_connection_unref(bus);
 +  dbus_error_free(&error);
 +}
 +
-+PRBool
++bool
 +ShouldA11yBeEnabled()
 +{
-+  static PRBool sChecked = PR_FALSE, sShouldEnable = PR_FALSE;
++  static bool sChecked = false, sShouldEnable = false;
 +  if (sChecked)
 +    return sShouldEnable;
 +
-+  sChecked = PR_TRUE;
++  sChecked = true;
 +
 +  // check if accessibility enabled/disabled by environment variable
 +  static const char sAccEnv [] = "GNOME_ACCESSIBILITY";
 +  const char* envValue = PR_GetEnv(sAccEnv);
 +  if (envValue)
 +    return sShouldEnable = !!atoi(envValue);
 +
 +#ifdef MOZ_ENABLE_DBUS
 +  PreInit();
-+  PRBool dbusSuccess = PR_FALSE;
++  bool dbusSuccess = false;
 +  DBusMessage *reply = nsnull;
 +  if (a11yPendingCall) {
 +    dbus_pending_call_block(a11yPendingCall);
 +    reply = dbus_pending_call_steal_reply(a11yPendingCall);
 +    dbus_pending_call_unref(a11yPendingCall);
 +} // namespace mozilla
 +
 diff --git a/accessible/src/base/nsAccessibilityService.h b/accessible/src/base/nsAccessibilityService.h
 --- a/accessible/src/base/nsAccessibilityService.h
 +++ b/accessible/src/base/nsAccessibilityService.h
-@@ -41,16 +41,36 @@
+@@ -46,16 +46,33 @@
-#include "nsIAccessibilityService.h"
+#include "mozilla/a11y/FocusManager.h"
-#include "a11yGeneric.h"
-#include "nsAccDocManager.h"
 #include "nsIObserver.h"
-+namespace mozilla {
+namespace mozilla {
-+namespace a11y {
+namespace a11y {
 +#ifdef MOZ_ACCESSIBILITY_ATK
 +/**
-+ * Perform initialization that should be done as soon as possible, in order
++ * + * Perform initialization that should be done as soon as possible, in
-+ * to minimize startup time.
++ * order
-+ * XXX: this function and the next defined in nsApplicationAccessibleWrap.cpp
++ * + * to minimize startup time.
-+ */
++ * + * XXX: this function and the next defined in
++ * nsApplicationAccessibleWrap.cpp
++ * + */
 +void PreInit();
 +
 +/**
-+ * Is platform accessibility enabled.
++ * + * Is platform accessibility enabled.
-+ * Only used on linux with atk for now.
++ * + * Only used on linux with atk for now.
-+ */
++ * + */
-+PRBool ShouldA11yBeEnabled();
++bool ShouldA11yBeEnabled();
 +#endif
 +
-+} // namespace a11y
+/**
-+} // namespace mozilla
+* Return focus manager.
-+
+*/
-class nsAccessibilityService : public nsAccDocManager,
+FocusManager* FocusMgr();
-public nsIAccessibilityService,
-public nsIObserver
+} // namespace a11y
-{
+} // namespace mozilla
-public:
-virtual ~nsAccessibilityService();
-NS_DECL_ISUPPORTS_INHERITED
 diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
 --- a/widget/src/gtk2/nsWindow.cpp
 +++ b/widget/src/gtk2/nsWindow.cpp
-@@ -103,29 +103,20 @@
+@@ -105,29 +105,21 @@
 #include "nsIStringBundle.h"
 #include "nsGfxCIID.h"
 #include "nsIObserverService.h"
 #include "nsIdleService.h"
 #include "nsIAccessibleDocument.h"
 -#include "prenv.h"
 -#include "stdlib.h"
 using namespace mozilla;
--
--static PRBool sAccessibilityChecked = PR_FALSE;
+-static bool sAccessibilityChecked = false;
 -/* static */
--PRBool nsWindow::sAccessibilityEnabled = PR_FALSE;
+-bool nsWindow::sAccessibilityEnabled = false;
 -static const char sSysPrefService [] = "@mozilla.org/system-preference-service;1";
 -static const char sAccEnv [] = "GNOME_ACCESSIBILITY";
 -static const char sAccessibilityKey [] = "config.use_system_prefs.accessibility";
 #endif
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsXPIDLString.h"
 #include "nsIFile.h"
 #include "nsILocalFile.h"
-@@ -1109,19 +1100,18 @@ nsWindow::Show(PRBool aState)
+@@ -1111,19 +1103,18 @@ nsWindow::Show(bool aState)
 NativeResize(mBounds.x, mBounds.y, mBounds.width, mBounds.height,
-PR_FALSE);
+false);
 } else if (mNeedsResize) {
-NativeResize(mBounds.width, mBounds.height, PR_FALSE);
+NativeResize(mBounds.width, mBounds.height, false);
 }
 }
 #ifdef ACCESSIBILITY
 -    if (aState && sAccessibilityEnabled) {
 return NS_OK;
 }
 NS_IMETHODIMP
-@@ -3887,16 +3877,21 @@ nsWindow::Create(nsIWidget        *aPare
+@@ -3885,16 +3876,21 @@ nsWindow::Create(nsIWidget        *aPare
 nsIWidget *baseParent = aInitData &&
 (aInitData->mWindowType == eWindowType_dialog ||
 aInitData->mWindowType == eWindowType_toplevel ||
 aInitData->mWindowType == eWindowType_invisible) ?
 nsnull : aParent;
 +#ifdef ACCESSIBILITY
 +    // Send a DBus message to check whether a11y is enabled
 +    a11y::PreInit();
 +#endif
 +
+// Ensure that the toolkit is created.
+nsGTKToolkit::GetToolkit();
 // initialize all the common bits of this class
-BaseCreate(baseParent, aRect, aHandleEventFunction, aContext,
+BaseCreate(baseParent, aRect, aHandleEventFunction, aContext, aInitData);
-aAppShell, aToolkit, aInitData);
 // Do we need to listen for resizes?
-PRBool listenForResizes = PR_FALSE;;
+bool listenForResizes = false;;
-if (aNativeParent || (aInitData && aInitData->mListenForResizes))
+@@ -4278,43 +4274,16 @@ nsWindow::Create(nsIWidget        *aPare
-listenForResizes = PR_TRUE;
-@@ -4278,43 +4273,16 @@ nsWindow::Create(nsIWidget        *aPare
 LOG(("\tmGdkWindow %p %lx\n", (void *)mGdkWindow,
 gdk_x11_window_get_xid(mGdkWindow)));
 }
 // resize so that everything is set to the right dimensions
 if (!mIsTopLevel)
-Resize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, PR_FALSE);
+Resize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, false);
 -#ifdef ACCESSIBILITY
 -    nsresult rv;
 -    if (!sAccessibilityChecked) {
--        sAccessibilityChecked = PR_TRUE;
+-        sAccessibilityChecked = true;
 -
 -        //check if accessibility enabled/disabled by environment variable
 -        const char *envValue = PR_GetEnv(sAccEnv);
 -        if (envValue) {
 -            sAccessibilityEnabled = atoi(envValue) != 0;
 D_ASSUME( mDFB != NULL );
 if (mDFB)
 mDFB->GetDisplayLayer( mDFB, DLID_PRIMARY, &mDFBLayer );
-@@ -6504,19 +6472,18 @@ nsWindow::DispatchAccessibleEvent()
+@@ -6504,19 +6473,18 @@ nsWindow::DispatchAccessibleEvent()
 DispatchEvent(&event, status);
 return event.mAccessible;
 }

changeset 369	04fc00b85b21
parent 358	b28670af14d5