summaryrefslogtreecommitdiff
path: root/Source/WebCore/rendering/RenderBox.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-07-18 13:59:13 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-07-18 13:59:28 +0200
commit4d6084feccab99c0a7b3ecef26bb49c41dd50201 (patch)
treefd1195897f551eee6d5a15d07ff5733b15aa2a5c /Source/WebCore/rendering/RenderBox.h
parentae901828d4689ab9e89113f6b6ea8042b37a9fda (diff)
downloadqtwebkit-4d6084feccab99c0a7b3ecef26bb49c41dd50201.tar.gz
Imported WebKit commit ff52235a78888e5cb8e286a828a8698042200e67 (http://svn.webkit.org/repository/webkit/trunk@122948)
New snapshot that should fix the rendering issues recently introduced
Diffstat (limited to 'Source/WebCore/rendering/RenderBox.h')
-rw-r--r--Source/WebCore/rendering/RenderBox.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/rendering/RenderBox.h b/Source/WebCore/rendering/RenderBox.h
index 064ed9191..488c58405 100644
--- a/Source/WebCore/rendering/RenderBox.h
+++ b/Source/WebCore/rendering/RenderBox.h
@@ -353,9 +353,9 @@ public:
LayoutUnit computePercentageLogicalHeight(const Length& height);
- // Block flows subclass availableWidth to handle multi column layout (shrinking the width available to children when laying out.)
+ // Block flows subclass availableWidth/Height to handle multi column layout (shrinking the width/height available to children when laying out.)
virtual LayoutUnit availableLogicalWidth() const { return contentLogicalWidth(); }
- LayoutUnit availableLogicalHeight() const;
+ virtual LayoutUnit availableLogicalHeight() const;
LayoutUnit availableLogicalHeightUsing(const Length&) const;
// There are a few cases where we need to refer specifically to the available physical width and available physical height.