diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index f710853dfc584587e08df8f971095f4a4bcd68ad..a0f22615a131b97fae817e067595a46570fc5c4b 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -29,17 +29,6 @@ * fast/forms/input-text-word-wrap-expected.txt: Added. * fast/forms/input-text-word-wrap.html: Added. -2007-03-18 Mitz Pettel - - Reviewed by Tim Hatcher. - - - test and updated result for http://bugs.webkit.org/show_bug.cgi?id=13091 - REGRESSION (r20075): Wrong text style and pixel break in Apple Store Locator HUD - - * editing/pasteboard/paste-table-002-expected.txt: - * fast/innerHTML/additional-inline-style-expected.txt: Added. - * fast/innerHTML/additional-inline-style.html: Added. - 2007-03-18 Dan Waylonis Reviewed by Tim Hatcher. diff --git a/LayoutTests/editing/pasteboard/paste-table-002-expected.txt b/LayoutTests/editing/pasteboard/paste-table-002-expected.txt index 953fbeaa8afa4f6c97d4e0bbd731dca9629c0508..1ae9200cad740ca887c90beebf46e9a0026a423e 100644 --- a/LayoutTests/editing/pasteboard/paste-table-002-expected.txt +++ b/LayoutTests/editing/pasteboard/paste-table-002-expected.txt @@ -16,5 +16,5 @@ Problem: copy/pasting some HTML including tables can give rise to a
elemen abcdef foo bar ghijk -
abcdef
foobar
ghijk
+
abcdef
foobar
ghijk
diff --git a/LayoutTests/fast/innerHTML/additional-inline-style-expected.txt b/LayoutTests/fast/innerHTML/additional-inline-style-expected.txt deleted file mode 100644 index 5848259feb883295ffd6a3d91d5c74e6fc0119af..0000000000000000000000000000000000000000 --- a/LayoutTests/fast/innerHTML/additional-inline-style-expected.txt +++ /dev/null @@ -1,8 +0,0 @@ -Test for http://bugs.webkit.org/show_bug.cgi?id=13091 REGRESSION (r20075): Wrong text style and pixel break in Apple Store Locator HUD. - -This tests that .innerHTML does not introduce additional inline style. - -The following markup should not include a style attribute: - - - diff --git a/LayoutTests/fast/innerHTML/additional-inline-style.html b/LayoutTests/fast/innerHTML/additional-inline-style.html deleted file mode 100644 index 6e7fdf6809c8c972500a4550d376caf101948d0c..0000000000000000000000000000000000000000 --- a/LayoutTests/fast/innerHTML/additional-inline-style.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - -

- Test for http://bugs.webkit.org/show_bug.cgi?id=13091 - REGRESSION (r20075): Wrong text style and pixel break in Apple Store Locator HUD. -

-

- This tests that .innerHTML does not introduce additional inline style. -

-

- The following markup should not include a style attribute: -

-
-

-
-
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e7fade4bd117bdc8a4794caec7f23e6437a44cb7..a96079817ba303cefefb16f5ab57b8cde0c66fc4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -33,19 +33,6 @@
         (WebCore::RenderTextControl::createInnerTextStyle): Force the inner block to
         'word-wrap:normal'.
 
-2007-03-18  Mitz Pettel  
-
-        Reviewed by Tim Hatcher.
-
-        - fix http://bugs.webkit.org/show_bug.cgi?id=13091
-          REGRESSION (r20075): Wrong text style and pixel break in Apple Store Locator HUD
-
-        Test: fast/innerHTML/additional-inline-style.html
-
-        * editing/markup.cpp:
-        (WebCore::startMarkup): Changed to add inline style based on CSS rules only
-        in AnnotateForInterchange mode.
-
 2007-03-18  Dan Waylonis  
 
         Reviewed by Tim Hatcher.
diff --git a/WebCore/editing/markup.cpp b/WebCore/editing/markup.cpp
index 5bb92364c1ca588c785fe822f7dc81cc38aac5bb..897168c3ac2d608c73a909a7796db0df95e55747 100644
--- a/WebCore/editing/markup.cpp
+++ b/WebCore/editing/markup.cpp
@@ -190,7 +190,7 @@ static DeprecatedString startMarkup(const Node *node, const Range *range, EAnnot
             const Element* el = static_cast(node);
             markup += el->nodeNamePreservingCase().deprecatedString();
             String additionalStyle;
-            if (annotate && el->isHTMLElement()) {
+            if (el->isHTMLElement()) {
                 RefPtr style = styleFromMatchedRulesForElement(const_cast(el));
                 if (style->length() > 0)
                     additionalStyle = style->cssText();
@@ -201,7 +201,7 @@ static DeprecatedString startMarkup(const Node *node, const Range *range, EAnnot
             for (unsigned int i = 0; i < length; i++) {
                 Attribute *attr = attrs->attributeItem(i);
                 String value = attr->value();
-                if (annotate && attr->name() == styleAttr && additionalStyle.length()) {
+                if (attr->name() == styleAttr && additionalStyle.length() > 0) {
                     value += "; " + additionalStyle;
                     additionalStyle = "";
                 }
@@ -213,7 +213,7 @@ static DeprecatedString startMarkup(const Node *node, const Range *range, EAnnot
                 markup += "=\"" + escapeTextForMarkup(value.deprecatedString(), true) + "\"";
             }
             
-            if (annotate && additionalStyle.length())
+            if (additionalStyle.length() > 0)
                 // FIXME: Handle case where additionalStyle has illegal characters in it, like "
                 markup += " " +  styleAttr.localName().deprecatedString() + "=\"" + additionalStyle.deprecatedString() + "\"";