| Index: Source/core/inspector/InspectorStyleSheet.cpp
|
| diff --git a/Source/core/inspector/InspectorStyleSheet.cpp b/Source/core/inspector/InspectorStyleSheet.cpp
|
| index 664fe99a22dc63e7eb2d6acdad080ef638447ba0..955d95d22c40b09ef02dc4a10293b090c890073f 100644
|
| --- a/Source/core/inspector/InspectorStyleSheet.cpp
|
| +++ b/Source/core/inspector/InspectorStyleSheet.cpp
|
| @@ -554,9 +554,9 @@ PassRefPtr<TypeBuilder::CSS::CSSStyle> InspectorStyle::buildObjectForStyle() con
|
| return result.release();
|
| }
|
|
|
| -PassRefPtr<TypeBuilder::Array<TypeBuilder::CSS::CSSComputedStyleProperty> > InspectorStyle::buildArrayForComputedStyle() const
|
| +PassRefPtr<TypeBuilder::Array<TypeBuilder::CSS::CSSComputedStyleProperty>> InspectorStyle::buildArrayForComputedStyle() const
|
| {
|
| - RefPtr<TypeBuilder::Array<TypeBuilder::CSS::CSSComputedStyleProperty> > result = TypeBuilder::Array<TypeBuilder::CSS::CSSComputedStyleProperty>::create();
|
| + RefPtr<TypeBuilder::Array<TypeBuilder::CSS::CSSComputedStyleProperty>> result = TypeBuilder::Array<TypeBuilder::CSS::CSSComputedStyleProperty>::create();
|
| WillBeHeapVector<InspectorStyleProperty> properties;
|
| populateAllProperties(properties);
|
|
|
| @@ -693,8 +693,8 @@ void InspectorStyle::populateAllProperties(WillBeHeapVector<InspectorStyleProper
|
|
|
| PassRefPtr<TypeBuilder::CSS::CSSStyle> InspectorStyle::styleWithProperties() const
|
| {
|
| - RefPtr<Array<TypeBuilder::CSS::CSSProperty> > propertiesObject = Array<TypeBuilder::CSS::CSSProperty>::create();
|
| - RefPtr<Array<TypeBuilder::CSS::ShorthandEntry> > shorthandEntries = Array<TypeBuilder::CSS::ShorthandEntry>::create();
|
| + RefPtr<Array<TypeBuilder::CSS::CSSProperty>> propertiesObject = Array<TypeBuilder::CSS::CSSProperty>::create();
|
| + RefPtr<Array<TypeBuilder::CSS::ShorthandEntry>> shorthandEntries = Array<TypeBuilder::CSS::ShorthandEntry>::create();
|
| HashSet<String> foundShorthands;
|
| RefPtrWillBeRawPtr<CSSRuleSourceData> sourceData = extractSourceData();
|
|
|
| @@ -1426,10 +1426,10 @@ PassRefPtr<TypeBuilder::CSS::CSSStyleSheetHeader> InspectorStyleSheet::buildObje
|
| return result.release();
|
| }
|
|
|
| -PassRefPtr<TypeBuilder::Array<TypeBuilder::CSS::Selector> > InspectorStyleSheet::selectorsFromSource(const CSSRuleSourceData* sourceData, const String& sheetText)
|
| +PassRefPtr<TypeBuilder::Array<TypeBuilder::CSS::Selector>> InspectorStyleSheet::selectorsFromSource(const CSSRuleSourceData* sourceData, const String& sheetText)
|
| {
|
| ScriptRegexp comment("/\\*[^]*?\\*/", TextCaseSensitive, MultilineEnabled);
|
| - RefPtr<TypeBuilder::Array<TypeBuilder::CSS::Selector> > result = TypeBuilder::Array<TypeBuilder::CSS::Selector>::create();
|
| + RefPtr<TypeBuilder::Array<TypeBuilder::CSS::Selector>> result = TypeBuilder::Array<TypeBuilder::CSS::Selector>::create();
|
| const SelectorRangeList& ranges = sourceData->selectorRanges;
|
| for (size_t i = 0, size = ranges.size(); i < size; ++i) {
|
| const SourceRange& range = ranges.at(i);
|
| @@ -1454,7 +1454,7 @@ PassRefPtr<TypeBuilder::CSS::SelectorList> InspectorStyleSheet::buildObjectForSe
|
| RefPtrWillBeRawPtr<CSSRuleSourceData> sourceData = nullptr;
|
| if (ensureParsedDataReady())
|
| sourceData = ruleSourceDataAt(styleId(rule->style()).ordinal());
|
| - RefPtr<TypeBuilder::Array<TypeBuilder::CSS::Selector> > selectors;
|
| + RefPtr<TypeBuilder::Array<TypeBuilder::CSS::Selector>> selectors;
|
|
|
| // This intentionally does not rely on the source data to avoid catching the trailing comments (before the declaration starting '{').
|
| String selectorText = rule->selectorText();
|
| @@ -1479,7 +1479,7 @@ static bool canBind(TypeBuilder::CSS::StyleSheetOrigin::Enum origin)
|
| return origin != TypeBuilder::CSS::StyleSheetOrigin::User_agent && origin != TypeBuilder::CSS::StyleSheetOrigin::Injected;
|
| }
|
|
|
| -PassRefPtr<TypeBuilder::CSS::CSSRule> InspectorStyleSheet::buildObjectForRule(CSSStyleRule* rule, PassRefPtr<Array<TypeBuilder::CSS::CSSMedia> > mediaStack)
|
| +PassRefPtr<TypeBuilder::CSS::CSSRule> InspectorStyleSheet::buildObjectForRule(CSSStyleRule* rule, PassRefPtr<Array<TypeBuilder::CSS::CSSMedia>> mediaStack)
|
| {
|
| CSSStyleSheet* styleSheet = pageStyleSheet();
|
| if (!styleSheet)
|
|
|