Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)

Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

1 files changed, 13 insertions, 23 deletions

diff --git a/Source/WebCore/rendering/AutoTableLayout.h b/Source/WebCore/rendering/AutoTableLayout.h
index a1fdad048..ce108ad90 100644
--- a/Source/WebCore/rendering/AutoTableLayout.h
+++ b/Source/WebCore/rendering/AutoTableLayout.h
@@ -31,42 +31,32 @@ namespace WebCore {
 class RenderTable;
 class RenderTableCell;
 
-class AutoTableLayout : public TableLayout {
+class AutoTableLayout final : public TableLayout {
 public:
-    AutoTableLayout(RenderTable*);
-    ~AutoTableLayout();
+    explicit AutoTableLayout(RenderTable*);
+    virtual ~AutoTableLayout();
 
-    virtual void computeIntrinsicLogicalWidths(LayoutUnit& minWidth, LayoutUnit& maxWidth) OVERRIDE;
-    virtual void applyPreferredLogicalWidthQuirks(LayoutUnit& minWidth, LayoutUnit& maxWidth) const OVERRIDE;
-    virtual void layout();
+    virtual void computeIntrinsicLogicalWidths(LayoutUnit& minWidth, LayoutUnit& maxWidth) override;
+    virtual void applyPreferredLogicalWidthQuirks(LayoutUnit& minWidth, LayoutUnit& maxWidth) const override;
+    virtual void layout() override;
 
 private:
     void fullRecalc();
     void recalcColumn(unsigned effCol);
 
-    int calcEffectiveLogicalWidth();
+    float calcEffectiveLogicalWidth();
 
     void insertSpanCell(RenderTableCell*);
 
     struct Layout {
-        Layout()
-            : minLogicalWidth(0)
-            , maxLogicalWidth(0)
-            , effectiveMinLogicalWidth(0)
-            , effectiveMaxLogicalWidth(0)
-            , computedLogicalWidth(0)
-            , emptyCellsOnly(true)
-        {
-        }
-
         Length logicalWidth;
         Length effectiveLogicalWidth;
-        int minLogicalWidth;
-        int maxLogicalWidth;
-        int effectiveMinLogicalWidth;
-        int effectiveMaxLogicalWidth;
-        int computedLogicalWidth;
-        bool emptyCellsOnly;
+        float minLogicalWidth { 0 };
+        float maxLogicalWidth { 0 };
+        float effectiveMinLogicalWidth { 0 };
+        float effectiveMaxLogicalWidth { 0 };
+        float computedLogicalWidth { 0 };
+        bool emptyCellsOnly { true };
     };
 
     Vector<Layout, 4> m_layoutStruct;