Changeset 111387

Timestamp:
03/20/12 05:38:45 (3 years ago)
Author:
kling@webkit.org
Message:

Let CSSImageValue inherit directly from CSSValue.
<http://webkit.org/b/81635>

Reviewed by Antti Koivisto.

Source/WebCore:

This removes the last of the CSSPrimitiveValue subclasses, which will
open up the class to heavier refactoring.

Those CSSImageValues that used to represent the 'none' value are now
simply created as CSSPrimitiveValue identifiers by the parser.

Test: fast/css/image-value-type.html

  • css/CSSCursorImageValue.cpp:

(WebCore::CSSCursorImageValue::~CSSCursorImageValue):
(WebCore::CSSCursorImageValue::updateIfSVGCursorIsUsed):
(WebCore::CSSCursorImageValue::cachedImage):

  • css/CSSImageValue.cpp:

(WebCore::CSSImageValue::CSSImageValue):
(WebCore::CSSImageValue::cachedOrPendingImage):
(WebCore::CSSImageValue::cachedImage):
(WebCore::CSSImageValue::customCssText):

  • css/CSSImageValue.h:

(WebCore::CSSImageValue::url):

  • css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseFillImage):
(WebCore::CSSParser::parseBorderImage):

  • css/CSSStyleApplyProperty.cpp:

(WebCore::ApplyPropertyCursor::applyValue):

  • css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::collectMatchingRulesForList):

  • css/CSSValue.h:

(WebCore::CSSValue::isPrimitiveValue):

LayoutTests:

Added a test to document the fact that image values are no longer CSSPrimitiveValues.
Updated setPrimitiveValue.html and expectation to reflect this as well.

  • fast/css/image-value-type-expected.txt: Added.
  • fast/css/image-value-type.html: Added.
  • fast/dom/setPrimitiveValue-expected.txt:
  • fast/dom/setPrimitiveValue.html:
Location:
trunk
Files:
2 added
11 edited

Note: See TracChangeset for help on using the changeset viewer.