Changeset 129174 in webkit

Timestamp:

Sep 20, 2012 4:11:16 PM (12 years ago)

Author:

tony@chromium.org

Message:

Replace RenderListBox::updateLogicalHeight with RenderListBox::computeLogicalHeight
​https://bugs.webkit.org/show_bug.cgi?id=97263

Reviewed by Ojan Vafai.

This is part of making computeLogicalHeight virtual so with any RenderBox pointer, one
can compute the logical height without mutating the RenderBox.

No new tests, this is a refactor and existing list box tests should pass.

• rendering/RenderBox.h:

(RenderBox):

• rendering/RenderListBox.cpp:

(WebCore::RenderListBox::layout): Move layout related logic here.
(WebCore::RenderListBox::computeLogicalHeight): Use const version and remove layout related code.

• rendering/RenderListBox.h:

(RenderListBox): Override computeLogicalHeight.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBox.h (modified) (1 diff)
• rendering/RenderListBox.cpp (modified) (2 diffs)
• rendering/RenderListBox.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-20  Tony Chang  <tony@chromium.org>
+
+        Replace RenderListBox::updateLogicalHeight with RenderListBox::computeLogicalHeight
+        https://bugs.webkit.org/show_bug.cgi?id=97263
+
+        Reviewed by Ojan Vafai.
+
+        This is part of making computeLogicalHeight virtual so with any RenderBox pointer, one
+        can compute the logical height without mutating the RenderBox.
+
+        No new tests, this is a refactor and existing list box tests should pass.
+
+        * rendering/RenderBox.h:
+        (RenderBox):
+        * rendering/RenderListBox.cpp:
+        (WebCore::RenderListBox::layout): Move layout related logic here.
+        (WebCore::RenderListBox::computeLogicalHeight): Use const version and remove layout related code.
+        * rendering/RenderListBox.h:
+        (RenderListBox): Override computeLogicalHeight.
+
 2012-09-20  Mike West  <mkwst@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBox.h

@@ -367 +367 @@
     virtual void updateLogicalWidth();
     virtual void updateLogicalHeight();
-    void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const;
+    virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const;
 
     RenderBoxRegionInfo* renderBoxRegionInfo(RenderRegion*, LayoutUnit offsetFromLogicalTopOfFirstPage, RenderBoxRegionInfoFlags = CacheRenderBoxRegionInfo) const;

trunk/Source/WebCore/rendering/RenderListBox.cpp

@@ -174 +174 @@
 {
     RenderBlock::layout();
+
+    if (m_vBar) {
+        bool enabled = numVisibleItems() < numItems();
+        m_vBar->setEnabled(enabled);
+        m_vBar->setSteps(1, max(1, numVisibleItems() - 1), itemHeight());
+        m_vBar->setProportion(numVisibleItems(), numItems());
+        if (!enabled) {
+            scrollToOffsetWithoutAnimation(VerticalScrollbar, 0);
+            m_indexOffset = 0;
+        }
+    }
+
     if (m_scrollToRevealSelectionAfterLayout) {
         LayoutStateDisabler layoutStateDisabler(view());
@@ -251 +263 @@
 }
 
-void RenderListBox::updateLogicalHeight()
-{
-    int toAdd = borderAndPaddingHeight();
- 
-    int itemHeight = RenderListBox::itemHeight();
-    setHeight(itemHeight * size() - rowSpacing + toAdd);
-    
-    RenderBlock::updateLogicalHeight();
-    
-    if (m_vBar) {
-        bool enabled = numVisibleItems() < numItems();
-        m_vBar->setEnabled(enabled);
-        m_vBar->setSteps(1, max(1, numVisibleItems() - 1), itemHeight);
-        m_vBar->setProportion(numVisibleItems(), numItems());
-        if (!enabled) {
-            scrollToOffsetWithoutAnimation(VerticalScrollbar, 0);
-            m_indexOffset = 0;
-        }
-    }
+void RenderListBox::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
+{
+    LayoutUnit height = itemHeight() * size() - rowSpacing + borderAndPaddingHeight();
+    RenderBox::computeLogicalHeight(height, logicalTop, computedValues);
 }
 

trunk/Source/WebCore/rendering/RenderListBox.h

@@ -78 +78 @@
     virtual void computePreferredLogicalWidths();
     virtual LayoutUnit baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
-    virtual void updateLogicalHeight() OVERRIDE;
+    virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE;
 
     virtual void layout();