Bug 946047 - Fix HasNfcSupport in MozNfc.webidl. r=khuey
authorGarner Lee <garner.lee@telekom.com>
Tue, 03 Dec 2013 17:59:16 -0800
changeset 160158 d4725eeb419df1408e3fb56241898f904411d31e
parent 160157 8ce2200b4bf63566d5be0a7d60fbfb92dcc35120
child 160159 f345ca8220846fa8fe87eacecebdbabaef7a879f
push id25825
push userkwierso@gmail.com
push dateFri, 13 Dec 2013 02:03:03 +0000
treeherdermozilla-central@f72cf27f3a2a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs946047
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 946047 - Fix HasNfcSupport in MozNfc.webidl. r=khuey
CLOBBER
dom/tests/mochitest/general/test_interfaces.html
dom/webidl/MozNfc.webidl
--- a/CLOBBER
+++ b/CLOBBER
@@ -13,12 +13,9 @@
 #          |               |
 #          O <-- Clobber   O  <-- Clobber
 #
 # Note: The description below will be part of the error message shown to users.
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
-Bug 934646 needs a clobber -- the icon resources previously copied
-into $OBJDIR/mobile/android/base/res will conflict with those in
-$BRANDING_DIRECTORY/res.
-
+Bug 946047 - Windows needs a clobber for webidl changes.
--- a/dom/tests/mochitest/general/test_interfaces.html
+++ b/dom/tests/mochitest/general/test_interfaces.html
@@ -380,17 +380,16 @@ var interfaceNamesInGlobalScope =
     "MozMmsEvent",
     "MozMmsMessage",
     {name: "MozMobileConnection", b2g: true, pref: "dom.mobileconnection.enabled"},
     {name: "MozMobileConnectionArray", b2g: true, pref: "dom.mobileconnection.enabled"},
     "MozMobileMessageManager",
     "MozMobileMessageThread",
     "MozNamedAttrMap",
     {name: "MozNdefRecord", b2g: true},
-    {name: "MozNfc", b2g: true},
     {name: "MozNFCPeer", b2g: true},
     {name: "MozNFCTag", b2g: true},
     {name: "MozOtaStatusEvent", b2g: true, pref: "dom.mobileconnection.enabled"},
     "MozPowerManager",
     {name: "mozRTCIceCandidate", pref: "media.peerconnection.enabled"},
     {name: "mozRTCPeerConnection", pref: "media.peerconnection.enabled"},
     {name: "mozRTCSessionDescription", pref: "media.peerconnection.enabled"},
     "MozSettingsEvent",
--- a/dom/webidl/MozNfc.webidl
+++ b/dom/webidl/MozNfc.webidl
@@ -1,16 +1,17 @@
 /* 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/. */
 
  /* Copyright © 2013 Deutsche Telekom, Inc. */
 
 [JSImplementation="@mozilla.org/navigatorNfc;1",
- NavigatorProperty="mozNfc"]
+ NavigatorProperty="mozNfc",
+ Func="Navigator::HasNfcSupport"]
 interface MozNfc : EventTarget {
    MozNFCTag getNFCTag(DOMString sessionId);
    MozNFCPeer getNFCPeer(DOMString sessionId);
 
    /**
     * API to check if the given application's manifest
     * URL is registered with the Chrome Process or not.
     *