Merge 147281 "Cross-Origin copy&paste / drag&drop allowing XSS v..."

Source/WebCore/dom/Element.h

Index: Source/WebCore/dom/Element.h
===================================================================
--- Source/WebCore/dom/Element.h	(revision 148876)
+++ Source/WebCore/dom/Element.h	(working copy)
@@ -380,7 +380,8 @@
     // Only called by the parser immediately after element construction.
     void parserSetAttributes(const Vector<Attribute>&);
 
-    void stripJavaScriptAttributes(Vector<Attribute>&);
+    // Remove attributes that might introduce scripting from the vector leaving the element unchanged.
+    void stripScriptingAttributes(Vector<Attribute>&) const;
 
     const ElementData* elementData() const { return m_elementData.get(); }
     UniqueElementData* ensureUniqueElementData();
@@ -454,6 +455,7 @@
     virtual void accessKeyAction(bool /*sendToAnyEvent*/) { }
 
     virtual bool isURLAttribute(const Attribute&) const { return false; }
+    virtual bool isHTMLContentAttribute(const Attribute&) const { return false; }
 
     KURL getURLAttribute(const QualifiedName&) const;
     KURL getNonEmptyURLAttribute(const QualifiedName&) const;
@@ -726,8 +728,7 @@
 
     void createRendererIfNeeded();
 
-    bool isJavaScriptAttribute(const Attribute&);
-    bool isJavaScriptURLAttribute(const Attribute&);
+    bool isJavaScriptURLAttribute(const Attribute&) const;
 
     RefPtr<ElementData> m_elementData;
 };