Commit 4d188dd2 authored by slangley's avatar slangley Committed by Commit bot

Move CSSCounterValue & CSSCursorImageValue to the namespace blink::cssvalue.

This is a continuation of other work to move CSS.*Value types to the nested
namespace blink::cssvalue to avoid name collisions. I will be moving over type
2 or 3 at a time per CL. In some cases we need to temporarily introduce using
statements while we're shuffling the classes around. These will be cleaned up
once all types have been moved to blink::cssvalue.

BUG=667961

Review-Url: https://codereview.chromium.org/2804673003
Cr-Commit-Position: refs/heads/master@{#462740}
parent 60d4e0a6
......@@ -9,6 +9,8 @@
namespace blink {
namespace cssvalue {
String CSSCounterValue::customCSSText() const {
StringBuilder result;
if (separator().isEmpty())
......@@ -38,4 +40,6 @@ DEFINE_TRACE_AFTER_DISPATCH(CSSCounterValue) {
CSSValue::traceAfterDispatch(visitor);
}
} // namespace cssvalue
} // namespace blink
......@@ -28,6 +28,8 @@
namespace blink {
namespace cssvalue {
class CSSCounterValue : public CSSValue {
public:
static CSSCounterValue* create(CSSCustomIdentValue* identifier,
......@@ -65,6 +67,8 @@ class CSSCounterValue : public CSSValue {
DEFINE_CSS_VALUE_TYPE_CASTS(CSSCounterValue, isCounterValue());
} // namespace cssvalue
} // namespace blink
#endif // CSSCounterValue_h
......@@ -26,6 +26,8 @@
namespace blink {
namespace cssvalue {
CSSCursorImageValue::CSSCursorImageValue(const CSSValue& imageValue,
bool hotSpotSpecified,
const IntPoint& hotSpot)
......@@ -62,4 +64,6 @@ DEFINE_TRACE_AFTER_DISPATCH(CSSCursorImageValue) {
CSSValue::traceAfterDispatch(visitor);
}
} // namespace cssvalue
} // namespace blink
......@@ -26,6 +26,8 @@
namespace blink {
namespace cssvalue {
class CSSCursorImageValue : public CSSValue {
public:
static const CSSCursorImageValue* create(const CSSValue& imageValue,
......@@ -58,6 +60,8 @@ class CSSCursorImageValue : public CSSValue {
DEFINE_CSS_VALUE_TYPE_CASTS(CSSCursorImageValue, isCursorImageValue());
} // namespace cssvalue
} // namespace blink
#endif // CSSCursorImageValue_h
......@@ -14,6 +14,8 @@
namespace blink {
using CSSCounterValue = cssvalue::CSSCounterValue;
namespace {
CSSValue* consumeAttr(CSSParserTokenRange args,
......
......@@ -13,6 +13,8 @@
namespace blink {
using CSSCursorImageValue = cssvalue::CSSCursorImageValue;
const CSSValue* CSSPropertyAPICursor::parseSingleValue(
CSSParserTokenRange& range,
const CSSParserContext& context) {
......
......@@ -217,7 +217,8 @@ void StyleBuilderFunctions::applyValueCSSPropertyCursor(
state.style()->setCursor(ECursor::kAuto);
for (const auto& item : toCSSValueList(value)) {
if (item->isCursorImageValue()) {
const CSSCursorImageValue& cursor = toCSSCursorImageValue(*item);
const cssvalue::CSSCursorImageValue& cursor =
cssvalue::toCSSCursorImageValue(*item);
const CSSValue& image = cursor.imageValue();
state.style()->addCursor(state.styleImage(CSSPropertyCursor, image),
cursor.hotSpotSpecified(), cursor.hotSpot());
......@@ -723,7 +724,8 @@ void StyleBuilderFunctions::applyValueCSSPropertyContent(
nextContent =
ContentData::create(state.styleImage(CSSPropertyContent, *item));
} else if (item->isCounterValue()) {
const CSSCounterValue* counterValue = toCSSCounterValue(item.get());
const cssvalue::CSSCounterValue* counterValue =
cssvalue::toCSSCounterValue(item.get());
const auto listStyleType =
cssValueIDToPlatformEnum<EListStyleType>(counterValue->listStyle());
std::unique_ptr<CounterContent> counter =
......
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