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, 5 insertions, 4 deletions

diff --git a/Source/WebCore/rendering/RenderTableCol.h b/Source/WebCore/rendering/RenderTableCol.h
index a091a9399..c93b01922 100644
--- a/Source/WebCore/rendering/RenderTableCol.h
+++ b/Source/WebCore/rendering/RenderTableCol.h
@@ -35,7 +35,7 @@ class RenderTableCell;
 
 class RenderTableCol : public RenderBox {
 public:
-    explicit RenderTableCol(Node*);
+    explicit RenderTableCol(Element*);
 
     RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
     RenderObject* lastChild() const { ASSERT(children() == virtualChildren()); return children()->lastChild(); }
@@ -43,7 +43,7 @@ public:
     const RenderObjectChildList* children() const { return &m_children; }
     RenderObjectChildList* children() { return &m_children; }
 
-    virtual void computePreferredLogicalWidths();
+    void clearPreferredLogicalWidthsDirtyBits();
 
     unsigned span() const { return m_span; }
     void setSpan(unsigned span) { m_span = span; }
@@ -83,6 +83,7 @@ private:
     virtual const char* renderName() const { return "RenderTableCol"; }
     virtual bool isRenderTableCol() const OVERRIDE { return true; }
     virtual void updateFromElement();
+    virtual void computePreferredLogicalWidths() OVERRIDE { ASSERT_NOT_REACHED(); }
 
     virtual void insertedIntoTree() OVERRIDE;
     virtual void willBeRemovedFromTree() OVERRIDE;
@@ -104,13 +105,13 @@ private:
 
 inline RenderTableCol* toRenderTableCol(RenderObject* object)
 {
-    ASSERT(!object || object->isRenderTableCol());
+    ASSERT_WITH_SECURITY_IMPLICATION(!object || object->isRenderTableCol());
     return static_cast<RenderTableCol*>(object);
 }
 
 inline const RenderTableCol* toRenderTableCol(const RenderObject* object)
 {
-    ASSERT(!object || object->isRenderTableCol());
+    ASSERT_WITH_SECURITY_IMPLICATION(!object || object->isRenderTableCol());
     return static_cast<const RenderTableCol*>(object);
 }