Changeset 112472 in webkit

Timestamp:

Mar 28, 2012 4:41:42 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

SL bot is hitting SHOULD NEVER BE REACHED in WebCore::valueForLength() on many tests
​https://bugs.webkit.org/show_bug.cgi?id=82390

Patch by Joe Thomas <​joethomas@motorola.com> on 2012-03-28
Reviewed by Simon Fraser.

This is an attempt to fix the MAC SL/Lion Bot issue as this issue is not reproducible locally.
The assertion happened when length type is Undefined in valueForLength() function but the assertion for Undefined length type
in RenderBox::computeLogicalWidthInRegionUsing which calls the above said function did not get hit.

This patch passes Length structure as const reference to Length calculation functions which avoids the call to the copy-constructor.
And it ensures that the Length structure is not getting modified during copy-construction.

• css/LengthFunctions.cpp:

(WebCore::minimumValueForLength):
(WebCore::valueForLength):
(WebCore::floatValueForLength):

• css/LengthFunctions.h:

(WebCore):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/LengthFunctions.cpp (modified) (4 diffs)
• css/LengthFunctions.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-28  Joe Thomas  <joethomas@motorola.com>
+
+        SL bot is hitting SHOULD NEVER BE REACHED in WebCore::valueForLength() on many tests
+        https://bugs.webkit.org/show_bug.cgi?id=82390
+
+        Reviewed by Simon Fraser.
+
+        This is an attempt to fix the MAC SL/Lion Bot issue as this issue is not reproducible locally.
+        The assertion happened when length type is Undefined in valueForLength() function but the assertion for Undefined length type
+        in RenderBox::computeLogicalWidthInRegionUsing which calls the above said function did not get hit.
+
+        This patch passes Length structure as const reference to Length calculation functions which avoids the call to the copy-constructor.
+        And it ensures that the Length structure is not getting modified during copy-construction. 
+
+        * css/LengthFunctions.cpp:
+        (WebCore::minimumValueForLength):
+        (WebCore::valueForLength):
+        (WebCore::floatValueForLength):
+        * css/LengthFunctions.h:
+        (WebCore):
+
 2012-03-28  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/WebCore/css/LengthFunctions.cpp

@@ -30 +30 @@
 namespace WebCore {
 
-int minimumValueForLength(Length length, int maximumValue, RenderView* renderView, bool roundPercentages)
+int minimumValueForLength(const Length& length, int maximumValue, RenderView* renderView, bool roundPercentages)
 {
     switch (length.type()) {
@@ -69 +69 @@
 }
 
-int valueForLength(Length length, int maximumValue, RenderView* renderView, bool roundPercentages)
+int valueForLength(const Length& length, int maximumValue, RenderView* renderView, bool roundPercentages)
 {
     switch (length.type()) {
@@ -97 +97 @@
 
 // FIXME: when subpixel layout is supported this copy of floatValueForLength() can be removed. See bug 71143.
-float floatValueForLength(Length length, int maximumValue, RenderView* renderView)
+float floatValueForLength(const Length& length, int maximumValue, RenderView* renderView)
 {
     switch (length.type()) {
@@ -133 +133 @@
 }
 
-float floatValueForLength(Length length, float maximumValue, RenderView* renderView)
+float floatValueForLength(const Length& length, float maximumValue, RenderView* renderView)
 {
     switch (length.type()) {

trunk/Source/WebCore/css/LengthFunctions.h

@@ -30 +30 @@
 struct Length;
 
-int minimumValueForLength(Length, int maximumValue, RenderView* = 0, bool roundPercentages = false);
-int valueForLength(Length, int maximumValue, RenderView* = 0, bool roundPercentages = false);
-float floatValueForLength(Length, int maximumValue, RenderView* = 0);
-float floatValueForLength(Length, float maximumValue, RenderView* = 0);
+int minimumValueForLength(const Length&, int maximumValue, RenderView* = 0, bool roundPercentages = false);
+int valueForLength(const Length&, int maximumValue, RenderView* = 0, bool roundPercentages = false);
+float floatValueForLength(const Length&, int maximumValue, RenderView* = 0);
+float floatValueForLength(const Length&, float maximumValue, RenderView* = 0);
 
 } // namespace WebCore