auto merge of #878 : evilpie/servo/navigator, r=metajack

8 files changed, 497 insertions, 1 deletions

diff --git a/src/components/script/dom/bindings/codegen/Bindings.conf b/src/components/script/dom/bindings/codegen/Bindings.conf
index 03f0b27ceab..f3f9ae8ab4c 100644
--- a/src/components/script/dom/bindings/codegen/Bindings.conf
+++ b/src/components/script/dom/bindings/codegen/Bindings.conf
@@ -284,6 +284,9 @@ DOMInterfaces = {
 'MouseEvent': {
 },
 
+'Navigator': {
+},
+
 'Node': {
     'nativeType': 'AbstractNode<ScriptView>',
     'concreteType': 'Node<ScriptView>',
diff --git a/src/components/script/dom/bindings/codegen/Navigator.webidl b/src/components/script/dom/bindings/codegen/Navigator.webidl
new file mode 100644
index 00000000000..6098b756b3e
--- /dev/null
+++ b/src/components/script/dom/bindings/codegen/Navigator.webidl
@@ -0,0 +1,345 @@
+/* -*- Mode: IDL; 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/.
+ *
+ * The origin of this IDL file is
+ * http://www.whatwg.org/specs/web-apps/current-work/#the-navigator-object
+ * http://www.w3.org/TR/tracking-dnt/
+ * http://www.w3.org/TR/geolocation-API/#geolocation_interface
+ * http://www.w3.org/TR/battery-status/#navigatorbattery-interface
+ * http://www.w3.org/TR/vibration/#vibration-interface
+ * http://www.w3.org/2012/sysapps/runtime/#extension-to-the-navigator-interface-1
+ * https://dvcs.w3.org/hg/gamepad/raw-file/default/gamepad.html#navigator-interface-extension
+ *
+ * © Copyright 2004-2011 Apple Computer, Inc., Mozilla Foundation, and
+ * Opera Software ASA. You are granted a license to use, reproduce
+ * and create derivative works of this document.
+ */
+
+interface MozPowerManager;
+interface MozWakeLock;
+
+// http://www.whatwg.org/specs/web-apps/current-work/#the-navigator-object
+[HeaderFile="Navigator.h", NeedNewResolve]
+interface Navigator {
+  // objects implementing this interface also implement the interfaces given below
+};
+Navigator implements NavigatorID;
+Navigator implements NavigatorLanguage;
+Navigator implements NavigatorOnLine;
+//Navigator implements NavigatorContentUtils;
+//Navigator implements NavigatorStorageUtils;
+
+[NoInterfaceObject]
+interface NavigatorID {
+  readonly attribute DOMString appName;
+  [Throws]
+  readonly attribute DOMString appVersion;
+  [Throws]
+  readonly attribute DOMString platform;
+  [Throws]
+  readonly attribute DOMString userAgent;
+
+  // Spec has this as a const, but that's wrong because it should not
+  // be on the interface object.
+  //const DOMString product = "Gecko"; // for historical reasons
+  readonly attribute DOMString product;
+};
+
+[NoInterfaceObject]
+interface NavigatorLanguage {
+  readonly attribute DOMString? language;
+};
+
+[NoInterfaceObject]
+interface NavigatorOnLine {
+  readonly attribute boolean onLine;
+};
+
+/*
+[NoInterfaceObject]
+interface NavigatorContentUtils {
+  // content handler registration
+  [Throws]
+  void registerProtocolHandler(DOMString scheme, DOMString url, DOMString title);
+  [Throws]
+  void registerContentHandler(DOMString mimeType, DOMString url, DOMString title);
+  // NOT IMPLEMENTED
+  //DOMString isProtocolHandlerRegistered(DOMString scheme, DOMString url);
+  //DOMString isContentHandlerRegistered(DOMString mimeType, DOMString url);
+  //void unregisterProtocolHandler(DOMString scheme, DOMString url);
+  //void unregisterContentHandler(DOMString mimeType, DOMString url);
+};
+
+[NoInterfaceObject]
+interface NavigatorStorageUtils {
+  // NOT IMPLEMENTED
+  //void yieldForStorageUpdates();
+};
+
+// Things that definitely need to be in the spec and and are not for some
+// reason.  See https://www.w3.org/Bugs/Public/show_bug.cgi?id=22406
+partial interface Navigator {
+  [Throws]
+  readonly attribute MimeTypeArray mimeTypes;
+  [Throws]
+  readonly attribute PluginArray plugins;
+};
+*/
+
+// http://www.w3.org/TR/tracking-dnt/ sort of
+partial interface Navigator {
+  readonly attribute DOMString doNotTrack;
+};
+
+/*
+// http://www.w3.org/TR/geolocation-API/#geolocation_interface
+[NoInterfaceObject]
+interface NavigatorGeolocation {
+  [Throws, Pref="geo.enabled"]
+  readonly attribute Geolocation geolocation;
+};
+Navigator implements NavigatorGeolocation;
+
+// http://www.w3.org/TR/battery-status/#navigatorbattery-interface
+[NoInterfaceObject]
+interface NavigatorBattery {
+    // XXXbz Per spec this should be non-nullable, but we return null in
+    // torn-down windows.  See bug 884925.
+    [Throws, Func="Navigator::HasBatterySupport"]
+    readonly attribute BatteryManager? battery;
+};
+Navigator implements NavigatorBattery;
+*/
+
+/*
+// http://www.w3.org/TR/vibration/#vibration-interface
+partial interface Navigator {
+    // We don't support sequences in unions yet
+    //boolean vibrate ((unsigned long or sequence<unsigned long>) pattern);
+    // XXXbz also, per spec we should be returning a boolean, and we just don't.
+    // See bug 884935.
+    [Throws]
+    void vibrate(unsigned long duration);
+    [Throws]
+    void vibrate(sequence<unsigned long> pattern);
+};
+*/
+
+// Mozilla-specific extensions
+
+callback interface MozIdleObserver {
+  // Time is in seconds and is read only when idle observers are added
+  // and removed.
+  readonly attribute unsigned long time;
+  void onidle();
+  void onactive();
+};
+
+// nsIDOMNavigator
+partial interface Navigator {
+  // WebKit/Blink/Trident/Presto support this (hardcoded "Mozilla").
+  [Throws]
+  readonly attribute DOMString appCodeName;
+  //[Throws]
+  //readonly attribute DOMString oscpu;
+  // WebKit/Blink support this; Trident/Presto do not.
+  readonly attribute DOMString vendor;
+  // WebKit/Blink supports this (hardcoded ""); Trident/Presto do not.
+  readonly attribute DOMString vendorSub;
+  // WebKit/Blink supports this (hardcoded "20030107"); Trident/Presto don't
+  readonly attribute DOMString productSub;
+  // WebKit/Blink/Trident/Presto support this.
+  readonly attribute boolean cookieEnabled;
+  [Throws]
+  readonly attribute DOMString buildID;
+  //[Throws, Func="Navigator::HasPowerSupport"]
+  //readonly attribute MozPowerManager mozPower;
+
+  // WebKit/Blink/Trident/Presto support this.
+  [Throws]
+  boolean javaEnabled();
+  // Everyone but WebKit/Blink supports this.  See bug 679971.
+  boolean taintEnabled();
+
+  /**
+   * Navigator requests to add an idle observer to the existing window.
+   */
+  //[Throws, Func="Navigator::HasIdleSupport"]
+  //void addIdleObserver(MozIdleObserver aIdleObserver);
+
+  /**
+   * Navigator requests to remove an idle observer from the existing window.
+   */
+  //[Throws, Func="Navigator::HasIdleSupport"]
+  //void removeIdleObserver(MozIdleObserver aIdleObserver);
+
+  /**
+   * Request a wake lock for a resource.
+   *
+   * A page holds a wake lock to request that a resource not be turned
+   * off (or otherwise made unavailable).
+   *
+   * The topic is the name of a resource that might be made unavailable for
+   * various reasons. For example, on a mobile device the power manager might
+   * decide to turn off the screen after a period of idle time to save power.
+   *
+   * The resource manager checks the lock state of a topic before turning off
+   * the associated resource. For example, a page could hold a lock on the
+   * "screen" topic to prevent the screensaver from appearing or the screen
+   * from turning off.
+   *
+   * The resource manager defines what each topic means and sets policy.  For
+   * example, the resource manager might decide to ignore 'screen' wake locks
+   * held by pages which are not visible.
+   *
+   * One topic can be locked multiple times; it is considered released only when
+   * all locks on the topic have been released.
+   *
+   * The returned nsIDOMMozWakeLock object is a token of the lock.  You can
+   * unlock the lock via the object's |unlock| method.  The lock is released
+   * automatically when its associated window is unloaded.
+   *
+   * @param aTopic resource name
+   */
+  //[Throws, Func="Navigator::HasWakeLockSupport"]
+  //MozWakeLock requestWakeLock(DOMString aTopic);
+};
+
+/*
+// nsIDOMNavigatorDeviceStorage
+partial interface Navigator {
+  [Throws, Pref="device.storage.enabled"]
+  DeviceStorage? getDeviceStorage(DOMString type);
+  [Throws, Pref="device.storage.enabled"]
+  sequence<DeviceStorage> getDeviceStorages(DOMString type);
+};
+
+// nsIDOMNavigatorDesktopNotification
+partial interface Navigator {
+  [Throws, Func="Navigator::HasDesktopNotificationSupport"]
+  readonly attribute DesktopNotificationCenter mozNotification;
+};
+
+// nsIDOMClientInformation
+partial interface Navigator {
+  [Throws]
+  boolean mozIsLocallyAvailable(DOMString uri, boolean whenOffline);
+};
+
+// nsIDOMMozNavigatorMobileMessage
+interface MozMobileMessageManager;
+partial interface Navigator {
+  [Func="Navigator::HasMobileMessageSupport"]
+  readonly attribute MozMobileMessageManager? mozMobileMessage;
+};
+
+// nsIDOMMozNavigatorNetwork
+interface MozConnection;
+partial interface Navigator {
+  [Pref="dom.network.enabled"]
+  readonly attribute MozConnection? mozConnection;
+};
+
+// nsIDOMNavigatorCamera
+partial interface Navigator {
+  [Throws, Func="Navigator::HasCameraSupport"]
+  readonly attribute CameraManager mozCameras;
+};
+
+// nsIDOMNavigatorSystemMessages and sort of maybe
+// http://www.w3.org/2012/sysapps/runtime/#extension-to-the-navigator-interface-1
+callback systemMessageCallback = void (optional object message);
+partial interface Navigator {
+  [Throws, Pref="dom.sysmsg.enabled"]
+  void    mozSetMessageHandler (DOMString type, systemMessageCallback? callback);
+  [Throws, Pref="dom.sysmsg.enabled"]
+  boolean mozHasPendingMessage (DOMString type);
+};
+
+#ifdef MOZ_B2G_RIL
+partial interface Navigator {
+  [Throws, Func="Navigator::HasTelephonySupport"]
+  readonly attribute Telephony? mozTelephony;
+};
+
+// nsIMozNavigatorMobileConnection
+interface MozMobileConnection;
+partial interface Navigator {
+  [Throws, Func="Navigator::HasMobileConnectionSupport"]
+  readonly attribute MozMobileConnection mozMobileConnection;
+};
+
+partial interface Navigator {
+  [Throws, Func="Navigator::HasCellBroadcastSupport"]
+  readonly attribute MozCellBroadcast mozCellBroadcast;
+};
+
+// nsIMozNavigatorVoicemail
+interface MozVoicemail;
+partial interface Navigator {
+  [Throws, Func="Navigator::HasVoicemailSupport"]
+  readonly attribute MozVoicemail mozVoicemail;
+};
+
+// nsIMozNavigatorIccManager
+interface MozIccManager;
+partial interface Navigator {
+  [Throws, Func="Navigator::HasIccManagerSupport"]
+  readonly attribute MozIccManager? mozIccManager;
+};
+#endif // MOZ_B2G_RIL
+
+#ifdef MOZ_GAMEPAD
+// https://dvcs.w3.org/hg/gamepad/raw-file/default/gamepad.html#navigator-interface-extension
+partial interface Navigator {
+  [Throws, Pref="dom.gamepad.enabled"]
+  sequence<Gamepad?> getGamepads();
+};
+#endif // MOZ_GAMEPAD
+
+#ifdef MOZ_B2G_BT
+partial interface Navigator {
+  [Throws, Func="Navigator::HasBluetoothSupport"]
+  readonly attribute BluetoothManager mozBluetooth;
+};
+#endif // MOZ_B2G_BT
+
+#ifdef MOZ_TIME_MANAGER
+// nsIDOMMozNavigatorTime
+partial interface Navigator {
+  [Throws, Func="Navigator::HasTimeSupport"]
+  readonly attribute MozTimeManager mozTime;
+};
+#endif // MOZ_TIME_MANAGER
+
+#ifdef MOZ_AUDIO_CHANNEL_MANAGER
+// nsIMozNavigatorAudioChannelManager
+partial interface Navigator {
+  [Throws]
+  readonly attribute AudioChannelManager mozAudioChannelManager;
+};
+#endif // MOZ_AUDIO_CHANNEL_MANAGER
+
+#ifdef MOZ_MEDIA_NAVIGATOR
+// nsIDOMNavigatorUserMedia
+callback MozDOMGetUserMediaSuccessCallback = void (nsISupports? value);
+callback MozDOMGetUserMediaErrorCallback = void (DOMString error);
+interface MozMediaStreamOptions;
+partial interface Navigator {
+  [Throws, Func="Navigator::HasUserMediaSupport"]
+  void mozGetUserMedia(MozMediaStreamOptions? params,
+                       MozDOMGetUserMediaSuccessCallback? onsuccess,
+                       MozDOMGetUserMediaErrorCallback? onerror);
+};
+
+// nsINavigatorUserMedia
+callback MozGetUserMediaDevicesSuccessCallback = void (nsIVariant? devices);
+partial interface Navigator {
+  [Throws, ChromeOnly]
+  void mozGetUserMediaDevices(MozGetUserMediaDevicesSuccessCallback? onsuccess,
+                              MozDOMGetUserMediaErrorCallback? onerror);
+};
+#endif // MOZ_MEDIA_NAVIGATOR
+*/
\ No newline at end of file
diff --git a/src/components/script/dom/bindings/codegen/Window.webidl b/src/components/script/dom/bindings/codegen/Window.webidl
index 6240365be94..efa13f9c7b5 100644
--- a/src/components/script/dom/bindings/codegen/Window.webidl
+++ b/src/components/script/dom/bindings/codegen/Window.webidl
@@ -41,7 +41,8 @@
   getter object (DOMString name);
 
   // the user agent
-  /*readonly attribute Navigator navigator; 
+  readonly attribute Navigator navigator;
+  /*
   readonly attribute External external;
   readonly attribute ApplicationCache applicationCache;*/
 
diff --git a/src/components/script/dom/navigator.rs b/src/components/script/dom/navigator.rs
new file mode 100644
index 00000000000..f6a98b59a89
--- /dev/null
+++ b/src/components/script/dom/navigator.rs
@@ -0,0 +1,108 @@
+/* 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/. */
+
+use dom::bindings::utils::{WrapperCache, BindingObject, CacheableWrapper};
+use dom::bindings::utils::{DOMString, ErrorResult, str, null_string};
+use dom::bindings::codegen::NavigatorBinding;
+use script_task::{page_from_context};
+
+use js::jsapi::{JSContext, JSObject};
+
+use std::cast;
+
+pub struct Navigator {
+    wrapper: WrapperCache
+}
+
+impl Navigator {
+    pub fn new() -> @mut Navigator {
+        @mut Navigator {
+            wrapper: WrapperCache::new()
+        }
+    }
+
+    pub fn DoNotTrack(&self) -> DOMString {
+        str(~"unspecified")
+    }
+
+    pub fn Vendor(&self) -> DOMString {
+        str(~"") // Like Gecko
+    }
+
+    pub fn VendorSub(&self) -> DOMString {
+        str(~"") // Like Gecko
+    }
+
+    pub fn Product(&self) -> DOMString {
+        str(~"Gecko") // This is supposed to be constant, see webidl.
+    }
+
+    pub fn ProductSub(&self) -> DOMString {
+        null_string
+    }
+
+    pub fn CookieEnabled(&self) -> bool {
+        false
+    }
+
+    pub fn GetBuildID(&self, _rv: &mut ErrorResult) -> DOMString {
+        null_string
+    }
+
+    pub fn JavaEnabled(&self, _rv: &mut ErrorResult) -> bool {
+        false
+    }
+
+    pub fn TaintEnabled(&self) -> bool {
+        false
+    }
+
+    pub fn AppName(&self) -> DOMString {
+        str(~"Netscape") // Like Gecko/Webkit
+    }
+
+    pub fn GetAppCodeName(&self, _rv: &mut ErrorResult) -> DOMString {
+        str(~"Mozilla") // Like Gecko/Webkit
+    }
+
+    pub fn GetAppVersion(&self, _rv: &mut ErrorResult) -> DOMString {
+        null_string
+    }
+
+    pub fn GetPlatform(&self, _rv: &mut ErrorResult) -> DOMString {
+        null_string
+    }
+
+    pub fn GetUserAgent(&self, _rv: &mut ErrorResult) -> DOMString {
+        null_string
+    }
+
+    pub fn GetLanguage(&self) -> DOMString {
+        null_string
+    }
+
+    pub fn OnLine(&self) -> bool {
+        true
+    }
+}
+
+impl CacheableWrapper for Navigator {
+    fn get_wrappercache(&mut self) -> &mut WrapperCache {
+        unsafe { cast::transmute(&self.wrapper) }
+    }
+
+    fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
+        let mut unused = false;
+        NavigatorBinding::Wrap(cx, scope, self, &mut unused)
+    }
+}
+
+impl BindingObject for Navigator {
+    fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> {
+        let page = page_from_context(cx);
+        unsafe {
+            Some((*page).frame.get_ref().window as @mut CacheableWrapper)
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs
index 84644c7acbf..bc3993d3f4e 100644
--- a/src/components/script/dom/window.rs
+++ b/src/components/script/dom/window.rs
@@ -7,6 +7,7 @@ use dom::bindings::utils::{WrapperCache, DOMString, null_string};
 use dom::bindings::utils::{CacheableWrapper, BindingObject};
 use dom::document::AbstractDocument;
 use dom::node::{AbstractNode, ScriptView};
+use dom::navigator::Navigator;
 
 use layout_interface::ReflowForScriptQuery;
 use script_task::{ExitMsg, FireTimerMsg, Page, ScriptChan};
@@ -41,6 +42,7 @@ pub struct Window {
     compositor: @ScriptListener,
     wrapper: WrapperCache,
     timer_chan: SharedChan<TimerControlMsg>,
+    navigator: Option<@mut Navigator>,
 }
 
 #[unsafe_destructor]
@@ -105,6 +107,13 @@ impl Window {
         None
     }
 
+    pub fn Navigator(&mut self) -> @mut Navigator {
+        if self.navigator.is_none() {
+            self.navigator = Some(Navigator::new());
+        }
+        self.navigator.unwrap()
+    }
+
     pub fn Confirm(&self, _message: &DOMString) -> bool {
         false
     }
@@ -189,6 +198,7 @@ impl Window {
                 }
                 SharedChan::new(timer_chan)
             },
+            navigator: None,
         };
 
         unsafe {
diff --git a/src/components/script/script.rc b/src/components/script/script.rc
index abde82ce68a..422a013d932 100644
--- a/src/components/script/script.rc
+++ b/src/components/script/script.rc
@@ -125,6 +125,7 @@ pub mod dom {
     pub mod htmlvideoelement;
     pub mod htmlunknownelement;
     pub mod mouseevent;
+    pub mod navigator;
     pub mod node;
     pub mod uievent;
     pub mod text;
diff --git a/src/test/html/content/test_navigator.html b/src/test/html/content/test_navigator.html
new file mode 100644
index 00000000000..5e68d2608fe
--- /dev/null
+++ b/src/test/html/content/test_navigator.html
@@ -0,0 +1,9 @@
+<html>
+<head>
+  <title></title>
+  <script src="harness.js"></script>
+</head>
+<body>
+  <script src="test_navigator.js"></script>
+</body>
+</html>
diff --git a/src/test/html/content/test_navigator.js b/src/test/html/content/test_navigator.js
new file mode 100644
index 00000000000..7e343d40394
--- /dev/null
+++ b/src/test/html/content/test_navigator.js
@@ -0,0 +1,19 @@
+is(window.navigator, window.navigator);
+is(String(window.navigator), '[object Navigator]');
+
+var nav = window.navigator;
+is(nav.doNotTrack, "unspecified");
+is(nav.vendor, "");
+is(nav.vendorSub, "");
+is(nav.product, "Gecko");
+is(nav.javaEnabled(), false);
+is(nav.taintEnabled(), false);
+is(nav.appName, "Netscape");
+is(nav.appCodeName, "Mozilla");
+// todo
+is(nav.appVersion, null);
+is(nav.platform, null);
+is(nav.userAgent, null);
+is(nav.language, null);
+is(nav.onLine, true);
+finish();
\ No newline at end of file