diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/content/browser/resources/gpu | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/content/browser/resources/gpu')
| -rw-r--r-- | chromium/content/browser/resources/gpu/gpu_internals.html | 4 | ||||
| -rw-r--r-- | chromium/content/browser/resources/gpu/info_view.js | 34 |
2 files changed, 24 insertions, 14 deletions
diff --git a/chromium/content/browser/resources/gpu/gpu_internals.html b/chromium/content/browser/resources/gpu/gpu_internals.html index ad59aa817aa..ef4def79b32 100644 --- a/chromium/content/browser/resources/gpu/gpu_internals.html +++ b/chromium/content/browser/resources/gpu/gpu_internals.html @@ -40,8 +40,8 @@ tabbox tabpanels { <script src="chrome://resources/js/cr/ui/focus_outline_manager.js"></script> <script src="chrome://resources/js/cr/ui/tabs.js"></script> <script src="chrome://resources/js/util.js"></script> -<script src="chrome://gpu/gpu_internals.js"></script> -<script src="chrome://gpu/strings.js"></script> +<script src="gpu_internals.js"></script> +<script src="strings.js"></script> </head> <body> <div id="debug-div"> diff --git a/chromium/content/browser/resources/gpu/info_view.js b/chromium/content/browser/resources/gpu/info_view.js index d7d21d5a749..e736d8e49a8 100644 --- a/chromium/content/browser/resources/gpu/info_view.js +++ b/chromium/content/browser/resources/gpu/info_view.js @@ -37,6 +37,11 @@ cr.define('gpu', function() { // Client info if (browserBridge.clientInfo) { var clientInfo = browserBridge.clientInfo; + + var commandLineParts = clientInfo.command_line.split(' '); + commandLineParts.shift(); // Pop off the exe path + var commandLineString = commandLineParts.join(' ') + this.setTable_('client-info', [ { description: 'Data exported', @@ -65,6 +70,10 @@ cr.define('gpu', function() { { description: '2D graphics backend', value: clientInfo.graphics_backend + }, + { + description: 'Command Line Args', + value: commandLineString }]); } else { this.setText_('client-info', '... loading...'); @@ -83,6 +92,7 @@ cr.define('gpu', function() { 'flash_stage3d_baseline': 'Flash Stage3D Baseline profile', 'texture_sharing': 'Texture Sharing', 'video_decode': 'Video Decode', + 'video_encode': 'Video Encode', 'video': 'Video', // GPU Switching 'gpu_switching': 'GPU Switching', @@ -151,24 +161,24 @@ cr.define('gpu', function() { if (gpuInfo.featureStatus) { // feature status list featureStatusList.textContent = ''; - for (i = 0; i < gpuInfo.featureStatus.featureStatus.length; - i++) { - var feature = gpuInfo.featureStatus.featureStatus[i]; + for (var featureName in gpuInfo.featureStatus.featureStatus) { + var featureStatus = + gpuInfo.featureStatus.featureStatus[featureName]; var featureEl = document.createElement('li'); var nameEl = document.createElement('span'); - if (!featureLabelMap[feature.name]) - console.log('Missing featureLabel for', feature.name); - nameEl.textContent = featureLabelMap[feature.name] + ': '; + if (!featureLabelMap[featureName]) + console.log('Missing featureLabel for', featureName); + nameEl.textContent = featureLabelMap[featureName] + ': '; featureEl.appendChild(nameEl); var statusEl = document.createElement('span'); - if (!statusLabelMap[feature.status]) - console.log('Missing statusLabel for', feature.status); - if (!statusClassMap[feature.status]) - console.log('Missing statusClass for', feature.status); - statusEl.textContent = statusLabelMap[feature.status]; - statusEl.className = statusClassMap[feature.status]; + if (!statusLabelMap[featureStatus]) + console.log('Missing statusLabel for', featureStatus); + if (!statusClassMap[featureStatus]) + console.log('Missing statusClass for', featureStatus); + statusEl.textContent = statusLabelMap[featureStatus]; + statusEl.className = statusClassMap[featureStatus]; featureEl.appendChild(statusEl); featureStatusList.appendChild(featureEl); |