Changeset 114537 in webkit

Timestamp:

Apr 18, 2012 11:31:35 AM (12 years ago)

Author:

eae@chromium.org

Message:

Use explicit casts for size_t to unsigned conversion
​https://bugs.webkit.org/show_bug.cgi?id=83602

Reviewed by Eric Seidel.

No new tests, no change in functinality.

Not all platforms have implicit casts from size_t to unsigned and we
can't add size_t versions of the operators to FractionalLayoutUnit for
all platforms as it would conflict with the unsigned versions of same.

Change support methods to take unsigned instead of size_t and use
explicit casts when multiplying or dividing a FractionalLayoutUnit with
a size_t and the other way around.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::adjustForColumns):

• rendering/RenderFlexibleBox.cpp:

(WebCore::initialPackingOffset):
(WebCore::packingSpaceBetweenChildren):
(WebCore::initialLinePackingOffset):
(WebCore::linePackingSpaceBetweenChildren):
(WebCore::RenderFlexibleBox::packFlexLines):

• rendering/RenderFrameSet.cpp:

(WebCore::RenderFrameSet::layout):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderFlexibleBox.cpp (modified) (6 diffs)
• rendering/RenderFrameSet.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-18  Emil A Eklund  <eae@chromium.org>
+
+        Use explicit casts for size_t to unsigned conversion
+        https://bugs.webkit.org/show_bug.cgi?id=83602
+
+        Reviewed by Eric Seidel.
+
+        No new tests, no change in functinality.
+
+        Not all platforms have implicit casts from size_t to unsigned and we
+        can't add size_t versions of the operators to FractionalLayoutUnit for
+        all platforms as it would conflict with the unsigned versions of same.
+
+        Change support methods to take unsigned instead of size_t and use
+        explicit casts when multiplying or dividing a FractionalLayoutUnit with
+        a size_t and the other way around.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::adjustForColumns):
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::initialPackingOffset):
+        (WebCore::packingSpaceBetweenChildren):
+        (WebCore::initialLinePackingOffset):
+        (WebCore::linePackingSpaceBetweenChildren):
+        (WebCore::RenderFlexibleBox::packFlexLines):
+        * rendering/RenderFrameSet.cpp:
+        (WebCore::RenderFrameSet::layout):
+
 2012-04-18  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -5177 +5177 @@
 
     LayoutUnit logicalLeft = logicalLeftOffsetForContent();
-    size_t colCount = columnCount(colInfo);
+    unsigned colCount = columnCount(colInfo);
     LayoutUnit colLogicalWidth = colInfo->desiredColumnWidth();
     LayoutUnit colLogicalHeight = colInfo->columnHeight();
 
-    for (size_t i = 0; i < colCount; ++i) {
+    for (unsigned i = 0; i < colCount; ++i) {
         // Compute the edges for a given column in the block progression direction.
         LayoutRect sliceRect = LayoutRect(logicalLeft, borderBefore() + paddingBefore() + i * colLogicalHeight, colLogicalWidth, colLogicalHeight);

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -807 +807 @@
 }
 
-static LayoutUnit initialPackingOffset(LayoutUnit availableFreeSpace, EFlexPack flexPack, size_t numberOfChildren)
+static LayoutUnit initialPackingOffset(LayoutUnit availableFreeSpace, EFlexPack flexPack, unsigned numberOfChildren)
 {
     if (flexPack == PackEnd)
@@ -822 +822 @@
 }
 
-static LayoutUnit packingSpaceBetweenChildren(LayoutUnit availableFreeSpace, EFlexPack flexPack, size_t numberOfChildren)
+static LayoutUnit packingSpaceBetweenChildren(LayoutUnit availableFreeSpace, EFlexPack flexPack, unsigned numberOfChildren)
 {
     if (availableFreeSpace > 0 && numberOfChildren > 1) {
@@ -970 +970 @@
 }
 
-static LayoutUnit initialLinePackingOffset(LayoutUnit availableFreeSpace, EFlexLinePack linePack, size_t numberOfLines)
+static LayoutUnit initialLinePackingOffset(LayoutUnit availableFreeSpace, EFlexLinePack linePack, unsigned numberOfLines)
 {
     if (linePack == LinePackEnd)
@@ -985 +985 @@
 }
 
-static LayoutUnit linePackingSpaceBetweenChildren(LayoutUnit availableFreeSpace, EFlexLinePack linePack, size_t numberOfLines)
+static LayoutUnit linePackingSpaceBetweenChildren(LayoutUnit availableFreeSpace, EFlexLinePack linePack, unsigned numberOfLines)
 {
     if (availableFreeSpace > 0 && numberOfLines > 1) {
@@ -1007 +1007 @@
     RenderBox* child = iterator.first();
     LayoutUnit lineOffset = initialLinePackingOffset(availableCrossAxisSpace, style()->flexLinePack(), lineContexts.size());
-    for (size_t lineNumber = 0; lineNumber < lineContexts.size(); ++lineNumber) {
+    for (unsigned lineNumber = 0; lineNumber < lineContexts.size(); ++lineNumber) {
         lineContexts[lineNumber].crossAxisOffset += lineOffset;
         for (size_t childNumber = 0; childNumber < lineContexts[lineNumber].numberOfChildren; ++childNumber, child = iterator.next())
@@ -1013 +1013 @@
 
         if (style()->flexLinePack() == LinePackStretch && availableCrossAxisSpace > 0)
-            lineContexts[lineNumber].crossAxisExtent += availableCrossAxisSpace / lineContexts.size();
+            lineContexts[lineNumber].crossAxisExtent += availableCrossAxisSpace / static_cast<unsigned>(lineContexts.size());
 
         lineOffset += linePackingSpaceBetweenChildren(availableCrossAxisSpace, style()->flexLinePack(), lineContexts.size());

trunk/Source/WebCore/rendering/RenderFrameSet.cpp

@@ -473 +473 @@
     }
 
-    size_t cols = frameSet()->totalCols();
-    size_t rows = frameSet()->totalRows();
+    unsigned cols = frameSet()->totalCols();
+    unsigned rows = frameSet()->totalRows();
 
     if (m_rows.m_sizes.size() != rows || m_cols.m_sizes.size() != cols) {