Merge WebKit at r62496: Initial merge by git

Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2

1 files changed, 5 insertions, 25 deletions

diff --git a/WebCore/html/HTMLStyleElement.cpp b/WebCore/html/HTMLStyleElement.cpp
index a8ea42e..79bafe6 100644
--- a/WebCore/html/HTMLStyleElement.cpp
+++ b/WebCore/html/HTMLStyleElement.cpp
@@ -27,6 +27,7 @@
 #include "Attribute.h"
 #include "Document.h"
 #include "HTMLNames.h"
+#include "ScriptEventListener.h"
 
 namespace WebCore {
 
@@ -45,14 +46,13 @@ PassRefPtr<HTMLStyleElement> HTMLStyleElement::create(const QualifiedName& tagNa
     return adoptRef(new HTMLStyleElement(tagName, document, createdByParser));
 }
 
-// other stuff...
 void HTMLStyleElement::parseMappedAttribute(Attribute* attr)
 {
-    if (attr->name() == mediaAttr)
-        m_media = attr->value().string().lower();
-    else if (attr->name() == titleAttr && m_sheet)
+    if (attr->name() == titleAttr && m_sheet)
         m_sheet->setTitle(attr->value());
-     else
+    else if (attr->name() == onbeforeprocessAttr)
+        setAttributeEventListener(eventNames().beforeprocessEvent, createAttributeEventListener(this, attr));
+    else
         HTMLElement::parseMappedAttribute(attr);
 }
 
@@ -110,36 +110,16 @@ bool HTMLStyleElement::sheetLoaded()
     return false;
 }
 
-bool HTMLStyleElement::disabled() const
-{
-    return !getAttribute(disabledAttr).isNull();
-}
-
-void HTMLStyleElement::setDisabled(bool disabled)
-{
-    setAttribute(disabledAttr, disabled ? "" : 0);
-}
-
 const AtomicString& HTMLStyleElement::media() const
 {
     return getAttribute(mediaAttr);
 }
 
-void HTMLStyleElement::setMedia(const AtomicString &value)
-{
-    setAttribute(mediaAttr, value);
-}
-
 const AtomicString& HTMLStyleElement::type() const
 {
     return getAttribute(typeAttr);
 }
 
-void HTMLStyleElement::setType(const AtomicString &value)
-{
-    setAttribute(typeAttr, value);
-}
-
 void HTMLStyleElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {    
     HTMLElement::addSubresourceAttributeURLs(urls);