Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(672)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/core/inspector/InspectorStyleSheet.cpp

Issue 1201713011: DevTools: remove ruleId from the style. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/inspector/InspectorStyleSheet.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorStyleSheet.cpp
diff --git a/Source/core/inspector/InspectorStyleSheet.cpp b/Source/core/inspector/InspectorStyleSheet.cpp
index 738c52e73e22bc44f8dc4478ef25c5151cb99a51..c6f6755fbd12d8e967dae0257ba4191ee704d4df 100644
--- a/Source/core/inspector/InspectorStyleSheet.cpp
+++ b/Source/core/inspector/InspectorStyleSheet.cpp
@@ -577,14 +577,14 @@ static PassRefPtrWillBeRawPtr<CSSRuleList> asCSSRuleList(CSSRule* rule)
return nullptr;
}
-PassRefPtrWillBeRawPtr<InspectorStyle> InspectorStyle::create(unsigned ruleIndex, PassRefPtrWillBeRawPtr<CSSStyleDeclaration> style, InspectorStyleSheetBase* parentStyleSheet)
+PassRefPtrWillBeRawPtr<InspectorStyle> InspectorStyle::create(PassRefPtrWillBeRawPtr<CSSStyleDeclaration> style, PassRefPtrWillBeRawPtr<CSSRuleSourceData> sourceData, InspectorStyleSheetBase* parentStyleSheet)
{
- return adoptRefWillBeNoop(new InspectorStyle(ruleIndex, style, parentStyleSheet));
+ return adoptRefWillBeNoop(new InspectorStyle(style, sourceData, parentStyleSheet));
}
-InspectorStyle::InspectorStyle(unsigned ruleIndex, PassRefPtrWillBeRawPtr<CSSStyleDeclaration> style, InspectorStyleSheetBase* parentStyleSheet)
- : m_ruleIndex(ruleIndex)
- , m_style(style)
+InspectorStyle::InspectorStyle(PassRefPtrWillBeRawPtr<CSSStyleDeclaration> style, PassRefPtrWillBeRawPtr<CSSRuleSourceData> sourceData, InspectorStyleSheetBase* parentStyleSheet)
+ : m_style(style)
+ , m_sourceData(sourceData)
, m_parentStyleSheet(parentStyleSheet)
{
ASSERT(m_style);
@@ -596,9 +596,15 @@ PassRefPtr<TypeBuilder::CSS::CSSStyle> InspectorStyle::buildObjectForStyle() con
if (m_parentStyleSheet && !m_parentStyleSheet->id().isEmpty())
result->setStyleSheetId(m_parentStyleSheet->id());
- RefPtrWillBeRawPtr<CSSRuleSourceData> sourceData = extractSourceData();
- if (sourceData)
- result->setRange(buildSourceRangeObject(sourceData->ruleBodyRange, m_parentStyleSheet->lineEndings()));
+ if (m_sourceData) {
+ result->setRange(buildSourceRangeObject(m_sourceData->ruleBodyRange, m_parentStyleSheet->lineEndings()));
+ String sheetText;
+ bool success = m_parentStyleSheet->getText(&sheetText);
+ if (success) {
+ const SourceRange& bodyRange = m_sourceData->ruleBodyRange;
+ result->setCssText(sheetText.substring(bodyRange.start, bodyRange.end - bodyRange.start));
+ }
+ }
return result.release();
}
@@ -606,14 +612,13 @@ PassRefPtr<TypeBuilder::CSS::CSSStyle> InspectorStyle::buildObjectForStyle() con
PassRefPtr<TypeBuilder::Array<TypeBuilder::CSS::CSSComputedStyleProperty> > InspectorStyle::buildArrayForComputedStyle() const
{
RefPtr<TypeBuilder::Array<TypeBuilder::CSS::CSSComputedStyleProperty> > result = TypeBuilder::Array<TypeBuilder::CSS::CSSComputedStyleProperty>::create();
- WillBeHeapVector<InspectorStyleProperty> properties;
+ WillBeHeapVector<CSSPropertySourceData> properties;
populateAllProperties(properties);
for (auto& property : properties) {
- const CSSPropertySourceData& propertyEntry = property.sourceData;
RefPtr<TypeBuilder::CSS::CSSComputedStyleProperty> entry = TypeBuilder::CSS::CSSComputedStyleProperty::create()
- .setName(propertyEntry.name)
- .setValue(propertyEntry.value);
+ .setName(property.name)
+ .setValue(property.value);
result->addItem(entry);
}
@@ -622,11 +627,10 @@ PassRefPtr<TypeBuilder::Array<TypeBuilder::CSS::CSSComputedStyleProperty> > Insp
bool InspectorStyle::styleText(String* result) const
{
- RefPtrWillBeRawPtr<CSSRuleSourceData> sourceData = extractSourceData();
- if (!sourceData)
+ if (!m_sourceData)
return false;
- return textForRange(sourceData->ruleBodyRange, result);
+ return textForRange(m_sourceData->ruleBodyRange, result);
}
bool InspectorStyle::textForRange(const SourceRange& range, String* result) const
@@ -643,18 +647,15 @@ bool InspectorStyle::textForRange(const SourceRange& range, String* result) cons
return true;
}
-void InspectorStyle::populateAllProperties(WillBeHeapVector<InspectorStyleProperty>& result) const
+void InspectorStyle::populateAllProperties(WillBeHeapVector<CSSPropertySourceData>& result) const
{
HashSet<String> sourcePropertyNames;
- RefPtrWillBeRawPtr<CSSRuleSourceData> sourceData = extractSourceData();
- if (sourceData && sourceData->styleSourceData) {
- WillBeHeapVector<CSSPropertySourceData>& sourcePropertyData = sourceData->styleSourceData->propertyData;
+ RefPtrWillBeRawPtr<CSSRuleSourceData> sourceData = m_sourceData;
lushnikov 2015/06/23 10:26:10 unused
+ if (m_sourceData && m_sourceData->styleSourceData) {
+ WillBeHeapVector<CSSPropertySourceData>& sourcePropertyData = m_sourceData->styleSourceData->propertyData;
for (const auto& data : sourcePropertyData) {
- InspectorStyleProperty p(data, true);
- bool isPropertyTextKnown = textForRange(p.sourceData.range, &p.rawText);
- ASSERT_UNUSED(isPropertyTextKnown, isPropertyTextKnown);
- result.append(p);
+ result.append(data);
sourcePropertyNames.add(data.name.lower());
}
}
@@ -667,7 +668,7 @@ void InspectorStyle::populateAllProperties(WillBeHeapVector<InspectorStyleProper
String value = m_style->getPropertyValue(name);
if (value.isEmpty())
continue;
- result.append(InspectorStyleProperty(CSSPropertySourceData(name, value, !m_style->getPropertyPriority(name).isEmpty(), false, true, SourceRange()), false));
+ result.append(CSSPropertySourceData(name, value, !m_style->getPropertyPriority(name).isEmpty(), false, true, SourceRange()));
}
}
@@ -676,13 +677,12 @@ PassRefPtr<TypeBuilder::CSS::CSSStyle> InspectorStyle::styleWithProperties() con
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();
- WillBeHeapVector<InspectorStyleProperty> properties;
+ WillBeHeapVector<CSSPropertySourceData> properties;
populateAllProperties(properties);
for (auto& styleProperty : properties) {
- const CSSPropertySourceData& propertyEntry = styleProperty.sourceData;
+ const CSSPropertySourceData& propertyEntry = styleProperty;
const String& name = propertyEntry.name;
RefPtr<TypeBuilder::CSS::CSSProperty> property = TypeBuilder::CSS::CSSProperty::create()
@@ -693,15 +693,14 @@ PassRefPtr<TypeBuilder::CSS::CSSStyle> InspectorStyle::styleWithProperties() con
// Default "parsedOk" == true.
if (!propertyEntry.parsedOk)
property->setParsedOk(false);
- if (styleProperty.hasRawText())
- property->setText(styleProperty.rawText);
-
+ String text;
+ if (styleProperty.range.length() && textForRange(styleProperty.range, &text))
+ property->setText(text);
if (propertyEntry.important)
property->setImportant(true);
- if (styleProperty.hasSource) {
+ if (styleProperty.range.length()) {
property->setRange(buildSourceRangeObject(propertyEntry.range, m_parentStyleSheet ? m_parentStyleSheet->lineEndings() : nullptr));
if (!propertyEntry.disabled) {
- ASSERT_UNUSED(sourceData, sourceData);
property->setImplicit(false);
}
property->setDisabled(propertyEntry.disabled);
@@ -729,13 +728,6 @@ PassRefPtr<TypeBuilder::CSS::CSSStyle> InspectorStyle::styleWithProperties() con
return result.release();
}
-PassRefPtrWillBeRawPtr<CSSRuleSourceData> InspectorStyle::extractSourceData() const
-{
- if (m_ruleIndex == UINT_MAX || !m_parentStyleSheet || !m_parentStyleSheet->ensureParsedDataReady())
- return nullptr;
- return m_parentStyleSheet->ruleSourceDataAt(m_ruleIndex);
-}
-
String InspectorStyle::shorthandValue(const String& shorthandProperty) const
{
String value = m_style->getPropertyValue(shorthandProperty);
@@ -768,6 +760,7 @@ Document* InspectorStyle::ownerDocument() const
DEFINE_TRACE(InspectorStyle)
{
+ visitor->trace(m_sourceData);
visitor->trace(m_style);
visitor->trace(m_parentStyleSheet);
}
@@ -788,30 +781,8 @@ void InspectorStyleSheetBase::onStyleSheetTextChanged()
PassRefPtr<TypeBuilder::CSS::CSSStyle> InspectorStyleSheetBase::buildObjectForStyle(CSSStyleDeclaration* style)
{
- RefPtrWillBeRawPtr<CSSRuleSourceData> sourceData = nullptr;
- unsigned ruleIndex = indexOf(style);
- if (ruleIndex != UINT_MAX && ensureParsedDataReady())
- sourceData = ruleSourceDataAt(ruleIndex);
-
- if (ruleIndex == UINT_MAX) {
- // Any rule coming from User Agent and not from DefaultStyleSheet will not have id.
- // See InspectorCSSAgent::buildObjectForRule for details.
- RefPtrWillBeRawPtr<InspectorStyle> inspectorStyle = InspectorStyle::create(UINT_MAX, style, this);
- return inspectorStyle->buildObjectForStyle();
- }
- RefPtrWillBeRawPtr<InspectorStyle> inspectorStyle = inspectorStyleAt(ruleIndex);
- RefPtr<TypeBuilder::CSS::CSSStyle> result = inspectorStyle->buildObjectForStyle();
-
- // Style text cannot be retrieved without stylesheet, so set cssText here.
- if (sourceData) {
- String sheetText;
- bool success = getText(&sheetText);
- if (success) {
- const SourceRange& bodyRange = sourceData->ruleBodyRange;
- result->setCssText(sheetText.substring(bodyRange.start, bodyRange.end - bodyRange.start));
- }
- }
-
+ RefPtrWillBeRawPtr<InspectorStyle> is = inspectorStyle(style);
+ RefPtr<TypeBuilder::CSS::CSSStyle> result = is->buildObjectForStyle();
return result.release();
}
@@ -1230,8 +1201,9 @@ PassRefPtr<TypeBuilder::CSS::SelectorList> InspectorStyleSheet::buildObjectForSe
{
RefPtrWillBeRawPtr<CSSRuleSourceData> sourceData = nullptr;
unsigned ruleIndex = indexOf(rule->style());
- if (ruleIndex != UINT_MAX && ensureParsedDataReady())
- sourceData = ruleSourceDataAt(ruleIndex);
+ if (ruleIndex != UINT_MAX && ensureParsedDataReady()) {
+ sourceData = m_parsedStyleSheet->ruleSourceDataAt(ruleIndex);
+ }
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 '{').
@@ -1329,13 +1301,23 @@ PassRefPtr<TypeBuilder::CSS::SourceRange> InspectorStyleSheet::mediaQueryExpValu
return buildSourceRangeObject(mediaQueryData->expData.at(mediaQueryExpIndex).valueRange, lineEndings());
}
-PassRefPtrWillBeRawPtr<InspectorStyle> InspectorStyleSheet::inspectorStyleAt(unsigned ruleIndex)
+PassRefPtrWillBeRawPtr<InspectorStyle> InspectorStyleSheet::inspectorStyle(RefPtrWillBeRawPtr<CSSStyleDeclaration> style)
{
- CSSStyleDeclaration* style = styleAt(ruleIndex);
if (!style)
return nullptr;
- return InspectorStyle::create(ruleIndex, style, this);
+ RefPtrWillBeRawPtr<CSSRuleSourceData> sourceData = nullptr;
+ unsigned ruleIndex = indexOf(style.get());
+ if (ruleIndex != UINT_MAX && ensureParsedDataReady())
+ sourceData = m_parsedStyleSheet->ruleSourceDataAt(ruleIndex);
+
+ if (ruleIndex == UINT_MAX) {
+ // Any rule coming from User Agent and not from DefaultStyleSheet will not have id.
+ // See InspectorCSSAgent::buildObjectForRule for details.
+ return InspectorStyle::create(style, nullptr, this);
+ }
+
+ return InspectorStyle::create(style, sourceData, this);
}
unsigned InspectorStyleSheet::ruleCount()
@@ -1436,7 +1418,7 @@ bool InspectorStyleSheet::findRuleByHeaderRange(const SourceRange& sourceRange,
ensureFlatRules();
for (size_t i = 0; i < ruleCount() && i < m_flatRules.size(); ++i) {
- RefPtrWillBeRawPtr<CSSRuleSourceData> ruleSourceData = ruleSourceDataAt(i);
+ RefPtrWillBeRawPtr<CSSRuleSourceData> ruleSourceData = m_parsedStyleSheet->ruleSourceDataAt(i);
if (ruleSourceData->ruleHeaderRange.start == sourceRange.start && ruleSourceData->ruleHeaderRange.end == sourceRange.end) {
*pRule = m_flatRules.at(i).get();
if (!(*pRule)->parentStyleSheet())
@@ -1455,7 +1437,7 @@ bool InspectorStyleSheet::findRuleByBodyRange(const SourceRange& sourceRange, CS
ensureFlatRules();
for (size_t i = 0; i < ruleCount() && i < m_flatRules.size(); ++i) {
- RefPtrWillBeRawPtr<CSSRuleSourceData> ruleSourceData = ruleSourceDataAt(i);
+ RefPtrWillBeRawPtr<CSSRuleSourceData> ruleSourceData = m_parsedStyleSheet->ruleSourceDataAt(i);
if (ruleSourceData->ruleBodyRange.start == sourceRange.start && ruleSourceData->ruleBodyRange.end == sourceRange.end) {
*pRule = m_flatRules.at(i).get();
if (!(*pRule)->parentStyleSheet())
@@ -1478,11 +1460,6 @@ Document* InspectorStyleSheet::ownerDocument() const
return m_pageStyleSheet->ownerDocument();
}
-PassRefPtrWillBeRawPtr<CSSRuleSourceData> InspectorStyleSheet::ruleSourceDataAt(unsigned ruleIndex) const
-{
- return m_parsedStyleSheet->ruleSourceDataAt(ruleIndex);
-}
-
bool InspectorStyleSheet::ensureParsedDataReady()
{
return ensureText() && m_parsedStyleSheet->ensureSourceData();
@@ -1601,20 +1578,13 @@ PassRefPtrWillBeRawPtr<InspectorStyleSheetForInlineStyle> InspectorStyleSheetFor
InspectorStyleSheetForInlineStyle::InspectorStyleSheetForInlineStyle(const String& id, PassRefPtrWillBeRawPtr<Element> element, Listener* listener)
: InspectorStyleSheetBase(id, listener)
, m_element(element)
- , m_ruleSourceData(nullptr)
- , m_isStyleTextValid(false)
{
ASSERT(m_element);
- m_inspectorStyle = InspectorStyle::create(0, inlineStyle(), this);
- m_styleText = m_element->isStyledElement() ? m_element->getAttribute("style").string() : String();
}
void InspectorStyleSheetForInlineStyle::didModifyElementAttribute()
{
- m_isStyleTextValid = false;
- if (m_element->isStyledElement() && m_element->style() != m_inspectorStyle->cssStyle())
- m_inspectorStyle = InspectorStyle::create(0, inlineStyle(), this);
- m_ruleSourceData.clear();
+ m_inspectorStyle.clear();
}
bool InspectorStyleSheetForInlineStyle::setText(const String& text, ExceptionState& exceptionState)
@@ -1628,22 +1598,14 @@ bool InspectorStyleSheetForInlineStyle::setText(const String& text, ExceptionSta
InspectorCSSAgent::InlineStyleOverrideScope overrideScope(m_element->ownerDocument());
m_element->setAttribute("style", AtomicString(text), exceptionState);
}
- if (!exceptionState.hadException()) {
- m_styleText = text;
- m_isStyleTextValid = true;
- m_ruleSourceData.clear();
+ if (!exceptionState.hadException())
onStyleSheetTextChanged();
- }
return !exceptionState.hadException();
}
bool InspectorStyleSheetForInlineStyle::getText(String* result) const
{
- if (!m_isStyleTextValid) {
- m_styleText = elementStyleText();
- m_isStyleTextValid = true;
- }
- *result = m_styleText;
+ *result = elementStyleText();
return true;
}
@@ -1654,31 +1616,26 @@ Document* InspectorStyleSheetForInlineStyle::ownerDocument() const
bool InspectorStyleSheetForInlineStyle::ensureParsedDataReady()
{
- // The "style" property value can get changed indirectly, e.g. via element.style.borderWidth = "2px".
- const String& currentStyleText = elementStyleText();
- if (m_styleText != currentStyleText) {
- m_ruleSourceData.clear();
- m_styleText = currentStyleText;
- m_isStyleTextValid = true;
- }
-
- if (m_ruleSourceData)
- return true;
-
- m_ruleSourceData = getStyleAttributeData();
-
- bool success = !!m_ruleSourceData;
- if (!success) {
- m_ruleSourceData = CSSRuleSourceData::create(StyleRule::Style);
- return false;
- }
-
return true;
}
-PassRefPtrWillBeRawPtr<InspectorStyle> InspectorStyleSheetForInlineStyle::inspectorStyleAt(unsigned ruleIndex)
-{
- ASSERT_UNUSED(ruleIndex, !ruleIndex);
+PassRefPtrWillBeRawPtr<InspectorStyle> InspectorStyleSheetForInlineStyle::inspectorStyle(RefPtrWillBeRawPtr<CSSStyleDeclaration> style)
+{
+ if (!m_inspectorStyle) {
+ const String& text = elementStyleText();
+ RefPtrWillBeRawPtr<CSSRuleSourceData> ruleSourceData;
+ if (text.isEmpty()) {
+ ruleSourceData = CSSRuleSourceData::create(StyleRule::Style);
+ ruleSourceData->ruleBodyRange.start = 0;
+ ruleSourceData->ruleBodyRange.end = 0;
+ } else {
+ RuleSourceDataList ruleSourceDataResult;
+ StyleSheetHandler handler(text, &m_element->document(), &ruleSourceDataResult);
+ CSSParser::parseDeclarationListForInspector(parserContextForDocument(&m_element->document()), text, handler);
+ ruleSourceData = ruleSourceDataResult.first().release();
+ }
+ m_inspectorStyle = InspectorStyle::create(m_element->style(), ruleSourceData, this);
+ }
return m_inspectorStyle;
}
@@ -1692,28 +1649,9 @@ const String& InspectorStyleSheetForInlineStyle::elementStyleText() const
return m_element->getAttribute("style").string();
}
-PassRefPtrWillBeRawPtr<CSSRuleSourceData> InspectorStyleSheetForInlineStyle::getStyleAttributeData() const
-{
- if (!m_element->isStyledElement())
- return nullptr;
-
- if (m_styleText.isEmpty()) {
- RefPtrWillBeRawPtr<CSSRuleSourceData> result = CSSRuleSourceData::create(StyleRule::Style);
- result->ruleBodyRange.start = 0;
- result->ruleBodyRange.end = 0;
- return result.release();
- }
-
- RuleSourceDataList ruleSourceDataResult;
- StyleSheetHandler handler(m_styleText, &m_element->document(), &ruleSourceDataResult);
- CSSParser::parseDeclarationListForInspector(parserContextForDocument(&m_element->document()), m_styleText, handler);
- return ruleSourceDataResult.first().release();
-}
-
DEFINE_TRACE(InspectorStyleSheetForInlineStyle)
{
visitor->trace(m_element);
- visitor->trace(m_ruleSourceData);
visitor->trace(m_inspectorStyle);
InspectorStyleSheetBase::trace(visitor);
}
« no previous file with comments | « Source/core/inspector/InspectorStyleSheet.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698