Merge 84909 - 2011-04-26 Pavel Feldman <pfeldman@google.com> Web Inspector: New Style is...

Source/WebCore/inspector/front-end/CSSStyleModel.js

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 104 matching lines @@
                 userCallback(null);
             else
                 userCallback(WebInspector.CSSStyleDeclaration.parsePayload(stylePayload));
         }
 
         CSSAgent.getInlineStyleForNode(nodeId, callback.bind(null, userCallback));
     },
 
     setRuleSelector: function(ruleId, nodeId, newSelector, successCallback, failureCallback)
     {
-        function checkAffectsCallback(nodeId, successCallback, rulePayload, error, selectedNodeIds)
+        function checkAffectsCallback(nodeId, successCallback, rulePayload, selectedNodeIds)
         {
-            if (error)
+            if (!selectedNodeIds)
                 return;
             var doesAffectSelectedNode = (selectedNodeIds.indexOf(nodeId) >= 0);
             var rule = WebInspector.CSSRule.parsePayload(rulePayload);
             successCallback(rule, doesAffectSelectedNode);
             this._fireStyleSheetChanged(rule.id.styleSheetId, true);
         }
 
         function callback(nodeId, successCallback, failureCallback, error, newSelector, rulePayload)
         {
             // FIXME: looks like rulePayload is always null.
             if (error)
                 failureCallback();
-            else
-                WebInspector.domAgent.querySelectorAll(nodeId, newSelector, checkAffectsCallback.bind(this, nodeId, successCallback, rulePayload));
+            else {
+                var documentElementId = this._documentElementId(nodeId);
+                if (documentElementId)
+                    WebInspector.domAgent.querySelectorAll(documentElementId, newSelector, checkAffectsCallback.bind(this, nodeId, successCallback, rulePayload));
+                else
+                    failureCallback();
+            }
         }
 
         CSSAgent.setRuleSelector(ruleId, newSelector, callback.bind(this, nodeId, successCallback, failureCallback, newSelector));
     },
 
     addRule: function(nodeId, selector, successCallback, failureCallback)
     {
-        function checkAffectsCallback(nodeId, successCallback, rulePayload, error, selectedNodeIds)
+        function checkAffectsCallback(nodeId, successCallback, rulePayload, selectedNodeIds)
         {
+            if (!selectedNodeIds)
+                return;
             var doesAffectSelectedNode = (selectedNodeIds.indexOf(nodeId) >= 0);
             var rule = WebInspector.CSSRule.parsePayload(rulePayload);
             successCallback(rule, doesAffectSelectedNode);
             this._fireStyleSheetChanged(rule.id.styleSheetId, true);
         }
 
         function callback(successCallback, failureCallback, selector, error, rulePayload)
         {
             if (error) {
                 // Invalid syntax for a selector
                 failureCallback();
-            } else
-                WebInspector.domAgent.querySelectorAll(nodeId, selector, checkAffectsCallback.bind(this, nodeId, successCallback, rulePayload));
+            } else {
+                var documentElementId = this._documentElementId(nodeId);
+                if (documentElementId)
+                    WebInspector.domAgent.querySelectorAll(documentElementId, selector, checkAffectsCallback.bind(this, nodeId, successCallback, rulePayload));
+                else
+                    failureCallback();
+            }
         }
 
         CSSAgent.addRule(nodeId, selector, callback.bind(this, successCallback, failureCallback, selector));
     },
 
+    _documentElementId: function(nodeId) 
+    { 
+        var node = WebInspector.domAgent.nodeForId(nodeId); 
+        if (!node) 
+            return null; 
+        return node.ownerDocumentElement().id; 
+    }, 
+
     _fireStyleSheetChanged: function(styleSheetId, majorChange, callback)
     {
         callback = callback || function() {};
 
         if (!majorChange || !styleSheetId || !this.hasEventListeners(WebInspector.CSSStyleModel.Events.StyleSheetChanged)) {
             callback();
             return;
         }
 
         function mycallback(error, content)
@@ skipping 507 matching lines @@
 
         if (!this._styleSheetIdToURL[styleSheetId]) {
             this._loadStyleSheetHeaders(setContent.bind(this));
             return;
         }
         setContent.call(this);
     }
 }
 
 WebInspector.CSSStyleModelResourceBinding.prototype.__proto__ = WebInspector.ResourceDomainModelBinding.prototype;