Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 54804ca28d80d0d3999bb0e385ce616399b7e9e0
      
https://github.com/WebKit/WebKit/commit/54804ca28d80d0d3999bb0e385ce616399b7e9e0
  Author: Ahmad Saleem <[email protected]>
  Date:   2022-11-29 (Tue, 29 Nov 2022)

  Changed paths:
    M 
LayoutTests/accessibility/mac/find-and-replace-match-capitalization-expected.txt
    M LayoutTests/accessibility/mac/find-and-replace-match-capitalization.html
    M LayoutTests/accessibility/mac/select-text/select-text-135575-expected.txt
    M LayoutTests/accessibility/mac/select-text/select-text-135575.html
    M LayoutTests/accessibility/mac/select-text/select-text-7-expected.txt
    M LayoutTests/accessibility/mac/select-text/select-text-7.html
    M LayoutTests/accessibility/mac/select-text/select-text-8-expected.txt
    M LayoutTests/accessibility/mac/select-text/select-text-8.html
    M LayoutTests/accessibility/mac/select-text/select-text-9-expected.txt
    M LayoutTests/accessibility/mac/select-text/select-text-9.html
    M LayoutTests/editing/pasteboard/paste-text-003-expected.txt
    M LayoutTests/platform/gtk/editing/execCommand/paste-1-expected.txt
    M LayoutTests/platform/gtk/editing/pasteboard/5028447-expected.txt
    M LayoutTests/platform/gtk/editing/pasteboard/merge-end-borders-expected.txt
    M LayoutTests/platform/gtk/editing/pasteboard/paste-2-expected.txt
    M 
LayoutTests/platform/gtk/editing/pasteboard/paste-line-endings-006-expected.png
    M 
LayoutTests/platform/gtk/editing/pasteboard/paste-line-endings-010-expected.png
    M LayoutTests/platform/gtk/editing/pasteboard/paste-text-009-expected.png
    M LayoutTests/platform/gtk/editing/pasteboard/unrendered-br-expected.txt
    M LayoutTests/platform/ios-wk2/editing/pasteboard/5028447-expected.txt
    M 
LayoutTests/platform/ios-wk2/editing/pasteboard/paste-text-009-expected.txt
    M 
LayoutTests/platform/ios-wk2/editing/pasteboard/paste-text-at-tabspan-003-expected.txt
    M LayoutTests/platform/ios-wk2/editing/pasteboard/unrendered-br-expected.txt
    M 
LayoutTests/platform/ios/editing/pasteboard/paste-line-endings-006-expected.txt
    M 
LayoutTests/platform/ios/editing/pasteboard/paste-line-endings-010-expected.txt
    M LayoutTests/platform/ios/editing/pasteboard/paste-text-003-expected.txt
    A 
LayoutTests/platform/mac-wk1/editing/execCommand/find-after-replace-expected.txt
    A 
LayoutTests/platform/mac-wk1/editing/mac/spelling/autocorrection-blockquote-crash-expected.txt
    A LayoutTests/platform/mac-wk1/fast/lists/drag-into-marker-expected.txt
    M LayoutTests/platform/mac/editing/execCommand/paste-1-expected.png
    M LayoutTests/platform/mac/editing/execCommand/paste-1-expected.txt
    M LayoutTests/platform/mac/editing/pasteboard/5028447-expected.png
    M LayoutTests/platform/mac/editing/pasteboard/5028447-expected.txt
    M LayoutTests/platform/mac/editing/pasteboard/merge-end-borders-expected.png
    M LayoutTests/platform/mac/editing/pasteboard/merge-end-borders-expected.txt
    M LayoutTests/platform/mac/editing/pasteboard/paste-2-expected.png
    M LayoutTests/platform/mac/editing/pasteboard/paste-2-expected.txt
    M LayoutTests/platform/mac/editing/pasteboard/unrendered-br-expected.png
    M LayoutTests/platform/mac/editing/pasteboard/unrendered-br-expected.txt
    M 
LayoutTests/platform/win/editing/execCommand/find-after-replace-expected.txt
    M LayoutTests/platform/win/editing/execCommand/paste-1-expected.txt
    M Source/WebCore/editing/CompositeEditCommand.cpp
    M Source/WebCore/editing/Editing.cpp
    M Source/WebCore/editing/Editing.h

  Log Message:
  -----------
  '&nbsp;' is forced on SPACE between text nodes

'&nbsp;' is forced on SPACE between text nodes
https://bugs.webkit.org/show_bug.cgi?id=123163

Reviewed by Ryosuke Niwa.

Merge - 
https://chromium.googlesource.com/chromium/src.git/+/8134eeb454ef76c72df8cd7c26f6141072c314cb

When we rebalance white spaces, '&nbsp;' can be added as space
under some conditions. This CL adds a condition that the next
sibling text node should not exist.

* Source/WebCore/editing/CompositeEditCommand.cpp:
(CompositeEditCommand::rebalanceWhitespaceOnTextSubstring): Extend condition 
for "rebalanceString" to ensure that nextSibling text node should not exist
* Source/WebCore/editing/Editing.cpp: Update variable name from 
"endIsEndOfParagraph" to "shouldEmitNBSPbeforeEnd" as needed
* Source;WebCore/editing/Editing.h: Ditto
* LayoutTests/platform/gtk/editing/pasteboard/merge-end-borders-expected.txt: 
Rebaselined
* 
LayoutTests/platform/gtk/editing/pasteboard/paste-line-endings-006-expected.png:
 Rebaselined
* LayoutTests/platform/gtk/editing/pasteboard/paste-line-006-expected.txt: 
Rebaselined
* LayoutTests/platform/gtk/editing/pasteboard/paste-line-010-expected.txt: 
Rebaselined
* LayoutTests/platform/gtk/editing/pasteboard/paste-line-010-expected.png: 
Rebaselined
* LayoutTests/platform/gtk/editing/pasteboard/paste-text-009-expected.png: 
Rebaselined
* LayoutTests/platform/gtk/editing/pasteboard/paste-text-009-expected.txt: 
Rebaselined
* LayoutTests/platform/gtk/editing/pasteboard/unrendered-br-expected.txt:  
Rebaselined
* LayoutTests/platform/ios-wk2/editing/pasteboard/5028447-expected.txt: 
Rebaselined
* LayoutTests/platform/win/editing/execCommand/find-after-replace-expected.txt: 
Rebaselined
* LayoutTests/platform/win/editing/execCommand/paste-1-expected.txt: Rebaselined
* LayoutTests/accessibility/mac/find-replace-match-capitalization-expected.txt: 
Rebaselined
* LayoutTests/accessibility/mac/find-replace-match-capitalization.html: Updated
* LayoutTests/accessibility/mac/select-text-145575-expected.txt: Rebaselined
* LayoutTests/accessibility/mac/select-text/select-text-7.html: Updated
* LayoutTests/accessibility/mac/select-text/select-text-7-expected.txt: 
Rebaselined
* LayoutTests/accessibility/mac/select-text/select-text-8.html: Updated
* LayoutTests/accessibility/mac/select-text/select-text-8-expected.txt: 
Rebaselined
* LayoutTests/accessibility/mac/select-text/select-text-9.html: Updated
* LayoutTests/accessibility/mac/select-text/select-text-9-expected.txt: 
Rebaselined
* LayoutTests/editing/pasteboard/paste-text-003-expected.txt: Rebaselined
* LayoutTests/platform/gtk/editing/execCommand/paste-1-expected.txt: Rebaselined
* LayoutTests/platform/gtk/editing/pasteboard/paste-2-expected.txt: Rebaselined
* LayoutTests/platform/mac/editing/pasteboard/unrendered-br-expected.png: 
Rebaselined
* LayoutTests/platform/mac/editing/pasteboard/unrendered-br-expected.txt: 
Rebaselined
* LayoutTests/accessibility/mac/select-text/select-text-135575.html: Updated to 
use "js-test.js"
* LayoutTests/platform/gtk/editing/pasteboard/5028447-expected.txt: Rebaselined
* 
LayoutTests/platform/gtk/editing/pasteboard/paste-line-endings-006-expected.txt:
 Rebaselined
* 
LayoutTests/platform/gtk/editing/pasteboard/paste-line-endings-010-expected.txt:
 Rebaselined
* LayoutTests/platform/gtk/editing/pasteboard/paste-text-009-expected.txt: 
Rebaselined
* LayoutTests/platform/mac/editing/execCommand/paste-1-expected.png: Rebaselined
* LayoutTests/platform/mac/editing/execCommand/paste-1-expected.txt: Rebaselined
* LayoutTests/platform/mac/editing/pasteboard/5028447-expected.txt: Rebaselined
* LayoutTests/platform/mac/editing/pasteboard/5028447-expected.png: Rebaselined
* LayoutTests/platform/mac/editing/pasteboard/merge-end-borders-expected.png: 
Rebaselined
* LayoutTests/platform/mac/editing/pasteboard/merge-end-borders-expected.txt: 
Rebaselined
* LayoutTests/platform/mac/editing/pasteboard/paste-2-expected.png: Rebaselined
* LayoutTests/platform/mac/editing/pasteboard/paste-2-expected.txt: Rebaselined
* LayoutTests/platform/ios-wk2/editing/pasteboard/paste-text-009-expected.txt: 
Rebaselined
* 
LayoutTests/platform/ios-wk2/editing/pasteboard/paste-text-at-tabspan-003-expected.txt:
 Rebaselined
* LayoutTests/platform/ios-wk2/editing/pasteboard/unrendered-br-expected.txt: 
Rebaselined
* 
LayoutTests/platform/ios/editing/pasteboard/paste-line-endings-006-expected.txt:
 Rebaselined
* 
LayoutTests/platform/ios/editing/pasteboard/paste-line-endings-010-expected.txt:
 Rebaselined
* LayoutTests/platform/ios/editing/pasteboard/paste-text-003-expected.txt: 
Rebaselined
* LayoutTests/platform/ios-wk2/editing/pasteboard/unrendered-br-expected.txt: 
Rebaselined
* 
LayoutTests/platform/mac-wk1/editing/execCommand/find-after-replace-expected.txt:
 Added Platform Specific Expectation
* 
LayoutTests/platform/mac-wk1/editing/mac/spelling/autocorrection-blockquote-crash-expected.txt:
 Added Platform Specific Expectation
* LayoutTests/platform/mac-wk1/fast/lists/drag-into-marker-expected.txt: Added 
Platform Specific Expectation

Canonical link: https://commits.webkit.org/257136@main


_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to