Bug 1548795 - edit remaining conflict issues r=jya a=conflict-fix
authorAndreea Pavel <apavel@mozilla.com>
Tue, 14 May 2019 02:42:12 +0300
changeset 526547 dbed01e3bf9fa1a8d6d30bdec16ea75c2d6c740b
parent 526546 6c593eea1a8bd5391c2469813a1a92139ca7ccdb
child 526548 0dd2fe24bc08b569f02f32337a2d118704c0f8b3
push id2037
push userapavel@mozilla.com
push dateMon, 13 May 2019 23:59:27 +0000
treeherdermozilla-release@dbed01e3bf9f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjya, conflict-fix
bugs1548795
milestone67.0
Bug 1548795 - 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,17 +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
 )
 
-// Whether the disabled attribute in HTMLLinkElement disables the sheet loading
 // 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,