Diff
Modified: trunk/LayoutTests/ChangeLog (93050 => 93051)
--- trunk/LayoutTests/ChangeLog 2011-08-15 19:07:58 UTC (rev 93050)
+++ trunk/LayoutTests/ChangeLog 2011-08-15 19:23:26 UTC (rev 93051)
@@ -1,3 +1,27 @@
+2011-08-15 Ryosuke Niwa <[email protected]>
+
+ webkit-indent-blockquote is unnecessary
+ https://bugs.webkit.org/show_bug.cgi?id=66195
+
+ Reviewed by Tony Chang.
+
+ Rebaselined the tests since WebKit longer adds class="webkit-indent-blockquote" on blockquotes
+ created by execCommand('Indent') and execCommand('Outdent') after this patch.
+
+ * editing/execCommand/19653-1-expected.txt:
+ * editing/execCommand/5658933-2-expected.txt:
+ * editing/execCommand/5658933-3-expected.txt:
+ * editing/execCommand/indent-div-inside-list-expected.txt:
+ * editing/execCommand/indent-nested-blockquotes-expected.txt:
+ * editing/execCommand/indent-nested-div-expected.txt:
+ * editing/execCommand/indent-paragraphs-expected.txt:
+ * editing/execCommand/indent-pre-expected.txt:
+ * editing/execCommand/indent-pre-list-expected.txt:
+ * editing/execCommand/indent-pre-paragraphs-expected.txt:
+ * editing/execCommand/indent-second-paragraph-in-blockquote-expected.txt:
+ * editing/execCommand/indent-with-style-expected.txt:
+ * editing/execCommand/indent-with-style2-expected.txt:
+
2011-08-15 Gavin Barraclough <[email protected]>
Crash accessing static property on sealed object
Modified: trunk/LayoutTests/editing/execCommand/19653-1-expected.txt (93050 => 93051)
--- trunk/LayoutTests/editing/execCommand/19653-1-expected.txt 2011-08-15 19:07:58 UTC (rev 93050)
+++ trunk/LayoutTests/editing/execCommand/19653-1-expected.txt 2011-08-15 19:23:26 UTC (rev 93051)
@@ -5,10 +5,10 @@
<ul><li><b>Bold</b></li></ul>
This tests indenting an empty paragraph with bold already applied to it. The word below should be bold.
-<blockquote class="webkit-indent-blockquote" style="margin: 0 0 0 40px; border: none; padding: 0px;"><div><b>Bold</b></div></blockquote>
+<blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;"><div><b>Bold</b></div></blockquote>
This tests indenting an empty paragraph when the typing style was Bold. The word below should be bold.
-<blockquote class="webkit-indent-blockquote" style="margin: 0 0 0 40px; border: none; padding: 0px;"><b>Bold</b></blockquote>
+<blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;"><b>Bold</b></blockquote>
This tests outdenting an empty paragraph with bold already applied to it. The word below should be bold.
<b>Bold</b>
Modified: trunk/LayoutTests/editing/execCommand/5658933-2-expected.txt (93050 => 93051)
--- trunk/LayoutTests/editing/execCommand/5658933-2-expected.txt 2011-08-15 19:07:58 UTC (rev 93050)
+++ trunk/LayoutTests/editing/execCommand/5658933-2-expected.txt 2011-08-15 19:23:26 UTC (rev 93051)
@@ -1,4 +1,4 @@
This tests to see if indenting inside a table cell breaks the table structure. The indented blockquote should be placed inside the table cell where the Indent operation was performed and the table structure should remain unchanged.
-<table border="1"><tbody><tr><td id="td"><blockquote class="webkit-indent-blockquote" style="margin: 0 0 0 40px; border: none; padding: 0px;">hello</blockquote></td></tr></tbody></table>
+<table border="1"><tbody><tr><td id="td"><blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;">hello</blockquote></td></tr></tbody></table>
Modified: trunk/LayoutTests/editing/execCommand/5658933-3-expected.txt (93050 => 93051)
--- trunk/LayoutTests/editing/execCommand/5658933-3-expected.txt 2011-08-15 19:07:58 UTC (rev 93050)
+++ trunk/LayoutTests/editing/execCommand/5658933-3-expected.txt 2011-08-15 19:23:26 UTC (rev 93051)
@@ -1,4 +1,4 @@
This tests to see if indenting several paragraphs inside different table cells puts them into a single cell, as in FireFox (wrong) or indents each paragraph (correct).
-<table border="1"><tbody><tr><td id="start"><blockquote class="webkit-indent-blockquote" style="margin: 0 0 0 40px; border: none; padding: 0px;">hello</blockquote></td><td id="end"><blockquote class="webkit-indent-blockquote" style="margin: 0 0 0 40px; border: none; padding: 0px;">world</blockquote></td></tr></tbody></table>
+<table border="1"><tbody><tr><td id="start"><blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;">hello</blockquote></td><td id="end"><blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;">world</blockquote></td></tr></tbody></table>
Modified: trunk/LayoutTests/editing/execCommand/indent-div-inside-list-expected.txt (93050 => 93051)
--- trunk/LayoutTests/editing/execCommand/indent-div-inside-list-expected.txt 2011-08-15 19:07:58 UTC (rev 93050)
+++ trunk/LayoutTests/editing/execCommand/indent-div-inside-list-expected.txt 2011-08-15 19:23:26 UTC (rev 93051)
@@ -4,4 +4,4 @@
hello
world
b
-a <ul> <li>hello<div id="test"><blockquote class="webkit-indent-blockquote" style="margin: 0 0 0 40px; border: none; padding: 0px;"> world </blockquote></div></li> </ul> b
+a <ul> <li>hello<div id="test"><blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;"> world </blockquote></div></li> </ul> b
Modified: trunk/LayoutTests/editing/execCommand/indent-nested-blockquotes-expected.txt (93050 => 93051)
--- trunk/LayoutTests/editing/execCommand/indent-nested-blockquotes-expected.txt 2011-08-15 19:07:58 UTC (rev 93050)
+++ trunk/LayoutTests/editing/execCommand/indent-nested-blockquotes-expected.txt 2011-08-15 19:23:26 UTC (rev 93051)
@@ -4,4 +4,4 @@
world
webkit
is great
-<blockquote id="outer"> hello <blockquote id="inner"> world<br></blockquote></blockquote><blockquote class="webkit-indent-blockquote" style="margin: 0 0 0 40px; border: none; padding: 0px;"><blockquote><blockquote> webkit </blockquote></blockquote></blockquote><blockquote> is great </blockquote>
+<blockquote id="outer"> hello <blockquote id="inner"> world<br></blockquote></blockquote><blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;"><blockquote><blockquote> webkit </blockquote></blockquote></blockquote><blockquote> is great </blockquote>
Modified: trunk/LayoutTests/editing/execCommand/indent-nested-div-expected.txt (93050 => 93051)
--- trunk/LayoutTests/editing/execCommand/indent-nested-div-expected.txt 2011-08-15 19:07:58 UTC (rev 93050)
+++ trunk/LayoutTests/editing/execCommand/indent-nested-div-expected.txt 2011-08-15 19:23:26 UTC (rev 93051)
@@ -1,4 +1,4 @@
This tests indenting nested divs. By indenting "hello", we should be able to enclose all three blocks 1 through 3 by a blockquote
hello
-<blockquote class="webkit-indent-blockquote" style="margin: 0 0 0 40px; border: none; padding: 0px;"><div id="block1"><div id="block2"><div id="block3">hello</div></div></div></blockquote>
+<blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;"><div id="block1"><div id="block2"><div id="block3">hello</div></div></div></blockquote>
Modified: trunk/LayoutTests/editing/execCommand/indent-paragraphs-expected.txt (93050 => 93051)
--- trunk/LayoutTests/editing/execCommand/indent-paragraphs-expected.txt 2011-08-15 19:07:58 UTC (rev 93050)
+++ trunk/LayoutTests/editing/execCommand/indent-paragraphs-expected.txt 2011-08-15 19:23:26 UTC (rev 93051)
@@ -13,4 +13,4 @@
Hello world
Before indent: <div id="test"> <div><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">Hello <img src="" world</span></div> <div>Hello <img src="" world</div> Hello <img src="" world </div>
-After indent: <blockquote class="webkit-indent-blockquote" style="margin: 0 0 0 40px; border: none; padding: 0px;"><div id="test"><div><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">Hello <img src="" world</span></div></div><div id="test"><div>Hello <img src="" world</div></div><div id="test"> Hello <img src="" world </div></blockquote>
+After indent: <blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;"><div id="test"><div><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">Hello <img src="" world</span></div></div><div id="test"><div>Hello <img src="" world</div></div><div id="test"> Hello <img src="" world </div></blockquote>
Modified: trunk/LayoutTests/editing/execCommand/indent-pre-expected.txt (93050 => 93051)
--- trunk/LayoutTests/editing/execCommand/indent-pre-expected.txt 2011-08-15 19:07:58 UTC (rev 93050)
+++ trunk/LayoutTests/editing/execCommand/indent-pre-expected.txt 2011-08-15 19:23:26 UTC (rev 93051)
@@ -15,7 +15,6 @@
| "
"
| <blockquote>
-| class="webkit-indent-blockquote"
| style="margin: 0 0 0 40px; border: none; padding: 0px;"
| <pre>
| id="pre-basic"
@@ -25,7 +24,6 @@
| "line two
"
| <blockquote>
-| class="webkit-indent-blockquote"
| style="margin: 0 0 0 40px; border: none; padding: 0px;"
| <pre>
| "line three"
@@ -41,7 +39,6 @@
| "list one
"
| <blockquote>
-| class="webkit-indent-blockquote"
| style="margin: 0 0 0 40px; border: none; padding: 0px;"
| "list two"
| <br>
@@ -62,7 +59,6 @@
| "table one<#selection-anchor>
"
| <blockquote>
-| class="webkit-indent-blockquote"
| style="margin: 0 0 0 40px; border: none; padding: 0px;"
| <pre>
| "table two"
Modified: trunk/LayoutTests/editing/execCommand/indent-pre-list-expected.txt (93050 => 93051)
--- trunk/LayoutTests/editing/execCommand/indent-pre-list-expected.txt 2011-08-15 19:07:58 UTC (rev 93050)
+++ trunk/LayoutTests/editing/execCommand/indent-pre-list-expected.txt 2011-08-15 19:23:26 UTC (rev 93051)
@@ -68,7 +68,6 @@
| <li>
| <pre>
| <blockquote>
-| class="webkit-indent-blockquote"
| style="margin: 0 0 0 40px; border: none; padding: 0px;"
| "hello"
| <br>
@@ -98,7 +97,6 @@
| <li>
| <pre>
| <blockquote>
-| class="webkit-indent-blockquote"
| style="margin: 0 0 0 40px; border: none; padding: 0px;"
| "<#selection-anchor>hello<#selection-focus>"
| "world
@@ -129,7 +127,6 @@
| "hello
"
| <blockquote>
-| class="webkit-indent-blockquote"
| style="margin: 0 0 0 40px; border: none; padding: 0px;"
| "<#selection-anchor>world<#selection-focus>"
| "webkit
@@ -160,7 +157,6 @@
world
"
| <blockquote>
-| class="webkit-indent-blockquote"
| style="margin: 0 0 0 40px; border: none; padding: 0px;"
| "<#selection-anchor>webki<#selection-focus>t"
| "
Modified: trunk/LayoutTests/editing/execCommand/indent-pre-paragraphs-expected.txt (93050 => 93051)
--- trunk/LayoutTests/editing/execCommand/indent-pre-paragraphs-expected.txt 2011-08-15 19:07:58 UTC (rev 93050)
+++ trunk/LayoutTests/editing/execCommand/indent-pre-paragraphs-expected.txt 2011-08-15 19:23:26 UTC (rev 93051)
@@ -11,7 +11,6 @@
| "
"
| <blockquote>
-| class="webkit-indent-blockquote"
| style="margin: 0 0 0 40px; border: none; padding: 0px;"
| <pre>
| "<#selection-anchor>hello<#selection-focus>"
@@ -35,7 +34,6 @@
| "
"
| <blockquote>
-| class="webkit-indent-blockquote"
| style="margin: 0 0 0 40px; border: none; padding: 0px;"
| <pre>
| "<#selection-anchor>hello"
@@ -67,7 +65,6 @@
| "
"
| <blockquote>
-| class="webkit-indent-blockquote"
| style="margin: 0 0 0 40px; border: none; padding: 0px;"
| <pre>
| "<#selection-anchor>hello"
@@ -93,7 +90,6 @@
| "
"
| <blockquote>
-| class="webkit-indent-blockquote"
| style="margin: 0 0 0 40px; border: none; padding: 0px;"
| <pre>
| "<#selection-anchor>hello<#selection-focus>"
@@ -122,7 +118,6 @@
| "hello<#selection-caret>
"
| <blockquote>
-| class="webkit-indent-blockquote"
| style="margin: 0 0 0 40px; border: none; padding: 0px;"
| <pre>
| "
@@ -152,7 +147,6 @@
<#selection-anchor>
"
| <blockquote>
-| class="webkit-indent-blockquote"
| style="margin: 0 0 0 40px; border: none; padding: 0px;"
| <pre>
| "worl<#selection-focus>d"
Modified: trunk/LayoutTests/editing/execCommand/indent-second-paragraph-in-blockquote-expected.txt (93050 => 93051)
--- trunk/LayoutTests/editing/execCommand/indent-second-paragraph-in-blockquote-expected.txt 2011-08-15 19:07:58 UTC (rev 93050)
+++ trunk/LayoutTests/editing/execCommand/indent-second-paragraph-in-blockquote-expected.txt 2011-08-15 19:23:26 UTC (rev 93051)
@@ -2,4 +2,4 @@
hello
world
-<blockquote id="test"> hello<br></blockquote><blockquote class="webkit-indent-blockquote" style="margin: 0 0 0 40px; border: none; padding: 0px;"><blockquote> world </blockquote></blockquote>
+<blockquote id="test"> hello<br></blockquote><blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;"><blockquote> world </blockquote></blockquote>
Modified: trunk/LayoutTests/editing/execCommand/indent-with-style-expected.txt (93050 => 93051)
--- trunk/LayoutTests/editing/execCommand/indent-with-style-expected.txt 2011-08-15 19:07:58 UTC (rev 93050)
+++ trunk/LayoutTests/editing/execCommand/indent-with-style-expected.txt 2011-08-15 19:23:26 UTC (rev 93051)
@@ -14,4 +14,4 @@
four
Before ordered list: <div><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">one</span></div> <div id="test1"><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">two</span></div> <div id="test2"><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">three</span></div> <div><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">four</span></div>
-After ordered: <div><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">one</span></div> <blockquote class="webkit-indent-blockquote" style="margin: 0 0 0 40px; border: none; padding: 0px;"><div id="test1"><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">two</span></div><div id="test2"><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">three</span></div></blockquote> <div><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">four</span></div>
+After ordered: <div><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">one</span></div> <blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;"><div id="test1"><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">two</span></div><div id="test2"><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">three</span></div></blockquote> <div><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">four</span></div>
Modified: trunk/LayoutTests/editing/execCommand/indent-with-style2-expected.txt (93050 => 93051)
--- trunk/LayoutTests/editing/execCommand/indent-with-style2-expected.txt 2011-08-15 19:07:58 UTC (rev 93050)
+++ trunk/LayoutTests/editing/execCommand/indent-with-style2-expected.txt 2011-08-15 19:23:26 UTC (rev 93051)
@@ -9,4 +9,4 @@
foobar
five six seven
Before: one <div id="test1"><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">two</span> three</div> <div id="test2">four<span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">five</span></div> <div><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">four</span></div> <ul><li><b>foo</b>bar</li></ul> <span class="Apple-style-span" style="background-color: rgb(255, 0, 0);"><font class="Apple-style-span" color="#3333FF">five</font></span> six <b><i>seven</i></b>
-After: <blockquote class="webkit-indent-blockquote" style="margin: 0 0 0 40px; border: none; padding: 0px;"> one <div id="test1"><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">two</span> three</div><div id="test2">four<span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">five</span></div><div><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">four</span></div></blockquote> <ul><ul><li><b>foo</b>bar</li></ul></ul> <blockquote class="webkit-indent-blockquote" style="margin: 0 0 0 40px; border: none; padding: 0px;"><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);"><font class="Apple-style-span" color="#3333FF">five</font></span> six <b><i>seven</i></b></blockquote>
+After: <blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;"> one <div id="test1"><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">two</span> three</div><div id="test2">four<span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">five</span></div><div><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">four</span></div></blockquote> <ul><ul><li><b>foo</b>bar</li></ul></ul> <blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;"><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);"><font class="Apple-style-span" color="#3333FF">five</font></span> six <b><i>seven</i></b></blockquote>
Modified: trunk/Source/WebCore/ChangeLog (93050 => 93051)
--- trunk/Source/WebCore/ChangeLog 2011-08-15 19:07:58 UTC (rev 93050)
+++ trunk/Source/WebCore/ChangeLog 2011-08-15 19:23:26 UTC (rev 93051)
@@ -1,3 +1,21 @@
+2011-08-15 Ryosuke Niwa <[email protected]>
+
+ webkit-indent-blockquote is unnecessary
+ https://bugs.webkit.org/show_bug.cgi?id=66195
+
+ Reviewed by Tony Chang.
+
+ Stop adding class="webkit-indent-blockquote" on blockquotes created by execCommand('Indent') and
+ execCommand('Outdent'). Also removed the code to add the class attribute in ApplyBlockElementCommand
+ since no other class inherited from ApplyBlockElementCommand uses this feature.
+
+ * editing/ApplyBlockElementCommand.cpp:
+ (WebCore::ApplyBlockElementCommand::ApplyBlockElementCommand):
+ (WebCore::ApplyBlockElementCommand::createBlockElement):
+ * editing/ApplyBlockElementCommand.h:
+ * editing/IndentOutdentCommand.cpp:
+ (WebCore::IndentOutdentCommand::IndentOutdentCommand):
+
2011-08-15 Levi Weintraub <[email protected]>
Switch remaining SVG Rendering methods to LayoutUnits
Modified: trunk/Source/WebCore/editing/ApplyBlockElementCommand.cpp (93050 => 93051)
--- trunk/Source/WebCore/editing/ApplyBlockElementCommand.cpp 2011-08-15 19:07:58 UTC (rev 93050)
+++ trunk/Source/WebCore/editing/ApplyBlockElementCommand.cpp 2011-08-15 19:23:26 UTC (rev 93051)
@@ -41,10 +41,9 @@
using namespace HTMLNames;
-ApplyBlockElementCommand::ApplyBlockElementCommand(Document* document, const QualifiedName& tagName, const AtomicString& className, const AtomicString& inlineStyle)
+ApplyBlockElementCommand::ApplyBlockElementCommand(Document* document, const QualifiedName& tagName, const AtomicString& inlineStyle)
: CompositeEditCommand(document)
, m_tagName(tagName)
- , m_className(className)
, m_inlineStyle(inlineStyle)
{
}
@@ -280,8 +279,6 @@
PassRefPtr<Element> ApplyBlockElementCommand::createBlockElement() const
{
RefPtr<Element> element = createHTMLElement(document(), m_tagName);
- if (m_className.length())
- element->setAttribute(classAttr, m_className);
if (m_inlineStyle.length())
element->setAttribute(styleAttr, m_inlineStyle);
return element.release();
Modified: trunk/Source/WebCore/editing/ApplyBlockElementCommand.h (93050 => 93051)
--- trunk/Source/WebCore/editing/ApplyBlockElementCommand.h 2011-08-15 19:07:58 UTC (rev 93050)
+++ trunk/Source/WebCore/editing/ApplyBlockElementCommand.h 2011-08-15 19:23:26 UTC (rev 93051)
@@ -38,7 +38,7 @@
class ApplyBlockElementCommand : public CompositeEditCommand {
protected:
- ApplyBlockElementCommand(Document*, const QualifiedName& tagName, const AtomicString& className, const AtomicString& inlineStyle);
+ ApplyBlockElementCommand(Document*, const QualifiedName& tagName, const AtomicString& inlineStyle);
ApplyBlockElementCommand(Document*, const QualifiedName& tagName);
virtual void formatSelection(const VisiblePosition& startOfSelection, const VisiblePosition& endOfSelection);
@@ -52,7 +52,6 @@
VisiblePosition endOfNextParagrahSplittingTextNodesIfNeeded(VisiblePosition&, Position&, Position&);
QualifiedName m_tagName;
- AtomicString m_className;
AtomicString m_inlineStyle;
Position m_endOfLastParagraph;
};
Modified: trunk/Source/WebCore/editing/IndentOutdentCommand.cpp (93050 => 93051)
--- trunk/Source/WebCore/editing/IndentOutdentCommand.cpp 2011-08-15 19:07:58 UTC (rev 93050)
+++ trunk/Source/WebCore/editing/IndentOutdentCommand.cpp 2011-08-15 19:23:26 UTC (rev 93051)
@@ -51,7 +51,7 @@
}
IndentOutdentCommand::IndentOutdentCommand(Document* document, EIndentType typeOfAction, int marginInPixels)
- : ApplyBlockElementCommand(document, blockquoteTag, "webkit-indent-blockquote", "margin: 0 0 0 40px; border: none; padding: 0px;")
+ : ApplyBlockElementCommand(document, blockquoteTag, "margin: 0 0 0 40px; border: none; padding: 0px;")
, m_typeOfAction(typeOfAction)
, m_marginInPixels(marginInPixels)
{
