wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1234210 - Restrict updates for accessibility.lastLoadDate to shutdown. r=trevor

Browse Source
This commit is contained in:
Jim Mathies 2015-12-21 08:54:06 -06:00
parent 52200b5160
commit 2b61a043dd
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
widget/nsBaseWidget.cpp
View File

@ -167,6 +167,9 @@ nsBaseWidget::nsBaseWidget()
, mUpdateCursor(true)
, mUseAttachedEvents(false)
, mIMEHasFocus(false)
#ifdef XP_WIN
, mAccessibilityInUseFlag(false)
#endif
{
#ifdef NOISY_WIDGET_LEAKS
gNumWidgets++;
@ -232,6 +235,18 @@ WidgetShutdownObserver::Unregister()
}
}
#ifdef XP_WIN
// defined in nsAppRunner.cpp
extern const char* kAccessibilityLastRunDatePref;
static inline uint32_t
PRTimeToSeconds(PRTime t_usec)
{
PRTime usec_per_sec = PR_USEC_PER_SEC;
return uint32_t(t_usec /= usec_per_sec);
}
#endif
void
nsBaseWidget::Shutdown()
{
@ -242,6 +257,12 @@ nsBaseWidget::Shutdown()
delete sPluginWidgetList;
sPluginWidgetList = nullptr;
}
#if defined(XP_WIN)
if (mAccessibilityInUseFlag) {
uint32_t now = PRTimeToSeconds(PR_Now());
Preferences::SetInt(kAccessibilityLastRunDatePref, now);
}
#endif
#endif
}
@ -285,6 +306,7 @@ nsBaseWidget::FreeShutdownObserver()
// nsBaseWidget destructor
//
//-------------------------------------------------------------------------
nsBaseWidget::~nsBaseWidget()
{
IMEStateManager::WidgetDestroyed(this);
@ -1770,18 +1792,6 @@ nsBaseWidget::GetTextEventDispatcher()
#ifdef ACCESSIBILITY
#ifdef XP_WIN
// defined in nsAppRunner.cpp
extern const char* kAccessibilityLastRunDatePref;
static inline uint32_t
PRTimeToSeconds(PRTime t_usec)
{
PRTime usec_per_sec = PR_USEC_PER_SEC;
return uint32_t(t_usec /= usec_per_sec);
}
#endif
a11y::Accessible*
nsBaseWidget::GetRootAccessible()
{
@ -1801,8 +1811,7 @@ nsBaseWidget::GetRootAccessible()
services::GetAccessibilityService();
if (accService) {
#ifdef XP_WIN
uint32_t now = PRTimeToSeconds(PR_Now());
Preferences::SetInt(kAccessibilityLastRunDatePref, now);
mAccessibilityInUseFlag = true;
#endif
return accService->GetRootDocumentAccessible(presShell, nsContentUtils::IsSafeToRunScript());
}

4
widget/nsBaseWidget.h
View File

@ -521,7 +521,9 @@ protected:
bool mUpdateCursor;
bool mUseAttachedEvents;
bool mIMEHasFocus;
#ifdef XP_WIN
bool mAccessibilityInUseFlag;
#endif
static nsIRollupListener* gRollupListener;
// the last rolled up popup. Only set this when an nsAutoRollup is in scope,