Bug 920551 - 2.d/2: fix ICC. r=hsinyi,khuey, a=koi+
☠☠ backed out by 9535f227ec80 ☠ ☠
authorVicamo Yang <vyang@mozilla.com>
Thu, 31 Oct 2013 21:08:09 +0800
changeset 166327 fcb5a4dfe061eb4ab4716ea0df8553040e72e359
parent 166326 da509068de16864fc9c7c7e0c9e041aff34f54b8
child 166328 c57a2291acaac7b4b294452c6c90bfa54c31eb57
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershsinyi, khuey, koi
bugs920551
milestone27.0a2
Bug 920551 - 2.d/2: fix ICC. r=hsinyi,khuey, a=koi+
b2g/app/b2g.js
dom/base/moz.build
dom/webidl/moz.build
modules/libpref/src/init/all.js
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -819,19 +819,16 @@ pref("gfx.canvas.azure.accelerated", tru
 pref("gfx.canvas.skiagl.dynamic-cache", true);
 
 // enable fence with readpixels for SurfaceStream
 pref("gfx.gralloc.fence-with-readpixels", true);
 
 // Cell Broadcast API
 pref("ril.cellbroadcast.disabled", false);
 
-// ICC API
-pref("dom.icc.enabled", true);
-
 // Mobile Connection API
 pref("dom.mobileconnection.enabled", true);
 
 // Voice Mail API
 pref("dom.voicemail.enabled", true);
 
 // The url of the page used to display network error details.
 pref("b2g.neterror.url", "app://system.gaiamobile.org/net_error.html");
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -123,17 +123,16 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'jsdombase_s'
 
 LOCAL_INCLUDES += [
     '../battery',
     '../bluetooth',
-    '../icc/src',
     '../media',
     '../network/src',
     '../src/geolocation',
     '../src/storage',
     '../time',
     '/content/base/src',
     '/content/events/src',
     '/content/html/document/src',
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -465,17 +465,16 @@ if CONFIG['MOZ_WEBSPEECH']:
 
 if CONFIG['MOZ_GAMEPAD']:
     WEBIDL_FILES += [
         'Gamepad.webidl',
     ]
 
 if CONFIG['MOZ_B2G_RIL']:
     WEBIDL_FILES += [
-        'MozStkCommandEvent.webidl',
         'MozVoicemail.webidl',
     ]
 
 WEBIDL_FILES += [
     'CloseEvent.webidl',
     'CustomEvent.webidl',
     'DeviceOrientationEvent.webidl',
     'DeviceStorageChangeEvent.webidl',
@@ -511,16 +510,17 @@ if CONFIG['MOZ_B2G_RIL']:
     WEBIDL_FILES += [
         'CFStateChangeEvent.webidl',
         'DataErrorEvent.webidl',
         'IccCardLockError.webidl',
         'MozCellBroadcast.webidl',
         'MozCellBroadcastEvent.webidl',
         'MozEmergencyCbModeEvent.webidl',
         'MozOtaStatusEvent.webidl',
+        'MozStkCommandEvent.webidl',
         'MozVoicemailEvent.webidl',
         'MozWifiConnectionInfoEvent.webidl',
         'MozWifiStatusChangeEvent.webidl',
         'USSDReceivedEvent.webidl',
     ]
 
 if CONFIG['MOZ_WEBSPEECH']:
     WEBIDL_FILES += [
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -4524,17 +4524,21 @@ pref("dom.telephony.defaultServiceId", 0
 // Cell Broadcast API
 #ifdef MOZ_B2G_RIL
 pref("dom.cellbroadcast.enabled", true);
 #else
 pref("dom.cellbroadcast.enabled", false);
 #endif
 
 // ICC API
+#ifdef MOZ_B2G_RIL
+pref("dom.icc.enabled", true);
+#else
 pref("dom.icc.enabled", false);
+#endif
 
 // Mobile Connection API
 pref("dom.mobileconnection.enabled", false);
 
 // Voice Mail API
 pref("dom.voicemail.enabled", false);
 // Numeric default service id for Voice Mail API calls with |serviceId|
 // parameter omitted.