Bug 1628770 - Restrict "empty editable block" bits to contenteditable…

… roots. r=jfkthame This is what other UAs do. Differential Revision: https://phabricator.services.mozilla.com/D70423
iaxat · Apr 10, 2020 · 428f8ad · 428f8ad
1 parent a858603
commit 428f8ad
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
@@ -3056,8 +3056,7 @@ void nsBlockFrame::ReflowDirtyLines(BlockReflowInput& aState) {
           marker->SetRect(marker->GetRect() + nsPoint(0, offset));
         }
       }
-    } else if (!Style()->IsPseudoOrAnonBox() &&
-               StyleUI()->mUserModify != StyleUserModify::ReadOnly) {
+    } else if (ShouldHaveLineIfEmpty()) {
       aState.mBCoord += aState.mMinLineHeight;
     }
   }

diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
@@ -4686,6 +4686,13 @@ bool nsIFrame::IsSelectable(StyleUserSelect* aSelectStyle) const {
   return style != StyleUserSelect::None;
 }
 
+bool nsIFrame::ShouldHaveLineIfEmpty() const {
+  if (Style()->IsPseudoOrAnonBox()) {
+    return false;
+  }
+  return IsEditingHost(this);
+}
+
 /**
  * Handles the Mouse Press Event for the frame
  */

diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
@@ -3405,6 +3405,12 @@ class nsIFrame : public nsQueryFrame {
    */
   bool IsSelectable(mozilla::StyleUserSelect* aSelectStyle) const;
 
+  /**
+   * Returns whether this frame should have the content-block-size of a line,
+   * even if empty.
+   */
+  bool ShouldHaveLineIfEmpty() const;
+
   /**
    * Called to retrieve the SelectionController associated with the frame.
    *

diff --git a/...rm/tests/html/editing/editing-0/contenteditable/contenteditable-with-empty-block-ref.html b/...rm/tests/html/editing/editing-0/contenteditable/contenteditable-with-empty-block-ref.html
@@ -0,0 +1,7 @@
+<!doctype html>
+<title>Test reference</title>
+<div>
+  Foo
+  <div></div>
+  Bar
+</div>
diff --git a/...atform/tests/html/editing/editing-0/contenteditable/contenteditable-with-empty-block.html b/...atform/tests/html/editing/editing-0/contenteditable/contenteditable-with-empty-block.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<title>contenteditable doesn't cause inner empty blocks to grow.</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:[email protected]">
+<link rel="author" title="Mozilla" href="https://mozilla.org">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1628770">
+<link rel="match" href="contenteditable-with-empty-block-ref.html">
+<div contenteditable>
+  Foo
+  <div></div>
+  Bar
+</div>