Merge 90013 - 2011-06-29 Pavel Feldman <pfeldman@google.com>

Source/WebCore/inspector/InspectorDOMAgent.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 571 matching lines @@
         *errorString = "Internal error: could not set attribute value.";
         return;
     }
 
     toHTMLElement(parsedElement.get())->setInnerHTML("<span " + value + "></span>", ec);
     if (ec) {
         *errorString = "Could not parse value as attributes.";
         return;
     }
 
-    const NamedNodeMap* attrMap = toHTMLElement(parsedElement->firstChild())->attributes(true);
+    Node* child = parsedElement->firstChild();
+    if (!child) {
+        *errorString = "Could not parse value as attributes.";
+        return;
+    }
+
+    const NamedNodeMap* attrMap = toHTMLElement(child)->attributes(true);
     if (!attrMap) {
         element->removeAttribute(name, ec);
         if (ec)
             *errorString = "Could not remove attribute.";
         return;
     }
 
     bool foundOriginalAttribute = false;
     unsigned numAttrs = attrMap->length();
     for (unsigned i = 0; i < numAttrs; ++i) {
@@ skipping 833 matching lines @@
     else if (m_highlightMode == "border")
         mode = DOMNodeHighlighter::HighlightBorder;
     else if (m_highlightMode == "margin")
         mode = DOMNodeHighlighter::HighlightMargin;
     DOMNodeHighlighter::DrawNodeHighlight(context, m_highlightedNode.get(), mode);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)