Title: [235523] trunk
Revision
235523
Author
[email protected]
Date
2018-08-30 13:54:35 -0700 (Thu, 30 Aug 2018)

Log Message

Unreviewed, rolling out r235516.

Caused 50 Crashes on Sierra

Reverted changeset:

"The width of a nullptr TextRun should be zero"
https://bugs.webkit.org/show_bug.cgi?id=189154
https://trac.webkit.org/changeset/235516

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (235522 => 235523)


--- trunk/LayoutTests/ChangeLog	2018-08-30 20:47:30 UTC (rev 235522)
+++ trunk/LayoutTests/ChangeLog	2018-08-30 20:54:35 UTC (rev 235523)
@@ -1,3 +1,15 @@
+2018-08-30  Truitt Savell  <[email protected]>
+
+        Unreviewed, rolling out r235516.
+
+        Caused 50 Crashes on Sierra
+
+        Reverted changeset:
+
+        "The width of a nullptr TextRun should be zero"
+        https://bugs.webkit.org/show_bug.cgi?id=189154
+        https://trac.webkit.org/changeset/235516
+
 2018-08-30  Youenn Fablet  <[email protected]>
 
         Remove WebRTC legacy API implementation

Deleted: trunk/LayoutTests/fast/text/null-string-textrun-expected.txt (235522 => 235523)


--- trunk/LayoutTests/fast/text/null-string-textrun-expected.txt	2018-08-30 20:47:30 UTC (rev 235522)
+++ trunk/LayoutTests/fast/text/null-string-textrun-expected.txt	2018-08-30 20:54:35 UTC (rev 235523)
@@ -1,6 +0,0 @@
-This test confirms that a null text run doesn't trigger a crash. It passes if it loads without crashing.
-
-        
-        
-    
-

Deleted: trunk/LayoutTests/fast/text/null-string-textrun.html (235522 => 235523)


--- trunk/LayoutTests/fast/text/null-string-textrun.html	2018-08-30 20:47:30 UTC (rev 235522)
+++ trunk/LayoutTests/fast/text/null-string-textrun.html	2018-08-30 20:54:35 UTC (rev 235523)
@@ -1,19 +0,0 @@
-<!doctype html>
-<head>
-<script>
-if (window.testRunner)
-    testRunner.dumpAsText();
-</script>
-<head>
-<body>
-    <p>This test confirms that a null text run doesn't trigger a crash. It passes if it loads without crashing.</p>
-    <pre id="pre_tag" dir="RTL" >
-        <style _onload_="pre_tag.appendChild(meter_tag)"/></style>
-        <select multiple="multiple">
-            <optgroup/>
-        </select>
-    </pre>
-    <label>
-        <meter id="meter_tag">
-    </label>
-</body>
\ No newline at end of file

Modified: trunk/Source/WebCore/ChangeLog (235522 => 235523)


--- trunk/Source/WebCore/ChangeLog	2018-08-30 20:47:30 UTC (rev 235522)
+++ trunk/Source/WebCore/ChangeLog	2018-08-30 20:54:35 UTC (rev 235523)
@@ -1,3 +1,15 @@
+2018-08-30  Truitt Savell  <[email protected]>
+
+        Unreviewed, rolling out r235516.
+
+        Caused 50 Crashes on Sierra
+
+        Reverted changeset:
+
+        "The width of a nullptr TextRun should be zero"
+        https://bugs.webkit.org/show_bug.cgi?id=189154
+        https://trac.webkit.org/changeset/235516
+
 2018-08-30  Tim Horton  <[email protected]>
 
         Bundle unified sources more tightly in projects with deep directory structures

Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (235522 => 235523)


--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp	2018-08-30 20:47:30 UTC (rev 235522)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp	2018-08-30 20:54:35 UTC (rev 235523)
@@ -341,9 +341,6 @@
     ASSERT(from <= to);
     ASSERT(to <= run.length());
 
-    if (!run.length())
-        return 0;
-
     float offsetBeforeRange = 0;
     float offsetAfterRange = 0;
     float totalWidth = 0;
@@ -388,9 +385,6 @@
 
 float FontCascade::width(const TextRun& run, HashSet<const Font*>* fallbackFonts, GlyphOverflow* glyphOverflow) const
 {
-    if (!run.length())
-        return 0;
-
     CodePath codePathToUse = codePath(run);
     if (codePathToUse != Complex) {
         // The complex path is more restrictive about returning fallback fonts than the simple path, so we need an explicit test to make their behaviors match.
@@ -610,8 +604,6 @@
     if (s_codePath != Auto)
         return s_codePath;
 
-    ASSERT(run.length());
-
 #if !USE(FREETYPE)
     // FIXME: Use the fast code path once it handles partial runs with kerning and ligatures. See http://webkit.org/b/100050
     if ((enableKerning() || requiresShaping()) && (from.value_or(0) || to.value_or(run.length()) != run.length()))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to