Merge webkit.org at r58033 : Initial merge by git

Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1

1 files changed, 58 insertions, 3 deletions

diff --git a/WebCore/inspector/InspectorDOMAgent.h b/WebCore/inspector/InspectorDOMAgent.h
index d7334b7..7211ed2 100644
--- a/WebCore/inspector/InspectorDOMAgent.h
+++ b/WebCore/inspector/InspectorDOMAgent.h
@@ -45,6 +45,11 @@
 
 namespace WebCore {
     class ContainerNode;
+    class CSSRule;
+    class CSSRuleList;
+    class CSSStyleDeclaration;
+    class CSSStyleRule;
+    class CSSStyleSheet;
     class Element;
     class Event;
     class Document;
@@ -87,13 +92,27 @@ namespace WebCore {
 
         virtual bool operator==(const EventListener& other);
 
-        // Methods called from the frontend.
+        // Methods called from the frontend for DOM nodes inspection.
         void getChildNodes(long callId, long nodeId);
         void setAttribute(long callId, long elementId, const String& name, const String& value);
         void removeAttribute(long callId, long elementId, const String& name);
+        void removeNode(long callId, long nodeId);
+        void changeTagName(long callId, long nodeId, const AtomicString& tagName, bool expanded);
         void setTextNodeValue(long callId, long nodeId, const String& value);
         void getEventListenersForNode(long callId, long nodeId);
 
+        // Methods called from the frontend for CSS styles inspection.
+        void getStyles(long callId, long nodeId, bool authorOnly);
+        void getAllStyles(long callId);
+        void getInlineStyle(long callId, long nodeId);
+        void getComputedStyle(long callId, long nodeId);
+        void applyStyleText(long callId, long styleId, const String& styleText, const String& propertyName);
+        void setStyleText(long callId, long styleId, const String& cssText);
+        void setStyleProperty(long callId, long styleId, const String& name, const String& value);
+        void toggleStyleEnabled(long callId, long styleId, const String& propertyName, bool disabled);
+        void setRuleSelector(long callId, long ruleId, const String& selector, long selectedNodeId);
+        void addRule(long callId, const String& selector, long selectedNodeId);
+
         // Methods called from the InspectorController.
         void setDocument(Document* document);
         void releaseDanglingNodes();
@@ -107,22 +126,29 @@ namespace WebCore {
         long pushNodePathToFrontend(Node* node);
         void pushChildNodesToFrontend(long nodeId);
 
-   private:
+    private:
+        typedef std::pair<String, String> PropertyValueAndPriority;
+        typedef HashMap<String, PropertyValueAndPriority> DisabledStyleDeclaration;
+
         void startListening(Document* document);
         void stopListening(Document* document);
 
         virtual void handleEvent(ScriptExecutionContext*, Event* event);
 
+        // Node-related methods.
         typedef HashMap<RefPtr<Node>, long> NodeToIdMap;
         long bind(Node* node, NodeToIdMap* nodesMap);
         void unbind(Node* node, NodeToIdMap* nodesMap);
 
         bool pushDocumentToFrontend();
 
+        ScriptObject buildObjectForAttributeStyles(Element* element);
+        ScriptArray buildArrayForCSSRules(CSSRuleList*);
+        ScriptArray buildArrayForPseudoElements(Element* element, bool authorOnly);
+
         ScriptObject buildObjectForNode(Node* node, int depth, NodeToIdMap* nodesMap);
         ScriptArray buildArrayForElementAttributes(Element* element);
         ScriptArray buildArrayForContainerChildren(Node* container, int depth, NodeToIdMap* nodesMap);
-
         ScriptObject buildObjectForEventListener(const RegisteredEventListener& registeredEventListener, const AtomicString& eventType, Node* node);
 
         // We represent embedded doms as a part of the same hierarchy. Hence we treat children of frame owners differently.
@@ -136,6 +162,20 @@ namespace WebCore {
 
         Document* mainFrameDocument() const;
         String documentURLString(Document* document) const;
+
+        long bindStyle(CSSStyleDeclaration*);
+        long bindRule(CSSStyleRule*);
+        ScriptObject buildObjectForStyle(CSSStyleDeclaration*, bool bind);
+        void populateObjectWithStyleProperties(CSSStyleDeclaration*, ScriptObject& result);
+        ScriptArray buildArrayForDisabledStyleProperties(DisabledStyleDeclaration&);
+        ScriptObject buildObjectForRule(CSSStyleRule*);
+        ScriptObject buildObjectForStyleSheet(CSSStyleSheet*);
+        Vector<String> longhandProperties(CSSStyleDeclaration*, const String& shorthandProperty);
+        String shorthandValue(CSSStyleDeclaration*, const String& shorthandProperty);
+        String shorthandPriority(CSSStyleDeclaration*, const String& shorthandProperty);
+        bool ruleAffectsNode(CSSStyleRule*, Node*);
+        ScriptArray toArray(const Vector<String>& data);
+
         void discardBindings();
 
         InspectorFrontend* m_frontend;
@@ -146,6 +186,21 @@ namespace WebCore {
         HashMap<long, NodeToIdMap*> m_idToNodesMap;
         HashSet<long> m_childrenRequested;
         long m_lastNodeId;
+
+        typedef HashMap<CSSStyleDeclaration*, long> StyleToIdMap;
+        typedef HashMap<long, RefPtr<CSSStyleDeclaration> > IdToStyleMap;
+        StyleToIdMap m_styleToId;
+        IdToStyleMap m_idToStyle;
+        typedef HashMap<CSSStyleRule*, long> RuleToIdMap;
+        typedef HashMap<long, RefPtr<CSSStyleRule> > IdToRuleMap;
+        RuleToIdMap m_ruleToId;
+        IdToRuleMap m_idToRule;
+        typedef HashMap<long, DisabledStyleDeclaration>  IdToDisabledStyleMap;
+        IdToDisabledStyleMap m_idToDisabledStyle;
+        RefPtr<CSSStyleSheet> m_inspectorStyleSheet;
+
+        long m_lastStyleId;
+        long m_lastRuleId;
         ListHashSet<RefPtr<Document> > m_documents;
     };