Revert 130299 - Revert 130298 - Revert 130258 - Make it possible to blacklist gpu's based on the Wi…

chrome/browser/resources/gpu_internals/info_view.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 
 /**
  * @fileoverview This view displays information on the current GPU
  * hardware.  Its primary usefulness is to allow users to copy-paste
  * their data in an easy to read format for bug reports.
  */
@@ skipping 48 matching lines @@
             value: clientInfo.blacklist_version
           },
           {
             description: 'ANGLE revision',
             value: clientInfo.angle_revision
           },
           {
             description: '2D graphics backend',
             value: clientInfo.graphics_backend
           }]);
+
+        this.setTable_('performance-info', clientInfo.performance);
       } else {
         this.setText_('client-info', '... loading...');
       }
 
       // Feature map
       var featureLabelMap = {
         '2d_canvas': 'Canvas',
         '3d_css': '3D CSS',
         'compositing': 'HTML Rendering',
         'webgl': 'WebGL',
@@ skipping 17 matching lines @@
         'unavailable_software': 'feature-yellow',
         'enabled': 'feature-green'
       };
 
       // GPU info, basic
       var diagnosticsDiv = this.querySelector('.diagnostics');
       var diagnosticsLoadingDiv = this.querySelector('.diagnostics-loading');
       var featureStatusList = this.querySelector('.feature-status-list');
       var problemsDiv = this.querySelector('.problems-div');
       var problemsList = this.querySelector('.problems-list');
-      var performanceDiv = this.querySelector('.performance-div');
       var gpuInfo = browserBridge.gpuInfo;
       var i;
       if (gpuInfo) {
         // Not using jstemplate here for blacklist status because we construct
         // href from data, which jstemplate can't seem to do.
         if (gpuInfo.featureStatus) {
           // feature status list
           featureStatusList.textContent = '';
           for (i = 0; i < gpuInfo.featureStatus.featureStatus.length;
                i++) {
@@ skipping 33 matching lines @@
 
         } else {
           featureStatusList.textContent = '';
           problemsList.hidden = true;
         }
         if (gpuInfo.basic_info)
           this.setTable_('basic-info', gpuInfo.basic_info);
         else
           this.setTable_('basic-info', []);
 
-        if (gpuInfo.performance_info) {
-          performanceDiv.hidden = false;
-          this.setTable_('performance-info', gpuInfo.performance_info);
-        } else {
-          performanceDiv.hidden = true;
-        }
-
         if (gpuInfo.diagnostics) {
           diagnosticsDiv.hidden = false;
           diagnosticsLoadingDiv.hidden = true;
           $('diagnostics-table').hidden = false;
           this.setTable_('diagnostics-table', gpuInfo.diagnostics);
         } else if (gpuInfo.diagnostics === null) {
           // gpu_internals.cc sets diagnostics to null when it is being loaded
           diagnosticsDiv.hidden = false;
           diagnosticsLoadingDiv.hidden = false;
           $('diagnostics-table').hidden = true;
@@ skipping 82 matching lines @@
 
       peg.innerHTML = '';
       peg.appendChild(template);
     }
   };
 
   return {
     InfoView: InfoView
   };
 });