Changeset 82578 in webkit
- Timestamp:
- Mar 31, 2011 8:03:50 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r82576 r82578 1 2011-03-31 Alexander Pavlov <apavlov@chromium.org> 2 3 Reviewed by Yury Semikhatsky. 4 5 Web Inspector: CSS domain - make a "range" object, get rid of "properties" object for Style objects 6 https://bugs.webkit.org/show_bug.cgi?id=57538 7 8 * http/tests/inspector/elements-test.js: 9 (initialize_ElementTest.InspectorTest.rangeText): 10 (initialize_ElementTest): 11 * inspector/styles/get-set-stylesheet-text.html: 12 * inspector/styles/styles-new-API.html: 13 * inspector/styles/styles-source-offsets.html: 14 1 15 2011-03-31 Pavel Podivilov <podivilov@chromium.org> 2 16 -
trunk/LayoutTests/http/tests/inspector/elements-test.js
r80931 r82578 213 213 }; 214 214 215 }; 215 InspectorTest.rangeText = function(range) 216 { 217 if (!range) 218 return "[undefined-undefined]"; 219 return "[" + range.start + "-" + range.end + "]"; 220 }; 221 222 }; -
trunk/LayoutTests/inspector/styles/get-set-stylesheet-text.html
r82252 r82578 100 100 var property = style.cssProperties[i]; 101 101 if (property.status !== "disabled") 102 InspectorTest.addResult("['" + property.name + "':'" + property.value + "'" + (property.priority === "important" ? " is-important" : "") + (("parsedOk" in property) ? " non-parsed" : "") +"] @ [" + property.startOffset + "-" + property.endOffset + "]" + (property.status || "style"));102 InspectorTest.addResult("['" + property.name + "':'" + property.value + "'" + (property.priority === "important" ? " is-important" : "") + (("parsedOk" in property) ? " non-parsed" : "") +"] @" + InspectorTest.rangeText(property.range) + " " + (property.status || "style")); 103 103 else 104 104 InspectorTest.addResult("[text='" + property.text + "'] " + property.status); -
trunk/LayoutTests/inspector/styles/styles-new-API.html
r82433 r82578 288 288 var property = style.cssProperties[i]; 289 289 if (property.status !== "disabled") 290 InspectorTest.addResult("['" + property.name + "':'" + property.value + "'" + (property.priority === "important" ? " is-important" : "") + (("parsedOk" in property) ? " non-parsed" : "") +"] @ [" + property.startOffset + "-" + property.endOffset + "]" + (property.status || "style"));290 InspectorTest.addResult("['" + property.name + "':'" + property.value + "'" + (property.priority === "important" ? " is-important" : "") + (("parsedOk" in property) ? " non-parsed" : "") +"] @" + InspectorTest.rangeText(property.range) + " " + (property.status || "style")); 291 291 else 292 292 InspectorTest.addResult("[text='" + property.text + "'] " + property.status); -
trunk/LayoutTests/inspector/styles/styles-source-offsets.html
r81019 r82578 24 24 header = "element.style:"; 25 25 } 26 InspectorTest.addResult(header + " [" + style.properties.startOffset + "-" + style.properties.endOffset + "]");26 InspectorTest.addResult(header + " " + InspectorTest.rangeText(style.range)); 27 27 var allProperties = style.cssProperties; 28 28 for (var i = 0; i < allProperties.length; ++i) { … … 30 30 if (!property.status) 31 31 continue; 32 InspectorTest.addResult("['" + property.name + "':'" + property.value + "'" + (property.priority ? " !important" : "") + (("parsedOk" in property) ? " non-parsed" : "") +"] @ [" + property.startOffset + "-" + property.endOffset + "]");32 InspectorTest.addResult("['" + property.name + "':'" + property.value + "'" + (property.priority ? " !important" : "") + (("parsedOk" in property) ? " non-parsed" : "") +"] @" + InspectorTest.rangeText(property.range)); 33 33 } 34 34 } -
trunk/Source/WebCore/ChangeLog
r82571 r82578 1 2011-03-31 Alexander Pavlov <apavlov@chromium.org> 2 3 Reviewed by Yury Semikhatsky. 4 5 Web Inspector: CSS domain - make a "range" object, get rid of "properties" object for Style objects 6 https://bugs.webkit.org/show_bug.cgi?id=57538 7 8 * inspector/InspectorStyleSheet.cpp: 9 (WebCore::buildSourceRangeObject): 10 (WebCore::InspectorStyle::buildObjectForStyle): 11 (WebCore::InspectorStyle::populateObjectWithStyleProperties): 12 * inspector/front-end/AuditRules.js: 13 (WebInspector.AuditRules.UnusedCssRule.prototype.doRun.evalCallback.selectorsCallback): 14 * inspector/front-end/CSSStyleModel.js: 15 (WebInspector.CSSStyleDeclaration): 16 1 17 2011-03-31 Sheriff Bot <webkit.review.bot@gmail.com> 2 18 -
trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp
r82555 r82578 103 103 namespace WebCore { 104 104 105 static PassRefPtr<InspectorObject> buildSourceRangeObject(const SourceRange& range) 106 { 107 RefPtr<InspectorObject> result = InspectorObject::create(); 108 result->setNumber("start", range.start); 109 result->setNumber("end", range.end); 110 return result.release(); 111 } 112 105 113 static PassRefPtr<CSSRuleList> asCSSRuleList(StyleBase* styleBase) 106 114 { … … 155 163 result->setValue("styleId", m_styleId.asInspectorValue()); 156 164 157 RefPtr<InspectorObject> propertiesObject = InspectorObject::create(); 158 propertiesObject->setString("width", m_style->getPropertyValue("width")); 159 propertiesObject->setString("height", m_style->getPropertyValue("height")); 165 result->setString("width", m_style->getPropertyValue("width")); 166 result->setString("height", m_style->getPropertyValue("height")); 160 167 161 168 RefPtr<CSSRuleSourceData> sourceData = m_parentStyleSheet ? m_parentStyleSheet->ruleSourceDataFor(m_style.get()) : 0; 162 if (sourceData) { 163 propertiesObject->setNumber("startOffset", sourceData->styleSourceData->styleBodyRange.start); 164 propertiesObject->setNumber("endOffset", sourceData->styleSourceData->styleBodyRange.end); 165 } 166 result->setObject("properties", propertiesObject); 169 if (sourceData) 170 result->setObject("range", buildSourceRangeObject(sourceData->styleSourceData->styleBodyRange)); 167 171 168 172 populateObjectWithStyleProperties(result.get()); … … 467 471 if (it->hasSource) { 468 472 property->setBoolean("implicit", false); 469 property->setNumber("startOffset", propertyEntry.range.start); 470 property->setNumber("endOffset", propertyEntry.range.end); 473 property->setObject("range", buildSourceRangeObject(propertyEntry.range)); 471 474 472 475 // Parsed property overrides any property with the same name. Non-parsed property overrides -
trunk/Source/WebCore/inspector/front-end/AuditRules.js
r82453 r82578 323 323 var rule = styleSheet.rules[curRule]; 324 324 // Exact computation whenever source ranges are available. 325 var textLength = (rule.selectorRange && rule.style. properties.endOffset) ? rule.style.properties.endOffset- rule.selectorRange.start + 1 : 0;325 var textLength = (rule.selectorRange && rule.style.range && rule.style.range.end) ? rule.style.range.end - rule.selectorRange.start + 1 : 0; 326 326 if (!textLength && rule.style.cssText) 327 327 textLength = rule.style.cssText.length + rule.selectorText.length; -
trunk/Source/WebCore/inspector/front-end/CSSStyleModel.js
r82555 r82578 197 197 { 198 198 this.id = payload.styleId; 199 this.properties = payload.properties; 199 this.width = payload.width; 200 this.height = payload.height; 201 this.range = payload.range; 200 202 this._shorthandValues = WebInspector.CSSStyleDeclaration.buildShorthandValueMap(payload.shorthandEntries); 201 203 this._livePropertyMap = {}; // LIVE properties (source-based or style-based) : { name -> CSSProperty }
Note: See TracChangeset
for help on using the changeset viewer.