Chromium Code Reviews
Help | Chromium Project | Gerrit Changes | Sign in
(3)

Issue 2111473002: Revert of Remove style spans to follow the styles of the block element (patchset #2 id:20001 of htt… (Closed)

Created:
1 year, 4 months ago by yosin_UTC9
Modified:
1 year, 4 months ago
Reviewers:
yosin_UTC9, joone
CC:
chromium-reviews
Base URL:
https://chromium.googlesource.com/chromium/src.git@2783
Target Ref:
refs/pending/branch-heads/2783
Project:
chromium
Visibility:
Public.

Description

Revert of Remove style spans to follow the styles of the block element (patchset #2 id:20001 of https://codereview.chromium.org/2102913002/ ) Reason for revert: Assignment within conditional on line 836 of ReplaceSelectionCommand.cpp is breaking Win8 build: https://build.chromium.org/p/chromium.win/builders/Win8%20GYP%20%28dbg%29/builds/133 crbug.com/624263 tracks build failures Original issue's description: > Remove style spans to follow the styles of the block element > > This CL removes style spans to follow the styles of the block > element(li, pre, td, and h1~6) when the text of the pasted > or merged element becomes a part of the block element. > > BUG=226941 > TEST=third_party/WebKit/LayoutTests/editing/deleting/backspace-merge-into-block-element.html > > Committed: https://crrev.com/5220699381aae450f22d1ea3805141deb139f8f3 > Cr-Commit-Position: refs/heads/master@{#402659} TBR=yosin@chromium.org,joone.hur@intel.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=226941 Review-Url: https://codereview.chromium.org/2109973002 Cr-Commit-Position: refs/heads/master@{#402696} (cherry picked from commit 45859e627709ac2a56e939a00f725a0fca27f75f)

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+21 lines, -77 lines) Patch
D third_party/WebKit/LayoutTests/editing/deleting/backspace-merge-into-block.html View 1 chunk +0 lines, -36 lines 0 comments Download
A + third_party/WebKit/LayoutTests/editing/deleting/backspace-merge-into-list-item.html View 2 chunks +14 lines, -10 lines 0 comments Download
M third_party/WebKit/LayoutTests/editing/deleting/merge-paragraph-from-p-with-style-3-expected.txt View 1 chunk +4 lines, -1 line 0 comments Download
M third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp View 3 chunks +3 lines, -30 lines 0 comments Download
Trybot results:

Messages

Total messages: 4 (2 generated)
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2111473002/1
1 year, 4 months ago (2016-06-29 05:59:09 UTC) #2
commit-bot: I haz the power
1 year, 4 months ago (2016-06-29 06:02:16 UTC) #4
Failed to apply patch for
third_party/WebKit/LayoutTests/editing/deleting/backspace-merge-into-block.html:
While running git rm
third_party/WebKit/LayoutTests/editing/deleting/backspace-merge-into-block.html;
  fatal: pathspec
'third_party/WebKit/LayoutTests/editing/deleting/backspace-merge-into-block.html'
did not match any files

Patch:  D   
third_party/WebKit/LayoutTests/editing/deleting/backspace-merge-into-block.html
Index:
third_party/WebKit/LayoutTests/editing/deleting/backspace-merge-into-block.html
diff --git
a/third_party/WebKit/LayoutTests/editing/deleting/backspace-merge-into-block.html
b/third_party/WebKit/LayoutTests/editing/deleting/backspace-merge-into-block.html
deleted file mode 100644
index
f57277feedaeea50ae5c597f0f3ff3a3bca4858f..0000000000000000000000000000000000000000
---
a/third_party/WebKit/LayoutTests/editing/deleting/backspace-merge-into-block.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!doctype HTML>
-<script src="../../resources/testharness.js"></script>
-<script src="../../resources/testharnessreport.js"></script>
-<script src="../assert_selection.js"></script>
-<style>
-p {
-    font-size: 20px;
-    line-height: 22px;
-    color: red;
-}
-</style>
-<div id="log"></div>
-<script>
-test(() => {
-    assert_selection(
-        '<div contenteditable="true"><h1>Heading 1:</h1>^<p>|paragraph was
merged.</p></div>',
-        'delete',
-        '<div contenteditable="true"><h1>Heading 1:|paragraph was
merged.</h1></div>',
-        'Make a paragraph into a heading');
-    assert_selection(
-        '<div contenteditable="true"><pre>Preformatted
text:</pre>^<p>|paragraph was merged.</p></div>',
-        'delete',
-        '<div contenteditable="true"><pre>Preformatted text:|paragraph was
merged.</pre></div>',
-        'Make a paragraph into a pre');
-    assert_selection(
-        '<div contenteditable="true"><ul><li>List Item:</li></ul>^<p>|paragraph
was merged.</p></div>',
-        'delete',
-        '<div contenteditable="true"><ul><li>List Item:|paragraph was
merged.</li></ul></div>',
-        'Make a paragraph into a list');
-    assert_selection(
-        '<div
contenteditable="true"><table><tbody><tr><td>Table:</td></tr></tbody></table>^<p>|paragraph
was merged.</p></div>',
-        'delete',
-        '<div contenteditable="true"><table><tbody><tr><td>Table:|paragraph was
merged.</td></tr></tbody></table></div>',
-        'Make a paragraph into a table');
-}, 'merge into a block by backspace');
-</script>

Powered by Google App Engine
This is Rietveld efc10ee0f