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

Backout 5439489dc320, 983f76488e59, 7a92558a8dec (Bug 714358) for debug build assertions and leaks

Browse Source
This commit is contained in:
Phil Ringnalda 2012-08-07 22:18:27 -07:00
parent 6b7558a193
commit 2400fbd6d1
33 changed files with 21 additions and 501 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
b2g/installer/package-manifest.in
View File

@ -201,7 +201,6 @@
@BINPATH@/components/dom_xpath.xpt
@BINPATH@/components/dom_xul.xpt
@BINPATH@/components/dom_loadsave.xpt
@BINPATH@/components/dom_time.xpt
@BINPATH@/components/downloads.xpt
@BINPATH@/components/editor.xpt
@BINPATH@/components/embed_base.xpt

1
content/base/src/nsGkAtomList.h
View File

@ -684,7 +684,6 @@ GK_ATOM(onmozfullscreenchange, "onmozfullscreenchange")
GK_ATOM(onmozfullscreenerror, "onmozfullscreenerror")
GK_ATOM(onmozpointerlockchange, "onmozpointerlockchange")
GK_ATOM(onmozpointerlockerror, "onmozpointerlockerror")
GK_ATOM(onmoztimechange, "onmoztimechange")
GK_ATOM(onMozMousePixelScroll, "onMozMousePixelScroll")
GK_ATOM(onMozScrolledAreaChanged, "onMozScrolledAreaChanged")
GK_ATOM(ononline, "ononline")

4
content/events/public/nsEventNameList.h
View File

@ -435,10 +435,6 @@ WINDOW_ONLY_EVENT(devicelight,
NS_DEVICE_LIGHT,
EventNameType_None,
NS_EVENT)
WINDOW_ONLY_EVENT(moztimechange,
NS_MOZ_TIME_CHANGE_EVENT,
EventNameType_None,
NS_EVENT)
TOUCH_EVENT(touchstart,
NS_TOUCH_START,

3
content/events/src/nsDOMEvent.cpp
View File

@ -97,8 +97,7 @@ static const char* const sEventNames[] = {
"deviceorientation",
"deviceproximity",
"userproximity",
"devicelight",
"moztimechange"
"devicelight"
};
static char *sPopupAllowedEvents;

3
content/events/src/nsDOMEvent.h
View File

@ -177,8 +177,7 @@ public:
eDOMEvents_deviceorientation,
eDOMEvents_deviceproximity,
eDOMEvents_userproximity,
eDOMEvents_devicelight,
eDOMEvents_moztimechange
eDOMEvents_devicelight
};
nsDOMEvent(nsPresContext* aPresContext, nsEvent* aEvent);

32
content/events/src/nsEventListenerManager.cpp
View File

@ -53,7 +53,6 @@
#include "nsIContentSecurityPolicy.h"
#include "nsJSEnvironment.h"
#include "xpcpublic.h"
#include "TimeChangeObserver.h"
using namespace mozilla::dom;
using namespace mozilla::hal;
@ -272,8 +271,6 @@ nsEventListenerManager::AddEventListener(nsIDOMEventListener *aListener,
EnableDevice(NS_DEVICE_LIGHT);
} else if (aTypeAtom == nsGkAtoms::ondevicemotion) {
EnableDevice(NS_DEVICE_MOTION);
} else if (aTypeAtom == nsGkAtoms::onmoztimechange) {
EnableTimeChangeNotifications();
} else if ((aType >= NS_MOZTOUCH_DOWN && aType <= NS_MOZTOUCH_UP) ||
(aTypeAtom == nsGkAtoms::ontouchstart ||
aTypeAtom == nsGkAtoms::ontouchend ||
@ -399,7 +396,6 @@ nsEventListenerManager::RemoveEventListener(nsIDOMEventListener *aListener,
PRUint32 count = mListeners.Length();
PRUint32 typeCount = 0;
bool deviceType = IsDeviceType(aType);
bool timeChangeEvent = (aType == NS_MOZ_TIME_CHANGE_EVENT);
for (PRUint32 i = 0; i < count; ++i) {
ls = &mListeners.ElementAt(i);
@ -413,7 +409,7 @@ nsEventListenerManager::RemoveEventListener(nsIDOMEventListener *aListener,
mNoListenerForEvent = NS_EVENT_TYPE_NULL;
mNoListenerForEventAtom = nullptr;
if (!deviceType && !timeChangeEvent) {
if (!deviceType) {
return;
}
--typeCount;
@ -423,8 +419,6 @@ nsEventListenerManager::RemoveEventListener(nsIDOMEventListener *aListener,
if (deviceType && typeCount == 0) {
DisableDevice(aType);
} else if (timeChangeEvent && typeCount == 0) {
DisableTimeChangeNotifications();
}
}
@ -1115,27 +1109,3 @@ nsEventListenerManager::UnmarkGrayJSListeners()
}
}
}
void
nsEventListenerManager::EnableTimeChangeNotifications()
{
nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(mTarget);
if (!window) {
return;
}
NS_ASSERTION(window->IsInnerWindow(), "Target should not be an outer window");
window->EnableTimeChangeNotifications();
}
void
nsEventListenerManager::DisableTimeChangeNotifications()
{
nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(mTarget);
if (!window) {
return;
}
NS_ASSERTION(window->IsInnerWindow(), "Target should not be an outer window");
window->DisableTimeChangeNotifications();
}

3
content/events/src/nsEventListenerManager.h
View File

@ -261,9 +261,6 @@ protected:
void EnableDevice(PRUint32 aType);
void DisableDevice(PRUint32 aType);
void EnableTimeChangeNotifications();
void DisableTimeChangeNotifications();
public:
/**
* Set the "inline" event listener for aEventName to |v|. This

1
dom/Makefile.in
View File

@ -61,7 +61,6 @@ DIRS += \
sms \
mms \
src \
time \
locales \
network \
plugins/base \

57
dom/base/Navigator.cpp
View File

@ -38,7 +38,6 @@
#include "Connection.h"
#include "MobileConnection.h"
#include "nsIIdleObserver.h"
#include "TimeManager.h"
#ifdef MOZ_MEDIA_NAVIGATOR
#include "MediaManager.h"
@ -116,7 +115,6 @@ NS_INTERFACE_MAP_BEGIN(Navigator)
#endif
NS_INTERFACE_MAP_ENTRY(nsIDOMNavigatorCamera)
NS_INTERFACE_MAP_ENTRY(nsIDOMNavigatorSystemMessages)
NS_INTERFACE_MAP_ENTRY(nsIDOMMozNavigatorTime)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Navigator)
NS_INTERFACE_MAP_END
@ -199,9 +197,6 @@ Navigator::Invalidate()
}
mDeviceStorageStores.Clear();
if (mTimeManager) {
mTimeManager = nsnull;
}
}
nsPIDOMWindow *
@ -1246,9 +1241,21 @@ Navigator::GetMozMobileConnection(nsIDOMMozMobileConnection** aMobileConnection)
if (!mMobileConnection) {
nsCOMPtr<nsPIDOMWindow> window = do_QueryReferent(mWindow);
if (!CheckPermission("dom.mobileconnection.whitelist")) {
return NS_OK;
}
NS_ENSURE_TRUE(window && window->GetDocShell(), NS_OK);
// Chrome is always allowed access, so do the permission check only
// for non-chrome pages.
if (!nsContentUtils::IsCallerChrome()) {
nsCOMPtr<nsIDocument> doc = do_QueryInterface(window->GetExtantDocument());
NS_ENSURE_TRUE(doc, NS_OK);
nsCOMPtr<nsIURI> uri;
doc->NodePrincipal()->GetURI(getter_AddRefs(uri));
if (!nsContentUtils::URIIsChromeOrInPref(uri, "dom.mobileconnection.whitelist")) {
return NS_OK;
}
}
mMobileConnection = new network::MobileConnection();
mMobileConnection->Init(window);
@ -1344,25 +1351,6 @@ Navigator::MozSetMessageHandler(const nsAString& aType,
#endif
}
//*****************************************************************************
// Navigator::nsIDOMNavigatorTime
//*****************************************************************************
NS_IMETHODIMP
Navigator::GetMozTime(nsIDOMMozTimeManager** aTime)
{
if (!CheckPermission("dom.time.whitelist")) {
return NS_ERROR_DOM_SECURITY_ERR;
}
if (!mTimeManager) {
*aTime = nsnull;
mTimeManager = new time::TimeManager();
}
NS_ADDREF(*aTime = mTimeManager);
return NS_OK;
}
//*****************************************************************************
// nsNavigator::nsIDOMNavigatorCamera
//*****************************************************************************
@ -1426,21 +1414,6 @@ Navigator::OnNavigation()
}
}
bool
Navigator::CheckPermission(const char* aPref)
{
if (!nsContentUtils::IsCallerChrome()) {
nsCOMPtr<nsPIDOMWindow> win = do_QueryReferent(mWindow);
NS_ENSURE_TRUE(win, false);
nsCOMPtr<nsIDocument> doc = do_QueryInterface(win->GetExtantDocument());
NS_ENSURE_TRUE(doc, false);
nsCOMPtr<nsIURI> uri;
doc->NodePrincipal()->GetURI(getter_AddRefs(uri));
return nsContentUtils::URIIsChromeOrInPref(uri, aPref);
}
return true;
}
} // namespace dom
} // namespace mozilla

9
dom/base/Navigator.h
View File

@ -15,7 +15,6 @@
#include "nsINavigatorBattery.h"
#include "nsIDOMNavigatorSms.h"
#include "nsIDOMNavigatorNetwork.h"
#include "nsIDOMNavigatorTime.h"
#include "nsAutoPtr.h"
#include "nsWeakReference.h"
#include "DeviceStorage.h"
@ -70,10 +69,6 @@ namespace power {
class PowerManager;
} // namespace power
namespace time {
class TimeManager;
} // namespace time
class Navigator : public nsIDOMNavigator
, public nsIDOMClientInformation
, public nsIDOMNavigatorDeviceStorage
@ -93,7 +88,6 @@ class Navigator : public nsIDOMNavigator
#endif
, public nsIDOMNavigatorCamera
, public nsIDOMNavigatorSystemMessages
, public nsIDOMMozNavigatorTime
{
public:
Navigator(nsPIDOMWindow *aInnerWindow);
@ -119,7 +113,6 @@ public:
NS_DECL_NSIDOMNAVIGATORBLUETOOTH
#endif
NS_DECL_NSIDOMNAVIGATORSYSTEMMESSAGES
NS_DECL_NSIDOMMOZNAVIGATORTIME
static void Init();
@ -151,7 +144,6 @@ public:
private:
bool IsSmsAllowed() const;
bool IsSmsSupported() const;
bool CheckPermission(const char* aPref);
nsRefPtr<nsMimeTypeArray> mMimeTypes;
nsRefPtr<nsPluginArray> mPlugins;
@ -172,7 +164,6 @@ private:
nsRefPtr<nsDOMCameraManager> mCameraManager;
nsCOMPtr<nsIDOMNavigatorSystemMessages> mMessagesManager;
nsTArray<nsRefPtr<nsDOMDeviceStorage> > mDeviceStorageStores;
nsRefPtr<time::TimeManager> mTimeManager;
nsWeakPtr mWindow;
};

9
dom/base/nsDOMClassInfo.cpp
View File

@ -523,7 +523,6 @@ using mozilla::dom::indexedDB::IDBWrapperCache;
#include "nsIDOMNavigatorSystemMessages.h"
#include "mozilla/dom/Activity.h"
#include "TimeManager.h"
#include "DOMCameraManager.h"
#include "CameraControl.h"
@ -1699,9 +1698,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
EVENTTARGET_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(MozActivity, nsEventTargetSH,
EVENTTARGET_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(MozTimeManager, nsDOMGenericSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS)
};
// Objects that should be constructable through |new Name();|
@ -2475,7 +2471,6 @@ nsDOMClassInfo::Init()
#endif
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNavigatorCamera)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNavigatorSystemMessages)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozNavigatorTime)
DOM_CLASSINFO_MAP_END
@ -4511,10 +4506,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN(MozTimeManager, nsIDOMMozTimeManager)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozTimeManager)
DOM_CLASSINFO_MAP_END
#ifdef DEBUG
{
PRUint32 i = ArrayLength(sClassInfoData);

2
dom/base/nsDOMClassInfoClasses.h
View File

@ -538,5 +538,3 @@ DOMCI_CLASS(FileRequest)
DOMCI_CLASS(LockedFile)
DOMCI_CLASS(MozActivity)
DOMCI_CLASS(MozTimeManager)

14
dom/base/nsGlobalWindow.cpp
View File

@ -222,7 +222,6 @@
#include "nsDOMEventTargetHelper.h"
#include "nsIAppsService.h"
#include "prrng.h"
#include "TimeChangeObserver.h"
#ifdef ANDROID
#include <android/log.h>
@ -1056,7 +1055,6 @@ nsGlobalWindow::CleanUp(bool aIgnoreModalDialog)
mIdleTimer = nullptr;
}
DisableTimeChangeNotifications();
#ifdef DEBUG
nsCycleCollector_DEBUG_shouldBeFreed(static_cast<nsIScriptGlobalObject*>(this));
#endif
@ -10622,18 +10620,6 @@ nsGlobalWindow::GetURL(nsIDOMMozURLProperty** aURL)
return NS_OK;
}
void
nsGlobalWindow::EnableTimeChangeNotifications()
{
nsSystemTimeChangeObserver::GetInstance()->AddWindowListener(this);
}
void
nsGlobalWindow::DisableTimeChangeNotifications()
{
nsSystemTimeChangeObserver::GetInstance()->RemoveWindowListener(this);
}
// static
bool
nsGlobalWindow::HasIndexedDBSupport()

3
dom/base/nsGlobalWindow.h
View File

@ -537,9 +537,6 @@ public:
virtual void EnableDeviceSensor(PRUint32 aType);
virtual void DisableDeviceSensor(PRUint32 aType);
virtual void EnableTimeChangeNotifications();
virtual void DisableTimeChangeNotifications();
virtual nsresult SetArguments(nsIArray *aArguments, nsIPrincipal *aOrigin);
static bool DOMWindowDumpEnabled();

3
dom/base/nsPIDOMWindow.h
View File

@ -576,9 +576,6 @@ public:
*/
virtual void DisableDeviceSensor(PRUint32 aType) = 0;
virtual void EnableTimeChangeNotifications() = 0;
virtual void DisableTimeChangeNotifications() = 0;
/**
* Set a arguments for this window. This will be set on the window
* right away (if there's an existing document) and it will also be

1
dom/dom-config.mk
View File

@ -19,7 +19,6 @@ DOM_SRCDIRS = \
dom/src/geolocation \
dom/src/notification \
dom/workers \
dom/time \
content/xbl/src \
content/xul/document/src \
content/events/src \

3
dom/interfaces/base/nsIDOMWindow.idl
View File

@ -32,7 +32,7 @@ interface nsIDOMMozURLProperty : nsISupports
* @see <http://www.whatwg.org/html/#window>
*/
[scriptable, uuid(AB4ED3B8-84F8-4585-B413-0996A7F96D20)]
[scriptable, uuid(A1AF6CD9-C6E7-4037-99F8-DBCA1B03E345)]
interface nsIDOMWindow : nsISupports
{
// the current browsing context
@ -496,7 +496,6 @@ interface nsIDOMWindow : nsISupports
[implicit_jscontext] attribute jsval ondeviceproximity;
[implicit_jscontext] attribute jsval onuserproximity;
[implicit_jscontext] attribute jsval ondevicelight;
[implicit_jscontext] attribute jsval onmoztimechange;
[implicit_jscontext] attribute jsval onmouseenter;
[implicit_jscontext] attribute jsval onmouseleave;

35
dom/time/Makefile.in
View File

@ -1,35 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = dom_time_s
XPIDL_MODULE = dom_time
LIBXUL_LIBRARY = 1
FORCE_STATIC_LIB = 1
include $(topsrcdir)/dom/dom-config.mk
CPPSRCS = \
TimeManager.cpp \
TimeChangeObserver.cpp \
$(NULL)
EXPORTS = \
TimeChangeObserver.h \
$(NULL)
XPIDLSRCS = \
nsIDOMNavigatorTime.idl \
nsIDOMTimeManager.idl \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk

87
dom/time/TimeChangeObserver.cpp
View File

@ -1,87 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* 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/. */
#include "TimeChangeObserver.h"
#include "mozilla/ClearOnShutdown.h"
#include "mozilla/StaticPtr.h"
#include "nsPIDOMWindow.h"
#include "nsDOMEvent.h"
#include "nsContentUtils.h"
using namespace mozilla::hal;
using namespace mozilla;
StaticAutoPtr<nsSystemTimeChangeObserver> sObserver;
nsSystemTimeChangeObserver* nsSystemTimeChangeObserver::GetInstance()
{
if (!sObserver) {
sObserver = new nsSystemTimeChangeObserver();
ClearOnShutdown(&sObserver);
}
return sObserver;
}
void
nsSystemTimeChangeObserver::Notify(const SystemTimeChange& aReason)
{
//Copy mWindowListeners and iterate over windowListeners instead because
//mWindowListeners may be modified while we loop.
nsTArray<nsWeakPtr> windowListeners;
for (PRUint32 i = 0; i < mWindowListeners.Length(); i++) {
windowListeners.AppendElement(mWindowListeners.SafeElementAt(i));
}
for (PRInt32 i = windowListeners.Length() - 1; i >= 0; i--) {
nsCOMPtr<nsIDOMWindow> window = do_QueryReferent(windowListeners[i]);
if (!window) {
mWindowListeners.RemoveElement(windowListeners[i]);
return;
}
nsCOMPtr<nsIDOMDocument> domdoc;
window->GetDocument(getter_AddRefs(domdoc));
nsCOMPtr<nsIDocument> doc(do_QueryInterface(domdoc));
if (!domdoc) {
return;
}
nsContentUtils::DispatchTrustedEvent(doc, window,
NS_LITERAL_STRING("moztimechange"), /* bubbles = */ true,
/* canceable = */ false);
}
}
nsresult
nsSystemTimeChangeObserver::AddWindowListener(nsIDOMWindow* aWindow)
{
if (!aWindow) {
return NS_ERROR_ILLEGAL_VALUE;
}
if (mWindowListeners.IndexOf(NS_GetWeakReference(aWindow)) !=
nsTArray<nsIDOMWindow*>::NoIndex) {
return NS_OK;
}
if (mWindowListeners.Length() == 0) {
RegisterSystemTimeChangeObserver(this);
}
mWindowListeners.AppendElement(NS_GetWeakReference(aWindow));
return NS_OK;
}
nsresult
nsSystemTimeChangeObserver::RemoveWindowListener(nsIDOMWindow *aWindow)
{
mWindowListeners.RemoveElement(NS_GetWeakReference(aWindow));
if (mWindowListeners.Length() == 0) {
UnregisterSystemTimeChangeObserver(this);
}
return NS_OK;
}

29
dom/time/TimeChangeObserver.h
View File

@ -1,29 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* 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/. */
#ifndef _mozilla_time_change_observer_h_
#define _mozilla_time_change_observer_h_
#include "mozilla/Hal.h"
#include "mozilla/Observer.h"
#include "mozilla/HalTypes.h"
#include "nsPIDOMWindow.h"
#include "nsWeakPtr.h"
typedef mozilla::Observer<mozilla::hal::SystemTimeChange> SystemTimeChangeObserver;
class nsSystemTimeChangeObserver : public SystemTimeChangeObserver
{
public:
static nsSystemTimeChangeObserver* GetInstance();
void Notify(const mozilla::hal::SystemTimeChange& aReason);
nsresult AddWindowListener(nsIDOMWindow *aWindow);
nsresult RemoveWindowListener(nsIDOMWindow *aWindow);
private:
nsSystemTimeChangeObserver() {};
nsTArray<nsWeakPtr> mWindowListeners;
};
#endif //_mozilla_time_change_observer_h_

57
dom/time/TimeManager.cpp
View File

@ -1,57 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* 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/. */
#include "jsapi.h"
#include "mozilla/Hal.h"
#include "nsDOMEvent.h"
#include "nsDOMEventTargetHelper.h"
#include "nsIDOMClassInfo.h"
#include "prtime.h"
#include "TimeManager.h"
using namespace mozilla::hal;
DOMCI_DATA(MozTimeManager, mozilla::dom::time::TimeManager)
namespace mozilla {
namespace dom {
namespace time {
NS_INTERFACE_MAP_BEGIN(TimeManager)
NS_INTERFACE_MAP_ENTRY(nsIDOMMozTimeManager)
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MozTimeManager)
NS_INTERFACE_MAP_END
NS_IMPL_ADDREF(TimeManager)
NS_IMPL_RELEASE(TimeManager)
nsresult
TimeManager::Set(const JS::Value& date, JSContext* ctx) {
double nowMSec = JS_Now() / 1000;
double dateMSec;
if (date.isObject()) {
JSObject* dateObj = JSVAL_TO_OBJECT(date);
if (JS_ObjectIsDate(ctx, dateObj) && js_DateIsValid(ctx, dateObj)) {
dateMSec = js_DateGetMsecSinceEpoch(ctx, dateObj);
}
else {
NS_WARN_IF_FALSE(JS_ObjectIsDate(ctx, dateObj), "This is not a Date object");
NS_WARN_IF_FALSE(js_DateIsValid(ctx, dateObj), "Date is not valid");
return NS_ERROR_INVALID_ARG;
}
} else if (date.isNumber()) {
dateMSec = date.toNumber();
} else {
return NS_ERROR_INVALID_ARG;
}
hal::AdjustSystemClock(JS_DoubleToInt32(dateMSec - nowMSec));
return NS_OK;
}
} // namespace time
} // namespace dom
} // namespace mozilla

31
dom/time/TimeManager.h
View File

@ -1,31 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* 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/. */
#ifndef mozilla_dom_time_TimeManager_h
#define mozilla_dom_time_TimeManager_h
#include "mozilla/HalTypes.h"
#include "nsIDOMTimeManager.h"
#include "mozilla/Observer.h"
class nsPIDOMWindow;
namespace mozilla {
typedef Observer<hal::SystemTimeChange> SystemTimeObserver;
namespace dom {
namespace time {
class TimeManager : public nsIDOMMozTimeManager
{
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIDOMMOZTIMEMANAGER
};
} // namespace time
} // namespace dom
} // namespace mozilla
#endif //mozilla_dom_time_TimeManager_h

13
dom/time/nsIDOMNavigatorTime.idl
View File

@ -1,13 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* 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/. */
#include "nsISupports.idl"
interface nsIDOMMozTimeManager;
[scriptable, uuid(befc186d-c249-4acb-8e70-8080f7b45e5c)]
interface nsIDOMMozNavigatorTime : nsISupports
{
readonly attribute nsIDOMMozTimeManager mozTime;
};

20
dom/time/nsIDOMTimeManager.idl
View File

@ -1,20 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* 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/. */
#include "nsISupports.idl"
[scriptable, builtinclass, uuid(d29beaaa-bd54-4fd5-9f18-e0eedb1dc96d)]
interface nsIDOMMozTimeManager : nsISupports
{
/* Set the system time.
*
* The |time| argument can be either a Date object or a number.
*
* - If |time| is a number, it's interpreted as seconds since the epoch
* (midnight UTC on January 1, 1970)
* - If |time| is a Date object, |set(time)| is equivalent to
* |set(time.getTime())|.
*/
[implicit_jscontext] void set(in jsval time);
};

21
hal/Hal.cpp
View File

@ -417,28 +417,7 @@ bool GetLight(LightType light, hal::LightConfiguration* aConfig)
RETURN_PROXY_IF_SANDBOXED(GetLight(light, aConfig));
}
static ObserverList<SystemTimeChange> sSystemTimeObserver;
void
RegisterSystemTimeChangeObserver(SystemTimeObserver *aObserver)
{
AssertMainThread();
sSystemTimeObserver.AddObserver(aObserver);
}
void
UnregisterSystemTimeChangeObserver(SystemTimeObserver *aObserver)
{
AssertMainThread();
sSystemTimeObserver.RemoveObserver(aObserver);
}
void
NotifySystemTimeChange(const hal::SystemTimeChange& aReason)
{
sSystemTimeObserver.Broadcast(aReason);
}
void
AdjustSystemClock(int32_t aDeltaMilliseconds)
{

20
hal/Hal.h
View File

@ -50,8 +50,6 @@ class WindowIdentifier;
extern PRLogModuleInfo *sHalLog;
#define HAL_LOG(msg) PR_LOG(mozilla::hal::sHalLog, PR_LOG_DEBUG, msg)
typedef Observer<SystemTimeChange> SystemTimeObserver;
} // namespace hal
namespace MOZ_HAL_NAMESPACE {
@ -251,24 +249,6 @@ void AdjustSystemClock(int32_t aDeltaMilliseconds);
*/
void SetTimezone(const nsCString& aTimezoneSpec);
/**
* Register observer for system time changed notification.
* @param aObserver The observer that should be added.
*/
void RegisterSystemTimeChangeObserver(hal::SystemTimeObserver *aObserver);
/**
* Unregister the observer for system time changed.
* @param aObserver The observer that should be removed.
*/
void UnregisterSystemTimeChangeObserver(hal::SystemTimeObserver *aObserver);
/**
* Notify of a change in the system cloeck or time zone.
* @param aReason
*/
void NotifySystemTimeChange(const hal::SystemTimeChange& aReason);
/**
* Reboot the device.
*/

18
hal/HalTypes.h
View File

@ -71,13 +71,6 @@ enum WakeLockControl {
WAKE_LOCK_ADD_ONE = 1,
};
enum SystemTimeChange {
SYS_TIME_CHANGE_UNKNOWN = -1,
SYS_TIME_CHANGE_CLOCK,
SYS_TIME_CHANGE_TZ,
SYS_TIME_CHANGE_GUARD
};
} // namespace hal
} // namespace mozilla
@ -150,16 +143,7 @@ struct ParamTraits<mozilla::hal::ProcessPriority>:
mozilla::hal::NUM_PROCESS_PRIORITY> {
};
/**
* SystemTimeChange serializer.
*/
template <>
struct ParamTraits<mozilla::hal::SystemTimeChange>
: public EnumSerializer<mozilla::hal::SystemTimeChange,
mozilla::hal::SYS_TIME_CHANGE_UNKNOWN,
mozilla::hal::SYS_TIME_CHANGE_GUARD>
{};
} // namespace IPC
#endif // mozilla_hal_Types_h

24
hal/gonk/GonkHal.cpp
View File

@ -581,10 +581,6 @@ sys_clock_settime(clockid_t clk_id, const struct timespec *tp)
void
AdjustSystemClock(int32_t aDeltaMilliseconds)
{
if (aDeltaMilliseconds == 0) {
return;
}
struct timespec now;
// Preventing context switch before setting system clock
@ -604,34 +600,16 @@ AdjustSystemClock(int32_t aDeltaMilliseconds)
now.tv_sec -= 1;
}
// we need to have root privilege.
if (sys_clock_settime(CLOCK_REALTIME, &now) != 0) {
NS_ERROR("sys_clock_settime failed");
return;
}
hal::NotifySystemTimeChange(hal::SYS_TIME_CHANGE_CLOCK);
}
bool
IsSameTimeZone(const nsCString& aTimezoneSpec)
{
char timezone[32];
property_get("persist.sys.timezone", timezone, "");
return aTimezoneSpec.EqualsASCII(timezone);
sys_clock_settime(CLOCK_REALTIME, &now);
}
void
SetTimezone(const nsCString& aTimezoneSpec)
{
if (IsSameTimeZone(aTimezoneSpec)) {
return;
}
property_set("persist.sys.timezone", aTimezoneSpec.get());
// this function is automatically called by the other time conversion
// functions that depend on the timezone. To be safe, we call it manually.
tzset();
hal::NotifySystemTimeChange(hal::SYS_TIME_CHANGE_TZ);
}
// Nothing to do here. Gonk widgetry always listens for screen

2
hal/sandbox/PHal.ipdl
View File

@ -24,7 +24,6 @@ using mozilla::hal::SwitchDevice;
using mozilla::hal::ProcessPriority;
using nsIntRect;
using PRTime;
using mozilla::hal::SystemTimeChange;
namespace mozilla {
@ -87,7 +86,6 @@ child:
NotifyWakeLockChange(WakeLockInformation aWakeLockInfo);
NotifyScreenConfigurationChange(ScreenConfiguration aScreenOrientation);
NotifySwitchChange(SwitchEvent aEvent);
NotifySystemTimeChange(SystemTimeChange aReason);
parent:
Vibrate(uint32_t[] pattern, uint64_t[] id, PBrowser browser);

11
hal/sandbox/SandboxHal.cpp
View File

@ -583,11 +583,6 @@ public:
hal::SetProcessPriority(aPid, aPriority);
return true;
}
void Notify(const SystemTimeChange& aReason)
{
unused << SendNotifySystemTimeChange(aReason);
}
};
class HalChild : public PHalChild {
@ -624,12 +619,6 @@ public:
hal::NotifySwitchChange(aEvent);
return true;
}
virtual bool
RecvNotifySystemTimeChange(const SystemTimeChange& aReason) {
hal::NotifySystemTimeChange(aReason);
return true;
}
};
bool

1
layout/build/Makefile.in
View File

@ -83,7 +83,6 @@ SHARED_LIBRARY_LIBS = \
$(DEPTH)/dom/indexedDB/$(LIB_PREFIX)dom_indexeddb_s.$(LIB_SUFFIX) \
$(DEPTH)/dom/indexedDB/ipc/$(LIB_PREFIX)dom_indexeddb_ipc_s.$(LIB_SUFFIX) \
$(DEPTH)/dom/browser-element/$(LIB_PREFIX)dom_browserelement_s.$(LIB_SUFFIX) \
$(DEPTH)/dom/time/$(LIB_PREFIX)dom_time_s.$(LIB_SUFFIX) \
$(DEPTH)/editor/libeditor/text/$(LIB_PREFIX)texteditor_s.$(LIB_SUFFIX) \
$(DEPTH)/editor/libeditor/base/$(LIB_PREFIX)editorbase_s.$(LIB_SUFFIX) \
$(DEPTH)/parser/html/$(LIB_PREFIX)html5p_s.$(LIB_SUFFIX) \

1
toolkit/toolkit-makefiles.sh
View File

@ -82,7 +82,6 @@ MAKEFILES_dom="
dom/src/storage/Makefile
dom/system/Makefile
dom/workers/Makefile
dom/time/Makefile
"
MAKEFILES_editor="

3
widget/nsGUIEvent.h
View File

@ -537,9 +537,6 @@ class nsHashKey;
#define NS_POINTERLOCKCHANGE (NS_POINTERLOCK_START)
#define NS_POINTERLOCKERROR (NS_POINTERLOCK_START + 1)
//System time is changed
#define NS_MOZ_TIME_CHANGE_EVENT 5400
/**
* Return status for event processors, nsEventStatus, is defined in
* nsEvent.h.