webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 52 insertions, 55 deletions

diff --git a/Source/WebCore/html/HTMLFrameSetElement.cpp b/Source/WebCore/html/HTMLFrameSetElement.cpp
index 17a90317f..6b793d15e 100644
--- a/Source/WebCore/html/HTMLFrameSetElement.cpp
+++ b/Source/WebCore/html/HTMLFrameSetElement.cpp
@@ -24,6 +24,7 @@
 #include "config.h"
 #include "HTMLFrameSetElement.h"
 
+#include "Attribute.h"
 #include "CSSPropertyNames.h"
 #include "Document.h"
 #include "ElementIterator.h"
@@ -32,7 +33,6 @@
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
-#include "HTMLBodyElement.h"
 #include "HTMLNames.h"
 #include "Length.h"
 #include "MouseEvent.h"
@@ -58,9 +58,9 @@ HTMLFrameSetElement::HTMLFrameSetElement(const QualifiedName& tagName, Document&
     setHasCustomStyleResolveCallbacks();
 }
 
-Ref<HTMLFrameSetElement> HTMLFrameSetElement::create(const QualifiedName& tagName, Document& document)
+PassRefPtr<HTMLFrameSetElement> HTMLFrameSetElement::create(const QualifiedName& tagName, Document& document)
 {
-    return adoptRef(*new HTMLFrameSetElement(tagName, document));
+    return adoptRef(new HTMLFrameSetElement(tagName, document));
 }
 
 bool HTMLFrameSetElement::isPresentationAttribute(const QualifiedName& name) const
@@ -81,73 +81,71 @@ void HTMLFrameSetElement::collectStyleForPresentationAttribute(const QualifiedNa
 void HTMLFrameSetElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
 {
     if (name == rowsAttr) {
-        // FIXME: What is the right thing to do when removing this attribute?
-        // Why not treat it the same way we treat setting it to the empty string?
         if (!value.isNull()) {
             m_rowLengths = newLengthArray(value.string(), m_totalRows);
-            // FIXME: Would be nice to optimize the case where m_rowLengths did not change.
             setNeedsStyleRecalc();
         }
-        return;
-    }
-
-    if (name == colsAttr) {
-        // FIXME: What is the right thing to do when removing this attribute?
-        // Why not treat it the same way we treat setting it to the empty string?
+    } else if (name == colsAttr) {
         if (!value.isNull()) {
             m_colLengths = newLengthArray(value.string(), m_totalCols);
-            // FIXME: Would be nice to optimize the case where m_colLengths did not change.
             setNeedsStyleRecalc();
         }
-        return;
-    }
-
-    if (name == frameborderAttr) {
+    } else if (name == frameborderAttr) {
         if (!value.isNull()) {
-            if (equalLettersIgnoringASCIICase(value, "no") || value == "0") {
+            if (equalIgnoringCase(value, "no") || equalIgnoringCase(value, "0")) {
                 m_frameborder = false;
                 m_frameborderSet = true;
-            } else if (equalLettersIgnoringASCIICase(value, "yes") || value == "1") {
+            } else if (equalIgnoringCase(value, "yes") || equalIgnoringCase(value, "1")) {
                 m_frameborderSet = true;
             }
         } else {
             m_frameborder = false;
             m_frameborderSet = false;
         }
-        // FIXME: Do we need to trigger repainting?
-        return;
-    }
-
-    if (name == noresizeAttr) {
-        // FIXME: This should set m_noresize to false if the value is null.
+    } else if (name == noresizeAttr) {
         m_noresize = true;
-        return;
-    }
-
-    if (name == borderAttr) {
+    } else if (name == borderAttr) {
         if (!value.isNull()) {
             m_border = value.toInt();
             m_borderSet = true;
         } else
             m_borderSet = false;
-        // FIXME: Do we need to trigger repainting?
-        return;
-    }
-
-    if (name == bordercolorAttr) {
+    } else if (name == bordercolorAttr)
         m_borderColorSet = !value.isEmpty();
-        // FIXME: Clearly wrong: This can overwrite the value inherited from the parent frameset.
-        // FIXME: Do we need to trigger repainting?
-        return;
-    }
-
-    auto& eventName = HTMLBodyElement::eventNameForWindowEventHandlerAttribute(name);
-    if (!eventName.isNull()) {
-        document().setWindowAttributeEventListener(eventName, name, value);
-        return;
-    }
-
-    HTMLElement::parseAttribute(name, value);
+    else if (name == onloadAttr)
+        document().setWindowAttributeEventListener(eventNames().loadEvent, name, value);
+    else if (name == onbeforeunloadAttr)
+        document().setWindowAttributeEventListener(eventNames().beforeunloadEvent, name, value);
+    else if (name == onunloadAttr)
+        document().setWindowAttributeEventListener(eventNames().unloadEvent, name, value);
+    else if (name == onblurAttr)
+        document().setWindowAttributeEventListener(eventNames().blurEvent, name, value);
+    else if (name == onfocusAttr)
+        document().setWindowAttributeEventListener(eventNames().focusEvent, name, value);
+    else if (name == onfocusinAttr)
+        document().setWindowAttributeEventListener(eventNames().focusinEvent, name, value);
+    else if (name == onfocusoutAttr)
+        document().setWindowAttributeEventListener(eventNames().focusoutEvent, name, value);
+#if ENABLE(ORIENTATION_EVENTS)
+    else if (name == onorientationchangeAttr)
+        document().setWindowAttributeEventListener(eventNames().orientationchangeEvent, name, value);
+#endif
+    else if (name == onhashchangeAttr)
+        document().setWindowAttributeEventListener(eventNames().hashchangeEvent, name, value);
+    else if (name == onresizeAttr)
+        document().setWindowAttributeEventListener(eventNames().resizeEvent, name, value);
+    else if (name == onscrollAttr)
+        document().setWindowAttributeEventListener(eventNames().scrollEvent, name, value);
+    else if (name == onstorageAttr)
+        document().setWindowAttributeEventListener(eventNames().storageEvent, name, value);
+    else if (name == ononlineAttr)
+        document().setWindowAttributeEventListener(eventNames().onlineEvent, name, value);
+    else if (name == onofflineAttr)
+        document().setWindowAttributeEventListener(eventNames().offlineEvent, name, value);
+    else if (name == onpopstateAttr)
+        document().setWindowAttributeEventListener(eventNames().popstateEvent, name, value);
+    else
+        HTMLElement::parseAttribute(name, value);
 }
 
 bool HTMLFrameSetElement::rendererIsNeeded(const RenderStyle& style)
@@ -157,12 +155,12 @@ bool HTMLFrameSetElement::rendererIsNeeded(const RenderStyle& style)
     return style.isStyleAvailable();
 }
 
-RenderPtr<RenderElement> HTMLFrameSetElement::createElementRenderer(Ref<RenderStyle>&& style, const RenderTreePosition&)
+RenderPtr<RenderElement> HTMLFrameSetElement::createElementRenderer(PassRef<RenderStyle> style)
 {
     if (style.get().hasContent())
-        return RenderElement::createFor(*this, WTFMove(style));
+        return RenderElement::createFor(*this, std::move(style));
     
-    return createRenderer<RenderFrameSet>(*this, WTFMove(style));
+    return createRenderer<RenderFrameSet>(*this, std::move(style));
 }
 
 HTMLFrameSetElement* HTMLFrameSetElement::findContaining(Element* descendant)
@@ -189,16 +187,15 @@ void HTMLFrameSetElement::willAttachRenderers()
         m_noresize = containingFrameSet->noResize();
 }
 
-void HTMLFrameSetElement::defaultEventHandler(Event* event)
+void HTMLFrameSetElement::defaultEventHandler(Event* evt)
 {
-    ASSERT(event);
-    if (is<MouseEvent>(*event) && !m_noresize && is<RenderFrameSet>(renderer())) {
-        if (downcast<RenderFrameSet>(*renderer()).userResize(downcast<MouseEvent>(event))) {
-            event->setDefaultHandled();
+    if (evt->isMouseEvent() && !m_noresize && renderer() && renderer()->isFrameSet()) {
+        if (toRenderFrameSet(renderer())->userResize(static_cast<MouseEvent*>(evt))) {
+            evt->setDefaultHandled();
             return;
         }
     }
-    HTMLElement::defaultEventHandler(event);
+    HTMLElement::defaultEventHandler(evt);
 }
 
 bool HTMLFrameSetElement::willRecalcStyle(Style::Change)