Changeset 56182 in webkit
- Timestamp:
- Mar 18, 2010 12:50:47 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/http/tests/mime/standard-mode-does-not-load-stylesheet-with-text-plain-and-css-extension-expected.txt
r42330 r56182 1 This test passes if we do NOT apply the stylesheet (which turns the background color red.) The background color is: rgba(0, 0, 0, 0).1 This test passes if we do NOT apply the stylesheet (which turns the background color red.) The background color is: transparent. -
trunk/LayoutTests/http/tests/mime/standard-mode-does-not-load-stylesheet-with-text-plain-expected.txt
r42330 r56182 1 This test passes if we do NOT apply the stylesheet (which turns the background color red.) The background color is: rgba(0, 0, 0, 0).1 This test passes if we do NOT apply the stylesheet (which turns the background color red.) The background color is: transparent. -
trunk/LayoutTests/http/tests/security/cross-origin-css-expected.txt
r52784 r56182 1 1 LINK Cross-origin, HTML, valid: rgb(255, 255, 0) 2 LINK + IMPORT Cross-origin, HTML, invalid: rgba(0, 0, 0, 0)2 LINK + IMPORT Cross-origin, HTML, invalid: transparent 3 3 LINK Cross-origin, CSS, invalid: rgb(255, 255, 0) 4 4 LINK Same-origin, HTML, invalid: rgb(255, 255, 0) -
trunk/LayoutTests/http/tests/security/cross-origin-css-in-xml-expected.txt
r52784 r56182 1 XML CSS Same-origin, HTML, valid: rgba(0, 0, 0, 0)1 XML CSS Same-origin, HTML, valid: transparent -
trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
r55576 r56182 3 3 rect: style.getPropertyValue(background-clip) : border-box 4 4 rect: style.getPropertyCSSValue(background-clip) : [object CSSPrimitiveValue] 5 rect: style.getPropertyValue(background-color) : rgba(0, 0, 0, 0)5 rect: style.getPropertyValue(background-color) : transparent 6 6 rect: style.getPropertyCSSValue(background-color) : [object CSSPrimitiveValue] 7 7 rect: style.getPropertyValue(background-image) : none … … 419 419 g: style.getPropertyValue(background-clip) : border-box 420 420 g: style.getPropertyCSSValue(background-clip) : [object CSSPrimitiveValue] 421 g: style.getPropertyValue(background-color) : rgba(0, 0, 0, 0)421 g: style.getPropertyValue(background-color) : transparent 422 422 g: style.getPropertyCSSValue(background-color) : [object CSSPrimitiveValue] 423 423 g: style.getPropertyValue(background-image) : none -
trunk/WebCore/ChangeLog
r56180 r56182 1 2010-03-18 David Hyatt <hyatt@apple.com> 2 3 Reviewed by Simon Fraser. 4 5 https://bugs.webkit.org/show_bug.cgi?id=36281 6 7 Make sure an exception is raised if an @import rule is inserted in the wrong place. 8 9 Also make sure (so that this particular test case passes) that rgba(0, 0, 0, 0) is dumped 10 as transparent by getComputedStyle, since it most commonly occurs in background-color and 11 that default makes more sense than dumping rgba values. 12 13 Added fast/css/invalid-import-insertion.html 14 15 * css/CSSPrimitiveValue.cpp: 16 (WebCore::CSSPrimitiveValue::createColor): 17 * css/CSSStyleSheet.cpp: 18 (WebCore::CSSStyleSheet::insertRule): 19 1 20 2010-03-18 Luiz Agostini <luiz.agostini@openbossa.org> 2 21 -
trunk/WebCore/css/CSSPrimitiveValue.cpp
r55914 r56182 69 69 // These are the empty and deleted values of the hash table. 70 70 if (rgbValue == Color::transparent) { 71 static CSSPrimitiveValue* colorTransparent = new CSSPrimitiveValue(C olor::transparent);71 static CSSPrimitiveValue* colorTransparent = new CSSPrimitiveValue(CSSValueTransparent); 72 72 return colorTransparent; 73 73 } -
trunk/WebCore/css/CSSStyleSheet.cpp
r53607 r56182 97 97 } 98 98 99 // ### 100 // HIERARCHY_REQUEST_ERR: Raised if the rule cannot be inserted at the specified index e.g. if an 101 //@import rule is inserted after a standard rule set or other at-rule. 99 // Throw a HIERARCHY_REQUEST_ERR exception if the rule cannot be inserted at the specified index. The best 100 // example of this is an @import rule inserted after regular rules. 101 if (index > 0) { 102 if (r->isImportRule()) { 103 // Check all the rules that come before this one to make sure they are only @charset and @import rules. 104 for (unsigned i = 0; i < index; ++i) { 105 if (!item(i)->isCharsetRule() && !item(i)->isImportRule()) { 106 ec = HIERARCHY_REQUEST_ERR; 107 return 0; 108 } 109 } 110 } else if (r->isCharsetRule()) { 111 // The @charset rule has to come first and there can be only one. 112 ec = HIERARCHY_REQUEST_ERR; 113 return 0; 114 } 115 } 116 102 117 insert(index, r.release()); 103 118
Note: See TracChangeset
for help on using the changeset viewer.