Bug 1548795 - re-edit remaining conflict issues r=jya a=conflict-fix
authorAndreea Pavel <apavel@mozilla.com>
Tue, 14 May 2019 03:10:35 +0300
changeset 526548 0dd2fe24bc08b569f02f32337a2d118704c0f8b3
parent 526547 dbed01e3bf9fa1a8d6d30bdec16ea75c2d6c740b
child 526549 8d1cd279ea4c160af30904f8ba7b65c3ef806f8f
push id2038
push userapavel@mozilla.com
push dateTue, 14 May 2019 00:14:07 +0000
treeherdermozilla-release@0dd2fe24bc08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjya, conflict-fix
bugs1548795
milestone67.0
Bug 1548795 - re-edit remaining conflict issues r=jya a=conflict-fix
modules/libpref/init/StaticPrefList.h
--- a/modules/libpref/init/StaticPrefList.h
+++ b/modules/libpref/init/StaticPrefList.h
@@ -242,27 +242,16 @@ VARCACHE_PREF(
 // NOTE: This preference is used in unit tests. If it is removed or its default
 // value changes, please update test_sharedMap_var_caches.js accordingly.
 VARCACHE_PREF(
   "dom.mutation-events.cssom.disabled",
    dom_mutation_events_cssom_disabled,
   bool, true
 )
 
-// altogether, or forwards to the inner stylesheet method without attribute
-// reflection.
-//
-// Historical behavior is the second, the first is being discussed at:
-// https://github.com/whatwg/html/issues/3840
-VARCACHE_PREF(
-  "dom.link.disabled_attribute.enabled",
-   dom_link_disabled_attribute_enabled,
-  bool, true
-)
-
 // Should we defer timeouts and intervals while loading a page.  Released
 // on Idle or when the page is loaded.
 VARCACHE_PREF(
   "dom.timeout.defer_during_load",
   dom_timeout_defer_during_load,
   bool, true
 )