Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/Source/WebCore/html/HTMLTableCellElement.cpp b/Source/WebCore/html/HTMLTableCellElement.cpp
index 71cbb9969..d12cae120 100644
--- a/Source/WebCore/html/HTMLTableCellElement.cpp
+++ b/Source/WebCore/html/HTMLTableCellElement.cpp
@@ -85,24 +85,24 @@ bool HTMLTableCellElement::isPresentationAttribute(const QualifiedName& name) co
     return HTMLTablePartElement::isPresentationAttribute(name);
 }
 
-void HTMLTableCellElement::collectStyleForPresentationAttribute(const Attribute& attribute, StylePropertySet* style)
+void HTMLTableCellElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet* style)
 {
-    if (attribute.name() == nowrapAttr) {
+    if (name == nowrapAttr)
         addPropertyToPresentationAttributeStyle(style, CSSPropertyWhiteSpace, CSSValueWebkitNowrap);
-    } else if (attribute.name() == widthAttr) {
-        if (!attribute.value().isEmpty()) {
-            int widthInt = attribute.value().toInt();
+    else if (name == widthAttr) {
+        if (!value.isEmpty()) {
+            int widthInt = value.toInt();
             if (widthInt > 0) // width="0" is ignored for compatibility with WinIE.
-                addHTMLLengthToStyle(style, CSSPropertyWidth, attribute.value());
+                addHTMLLengthToStyle(style, CSSPropertyWidth, value);
         }
-    } else if (attribute.name() == heightAttr) {
-        if (!attribute.value().isEmpty()) {
-            int heightInt = attribute.value().toInt();
+    } else if (name == heightAttr) {
+        if (!value.isEmpty()) {
+            int heightInt = value.toInt();
             if (heightInt > 0) // height="0" is ignored for compatibility with WinIE.
-                addHTMLLengthToStyle(style, CSSPropertyHeight, attribute.value());
+                addHTMLLengthToStyle(style, CSSPropertyHeight, value);
         }
     } else
-        HTMLTablePartElement::collectStyleForPresentationAttribute(attribute, style);
+        HTMLTablePartElement::collectStyleForPresentationAttribute(name, value, style);
 }
 
 void HTMLTableCellElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
@@ -186,13 +186,13 @@ HTMLTableCellElement* HTMLTableCellElement::cellAbove() const
 
 HTMLTableCellElement* toHTMLTableCellElement(Node* node)
 {
-    ASSERT(!node || node->hasTagName(HTMLNames::tdTag) || node->hasTagName(HTMLNames::thTag));
+    ASSERT_WITH_SECURITY_IMPLICATION(!node || node->hasTagName(HTMLNames::tdTag) || node->hasTagName(HTMLNames::thTag));
     return static_cast<HTMLTableCellElement*>(node);
 }
 
 const HTMLTableCellElement* toHTMLTableCellElement(const Node* node)
 {
-    ASSERT(!node || node->hasTagName(HTMLNames::tdTag) || node->hasTagName(HTMLNames::thTag));
+    ASSERT_WITH_SECURITY_IMPLICATION(!node || node->hasTagName(HTMLNames::tdTag) || node->hasTagName(HTMLNames::thTag));
     return static_cast<const HTMLTableCellElement*>(node);
 }