Skip to content

GitLab

T
tangled
Commit a2440766 authored by bdash's avatar bdash
Browse files
Options

2007-01-10 Mitz Pettel <mitz@webkit.org> 

        Reviewed by Darin.

        - fix http://bugs.webkit.org/show_bug.cgi?id=9284
          Quirksmode (CSS1): Removing inline border styles is impossible

        Test: fast/css/remove-shorthand.html

        * css/CSSMutableStyleDeclaration.cpp:
        (WebCore::PropertyLonghand::PropertyLonghand): Added this structure
        containing a pointer to an array if properties and the array's length.
        (WebCore::PropertyLonghand::properties):
        (WebCore::PropertyLonghand::length):
        (WebCore::initShorthandMap): Initialize the mapping from shorthand
        properties to their dependent properties.
        (WebCore::CSSMutableStyleDeclaration::removeProperty): Changed to check
        if the property being removed is a shorthand, and if so, to remove all
        of its dependent properties.
        (WebCore::CSSMutableStyleDeclaration::removePropertiesInSet): Added a
        'notifyChanged' boolean parameter which controls whether this method
        calls setChanged() if it actually removes any property.
        * css/CSSMutableStyleDeclaration.h:

2007-01-10  Mitz Pettel  <mitz@webkit.org>

        Reviewed by Darin.

        - test for http://bugs.webkit.org/show_bug.cgi?id=9284
          Quirksmode (CSS1): Removing inline border styles is impossible

        * fast/css/remove-shorthand-expected.txt: Added.
        * fast/css/remove-shorthand.html: Added.


git-svn-id: svn://svn.chromium.org/blink/trunk@18753 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 3ee486bd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 283 additions and 3 deletions
third_party/WebKit/LayoutTests/ChangeLog
View file @ a2440766
2007-01-10 Mitz Pettel <mitz@webkit.org>
Reviewed by Darin.
- test for http://bugs.webkit.org/show_bug.cgi?id=9284
Quirksmode (CSS1): Removing inline border styles is impossible
* fast/css/remove-shorthand-expected.txt: Added.
* fast/css/remove-shorthand.html: Added.
2007-01-10 Nikolas Zimmermann <zimmermann@kde.org> 2007-01-10 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed by Eric. Reviewed by Eric.
third_party/WebKit/LayoutTests/fast/css/remove-shorthand.html 0 → 100644
View file @ a2440766
<html>
<head>
<title></title>
<script type="text/javascript">
function log(message)
{
var console = document.getElementById("console");
console.appendChild(document.createTextNode(message + "\n"));
}
function testShorthand(shorthand)
{
var element = document.createElement("div");
element.setAttribute("style",
"border: thin dotted purple;\
background: red url(/background.png) repeat-y scroll right bottom;\
list-style: square outside url(/marker.png);\
margin: 5%;\
-webkit-margin-collapse: collapse;\
-webkit-marquee: ahead small infinite slide slow;\
padding: 2em;\
-webkit-text-stroke: orange 1pt;\
-webkit-columns: 100px 3;\
-webkit-column-rule: thick dashed silver;\
border-spacing: 10px 20px;");
element.style.removeProperty(shorthand);
log("Removing '" + shorthand + "' leaves '" + element.style.cssText +"'");
}
function test()
{
if (window.layoutTestController)
layoutTestController.dumpAsText();
var shorthands = [
"border",
"border-top", "border-right", "border-bottom", "border-left",
"border-width", "border-style", "border-color",
"background",
"background-position",
"list-style",
"margin",
"-webkit-margin-collapse",
"-webkit-marquee",
"padding",
"-webkit-text-stroke",
"-webkit-columns",
"-webkit-column-rule",
"border-spacing"
];
for (i in shorthands)
testShorthand(shorthands[i]);
}
</script>
</head>
<body onload="test()">
<p>
Test for <i><a href="http://bugs.webkit.org/show_bug.cgi?id=9284">http://bugs.webkit.org/show_bug.cgi?id=9284</a>
Quirksmode (CSS1): Removing inline border styles is impossible</i>.
</p>
<p>
Starting with a declaration containing all properties that are constituents of shortcuts, see what is left
when a shortcut property is removed. The shortcut&rsquo;s constituents and only them should be removed.
</p>
<pre id="console"></pre>
</body>
</html>
third_party/WebKit/WebCore/ChangeLog
View file @ a2440766
2007-01-10 Mitz Pettel <mitz@webkit.org>
Reviewed by Darin.
- fix http://bugs.webkit.org/show_bug.cgi?id=9284
Quirksmode (CSS1): Removing inline border styles is impossible
Test: fast/css/remove-shorthand.html
* css/CSSMutableStyleDeclaration.cpp:
(WebCore::PropertyLonghand::PropertyLonghand): Added this structure
containing a pointer to an array if properties and the array's length.
(WebCore::PropertyLonghand::properties):
(WebCore::PropertyLonghand::length):
(WebCore::initShorthandMap): Initialize the mapping from shorthand
properties to their dependent properties.
(WebCore::CSSMutableStyleDeclaration::removeProperty): Changed to check
if the property being removed is a shorthand, and if so, to remove all
of its dependent properties.
(WebCore::CSSMutableStyleDeclaration::removePropertiesInSet): Added a
'notifyChanged' boolean parameter which controls whether this method
calls setChanged() if it actually removes any property.
* css/CSSMutableStyleDeclaration.h:
2007-01-10 Steve Falkenburg <sfalken@apple.com> 2007-01-10 Steve Falkenburg <sfalken@apple.com>
Reviewed by Kevin. Reviewed by Kevin.
......
third_party/WebKit/WebCore/css/CSSMutableStyleDeclaration.cpp
View file @ a2440766
...@@ -211,10 +211,164 @@ PassRefPtr<CSSValue> CSSMutableStyleDeclaration::getPropertyCSSValue(int propert ...@@ -211,10 +211,164 @@ PassRefPtr<CSSValue> CSSMutableStyleDeclaration::getPropertyCSSValue(int propert
return 0; return 0;
} }
struct PropertyLonghand {
PropertyLonghand()
: m_properties(0)
, m_length(0)
{
}
PropertyLonghand(const int* firstProperty, unsigned numProperties)
: m_properties(firstProperty)
, m_length(numProperties)
{
}
const int* properties() const { return m_properties; }
unsigned length() const { return m_length; }
private:
const int* m_properties;
unsigned m_length;
};
static void initShorthandMap(HashMap<int, PropertyLonghand>& shorthandMap)
{
#define SET_SHORTHAND_MAP_ENTRY(map, propID, array) \
map.set(propID, PropertyLonghand(array, sizeof(array) / sizeof(array[0])))
// FIXME: The following properties have "shorthand nature" but are not parsed as
// shorthands: 'font', '-webkit-border-radius' and 'overflow'.
// Do not change the order of the following four shorthands, and keep them together.
static const int borderProperties[4][3] = {
{ CSS_PROP_BORDER_TOP_COLOR, CSS_PROP_BORDER_TOP_STYLE, CSS_PROP_BORDER_TOP_WIDTH },
{ CSS_PROP_BORDER_RIGHT_COLOR, CSS_PROP_BORDER_RIGHT_STYLE, CSS_PROP_BORDER_RIGHT_WIDTH },
{ CSS_PROP_BORDER_BOTTOM_COLOR, CSS_PROP_BORDER_BOTTOM_STYLE, CSS_PROP_BORDER_BOTTOM_WIDTH },
{ CSS_PROP_BORDER_LEFT_COLOR, CSS_PROP_BORDER_LEFT_STYLE, CSS_PROP_BORDER_LEFT_WIDTH }
};
SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSS_PROP_BORDER_TOP, borderProperties[0]);
SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSS_PROP_BORDER_RIGHT, borderProperties[1]);
SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSS_PROP_BORDER_BOTTOM, borderProperties[2]);
SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSS_PROP_BORDER_LEFT, borderProperties[3]);
shorthandMap.set(CSS_PROP_BORDER, PropertyLonghand(borderProperties[0], sizeof(borderProperties) / sizeof(borderProperties[0][0])));
static const int borderColorProperties[] = {
CSS_PROP_BORDER_TOP_COLOR,
CSS_PROP_BORDER_RIGHT_COLOR,
CSS_PROP_BORDER_BOTTOM_COLOR,
CSS_PROP_BORDER_LEFT_COLOR
};
SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSS_PROP_BORDER_COLOR, borderColorProperties);
static const int borderStyleProperties[] = {
CSS_PROP_BORDER_TOP_STYLE,
CSS_PROP_BORDER_RIGHT_STYLE,
CSS_PROP_BORDER_BOTTOM_STYLE,
CSS_PROP_BORDER_LEFT_STYLE
};
SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSS_PROP_BORDER_STYLE, borderStyleProperties);
static const int borderWidthProperties[] = {
CSS_PROP_BORDER_TOP_WIDTH,
CSS_PROP_BORDER_RIGHT_WIDTH,
CSS_PROP_BORDER_BOTTOM_WIDTH,
CSS_PROP_BORDER_LEFT_WIDTH
};
SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSS_PROP_BORDER_WIDTH, borderWidthProperties);
static const int backgroundPositionProperties[] = { CSS_PROP_BACKGROUND_POSITION_X, CSS_PROP_BACKGROUND_POSITION_Y };
SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSS_PROP_BACKGROUND_POSITION, backgroundPositionProperties);
static const int borderSpacingProperties[] = { CSS_PROP__WEBKIT_BORDER_HORIZONTAL_SPACING, CSS_PROP__WEBKIT_BORDER_VERTICAL_SPACING };
SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSS_PROP_BORDER_SPACING, borderSpacingProperties);
static const int listStyleProperties[] = {
CSS_PROP_LIST_STYLE_IMAGE,
CSS_PROP_LIST_STYLE_POSITION,
CSS_PROP_LIST_STYLE_TYPE
};
SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSS_PROP_LIST_STYLE, listStyleProperties);
static const int marginProperties[] = {
CSS_PROP_MARGIN_TOP,
CSS_PROP_MARGIN_RIGHT,
CSS_PROP_MARGIN_BOTTOM,
CSS_PROP_MARGIN_LEFT
};
SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSS_PROP_MARGIN, marginProperties);
static const int marginCollapseProperties[] = { CSS_PROP__WEBKIT_MARGIN_TOP_COLLAPSE, CSS_PROP__WEBKIT_MARGIN_BOTTOM_COLLAPSE };
SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSS_PROP__WEBKIT_MARGIN_COLLAPSE, marginCollapseProperties);
static const int marqueeProperties[] = {
CSS_PROP__WEBKIT_MARQUEE_DIRECTION,
CSS_PROP__WEBKIT_MARQUEE_INCREMENT,
CSS_PROP__WEBKIT_MARQUEE_REPETITION,
CSS_PROP__WEBKIT_MARQUEE_STYLE,
CSS_PROP__WEBKIT_MARQUEE_SPEED
};
SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSS_PROP__WEBKIT_MARQUEE, marqueeProperties);
static const int outlineProperties[] = {
CSS_PROP_OUTLINE_COLOR,
CSS_PROP_OUTLINE_OFFSET,
CSS_PROP_OUTLINE_STYLE,
CSS_PROP_OUTLINE_WIDTH
};
SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSS_PROP_OUTLINE, outlineProperties);
static const int paddingProperties[] = {
CSS_PROP_PADDING_TOP,
CSS_PROP_PADDING_RIGHT,
CSS_PROP_PADDING_BOTTOM,
CSS_PROP_PADDING_LEFT
};
SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSS_PROP_PADDING, paddingProperties);
static const int textStrokeProperties[] = { CSS_PROP__WEBKIT_TEXT_STROKE_COLOR, CSS_PROP__WEBKIT_TEXT_STROKE_WIDTH };
SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSS_PROP__WEBKIT_TEXT_STROKE, textStrokeProperties);
static const int backgroundProperties[] = {
CSS_PROP_BACKGROUND_ATTACHMENT,
CSS_PROP_BACKGROUND_COLOR,
CSS_PROP_BACKGROUND_IMAGE,
CSS_PROP_BACKGROUND_POSITION_X,
CSS_PROP_BACKGROUND_POSITION_Y,
CSS_PROP_BACKGROUND_REPEAT,
CSS_PROP__WEBKIT_BACKGROUND_SIZE
};
SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSS_PROP_BACKGROUND, backgroundProperties);
static const int columnsProperties[] = { CSS_PROP__WEBKIT_COLUMN_WIDTH, CSS_PROP__WEBKIT_COLUMN_COUNT };
SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSS_PROP__WEBKIT_COLUMNS, columnsProperties);
static const int columnRuleProperties[] = {
CSS_PROP__WEBKIT_COLUMN_RULE_COLOR,
CSS_PROP__WEBKIT_COLUMN_RULE_STYLE,
CSS_PROP__WEBKIT_COLUMN_RULE_WIDTH
};
SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSS_PROP__WEBKIT_COLUMN_RULE, columnRuleProperties);
#undef SET_SHORTHAND_MAP_ENTRY
}
String CSSMutableStyleDeclaration::removeProperty(int propertyID, bool notifyChanged, ExceptionCode& ec) String CSSMutableStyleDeclaration::removeProperty(int propertyID, bool notifyChanged, ExceptionCode& ec)
{ {
ec = 0; ec = 0;
static HashMap<int, PropertyLonghand> shorthandMap;
if (shorthandMap.isEmpty())
initShorthandMap(shorthandMap);
PropertyLonghand longhand = shorthandMap.get(propertyID);
if (longhand.length()) {
removePropertiesInSet(longhand.properties(), longhand.length(), notifyChanged);
// FIXME: Return an equivalent shorthand when possible.
return String();
}
String value; String value;
DeprecatedValueListIterator<CSSProperty> end; DeprecatedValueListIterator<CSSProperty> end;
...@@ -450,7 +604,7 @@ void CSSMutableStyleDeclaration::removeBlockProperties() ...@@ -450,7 +604,7 @@ void CSSMutableStyleDeclaration::removeBlockProperties()
removePropertiesInSet(blockProperties, numBlockProperties); removePropertiesInSet(blockProperties, numBlockProperties);
} }
void CSSMutableStyleDeclaration::removePropertiesInSet(const int *set, unsigned length) void CSSMutableStyleDeclaration::removePropertiesInSet(const int *set, unsigned length, bool notifyChanged)
{ {
bool changed = false; bool changed = false;
for (unsigned i = 0; i < length; i++) { for (unsigned i = 0; i < length; i++) {
...@@ -460,7 +614,7 @@ void CSSMutableStyleDeclaration::removePropertiesInSet(const int *set, unsigned ...@@ -460,7 +614,7 @@ void CSSMutableStyleDeclaration::removePropertiesInSet(const int *set, unsigned
changed = true; changed = true;
} }
} }
if (changed) if (changed && notifyChanged)
setChanged(); setChanged();
} }
......
third_party/WebKit/WebCore/css/CSSMutableStyleDeclaration.h
View file @ a2440766
...@@ -92,7 +92,7 @@ public: ...@@ -92,7 +92,7 @@ public:
PassRefPtr<CSSMutableStyleDeclaration> copyBlockProperties() const; PassRefPtr<CSSMutableStyleDeclaration> copyBlockProperties() const;
void removeBlockProperties(); void removeBlockProperties();
void removePropertiesInSet(const int* set, unsigned length); void removePropertiesInSet(const int* set, unsigned length, bool notifyChanged = true);
void merge(CSSMutableStyleDeclaration*, bool argOverridesOnConflict = true); void merge(CSSMutableStyleDeclaration*, bool argOverridesOnConflict = true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment