Changeset 20319 in webkit


Ignore:
Timestamp:
Mar 19, 2007 5:46:58 AM (17 years ago)
Author:
bdash
Message:

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

Reviewed by Tim Hatcher.

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

Reviewed by Tim Hatcher.

  • editing/pasteboard/paste-table-002-expected.txt:
  • fast/innerHTML/additional-inline-style-expected.txt: Added.
  • fast/innerHTML/additional-inline-style.html: Added.
  • webarchive/test-duplicate-resources-expected.txt:
  • webarchive/test-frameset-expected.txt:
  • webarchive/test-link-href-expected.txt:
Location:
trunk
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r20302 r20319  
     12007-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
    1152007-03-18  Sam Weinig  <sam@webkit.org>
    216
  • trunk/LayoutTests/editing/pasteboard/paste-table-002-expected.txt

    r20302 r20319  
    1717foo     bar
    1818ghijk
    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>
    2020
  • trunk/LayoutTests/webarchive/test-duplicate-resources-expected.txt

    r20075 r20319  
    1212&lt;link rel="stylesheet" href="resources/test-style.css" type="text/css"&gt;
    1313&lt;/head&gt;&lt;body&gt;
    14 &lt;div style="font-family: Arial, Helvetica, sans-serif; color: red; "&gt;
     14&lt;div&gt;
    1515  &lt;img src="resources/apple.gif"&gt;
    1616&lt;/div&gt;
    17 &lt;div style="font-family: Arial, Helvetica, sans-serif; color: red; "&gt;
     17&lt;div&gt;
    1818  This is not a frameset.  This text should be red sans-serif.
    1919&lt;/div&gt;
    20 &lt;div style="font-family: Arial, Helvetica, sans-serif; color: red; "&gt;
     20&lt;div&gt;
    2121  &lt;img src="resources/apple.gif"&gt;
    2222&lt;/div&gt;
     
    4343&lt;link rel="stylesheet" href="test-style.css" type="text/css"&gt;
    4444&lt;/head&gt;&lt;body&gt;
    45 &lt;div style="font-family: Arial, Helvetica, sans-serif; color: red; "&gt;
     45&lt;div&gt;
    4646  &lt;img src="apple.gif"&gt;
    4747&lt;/div&gt;
    48 &lt;div style="font-family: Arial, Helvetica, sans-serif; color: red; "&gt;
     48&lt;div&gt;
    4949  This is a subframe.  This text should be red sans-serif.
    5050&lt;/div&gt;
    51 &lt;div style="font-family: Arial, Helvetica, sans-serif; color: red; "&gt;
     51&lt;div&gt;
    5252  &lt;img src="apple.gif"&gt;
    5353&lt;/div&gt;
  • trunk/LayoutTests/webarchive/test-frameset-expected.txt

    r20075 r20319  
    3030&lt;link rel="stylesheet" href="test-style.css" type="text/css"&gt;
    3131&lt;/head&gt;&lt;body&gt;
    32 &lt;div style="font-family: Arial, Helvetica, sans-serif; color: red; "&gt;
     32&lt;div&gt;
    3333  &lt;img src="apple.gif"&gt;
    3434&lt;/div&gt;
    35 &lt;div style="font-family: Arial, Helvetica, sans-serif; color: red; "&gt;
     35&lt;div&gt;
    3636  This is a subframe.  This text should be red sans-serif.
    3737&lt;/div&gt;
    38 &lt;div style="font-family: Arial, Helvetica, sans-serif; color: red; "&gt;
     38&lt;div&gt;
    3939  &lt;img src="apple.gif"&gt;
    4040&lt;/div&gt;
  • trunk/LayoutTests/webarchive/test-link-href-expected.txt

    r20075 r20319  
    1313&lt;link rel="stylesheet" href="resources/test-style.css" type="text/css"&gt;
    1414&lt;/head&gt;&lt;body&gt;
    15 &lt;div style="font-family: Arial, Helvetica, sans-serif; color: red; "&gt;
     15&lt;div&gt;
    1616This text should be red sans-serif.
    1717&lt;/div&gt;
  • trunk/WebCore/ChangeLog

    r20318 r20319  
     12007-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
    1142007-03-19  Zack Rusin  <zrusin@trolltech.com>
    215
  • trunk/WebCore/editing/markup.cpp

    r20302 r20319  
    191191            markup += el->nodeNamePreservingCase().deprecatedString();
    192192            String additionalStyle;
    193             if (el->isHTMLElement()) {
     193            if (annotate && el->isHTMLElement()) {
    194194                RefPtr<CSSMutableStyleDeclaration> style = styleFromMatchedRulesForElement(const_cast<Element*>(el));
    195195                if (style->length() > 0)
     
    202202                Attribute *attr = attrs->attributeItem(i);
    203203                String value = attr->value();
    204                 if (attr->name() == styleAttr && additionalStyle.length() > 0) {
     204                if (annotate && attr->name() == styleAttr && additionalStyle.length()) {
    205205                    value += "; " + additionalStyle;
    206206                    additionalStyle = "";
     
    214214            }
    215215           
    216             if (additionalStyle.length() > 0)
     216            if (annotate && additionalStyle.length())
    217217                // FIXME: Handle case where additionalStyle has illegal characters in it, like "
    218218                markup += " " +  styleAttr.localName().deprecatedString() + "=\"" + additionalStyle.deprecatedString() + "\"";
Note: See TracChangeset for help on using the changeset viewer.