Merge 85415 - 2011-05-01 Pavel Feldman <pfeldman@chromium.org>

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

 /*
  * Copyright (C) 2008 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 245 matching lines @@
     _addWelcomeMessage: function(profileType)
     {
         var message = profileType.welcomeMessage;
         // Message text is supposed to have a '%s' substring as a placeholder
         // for a status bar button. If it is there, we split the message in two
         // parts, and insert the button between them.
         var buttonPos = message.indexOf("%s");
         if (buttonPos > -1) {
             var container = document.createDocumentFragment();
             var part1 = document.createElement("span");
-            part1.innerHTML = message.substr(0, buttonPos);
+            part1.textContent = message.substr(0, buttonPos);
             container.appendChild(part1);
      
             var button = new WebInspector.StatusBarButton(profileType.buttonTooltip, profileType.buttonStyle, profileType.buttonCaption);
             container.appendChild(button.element);
        
             var part2 = document.createElement("span");
-            part2.innerHTML = message.substr(buttonPos + 2);
+            part2.textContent = message.substr(buttonPos + 2);
             container.appendChild(part2);
             this.welcomeView.addMessage(container);
         } else
             this.welcomeView.addMessage(message);
     },
 
     _makeKey: function(text, profileTypeId)
     {
         return escape(text) + '/' + escape(profileTypeId);
     },
@@ skipping 622 matching lines @@
 
 WebInspector.ProfileGroupSidebarTreeElement.prototype = {
     onselect: function()
     {
         if (this.children.length > 0)
             WebInspector.panels.profiles.showProfile(this.children[this.children.length - 1].profile);
     }
 }
 
 WebInspector.ProfileGroupSidebarTreeElement.prototype.__proto__ = WebInspector.SidebarTreeElement.prototype;