Diff
Modified: trunk/Source/WebCore/ChangeLog (118532 => 118533)
--- trunk/Source/WebCore/ChangeLog 2012-05-25 16:23:08 UTC (rev 118532)
+++ trunk/Source/WebCore/ChangeLog 2012-05-25 16:24:48 UTC (rev 118533)
@@ -1,3 +1,33 @@
+2012-05-25 Alexander Pavlov <[email protected]>
+
+ Web Inspector: Clean up Inspector.json after r118367
+ https://bugs.webkit.org/show_bug.cgi?id=87499
+
+ Reviewed by Yury Semikhatsky.
+
+ This cleans up the semantic inconsistencies introduced into type/field names r118367.
+
+ No new tests, as this is a refactoring.
+
+ * inspector/Inspector.json:
+ * inspector/InspectorCSSAgent.cpp:
+ (WebCore::InspectorCSSAgent::asInspectorStyleSheet):
+ (WebCore::InspectorCSSAgent::viaInspectorStyleSheet):
+ (WebCore::InspectorCSSAgent::detectOrigin):
+ * inspector/InspectorCSSAgent.h:
+ (InspectorCSSAgent):
+ * inspector/InspectorStyleSheet.cpp:
+ (WebCore::InspectorStyleSheet::create):
+ (WebCore::InspectorStyleSheet::InspectorStyleSheet):
+ (WebCore::InspectorStyleSheet::buildObjectForRule):
+ (WebCore::InspectorStyleSheet::resourceStyleSheetText):
+ (WebCore::InspectorStyleSheetForInlineStyle::create):
+ (WebCore::InspectorStyleSheetForInlineStyle::InspectorStyleSheetForInlineStyle):
+ * inspector/InspectorStyleSheet.h:
+ (InspectorStyleSheet):
+ (WebCore::InspectorStyleSheet::canBind):
+ (InspectorStyleSheetForInlineStyle):
+
2012-05-25 Ilya Tikhonovsky <[email protected]>
Web Inspector: speed-up HeapSnapshot._bfs method.
Modified: trunk/Source/WebCore/inspector/Inspector.json (118532 => 118533)
--- trunk/Source/WebCore/inspector/Inspector.json 2012-05-25 16:23:08 UTC (rev 118532)
+++ trunk/Source/WebCore/inspector/Inspector.json 2012-05-25 16:24:48 UTC (rev 118533)
@@ -1859,10 +1859,10 @@
"description": "This object identifies a CSS style in a unique way."
},
{
- "id": "Origin",
+ "id": "StyleSheetOrigin",
"type": "string",
"enum": ["user", "user-agent", "inspector", "regular"],
- "description": "The parent stylesheet type: \"user\" for user stylesheets, \"user-agent\" for user-agent stylesheets, \"inspector\" for stylesheets created by the inspector (i.e. those holding new rules created with <code>addRule()</code>), \"regular\" for regular stylesheets."
+ "description": "Stylesheet type: \"user\" for user stylesheets, \"user-agent\" for user-agent stylesheets, \"inspector\" for stylesheets created by the inspector (i.e. those holding the \"via inspector\" rules), \"regular\" for regular stylesheets."
},
{
"id": "CSSRuleId",
@@ -1907,7 +1907,7 @@
{ "name": "styleSheetId", "$ref": "StyleSheetId", "description": "The stylesheet identifier."},
{ "name": "frameId", "$ref": "Network.FrameId", "description": "Owner frame identifier."},
{ "name": "sourceURL", "type": "string", "description": "Stylesheet resource URL."},
- { "name": "origin", "$ref": "Origin", "description": "Rule origin"},
+ { "name": "origin", "$ref": "StyleSheetOrigin", "description": "Stylesheet origin."},
{ "name": "title", "type": "string", "description": "Stylesheet title."},
{ "name": "disabled", "type": "boolean", "description": "Denotes whether the stylesheet is disabled."}
],
@@ -1931,7 +1931,7 @@
{ "name": "selectorText", "type": "string", "description": "Rule selector."},
{ "name": "sourceURL", "type": "string", "optional": true, "description": "Parent stylesheet resource URL (for regular rules)."},
{ "name": "sourceLine", "type": "integer", "description": "Line ordinal of the rule selector start character in the resource."},
- { "name": "origin", "$ref": "Origin", "description": "Rule origin"},
+ { "name": "origin", "$ref": "StyleSheetOrigin", "description": "Parent stylesheet's origin."},
{ "name": "style", "$ref": "CSSStyle", "description": "Associated style declaration." },
{ "name": "selectorRange", "$ref": "SourceRange", "optional": true, "description": "The rule selector range in the underlying resource (if available)." },
{ "name": "media", "type": "array", "items": { "$ref": "CSSMedia" }, "optional": true, "description": "Media list array (for rules involving media queries). The array enumerates media queries starting with the innermost one, going outwards." }
Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp (118532 => 118533)
--- trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2012-05-25 16:23:08 UTC (rev 118532)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2012-05-25 16:24:48 UTC (rev 118533)
@@ -826,7 +826,7 @@
return 0;
String newStyleSheetId = String::number(m_lastStyleSheetId++);
- RefPtr<InspectorStyleSheetForInlineStyle> inspectorStyleSheet = InspectorStyleSheetForInlineStyle::create(m_domAgent->pageAgent(), newStyleSheetId, element, TypeBuilder::CSS::Origin::Regular, this);
+ RefPtr<InspectorStyleSheetForInlineStyle> inspectorStyleSheet = InspectorStyleSheetForInlineStyle::create(m_domAgent->pageAgent(), newStyleSheetId, element, TypeBuilder::CSS::StyleSheetOrigin::Regular, this);
m_idToInspectorStyleSheet.set(newStyleSheetId, inspectorStyleSheet);
m_nodeToInspectorStyleSheet.set(element, inspectorStyleSheet);
return inspectorStyleSheet.get();
@@ -912,7 +912,7 @@
return 0;
CSSStyleSheet* cssStyleSheet = static_cast<CSSStyleSheet*>(styleSheet);
String id = String::number(m_lastStyleSheetId++);
- inspectorStyleSheet = InspectorStyleSheet::create(m_domAgent->pageAgent(), id, cssStyleSheet, TypeBuilder::CSS::Origin::Inspector, InspectorDOMAgent::documentURLString(document), this);
+ inspectorStyleSheet = InspectorStyleSheet::create(m_domAgent->pageAgent(), id, cssStyleSheet, TypeBuilder::CSS::StyleSheetOrigin::Inspector, InspectorDOMAgent::documentURLString(document), this);
m_idToInspectorStyleSheet.set(id, inspectorStyleSheet);
m_cssStyleSheetToInspectorStyleSheet.set(cssStyleSheet, inspectorStyleSheet);
m_documentToInspectorStyleSheet.set(document, inspectorStyleSheet);
@@ -929,17 +929,17 @@
return it->second.get();
}
-TypeBuilder::CSS::Origin::Enum InspectorCSSAgent::detectOrigin(CSSStyleSheet* pageStyleSheet, Document* ownerDocument)
+TypeBuilder::CSS::StyleSheetOrigin::Enum InspectorCSSAgent::detectOrigin(CSSStyleSheet* pageStyleSheet, Document* ownerDocument)
{
- TypeBuilder::CSS::Origin::Enum origin = TypeBuilder::CSS::Origin::Regular;
+ TypeBuilder::CSS::StyleSheetOrigin::Enum origin = TypeBuilder::CSS::StyleSheetOrigin::Regular;
if (pageStyleSheet && !pageStyleSheet->ownerNode() && pageStyleSheet->href().isEmpty())
- origin = TypeBuilder::CSS::Origin::User_agent;
+ origin = TypeBuilder::CSS::StyleSheetOrigin::User_agent;
else if (pageStyleSheet && pageStyleSheet->ownerNode() && pageStyleSheet->ownerNode()->nodeName() == "#document")
- origin = TypeBuilder::CSS::Origin::User;
+ origin = TypeBuilder::CSS::StyleSheetOrigin::User;
else {
InspectorStyleSheet* viaInspectorStyleSheetForOwner = viaInspectorStyleSheet(ownerDocument, false);
if (viaInspectorStyleSheetForOwner && pageStyleSheet == viaInspectorStyleSheetForOwner->pageStyleSheet())
- origin = TypeBuilder::CSS::Origin::Inspector;
+ origin = TypeBuilder::CSS::StyleSheetOrigin::Inspector;
}
return origin;
}
Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.h (118532 => 118533)
--- trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2012-05-25 16:23:08 UTC (rev 118532)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2012-05-25 16:24:48 UTC (rev 118533)
@@ -143,7 +143,7 @@
InspectorStyleSheet* bindStyleSheet(CSSStyleSheet*);
InspectorStyleSheet* viaInspectorStyleSheet(Document*, bool createIfAbsent);
InspectorStyleSheet* assertStyleSheetForId(ErrorString*, const String&);
- TypeBuilder::CSS::Origin::Enum detectOrigin(CSSStyleSheet* pageStyleSheet, Document* ownerDocument);
+ TypeBuilder::CSS::StyleSheetOrigin::Enum detectOrigin(CSSStyleSheet* pageStyleSheet, Document* ownerDocument);
PassRefPtr<TypeBuilder::Array<TypeBuilder::CSS::CSSRule> > buildArrayForRuleList(CSSRuleList*, StyleResolver*);
PassRefPtr<TypeBuilder::CSS::CSSStyle> buildObjectForAttributesStyle(Element*);
Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp (118532 => 118533)
--- trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2012-05-25 16:23:08 UTC (rev 118532)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2012-05-25 16:24:48 UTC (rev 118533)
@@ -682,7 +682,7 @@
return m_format;
}
-PassRefPtr<InspectorStyleSheet> InspectorStyleSheet::create(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::Origin::Enum origin, const String& documentURL, Listener* listener)
+PassRefPtr<InspectorStyleSheet> InspectorStyleSheet::create(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::StyleSheetOrigin::Enum origin, const String& documentURL, Listener* listener)
{
return adoptRef(new InspectorStyleSheet(pageAgent, id, pageStyleSheet, origin, documentURL, listener));
}
@@ -695,7 +695,7 @@
return emptyString();
}
-InspectorStyleSheet::InspectorStyleSheet(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::Origin::Enum origin, const String& documentURL, Listener* listener)
+InspectorStyleSheet::InspectorStyleSheet(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::StyleSheetOrigin::Enum origin, const String& documentURL, Listener* listener)
: m_pageAgent(pageAgent)
, m_id(id)
, m_pageStyleSheet(pageStyleSheet)
@@ -898,7 +898,7 @@
.setStyle(buildObjectForStyle(rule->style()));
// "sourceURL" is present only for regular rules, otherwise "origin" should be used in the frontend.
- if (m_origin == TypeBuilder::CSS::Origin::Regular)
+ if (m_origin == TypeBuilder::CSS::StyleSheetOrigin::Regular)
result->setSourceURL(finalURL());
if (canBind()) {
@@ -1204,7 +1204,7 @@
bool InspectorStyleSheet::resourceStyleSheetText(String* result) const
{
- if (m_origin == TypeBuilder::CSS::Origin::User || m_origin == TypeBuilder::CSS::Origin::User_agent)
+ if (m_origin == TypeBuilder::CSS::StyleSheetOrigin::User || m_origin == TypeBuilder::CSS::StyleSheetOrigin::User_agent)
return false;
if (!m_pageStyleSheet || !ownerDocument() || !ownerDocument()->frame())
@@ -1315,12 +1315,12 @@
}
}
-PassRefPtr<InspectorStyleSheetForInlineStyle> InspectorStyleSheetForInlineStyle::create(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<Element> element, TypeBuilder::CSS::Origin::Enum origin, Listener* listener)
+PassRefPtr<InspectorStyleSheetForInlineStyle> InspectorStyleSheetForInlineStyle::create(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<Element> element, TypeBuilder::CSS::StyleSheetOrigin::Enum origin, Listener* listener)
{
return adoptRef(new InspectorStyleSheetForInlineStyle(pageAgent, id, element, origin, listener));
}
-InspectorStyleSheetForInlineStyle::InspectorStyleSheetForInlineStyle(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<Element> element, TypeBuilder::CSS::Origin::Enum origin, Listener* listener)
+InspectorStyleSheetForInlineStyle::InspectorStyleSheetForInlineStyle(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<Element> element, TypeBuilder::CSS::StyleSheetOrigin::Enum origin, Listener* listener)
: InspectorStyleSheet(pageAgent, id, 0, origin, "", listener)
, m_element(element)
, m_ruleSourceData(0)
Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.h (118532 => 118533)
--- trunk/Source/WebCore/inspector/InspectorStyleSheet.h 2012-05-25 16:23:08 UTC (rev 118532)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.h 2012-05-25 16:24:48 UTC (rev 118533)
@@ -171,7 +171,7 @@
};
typedef HashMap<CSSStyleDeclaration*, RefPtr<InspectorStyle> > InspectorStyleMap;
- static PassRefPtr<InspectorStyleSheet> create(InspectorPageAgent*, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::Origin::Enum, const String& documentURL, Listener*);
+ static PassRefPtr<InspectorStyleSheet> create(InspectorPageAgent*, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::StyleSheetOrigin::Enum, const String& documentURL, Listener*);
static String styleSheetURL(CSSStyleSheet* pageStyleSheet);
virtual ~InspectorStyleSheet();
@@ -201,9 +201,9 @@
InspectorCSSId styleId(CSSStyleDeclaration* style) const { return ruleOrStyleId(style); }
protected:
- InspectorStyleSheet(InspectorPageAgent*, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::Origin::Enum, const String& documentURL, Listener*);
+ InspectorStyleSheet(InspectorPageAgent*, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::StyleSheetOrigin::Enum, const String& documentURL, Listener*);
- bool canBind() const { return m_origin != TypeBuilder::CSS::Origin::User_agent && m_origin != TypeBuilder::CSS::Origin::User; }
+ bool canBind() const { return m_origin != TypeBuilder::CSS::StyleSheetOrigin::User_agent && m_origin != TypeBuilder::CSS::StyleSheetOrigin::User; }
InspectorCSSId ruleOrStyleId(CSSStyleDeclaration* style) const;
virtual Document* ownerDocument() const;
virtual RefPtr<CSSRuleSourceData> ruleSourceDataFor(CSSStyleDeclaration* style) const;
@@ -234,7 +234,7 @@
InspectorPageAgent* m_pageAgent;
String m_id;
RefPtr<CSSStyleSheet> m_pageStyleSheet;
- TypeBuilder::CSS::Origin::Enum m_origin;
+ TypeBuilder::CSS::StyleSheetOrigin::Enum m_origin;
String m_documentURL;
bool m_isRevalidating;
ParsedStyleSheet* m_parsedStyleSheet;
@@ -245,14 +245,14 @@
class InspectorStyleSheetForInlineStyle : public InspectorStyleSheet {
public:
- static PassRefPtr<InspectorStyleSheetForInlineStyle> create(InspectorPageAgent*, const String& id, PassRefPtr<Element>, TypeBuilder::CSS::Origin::Enum, Listener*);
+ static PassRefPtr<InspectorStyleSheetForInlineStyle> create(InspectorPageAgent*, const String& id, PassRefPtr<Element>, TypeBuilder::CSS::StyleSheetOrigin::Enum, Listener*);
void didModifyElementAttribute();
virtual bool getText(String* result) const;
virtual CSSStyleDeclaration* styleForId(const InspectorCSSId& id) const { ASSERT_UNUSED(id, !id.ordinal()); return inlineStyle(); }
protected:
- InspectorStyleSheetForInlineStyle(InspectorPageAgent*, const String& id, PassRefPtr<Element>, TypeBuilder::CSS::Origin::Enum, Listener*);
+ InspectorStyleSheetForInlineStyle(InspectorPageAgent*, const String& id, PassRefPtr<Element>, TypeBuilder::CSS::StyleSheetOrigin::Enum, Listener*);
virtual Document* ownerDocument() const;
virtual RefPtr<CSSRuleSourceData> ruleSourceDataFor(CSSStyleDeclaration* style) const { ASSERT_UNUSED(style, style == inlineStyle()); return m_ruleSourceData; }
