git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a422589)
REGRESSION (r179168): Characters overlap after resizing the font on the copy-pasted...
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 1 Jul 2015 20:31:25 +0000 (20:31 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 1 Jul 2015 20:31:25 +0000 (20:31 +0000)
https://bugs.webkit.org/show_bug.cgi?id=146492

Reviewed by Darin Adler.

Source/WebCore:

The bug was caused by WebKit serializing the used line-height size (e.g. 18px) in the copied content
instead of string "normal" and removeStyleFromRulesAndContext failing to strip it down when text with
a font that influences the line height got pasted. This is because the used value of line-height
property of the context and the pasted content doesn't match when the context doesn't use the same font.

Fixed the bug by not considering line-height as a list of editing properties we try to preserve. This is
fine because we don't provide editing operations to directly manipulate line-height.

Test: editing/pasteboard/cjk-line-height.html

* editing/EditingStyle.cpp:
(WebCore::editingProperties): Removed CSSPropertyLineHeight.

LayoutTests:

Added a regression test. Also reverted the bad rebaseline in r179168:
http://trac.webkit.org/changeset/179168/trunk/LayoutTests/editing/pasteboard/simplfiying-markup-should-not-strip-content-expected.txt

* editing/pasteboard/cjk-line-height-expected.txt: Added.
* editing/pasteboard/cjk-line-height.html: Added.
* editing/pasteboard/simplfiying-markup-should-not-strip-content-expected.txt:

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

LayoutTests/ChangeLog patch | blob | history
LayoutTests/editing/pasteboard/cjk-line-height-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/editing/pasteboard/cjk-line-height.html [new file with mode: 0644] patch | blob
LayoutTests/editing/pasteboard/simplfiying-markup-should-not-strip-content-expected.txt patch | blob | history
Source/WebCore/ChangeLog patch | blob | history
Source/WebCore/editing/EditingStyle.cpp patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2080f0deac42ce67434a5841949a68ce6bacda20..7fda97c0a5107a9cbdf87c7680c751cfbd80f3cd 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2015-06-30  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION (r179168): Characters overlap after resizing the font on the copy-pasted Japanese text
+        https://bugs.webkit.org/show_bug.cgi?id=146492
+
+        Reviewed by Darin Adler.
+
+        Added a regression test. Also reverted the bad rebaseline in r179168:
+        http://trac.webkit.org/changeset/179168/trunk/LayoutTests/editing/pasteboard/simplfiying-markup-should-not-strip-content-expected.txt
+
+        * editing/pasteboard/cjk-line-height-expected.txt: Added.
+        * editing/pasteboard/cjk-line-height.html: Added.
+        * editing/pasteboard/simplfiying-markup-should-not-strip-content-expected.txt:
+
 2015-07-01  Matthew Daiter  <mdaiter@apple.com>
 
         Enable MEDIA_STREAM flag
diff --git a/LayoutTests/editing/pasteboard/cjk-line-height-expected.txt b/LayoutTests/editing/pasteboard/cjk-line-height-expected.txt
new file mode 100644 (file)
index 0000000..1f3d280
--- /dev/null
+++ b/LayoutTests/editing/pasteboard/cjk-line-height-expected.txt
@@ -0,0 +1,6 @@
+This tests copying and pasting text with a font that influences the used line-height value.
+To manually test, copy and paste the selected content below. WebKit should not generate line-height property in the pasted content.
+| <span>
+|   style="font-family: 'Hiragino Kaku Gothic ProN';"
+|   "hello<#selection-caret>"
+| <br>
diff --git a/LayoutTests/editing/pasteboard/cjk-line-height.html b/LayoutTests/editing/pasteboard/cjk-line-height.html
new file mode 100644 (file)
index 0000000..fcca237
--- /dev/null
+++ b/LayoutTests/editing/pasteboard/cjk-line-height.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<body>
+<div id=editor contenteditable><font face="Hiragino Kaku Gothic ProN">hello</font></div>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>
+
+Markup.description('This tests copying and pasting text with a font that influences the used line-height value.\n'
+ + 'To manually test, copy and paste the selected content below. WebKit should not generate line-height property in the pasted content.')
+
+var editor = document.getElementById('editor');
+editor.focus();
+document.execCommand('selectAll', false, null);
+
+Markup.noAutoDump();
+function dumpEditor() {
+    Markup.dump(editor);
+    Markup.notifyDone();
+}
+
+if (document.queryCommandEnabled('paste')) {
+    document.execCommand('copy', false, null);
+    document.execCommand('paste', false, null);
+    dumpEditor();
+} else
+    document.onpaste = function () { setTimeout(dumpEditor, 0); }
+
+</script>
+</body>
+</html>
diff --git a/LayoutTests/editing/pasteboard/simplfiying-markup-should-not-strip-content-expected.txt b/LayoutTests/editing/pasteboard/simplfiying-markup-should-not-strip-content-expected.txt
index df7311db9147d0c080b6a8440d8359c60b8f15a7..b9e6ae3decf5b2ebe2024e685ceee4968d988bf0 100644 (file)
--- a/LayoutTests/editing/pasteboard/simplfiying-markup-should-not-strip-content-expected.txt
+++ b/LayoutTests/editing/pasteboard/simplfiying-markup-should-not-strip-content-expected.txt
@@ -33,7 +33,7 @@ Pasted content:
 |   face="Verdana"
 |   "hello "
 | <br>
-|   style="font-family: Helvetica; line-height: 18px;"
+|   style="font-family: Helvetica;"
 | <font>
 |   face="Verdana"
 |   "worldWebKit<#selection-caret>"
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b79c30a48f46d14d339bd4726fd53af815a1c691..dae551115ea33d3e4dd22e42bf096e10d53b8cdd 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2015-06-30  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION (r179168): Characters overlap after resizing the font on the copy-pasted Japanese text
+        https://bugs.webkit.org/show_bug.cgi?id=146492
+
+        Reviewed by Darin Adler.
+
+        The bug was caused by WebKit serializing the used line-height size (e.g. 18px) in the copied content
+        instead of string "normal" and removeStyleFromRulesAndContext failing to strip it down when text with
+        a font that influences the line height got pasted. This is because the used value of line-height
+        property of the context and the pasted content doesn't match when the context doesn't use the same font.
+
+        Fixed the bug by not considering line-height as a list of editing properties we try to preserve. This is
+        fine because we don't provide editing operations to directly manipulate line-height.
+
+        Test: editing/pasteboard/cjk-line-height.html
+
+        * editing/EditingStyle.cpp:
+        (WebCore::editingProperties): Removed CSSPropertyLineHeight.
+
 2015-06-30  Brent Fulgham  <bfulgham@apple.com>
 
         REGRESSION (r184296): View keeps scrolling upward
diff --git a/Source/WebCore/editing/EditingStyle.cpp b/Source/WebCore/editing/EditingStyle.cpp
index dcf4fabcb8f7341b0d8f5f99abce3460ec4f8437..5cf12cd9b738a1dd740d5ecd55bd5972d9ed2661 100644 (file)
--- a/Source/WebCore/editing/EditingStyle.cpp
+++ b/Source/WebCore/editing/EditingStyle.cpp
@@ -63,7 +63,6 @@ static const CSSPropertyID editingProperties[] = {
     CSSPropertyFontVariant,
     CSSPropertyFontWeight,
     CSSPropertyLetterSpacing,
-    CSSPropertyLineHeight,
     CSSPropertyOrphans,
     CSSPropertyTextAlign,
     CSSPropertyTextIndent,
Mirror of the WebKit open source project from svn.webkit.org.