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

Source/WebCore/xml/parser/XMLDocumentParserQt.cpp

 /*
  * Copyright (C) 2000 Peter Kelly (pmk@post.com)
  * Copyright (C) 2005, 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2007 Samuel Weinig (sam@webkit.org)
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008 Holger Hans Peter Freyther
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 49 matching lines @@
 #include <wtf/Vector.h>
 #include <wtf/text/CString.h>
 
 using namespace std;
 
 namespace WebCore {
 
 static inline void setAttributes(Element* element, Vector<Attribute>& attributeVector, ParserContentPolicy parserContentPolicy)
 {
     if (!scriptingContentIsAllowed(parserContentPolicy))
-        element->stripJavaScriptAttributes(attributeVector);
+        element->stripScriptingAttributes(attributeVector);
     element->parserSetAttributes(attributeVector);
 }
 
 class EntityResolver : public QXmlStreamEntityResolver {
     virtual QString resolveUndeclaredEntity(const QString &name);
 };
 
 static QString decodeNamedEntity(const QString& entityName)
 {
     UChar utf16DecodedEntity[4];
@@ skipping 567 matching lines @@
         || (publicId == QLatin1String("-//WAPFORUM//DTD XHTML Mobile 1.0//EN"))
         || (publicId == QLatin1String("-//WAPFORUM//DTD XHTML Mobile 1.1//EN"))
         || (publicId == QLatin1String("-//WAPFORUM//DTD XHTML Mobile 1.2//EN"))
        )
         setIsXHTMLDocument(true); // controls if we replace entities or not.
     if (!m_parsingFragment)
         document()->parserAppendChild(DocumentType::create(document(), name, publicId, systemId));
 
 }
 }