Merge pull request #488 from openwebf/revert-434-feat/empty_fix

Revert "fix: fix :empty selector."
openwebf · Sep 20, 2023 · 040c646 · 040c646
2 parents 1cc8a36 + 976a2ba
commit 040c646
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 66 deletions.
diff --git a/bridge/core/html/parser/html_parser.cc b/bridge/core/html/parser/html_parser.cc
@@ -5,7 +5,6 @@
 
 #include <utility>
 
-#include "core/dom/comment.h"
 #include "core/dom/document.h"
 #include "core/dom/element.h"
 #include "core/dom/text.h"
@@ -93,23 +92,6 @@ void HTMLParser::traverseHTML(Node* root_node, GumboNode* node) {
       } else if (child->type == GUMBO_NODE_TEXT) {
         auto* text = context->document()->createTextNode(AtomicString(ctx, child->v.text.text), ASSERT_NO_EXCEPTION());
         root_container->AppendChild(text);
-      } else if (child->type == GUMBO_NODE_WHITESPACE) {
-        bool isBlankSpace = true;
-        int nLen = strlen(child->v.text.text);
-        for (int j = 0; j < nLen; ++j) {
-          isBlankSpace = child->v.text.text[j] == ' ';
-          if (!isBlankSpace) {
-            break;
-          }
-        }
-
-        if (isBlankSpace) {
-          if (nLen > 0) {
-            auto* textNode =
-                context->document()->createTextNode(AtomicString(ctx, child->v.text.text), ASSERT_NO_EXCEPTION());
-            root_container->appendChild(textNode, ASSERT_NO_EXCEPTION());
-          }
-        }
       }
     }
   }

diff --git a/integration_tests/scripts/html_loader.js b/integration_tests/scripts/html_loader.js
@@ -51,10 +51,14 @@ const loader = function(source) {
     }
   })
 
+  const htmlString = root.toString().replace(/['\n]/g, function(c){
+    return {'\n': '','\'': '\\'}[c];
+  });
+
   return `
     describe('HTMLSpec/${testRelativePath}', () => {
       // Use html_parse to parser html in html file.
-      const html_parse = () => __webf_parse_html__(\`${root.toString()}\`);
+      const html_parse = () => __webf_parse_html__(\`${htmlString}\`);
       var index = 0;
       const snapshotAction = async () => { await snapshot(null, '${snapshotFilepath}', ${scripts.length === 0 ? 'null' : 'index.toString()'}); index++; };
       ${isFit ? 'fit' : isXit ? 'xit' : 'it'}("should work", async (done) => {\

diff --git a/integration_tests/snapshots/css/css-empty/empty.html.6ddf1fc01.png b/integration_tests/snapshots/css/css-empty/empty.html.6ddf1fc01.png
diff --git a/integration_tests/specs/css/css-box/margin_collapse-001-manual.html b/integration_tests/specs/css/css-box/margin_collapse-001-manual.html
@@ -50,5 +50,6 @@
 </body>
 <script>
   await snapshotAction();
+  await sleep(0.1);
 </script>
 </html>
diff --git a/integration_tests/specs/css/css-empty/empty.html b/integration_tests/specs/css/css-empty/empty.html
diff --git a/webf/lib/src/css/query_selector.dart b/webf/lib/src/css/query_selector.dart
@@ -183,9 +183,7 @@ class SelectorEvaluator extends SelectorVisitor {
 
       // http://dev.w3.org/csswg/selectors-4/#the-empty-pseudo
       case 'empty':
-        return _element!.childNodes.every((n) =>
-        !(n is Element || (n is TextNode && n.data.isNotEmpty))
-        );
+        return _element!.childNodes.every((n) => !(n is Element || n is TextNode && n.data.isNotEmpty));
 
       // http://dev.w3.org/csswg/selectors-4/#the-blank-pseudo
       case 'blank':

diff --git a/webf/lib/src/rendering/paragraph.dart b/webf/lib/src/rendering/paragraph.dart
@@ -241,9 +241,6 @@ class WebFRenderParagraph extends RenderBox
 
   /// Compute distance to baseline of last text line
   double computeDistanceToLastLineBaseline() {
-    if (_lineOffset.isEmpty) {
-      return 0.0;
-    }
     double lastLineOffset = _lineOffset[_lineOffset.length - 1];
     ui.LineMetrics lastLineMetrics = _lineMetrics[_lineMetrics.length - 1];
 

diff --git a/webf/lib/src/rendering/text.dart b/webf/lib/src/rendering/text.dart
@@ -315,13 +315,7 @@ class RenderTextBox extends RenderBox with RenderObjectWithChildMixin<RenderBox>
 
   // '   a b c' => 'a b c'
   static String _trimLeftWhitespace(String string) {
-    String result = string.replaceAllMapped(_trimLeftWhitespaceReg, (Match m) =>
-    '${m[1]}'
-    );
-    if (result.startsWith(' ')) {
-      return '';
-    }
-    return result;
+    return string.replaceAllMapped(_trimLeftWhitespaceReg, (Match m) => '${m[1]}');
   }
 
   // 'a b c    ' => 'a b c'