Merge mozilla-central to mozilla-inbound

2017-02-09 11:38:08 +01:00
parent 53ccc0d594 b3fb2c8458
commit e1b6f23c86
390 changed files with 6006 additions and 22396 deletions
--- a/dom/html/HTMLInputElement.cpp
+++ b/dom/html/HTMLInputElement.cpp
@@ -69,11 +69,11 @@
 #include "mozilla/ContentEvents.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/EventStates.h"
+#include "mozilla/GenericSpecifiedValuesInlines.h"
 #include "mozilla/InternalMutationEvent.h"
 #include "mozilla/TextEvents.h"
 #include "mozilla/TouchEvents.h"

-#include "nsRuleData.h"
 #include <algorithm>

 // input type=radio
@@ -5909,7 +5909,7 @@ HTMLInputElement::ParseAttribute(int32_t aNamespaceID,

 void
 HTMLInputElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
-                                        nsRuleData* aData)
+                                        GenericSpecifiedValues* aData)
 {
  const nsAttrValue* value = aAttributes->GetAttr(nsGkAtoms::type);
  if (value && value->Type() == nsAttrValue::eEnum &&