Changeset 20319 in webkit
- Timestamp:
- Mar 19, 2007 5:46:58 AM (17 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r20302 r20319 1 2007-03-19 Mitz Pettel <mitz@webkit.org> 2 3 Reviewed by Tim Hatcher. 4 5 - test and updated result for http://bugs.webkit.org/show_bug.cgi?id=13091 6 REGRESSION (r20075): Wrong text style and pixel break in Apple Store Locator HUD 7 8 * editing/pasteboard/paste-table-002-expected.txt: 9 * fast/innerHTML/additional-inline-style-expected.txt: Added. 10 * fast/innerHTML/additional-inline-style.html: Added. 11 * webarchive/test-duplicate-resources-expected.txt: 12 * webarchive/test-frameset-expected.txt: 13 * webarchive/test-link-href-expected.txt: 14 1 15 2007-03-18 Sam Weinig <sam@webkit.org> 2 16 -
trunk/LayoutTests/editing/pasteboard/paste-table-002-expected.txt
r20302 r20319 17 17 foo bar 18 18 ghijk 19 <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>19 <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> 20 20 -
trunk/LayoutTests/webarchive/test-duplicate-resources-expected.txt
r20075 r20319 12 12 <link rel="stylesheet" href="resources/test-style.css" type="text/css"> 13 13 </head><body> 14 <div style="font-family: Arial, Helvetica, sans-serif; color: red; ">14 <div> 15 15 <img src="resources/apple.gif"> 16 16 </div> 17 <div style="font-family: Arial, Helvetica, sans-serif; color: red; ">17 <div> 18 18 This is not a frameset. This text should be red sans-serif. 19 19 </div> 20 <div style="font-family: Arial, Helvetica, sans-serif; color: red; ">20 <div> 21 21 <img src="resources/apple.gif"> 22 22 </div> … … 43 43 <link rel="stylesheet" href="test-style.css" type="text/css"> 44 44 </head><body> 45 <div style="font-family: Arial, Helvetica, sans-serif; color: red; ">45 <div> 46 46 <img src="apple.gif"> 47 47 </div> 48 <div style="font-family: Arial, Helvetica, sans-serif; color: red; ">48 <div> 49 49 This is a subframe. This text should be red sans-serif. 50 50 </div> 51 <div style="font-family: Arial, Helvetica, sans-serif; color: red; ">51 <div> 52 52 <img src="apple.gif"> 53 53 </div> -
trunk/LayoutTests/webarchive/test-frameset-expected.txt
r20075 r20319 30 30 <link rel="stylesheet" href="test-style.css" type="text/css"> 31 31 </head><body> 32 <div style="font-family: Arial, Helvetica, sans-serif; color: red; ">32 <div> 33 33 <img src="apple.gif"> 34 34 </div> 35 <div style="font-family: Arial, Helvetica, sans-serif; color: red; ">35 <div> 36 36 This is a subframe. This text should be red sans-serif. 37 37 </div> 38 <div style="font-family: Arial, Helvetica, sans-serif; color: red; ">38 <div> 39 39 <img src="apple.gif"> 40 40 </div> -
trunk/LayoutTests/webarchive/test-link-href-expected.txt
r20075 r20319 13 13 <link rel="stylesheet" href="resources/test-style.css" type="text/css"> 14 14 </head><body> 15 <div style="font-family: Arial, Helvetica, sans-serif; color: red; ">15 <div> 16 16 This text should be red sans-serif. 17 17 </div> -
trunk/WebCore/ChangeLog
r20318 r20319 1 2007-03-19 Mitz Pettel <mitz@webkit.org> 2 3 Reviewed by Tim Hatcher. 4 5 - fix http://bugs.webkit.org/show_bug.cgi?id=13091 6 REGRESSION (r20075): Wrong text style and pixel break in Apple Store Locator HUD 7 8 Test: fast/innerHTML/additional-inline-style.html 9 10 * editing/markup.cpp: 11 (WebCore::startMarkup): Changed to add inline style based on CSS rules only 12 in AnnotateForInterchange mode. 13 1 14 2007-03-19 Zack Rusin <zrusin@trolltech.com> 2 15 -
trunk/WebCore/editing/markup.cpp
r20302 r20319 191 191 markup += el->nodeNamePreservingCase().deprecatedString(); 192 192 String additionalStyle; 193 if ( el->isHTMLElement()) {193 if (annotate && el->isHTMLElement()) { 194 194 RefPtr<CSSMutableStyleDeclaration> style = styleFromMatchedRulesForElement(const_cast<Element*>(el)); 195 195 if (style->length() > 0) … … 202 202 Attribute *attr = attrs->attributeItem(i); 203 203 String value = attr->value(); 204 if (a ttr->name() == styleAttr && additionalStyle.length() > 0) {204 if (annotate && attr->name() == styleAttr && additionalStyle.length()) { 205 205 value += "; " + additionalStyle; 206 206 additionalStyle = ""; … … 214 214 } 215 215 216 if (a dditionalStyle.length() > 0)216 if (annotate && additionalStyle.length()) 217 217 // FIXME: Handle case where additionalStyle has illegal characters in it, like " 218 218 markup += " " + styleAttr.localName().deprecatedString() + "=\"" + additionalStyle.deprecatedString() + "\"";
Note: See TracChangeset
for help on using the changeset viewer.