Unreviewed, rolling out r215366.
authorryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Apr 2017 16:37:26 +0000 (16:37 +0000)
committerryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Apr 2017 16:37:26 +0000 (16:37 +0000)
This test is failing on performance bots.

Reverted changeset:

"Add performance test for asking the platform for a font for
U+2060 WORD JOINER"
https://bugs.webkit.org/show_bug.cgi?id=170842
http://trac.webkit.org/changeset/215366

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@215417 268f45cc-cd09-0410-ab3c-d52691b4dbfc

PerformanceTests/ChangeLog
PerformanceTests/Layout/word-joiner.html [deleted file]
Source/WTF/ChangeLog
Source/WTF/wtf/unicode/CharacterNames.h
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/WidthCache.h

index 8860b04..0ba54b6 100644 (file)
@@ -1,3 +1,16 @@
+2017-04-17  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r215366.
+
+        This test is failing on performance bots.
+
+        Reverted changeset:
+
+        "Add performance test for asking the platform for a font for
+        U+2060 WORD JOINER"
+        https://bugs.webkit.org/show_bug.cgi?id=170842
+        http://trac.webkit.org/changeset/215366
+
 2017-04-14  Myles C. Maxfield  <mmaxfield@apple.com>
 
         Add performance test for asking the platform for a font for U+2060 WORD JOINER
diff --git a/PerformanceTests/Layout/word-joiner.html b/PerformanceTests/Layout/word-joiner.html
deleted file mode 100644 (file)
index eedceb5..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src="../resources/runner.js"></script>
-</head>
-</head>
-<body>
-    <pre id="log"></pre>
-    <div id="target" style="width: 300px; display: block; font-family: 'Zapfino';">
-    </div>
-    <script>
-        var target = document.getElementById("target");
-        var style = target.style;
-        var locales = ["ar", "hy", "as", "iu", "ab", "hi", "am", "ka", "el", "gu", "pa", "ko", "ko", "he", "kn", "ja", "km", "lo", "aa", "ml", "my", "or", "si", "ta", "te", "dv", "th", "bo", "zh_hk", "ii"];
-
-        for (var i = 0; i < locales.length; ++i) {
-            var span = document.createElement("span");
-            span.className = "tester";
-            var joiner = document.createTextNode(String.fromCharCode(0x2060));
-            span.appendChild(joiner);
-            target.appendChild(span);
-        }
-
-        function updateLanguages() {
-            if (window.internals)
-                internals.invalidateFontCache();
-            var testers = document.getElementsByClassName("tester");
-            for (var i = 0; i < testers.length; ++i) {
-                testers[i].lang = locales[i];
-            }
-        }
-        
-        updateLanguages();
-
-        function test() {
-            updateLanguages();
-            var testers = document.getElementsByClassName("tester");
-            testers[testers.length - 1].getClientRects();
-        }
-
-        PerfTestRunner.measureRunsPerSecond({ run: test });
-    </script>
-</body>
-</html>
\ No newline at end of file
index e9e6920..9ccb494 100644 (file)
@@ -1,3 +1,16 @@
+2017-04-17  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r215366.
+
+        This test is failing on performance bots.
+
+        Reverted changeset:
+
+        "Add performance test for asking the platform for a font for
+        U+2060 WORD JOINER"
+        https://bugs.webkit.org/show_bug.cgi?id=170842
+        http://trac.webkit.org/changeset/215366
+
 2017-04-17  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         [JSCOnly] Fix build failures in macOS
index 1bdd060..1c415be 100644 (file)
@@ -92,7 +92,6 @@ const UChar whiteBullet = 0x25E6;
 const UChar whiteCircle = 0x25CB;
 const UChar whiteSesameDot = 0xFE46;
 const UChar whiteUpPointingTriangle = 0x25B3;
-const UChar wordJoiner = 0x2060;
 const UChar yenSign = 0x00A5;
 const UChar zeroWidthJoiner = 0x200D;
 const UChar zeroWidthNoBreakSpace = 0xFEFF;
@@ -155,7 +154,6 @@ using WTF::Unicode::whiteBullet;
 using WTF::Unicode::whiteCircle;
 using WTF::Unicode::whiteSesameDot;
 using WTF::Unicode::whiteUpPointingTriangle;
-using WTF::Unicode::wordJoiner;
 using WTF::Unicode::yenSign;
 using WTF::Unicode::zeroWidthJoiner;
 using WTF::Unicode::zeroWidthNoBreakSpace;
index 27ed661..da42535 100644 (file)
@@ -1,3 +1,16 @@
+2017-04-17  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r215366.
+
+        This test is failing on performance bots.
+
+        Reverted changeset:
+
+        "Add performance test for asking the platform for a font for
+        U+2060 WORD JOINER"
+        https://bugs.webkit.org/show_bug.cgi?id=170842
+        http://trac.webkit.org/changeset/215366
+
 2017-04-17  Youenn Fablet  <youenn@apple.com>
 
         RTCPeerConnection addTrack does not require a stream parameter
index b5ad561..4909409 100644 (file)
@@ -140,22 +140,22 @@ public:
             return nullptr;
         // The width cache is not really profitable unless we're doing expensive glyph transformations.
         if (!hasKerningOrLigatures)
-            return nullptr;
+            return 0;
         // Word spacing and letter spacing can change the width of a word.
         if (hasWordSpacingOrLetterSpacing)
-            return nullptr;
+            return 0;
         // Since this is just a width cache, we don't have enough information to satisfy glyph queries.
         if (glyphOverflow)
-            return nullptr;
+            return 0;
         // If we allow tabs and a tab occurs inside a word, the width of the word varies based on its position on the line.
         if (run.allowTabs())
-            return nullptr;
+            return 0;
         if (static_cast<unsigned>(run.length()) > SmallStringKey::capacity())
-            return nullptr;
+            return 0;
 
         if (m_countdown > 0) {
             --m_countdown;
-            return nullptr;
+            return 0;
         }
 
         return addSlowCase(run.text(), entry);
@@ -207,7 +207,7 @@ private:
         // No need to be fancy: we're just trying to avoid pathological growth.
         m_singleCharMap.clear();
         m_map.clear();
-        return nullptr;
+        return 0;
     }
 
     typedef HashMap<SmallStringKey, float, SmallStringKeyHash, SmallStringKeyHashTraits> Map;