Bug 1279608: Move nsBaseWidget.cpp's PRTimeToSeconds and kAccessibilityLastRunDatePref definitions inside the same #ifdef guard where their usages are. r=jimm
MozReview-Commit-ID: 5RAdy4RCDOQ
--- a/widget/nsBaseWidget.cpp
+++ b/widget/nsBaseWidget.cpp
@@ -237,28 +237,16 @@ WidgetShutdownObserver::Unregister()
{
if (mRegistered) {
mWidget = nullptr;
nsContentUtils::UnregisterShutdownObserver(this);
mRegistered = false;
}
}
-#if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_GTK)
-// 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()
{
DestroyCompositor();
FreeShutdownObserver();
#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK)
if (sPluginWidgetList) {
delete sPluginWidgetList;
@@ -1871,16 +1859,28 @@ nsBaseWidget::ZoomToRect(const uint32_t&
return;
}
uint64_t layerId = mCompositorSession->RootLayerTreeId();
mAPZC->ZoomToRect(ScrollableLayerGuid(layerId, aPresShellId, aViewId), aRect, aFlags);
}
#ifdef ACCESSIBILITY
+#if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_GTK)
+// 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()
{
NS_ENSURE_TRUE(mWidgetListener, nullptr);
nsIPresShell* presShell = mWidgetListener->GetPresShell();
NS_ENSURE_TRUE(presShell, nullptr);