Changeset 20297 in webkit

Timestamp:

Mar 18, 2007 4:40:26 PM (17 years ago)

Author:

bdash

Message:

2007-03-18 Mitz Pettel <​mitz@webkit.org>

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 Mitz Pettel <​mitz@webkit.org>

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/pasteboard/paste-table-002-expected.txt (modified) (1 diff)
• LayoutTests/fast/innerHTML/additional-inline-style-expected.txt (added)
• LayoutTests/fast/innerHTML/additional-inline-style.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/markup.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-03-18  Mitz Pettel  <mitz@webkit.org>
+
+        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  <waylonis@mac.com>
 

trunk/LayoutTests/editing/pasteboard/paste-table-002-expected.txt

@@ -17 +17 @@
 foo     bar
 ghijk
-<div id="test" class="editing" style="border-top-width: 2px; border-right-width: 2px; border-bottom-width: 2px; border-left-width: 2px; border-top-style: solid; border-right-style: solid; border-bottom-style: solid; border-left-style: solid; border-top-color: red; border-right-color: red; border-bottom-color: red; border-left-color: red; font-size: 24px; "> <div>abcdef<div style="text-align: center"><table><tbody><tr><td>foo</td><td>bar</td></tr></tbody></table>ghijk</div> </div> </div>
+<div id="test" class="editing"> <div>abcdef<div style="text-align: center"><table><tbody><tr><td>foo</td><td>bar</td></tr></tbody></table>ghijk</div> </div> </div>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-03-18  Mitz Pettel  <mitz@webkit.org>
+
+        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  <waylonis@mac.com>
 

trunk/WebCore/editing/markup.cpp

@@ -191 +191 @@
             markup += el->nodeNamePreservingCase().deprecatedString();
             String additionalStyle;
-            if (el->isHTMLElement()) {
+            if (annotate && el->isHTMLElement()) {
                 RefPtr<CSSMutableStyleDeclaration> style = styleFromMatchedRulesForElement(const_cast<Element*>(el));
                 if (style->length() > 0)
@@ -202 +202 @@
                 Attribute *attr = attrs->attributeItem(i);
                 String value = attr->value();
-                if (attr->name() == styleAttr && additionalStyle.length() > 0) {
+                if (annotate && attr->name() == styleAttr && additionalStyle.length()) {
                     value += "; " + additionalStyle;
                     additionalStyle = "";
@@ -214 +214 @@
             }
             
-            if (additionalStyle.length() > 0)
+            if (annotate && additionalStyle.length())
                 // FIXME: Handle case where additionalStyle has illegal characters in it, like "
                 markup += " " +  styleAttr.localName().deprecatedString() + "=\"" + additionalStyle.deprecatedString() + "\"";