Merge in WebKit r47029.

1 files changed, 38 insertions, 30 deletions

diff --git a/WebCore/dom/Node.h b/WebCore/dom/Node.h
index 43f5f76..22eb848 100644
--- a/WebCore/dom/Node.h
+++ b/WebCore/dom/Node.h
@@ -106,7 +106,7 @@ public:
     static void dumpStatistics();
 
     enum StyleChange { NoChange, NoInherit, Inherit, Detach, Force };    
-    static StyleChange diff(RenderStyle*, RenderStyle*);
+    static StyleChange diff(const RenderStyle*, const RenderStyle*);
 
     Node(Document*, bool isElement = false, bool isContainer = false, bool isText = false);
     virtual ~Node();
@@ -541,7 +541,7 @@ public:
     void removeAllEventListeners() { if (hasRareData()) removeAllEventListenersSlowCase(); }
 
     void dispatchSubtreeModifiedEvent();
-    void dispatchUIEvent(const AtomicString& eventType, int detail = 0, PassRefPtr<Event> underlyingEvent = 0);
+    void dispatchUIEvent(const AtomicString& eventType, int detail, PassRefPtr<Event> underlyingEvent);
     bool dispatchKeyEvent(const PlatformKeyboardEvent&);
     void dispatchWheelEvent(PlatformWheelEvent&);
     bool dispatchMouseEvent(const PlatformMouseEvent&, const AtomicString& eventType,
@@ -549,8 +549,8 @@ public:
     bool dispatchMouseEvent(const AtomicString& eventType, int button, int clickCount,
         int pageX, int pageY, int screenX, int screenY,
         bool ctrlKey, bool altKey, bool shiftKey, bool metaKey,
-        bool isSimulated = false, Node* relatedTarget = 0, PassRefPtr<Event> underlyingEvent = 0);
-    void dispatchSimulatedMouseEvent(const AtomicString& eventType, PassRefPtr<Event> underlyingEvent = 0);
+        bool isSimulated, Node* relatedTarget, PassRefPtr<Event> underlyingEvent);
+    void dispatchSimulatedMouseEvent(const AtomicString& eventType, PassRefPtr<Event> underlyingEvent);
     void dispatchSimulatedClick(PassRefPtr<Event> underlyingEvent, bool sendMouseEvents = false, bool showPressedLook = true);
     void dispatchProgressEvent(const AtomicString& eventType, bool lengthComputableArg, unsigned loadedArg, unsigned totalArg);
     void dispatchWebKitAnimationEvent(const AtomicString& eventType, const String& animationName, double elapsedTime);
@@ -577,10 +577,19 @@ public:
 
     const RegisteredEventListenerVector& eventListeners() const;
 
+    // These 4 attribute event handler attributes are overrided by HTMLBodyElement
+    // and HTMLFrameSetElement to forward to the DOMWindow.
+    virtual EventListener* onblur() const;
+    virtual void setOnblur(PassRefPtr<EventListener>);
+    virtual EventListener* onerror() const;
+    virtual void setOnerror(PassRefPtr<EventListener>);
+    virtual EventListener* onfocus() const;
+    virtual void setOnfocus(PassRefPtr<EventListener>);
+    virtual EventListener* onload() const;
+    virtual void setOnload(PassRefPtr<EventListener>);
+
     EventListener* onabort() const;
     void setOnabort(PassRefPtr<EventListener>);
-    EventListener* onblur() const;
-    void setOnblur(PassRefPtr<EventListener>);
     EventListener* onchange() const;
     void setOnchange(PassRefPtr<EventListener>);
     EventListener* onclick() const;
@@ -589,10 +598,6 @@ public:
     void setOncontextmenu(PassRefPtr<EventListener>);
     EventListener* ondblclick() const;
     void setOndblclick(PassRefPtr<EventListener>);
-    EventListener* onerror() const;
-    void setOnerror(PassRefPtr<EventListener>);
-    EventListener* onfocus() const;
-    void setOnfocus(PassRefPtr<EventListener>);
     EventListener* oninput() const;
     void setOninput(PassRefPtr<EventListener>);
     EventListener* onkeydown() const;
@@ -601,8 +606,6 @@ public:
     void setOnkeypress(PassRefPtr<EventListener>);
     EventListener* onkeyup() const;
     void setOnkeyup(PassRefPtr<EventListener>);
-    EventListener* onload() const;
-    void setOnload(PassRefPtr<EventListener>);
     EventListener* onmousedown() const;
     void setOnmousedown(PassRefPtr<EventListener>);
     EventListener* onmousemove() const;
@@ -615,18 +618,6 @@ public:
     void setOnmouseup(PassRefPtr<EventListener>);
     EventListener* onmousewheel() const;
     void setOnmousewheel(PassRefPtr<EventListener>);
-    EventListener* onbeforecut() const;
-    void setOnbeforecut(PassRefPtr<EventListener>);
-    EventListener* oncut() const;
-    void setOncut(PassRefPtr<EventListener>);
-    EventListener* onbeforecopy() const;
-    void setOnbeforecopy(PassRefPtr<EventListener>);
-    EventListener* oncopy() const;
-    void setOncopy(PassRefPtr<EventListener>);
-    EventListener* onbeforepaste() const;
-    void setOnbeforepaste(PassRefPtr<EventListener>);
-    EventListener* onpaste() const;
-    void setOnpaste(PassRefPtr<EventListener>);
     EventListener* ondragenter() const;
     void setOndragenter(PassRefPtr<EventListener>);
     EventListener* ondragover() const;
@@ -641,18 +632,33 @@ public:
     void setOndrag(PassRefPtr<EventListener>);
     EventListener* ondragend() const;
     void setOndragend(PassRefPtr<EventListener>);
-    EventListener* onreset() const;
-    void setOnreset(PassRefPtr<EventListener>);
-    EventListener* onresize() const;
-    void setOnresize(PassRefPtr<EventListener>);
     EventListener* onscroll() const;
     void setOnscroll(PassRefPtr<EventListener>);
-    EventListener* onsearch() const;
-    void setOnsearch(PassRefPtr<EventListener>);
     EventListener* onselect() const;
     void setOnselect(PassRefPtr<EventListener>);
+    EventListener* onsubmit() const;
+    void setOnsubmit(PassRefPtr<EventListener>);
+
+    // WebKit extensions
+    EventListener* onbeforecut() const;
+    void setOnbeforecut(PassRefPtr<EventListener>);
+    EventListener* oncut() const;
+    void setOncut(PassRefPtr<EventListener>);
+    EventListener* onbeforecopy() const;
+    void setOnbeforecopy(PassRefPtr<EventListener>);
+    EventListener* oncopy() const;
+    void setOncopy(PassRefPtr<EventListener>);
+    EventListener* onbeforepaste() const;
+    void setOnbeforepaste(PassRefPtr<EventListener>);
+    EventListener* onpaste() const;
+    void setOnpaste(PassRefPtr<EventListener>);
+    EventListener* onreset() const;
+    void setOnreset(PassRefPtr<EventListener>);
+    EventListener* onsearch() const;
+    void setOnsearch(PassRefPtr<EventListener>);
     EventListener* onselectstart() const;
     void setOnselectstart(PassRefPtr<EventListener>);
+#ifdef MANUAL_MERGE_REQUIRED
     EventListener* onsubmit() const;
     void setOnsubmit(PassRefPtr<EventListener>);
     EventListener* onunload() const;
@@ -667,6 +673,8 @@ public:
     EventListener* ontouchcancel() const;
     void setOntouchcancel(PassRefPtr<EventListener>);
 #endif
+#else // MANUAL_MERGE_REQUIRED
+#endif // MANUAL_MERGE_REQUIRED
 
     using TreeShared<Node>::ref;
     using TreeShared<Node>::deref;