| Index: Source/core/inspector/InspectorStyleSheet.cpp
|
| diff --git a/Source/core/inspector/InspectorStyleSheet.cpp b/Source/core/inspector/InspectorStyleSheet.cpp
|
| index 02706a2fc72628c35976bf7774468142006de2d1..cc8485acdc64a864d7d8342166faae7a61b7f023 100644
|
| --- a/Source/core/inspector/InspectorStyleSheet.cpp
|
| +++ b/Source/core/inspector/InspectorStyleSheet.cpp
|
| @@ -643,8 +643,9 @@ enum MediaListSource {
|
| MediaListSourceImportRule
|
| };
|
|
|
| -static PassRefPtr<TypeBuilder::CSS::SourceRange> buildSourceRangeObject(const SourceRange& range, const LineEndings* lineEndings)
|
| +PassRefPtr<TypeBuilder::CSS::SourceRange> InspectorStyleSheetBase::buildSourceRangeObject(const SourceRange& range)
|
| {
|
| + const LineEndings* lineEndings = this->lineEndings();
|
| if (!lineEndings)
|
| return nullptr;
|
| TextPosition start = TextPosition::fromOffsetAndLineEndings(range.start, *lineEndings);
|
| @@ -677,7 +678,7 @@ PassRefPtr<TypeBuilder::CSS::CSSStyle> InspectorStyle::buildObjectForStyle()
|
| if (m_sourceData) {
|
| if (m_parentStyleSheet && !m_parentStyleSheet->id().isEmpty())
|
| result->setStyleSheetId(m_parentStyleSheet->id());
|
| - result->setRange(buildSourceRangeObject(m_sourceData->ruleBodyRange, m_parentStyleSheet->lineEndings()));
|
| + result->setRange(m_parentStyleSheet->buildSourceRangeObject(m_sourceData->ruleBodyRange));
|
| String sheetText;
|
| bool success = m_parentStyleSheet->getText(&sheetText);
|
| if (success) {
|
| @@ -778,7 +779,7 @@ PassRefPtr<TypeBuilder::CSS::CSSStyle> InspectorStyle::styleWithProperties()
|
| if (propertyEntry.important)
|
| property->setImportant(true);
|
| if (styleProperty.range.length()) {
|
| - property->setRange(buildSourceRangeObject(propertyEntry.range, m_parentStyleSheet ? m_parentStyleSheet->lineEndings() : nullptr));
|
| + property->setRange(m_parentStyleSheet ? m_parentStyleSheet->buildSourceRangeObject(propertyEntry.range) : nullptr);
|
| if (!propertyEntry.disabled) {
|
| property->setImplicit(false);
|
| }
|
| @@ -1305,7 +1306,7 @@ PassRefPtr<TypeBuilder::Array<TypeBuilder::CSS::Selector>> InspectorStyleSheet::
|
|
|
| RefPtr<TypeBuilder::CSS::Selector> simpleSelector = TypeBuilder::CSS::Selector::create()
|
| .setValue(selector.stripWhiteSpace());
|
| - simpleSelector->setRange(buildSourceRangeObject(range, lineEndings()));
|
| + simpleSelector->setRange(buildSourceRangeObject(range));
|
| result->addItem(simpleSelector.release());
|
| }
|
| return result.release();
|
| @@ -1374,7 +1375,7 @@ PassRefPtr<TypeBuilder::CSS::SourceRange> InspectorStyleSheet::ruleHeaderSourceR
|
| RefPtrWillBeRawPtr<CSSRuleSourceData> sourceData = sourceDataForRule(rule);
|
| if (!sourceData)
|
| return nullptr;
|
| - return buildSourceRangeObject(sourceData->ruleHeaderRange, lineEndings());
|
| + return buildSourceRangeObject(sourceData->ruleHeaderRange);
|
| }
|
|
|
| PassRefPtr<TypeBuilder::CSS::SourceRange> InspectorStyleSheet::mediaQueryExpValueSourceRange(CSSRule* rule, size_t mediaQueryIndex, size_t mediaQueryExpIndex)
|
| @@ -1387,7 +1388,7 @@ PassRefPtr<TypeBuilder::CSS::SourceRange> InspectorStyleSheet::mediaQueryExpValu
|
| RefPtrWillBeRawPtr<CSSMediaQuerySourceData> mediaQueryData = sourceData->mediaSourceData->queryData.at(mediaQueryIndex);
|
| if (mediaQueryExpIndex >= mediaQueryData->expData.size())
|
| return nullptr;
|
| - return buildSourceRangeObject(mediaQueryData->expData.at(mediaQueryExpIndex).valueRange, lineEndings());
|
| + return buildSourceRangeObject(mediaQueryData->expData.at(mediaQueryExpIndex).valueRange);
|
| }
|
|
|
| PassRefPtrWillBeRawPtr<InspectorStyle> InspectorStyleSheet::inspectorStyle(RefPtrWillBeRawPtr<CSSStyleDeclaration> style)
|
|
|