Changeset 89950 in webkit

Timestamp:

Jun 28, 2011, 12:37:07 PM (15 years ago)

Author:

inferno@chromium.org

Message:

2011-06-28 Abhishek Arya <​inferno@chromium.org>

Reviewed by Anders Carlsson.

Split the string creation into a local (while creating text runs)
so that it is not destroyed prematurely.
​https://bugs.webkit.org/show_bug.cgi?id=63543

Run fast/forms/text-control-intrinsic-widths.html under valgrind/ASAN.

• rendering/RenderFileUploadControl.cpp: (WebCore::RenderFileUploadControl::computePreferredLogicalWidths): this one is just done for caution, in case, we don't do the same mistake when adding legacy rounding hacks option.
• rendering/RenderTextControl.cpp: (WebCore::RenderTextControl::getAvgCharWidth):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderFileUploadControl.cpp (modified) (1 diff)
• rendering/RenderTextControl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-28  Abhishek Arya  <inferno@chromium.org>
+
+        Reviewed by Anders Carlsson.
+
+        Split the string creation into a local (while creating text runs)
+        so that it is not destroyed prematurely.
+        https://bugs.webkit.org/show_bug.cgi?id=63543
+
+        Run fast/forms/text-control-intrinsic-widths.html under valgrind/ASAN.       
+        * rendering/RenderFileUploadControl.cpp:
+        (WebCore::RenderFileUploadControl::computePreferredLogicalWidths):
+        this one is just done for caution, in case, we don't do the same
+        mistake when adding legacy rounding hacks option.
+        * rendering/RenderTextControl.cpp:
+        (WebCore::RenderTextControl::getAvgCharWidth):
+
 2011-06-28  Greg Simon  <gregsimon@chromium.org>
 

trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp

@@ -160 +160 @@
         // (using "0" as the nominal character).
         const UChar ch = '0';
-        float charWidth = font.width(constructTextRun(this, font, String(&ch, 1), style, TextRun::AllowTrailingExpansion));
+        const String str = String(&ch, 1);
+        float charWidth = font.width(constructTextRun(this, font, str, style, TextRun::AllowTrailingExpansion));
         m_maxPreferredLogicalWidth = (int)ceilf(charWidth * defaultWidthNumChars);
     }

trunk/Source/WebCore/rendering/RenderTextControl.cpp

@@ -523 +523 @@
 
     const UChar ch = '0';
+    const String str = String(&ch, 1);
     const Font& font = style()->font();
-    TextRun textRun = constructTextRun(this, font, String(&ch, 1), style(), TextRun::AllowTrailingExpansion);
+    TextRun textRun = constructTextRun(this, font, str, style(), TextRun::AllowTrailingExpansion);
     textRun.disableRoundingHacks();
     return font.width(textRun);