Changeset 212482 in webkit

Timestamp:

Feb 16, 2017 3:58:34 PM (7 years ago)

Author:

Alan Bujtas

Message:

Simple line layout: Add forced line layout info to coverage print.
​https://bugs.webkit.org/show_bug.cgi?id=168470

Reviewed by Simon Fraser.

This is about potential vs. actual coverage:

Simple line layout potential coverage: 65.05%
Simple line layout actual coverage: 46.60%
Forced line layout blocks: 4 content length: 57(18.45%)

Not testable.

• rendering/SimpleLineLayout.cpp:

(WebCore::SimpleLineLayout::printSimpleLineLayoutCoverage):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/SimpleLineLayout.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-16  Zalan Bujtas  <zalan@apple.com>
+
+        Simple line layout: Add forced line layout info to coverage print.
+        https://bugs.webkit.org/show_bug.cgi?id=168470
+
+        Reviewed by Simon Fraser.
+
+        This is about potential vs. actual coverage:
+
+        Simple line layout potential coverage: 65.05%
+        Simple line layout actual coverage: 46.60%
+        Forced line layout blocks: 4 content length: 57(18.45%)
+
+        Not testable.
+
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::printSimpleLineLayoutCoverage):
+
 2017-02-16  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/rendering/SimpleLineLayout.cpp

@@ -1340 +1340 @@
     unsigned unsupportedTextLength = 0;
     unsigned numberOfUnsupportedLeafBlocks = 0;
+    unsigned supportedButForcedToLineLayoutTextLength = 0;
+    unsigned numberOfSupportedButForcedToLineLayoutLeafBlocks = 0;
     for (const auto* flow : leafRenderers) {
         auto flowLength = textLengthForSubtree(*flow);
         textLength += flowLength;
         auto reasons = canUseForWithReason(*flow, IncludeReasons::All);
-        if (reasons == NoReason)
+        if (reasons == NoReason) {
+            if (flow->lineLayoutPath() == RenderBlockFlow::ForceLineBoxesPath) {
+                supportedButForcedToLineLayoutTextLength += flowLength;
+                ++numberOfSupportedButForcedToLineLayoutLeafBlocks;
+            }
             continue;
+        }
         ++numberOfUnsupportedLeafBlocks;
         unsupportedTextLength += flowLength;
@@ -1357 +1364 @@
     }
     stream << "---------------------------------------------------\n";
-    stream << "Number of text blocks: total(" <<  leafRenderers.size() << ") non-simple(" << numberOfUnsupportedLeafBlocks << ")\nText length: total(" <<
+    stream << "Number of blocks: total(" <<  leafRenderers.size() << ") non-simple(" << numberOfUnsupportedLeafBlocks << ")\nContent length: total(" <<
         textLength << ") non-simple(" << unsupportedTextLength << ")\n";
     for (const auto reasonEntry : flowStatistics) {
@@ -1363 +1370 @@
         stream << ": " << (float)reasonEntry.value / (float)textLength * 100 << "%\n";
     }
-    stream << "simple line layout coverage: " << (float)(textLength - unsupportedTextLength) / (float)textLength * 100 << "%\n";
-    stream << "---------------------------------------------------\n";
+    if (supportedButForcedToLineLayoutTextLength) {
+        stream << "Simple line layout potential coverage: " << (float)(textLength - unsupportedTextLength) / (float)textLength * 100 << "%\n\n";
+        stream << "Simple line layout actual coverage: " << (float)(textLength - unsupportedTextLength - supportedButForcedToLineLayoutTextLength) / (float)textLength * 100 << "%\nForced line layout blocks: " << numberOfSupportedButForcedToLineLayoutLeafBlocks << " content length: " << supportedButForcedToLineLayoutTextLength << "(" << (float)supportedButForcedToLineLayoutTextLength / (float)textLength * 100 << "%)";
+    } else
+        stream << "Simple line layout coverage: " << (float)(textLength - unsupportedTextLength) / (float)textLength * 100 << "%";
+    stream << "\n---------------------------------------------------\n";
     WTFLogAlways("%s", stream.release().utf8().data());
 }