Skip to content

GitLab

T
tangled
Commit cbadf16b authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files
Options

2011-04-06 Sheriff Bot <webkit.review.bot@gmail.com> 

        Unreviewed, rolling out r83039.
        http://trac.webkit.org/changeset/83039
        https://bugs.webkit.org/show_bug.cgi?id=57978

        introduced a new regression in conjunction to
        ReplaceSelectionCommand (Requested by rniwa on #webkit).

        * editing/inserting/insert-paragraph-separator-tab-span-expected.txt: Removed.
        * editing/inserting/insert-paragraph-separator-tab-span.html: Removed.
2011-04-06  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r83039.
        http://trac.webkit.org/changeset/83039
        https://bugs.webkit.org/show_bug.cgi?id=57978

        introduced a new regression in conjunction to
        ReplaceSelectionCommand (Requested by rniwa on #webkit).

        * editing/EditingStyle.cpp:
        (WebCore::EditingStyle::init):
        * editing/InsertParagraphSeparatorCommand.cpp:
        (WebCore::InsertParagraphSeparatorCommand::doApply):

git-svn-id: svn://svn.chromium.org/blink/trunk@83097 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 7b35c703
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 81 deletions
third_party/WebKit/LayoutTests/ChangeLog
View file @ cbadf16b
2011-04-06 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r83039.
http://trac.webkit.org/changeset/83039
https://bugs.webkit.org/show_bug.cgi?id=57978
introduced a new regression in conjunction to
ReplaceSelectionCommand (Requested by rniwa on #webkit).
* editing/inserting/insert-paragraph-separator-tab-span-expected.txt: Removed.
* editing/inserting/insert-paragraph-separator-tab-span.html: Removed.
2011-04-06 Naoki Takano <takano.naoki@gmail.com> 2011-04-06 Naoki Takano <takano.naoki@gmail.com>
Reviewed by David Levin. Reviewed by David Levin.
third_party/WebKit/LayoutTests/editing/inserting/insert-paragraph-separator-tab-span-expected.txt deleted 100644 → 0
View file @ 7b35c703
This test ensures WebKit avoids cloning Apple tab span when inserting a paragraph separator.
Only tab should be inside a Apple tab span in the following tests.
last visible position:
| <span>
| class="Apple-tab-span"
| style="white-space:pre"
| " "
| <div>
| "hello world WebKit <#selection-caret>"
first visible position:
| <div>
| <br>
| "hello world WebKit <#selection-caret>"
| <span>
| class="Apple-tab-span"
| style="white-space:pre"
| " "
before tab span:
| "hi, "
| <div>
| "hello world WebKit <#selection-caret>"
| <span>
| class="Apple-tab-span"
| style="white-space:pre"
| " "
| " rocks"
after tab span:
| "hi, "
| <span>
| class="Apple-tab-span"
| style="white-space:pre"
| " "
| " rockshello world WebKit <#selection-caret>"
| <div>
third_party/WebKit/LayoutTests/editing/inserting/insert-paragraph-separator-tab-span.html deleted 100644 → 0
View file @ 7b35c703
<!DOCTYPE html>
<html>
<body>
<div contenteditable title="1: last visible position" style="word-wrap: break-word; width: 10ex; border: solid thin black;"><span class="Apple-tab-span" style="white-space:pre"> </span></div>
<div contenteditable title="0: first visible position" style="word-wrap: break-word; width: 10ex; border: solid thin black;"><span class="Apple-tab-span" style="white-space:pre"> </span></div>
<div contenteditable title="1: before tab span" style="word-wrap: break-word; width: 10ex; border: solid thin black;">hi, <span class="Apple-tab-span" style="white-space:pre"> </span> rocks</div>
<div contenteditable title="2: after tab span" style="word-wrap: break-word; width: 10ex; border: solid thin black;">hi, <span class="Apple-tab-span" style="white-space:pre"> </span> rocks</div>
<script src="../../resources/dump-as-markup.js"></script>
<script>
Markup.description('This test ensures WebKit avoids cloning Apple tab span when inserting a paragraph separator.\n'+
'Only tab should be inside a Apple tab span in the following tests.');
function runTest(div) {
var offset = div.title.substr(0, div.title.indexOf(':'));
window.getSelection().setPosition(div, offset);
document.execCommand("InsertParagraph");
document.execCommand("InsertText", false, "hello world WebKit ");
Markup.dump(div, div.title.substr(div.title.indexOf(': ') + 2));
}
var divs = document.getElementsByTagName('div');
var tests = new Array();
for (var i = 0; i < divs.length; i++)
tests.push(divs[i]);
for (i in tests)
runTest(tests[i]);
</script>
</body>
</html>
third_party/WebKit/Source/WebCore/ChangeLog
View file @ cbadf16b
2011-04-06 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r83039.
http://trac.webkit.org/changeset/83039
https://bugs.webkit.org/show_bug.cgi?id=57978
introduced a new regression in conjunction to
ReplaceSelectionCommand (Requested by rniwa on #webkit).
* editing/EditingStyle.cpp:
(WebCore::EditingStyle::init):
* editing/InsertParagraphSeparatorCommand.cpp:
(WebCore::InsertParagraphSeparatorCommand::doApply):
2011-04-06 Naoki Takano <takano.naoki@gmail.com> 2011-04-06 Naoki Takano <takano.naoki@gmail.com>
Reviewed by David Levin. Reviewed by David Levin.
third_party/WebKit/Source/WebCore/editing/EditingStyle.cpp
View file @ cbadf16b
...@@ -300,11 +300,6 @@ EditingStyle::~EditingStyle() ...@@ -300,11 +300,6 @@ EditingStyle::~EditingStyle()
void EditingStyle::init(Node* node, PropertiesToInclude propertiesToInclude) void EditingStyle::init(Node* node, PropertiesToInclude propertiesToInclude)
{ {
if (isTabSpanTextNode(node))
node = tabSpanNode(node)->parentNode();
else if (isTabSpanNode(node))
node = node->parentNode();
RefPtr<CSSComputedStyleDeclaration> computedStyleAtPosition = computedStyle(node); RefPtr<CSSComputedStyleDeclaration> computedStyleAtPosition = computedStyle(node);
m_mutableStyle = propertiesToInclude == AllProperties && computedStyleAtPosition ? computedStyleAtPosition->copy() : editingStyleFromComputedStyle(computedStyleAtPosition); m_mutableStyle = propertiesToInclude == AllProperties && computedStyleAtPosition ? computedStyleAtPosition->copy() : editingStyleFromComputedStyle(computedStyleAtPosition);
......
third_party/WebKit/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp
View file @ cbadf16b
...@@ -239,7 +239,7 @@ void InsertParagraphSeparatorCommand::doApply() ...@@ -239,7 +239,7 @@ void InsertParagraphSeparatorCommand::doApply()
// Recreate the same structure in the new paragraph. // Recreate the same structure in the new paragraph.
Vector<Element*> ancestors; Vector<Element*> ancestors;
getAncestorsInsideBlock(positionBeforeTabSpan(insertionPosition).deprecatedNode(), startBlock, ancestors); getAncestorsInsideBlock(insertionPosition.deprecatedNode(), startBlock, ancestors);
RefPtr<Element> parent = cloneHierarchyUnderNewBlock(ancestors, blockToInsert); RefPtr<Element> parent = cloneHierarchyUnderNewBlock(ancestors, blockToInsert);
appendBlockPlaceholder(parent); appendBlockPlaceholder(parent);
...@@ -254,9 +254,6 @@ void InsertParagraphSeparatorCommand::doApply() ...@@ -254,9 +254,6 @@ void InsertParagraphSeparatorCommand::doApply()
// similar case where previous position is in another, presumeably nested, block. // similar case where previous position is in another, presumeably nested, block.
if (isFirstInBlock || !inSameBlock(visiblePos, visiblePos.previous())) { if (isFirstInBlock || !inSameBlock(visiblePos, visiblePos.previous())) {
Node *refNode; Node *refNode;
insertionPosition = positionBeforeTabSpan(insertionPosition);
if (isFirstInBlock && !nestNewBlock) if (isFirstInBlock && !nestNewBlock)
refNode = startBlock; refNode = startBlock;
else if (insertionPosition.deprecatedNode() == startBlock && nestNewBlock) { else if (insertionPosition.deprecatedNode() == startBlock && nestNewBlock) {
...@@ -273,7 +270,7 @@ void InsertParagraphSeparatorCommand::doApply() ...@@ -273,7 +270,7 @@ void InsertParagraphSeparatorCommand::doApply()
// Recreate the same structure in the new paragraph. // Recreate the same structure in the new paragraph.
Vector<Element*> ancestors; Vector<Element*> ancestors;
getAncestorsInsideBlock(positionAvoidingSpecialElementBoundary(positionBeforeTabSpan(insertionPosition)).deprecatedNode(), startBlock, ancestors); getAncestorsInsideBlock(positionAvoidingSpecialElementBoundary(insertionPosition).deprecatedNode(), startBlock, ancestors);
appendBlockPlaceholder(cloneHierarchyUnderNewBlock(ancestors, blockToInsert)); appendBlockPlaceholder(cloneHierarchyUnderNewBlock(ancestors, blockToInsert));
...@@ -306,7 +303,7 @@ void InsertParagraphSeparatorCommand::doApply() ...@@ -306,7 +303,7 @@ void InsertParagraphSeparatorCommand::doApply()
// Build up list of ancestors in between the start node and the start block. // Build up list of ancestors in between the start node and the start block.
Vector<Element*> ancestors; Vector<Element*> ancestors;
getAncestorsInsideBlock(positionBeforeTabSpan(insertionPosition).deprecatedNode(), startBlock, ancestors); getAncestorsInsideBlock(insertionPosition.deprecatedNode(), startBlock, ancestors);
// Make sure we do not cause a rendered space to become unrendered. // Make sure we do not cause a rendered space to become unrendered.
// FIXME: We need the affinity for pos, but pos.downstream() does not give it // FIXME: We need the affinity for pos, but pos.downstream() does not give it
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment