| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import sys | 5 import sys |
| 6 import time | 6 import time |
| 7 | 7 |
| 8 from telemetry.core.util import TimeoutException | 8 from telemetry.core.util import TimeoutException |
| 9 from telemetry.page import page_test | 9 from telemetry.page import page_test |
| 10 from telemetry.value import scalar | 10 from telemetry.value import scalar |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 if ('picture_memory_usage' in data): | 70 if ('picture_memory_usage' in data): |
| 71 picture_memory_usage = data['picture_memory_usage'] | 71 picture_memory_usage = data['picture_memory_usage'] |
| 72 else: | 72 else: |
| 73 picture_memory_usage = 0 | 73 picture_memory_usage = 0 |
| 74 | 74 |
| 75 results.AddValue(scalar.ScalarValue( | 75 results.AddValue(scalar.ScalarValue( |
| 76 results.current_page, 'pixels_recorded', 'pixels', pixels_recorded)) | 76 results.current_page, 'pixels_recorded', 'pixels', pixels_recorded)) |
| 77 results.AddValue(scalar.ScalarValue( | 77 results.AddValue(scalar.ScalarValue( |
| 78 results.current_page, 'pixels_rasterized', 'pixels', pixels_rasterized)) | 78 results.current_page, 'pixels_rasterized', 'pixels', pixels_rasterized)) |
| 79 results.AddValue(scalar.ScalarValue( | 79 results.AddValue(scalar.ScalarValue( |
| 80 results.current_page, 'rasterize_time', 'ms', rasterize_time)) | 80 results.current_page, 'rasterize_time', 'ms', rasterize_time, |
| 81 higher_is_better=False)) |
| 81 results.AddValue(scalar.ScalarValue( | 82 results.AddValue(scalar.ScalarValue( |
| 82 results.current_page, 'viewport_picture_size', 'bytes', | 83 results.current_page, 'viewport_picture_size', 'bytes', |
| 83 picture_memory_usage)) | 84 picture_memory_usage, higher_is_better=False)) |
| 84 results.AddValue(scalar.ScalarValue( | 85 results.AddValue(scalar.ScalarValue( |
| 85 results.current_page, 'record_time', 'ms', record_time)) | 86 results.current_page, 'record_time', 'ms', record_time, |
| 87 higher_is_better=False)) |
| 86 record_time_sk_null_canvas = data['record_time_sk_null_canvas_ms'] | 88 record_time_sk_null_canvas = data['record_time_sk_null_canvas_ms'] |
| 87 record_time_painting_disabled = data['record_time_painting_disabled_ms'] | 89 record_time_painting_disabled = data['record_time_painting_disabled_ms'] |
| 88 results.AddValue(scalar.ScalarValue( | 90 results.AddValue(scalar.ScalarValue( |
| 89 results.current_page, 'record_time_sk_null_canvas', 'ms', | 91 results.current_page, 'record_time_sk_null_canvas', 'ms', |
| 90 record_time_sk_null_canvas)) | 92 record_time_sk_null_canvas, higher_is_better=False)) |
| 91 results.AddValue(scalar.ScalarValue( | 93 results.AddValue(scalar.ScalarValue( |
| 92 results.current_page, 'record_time_painting_disabled', 'ms', | 94 results.current_page, 'record_time_painting_disabled', 'ms', |
| 93 record_time_painting_disabled)) | 95 record_time_painting_disabled, higher_is_better=False)) |
| 94 | 96 |
| 95 if self._report_detailed_results: | 97 if self._report_detailed_results: |
| 96 pixels_rasterized_with_non_solid_color = \ | 98 pixels_rasterized_with_non_solid_color = \ |
| 97 data['pixels_rasterized_with_non_solid_color'] | 99 data['pixels_rasterized_with_non_solid_color'] |
| 98 pixels_rasterized_as_opaque = \ | 100 pixels_rasterized_as_opaque = \ |
| 99 data['pixels_rasterized_as_opaque'] | 101 data['pixels_rasterized_as_opaque'] |
| 100 total_layers = data['total_layers'] | 102 total_layers = data['total_layers'] |
| 101 total_picture_layers = data['total_picture_layers'] | 103 total_picture_layers = data['total_picture_layers'] |
| 102 total_picture_layers_with_no_content = \ | 104 total_picture_layers_with_no_content = \ |
| 103 data['total_picture_layers_with_no_content'] | 105 data['total_picture_layers_with_no_content'] |
| 104 total_picture_layers_off_screen = \ | 106 total_picture_layers_off_screen = \ |
| 105 data['total_picture_layers_off_screen'] | 107 data['total_picture_layers_off_screen'] |
| 106 # TODO(schenney): Remove this workaround when reference builds get past | 108 # TODO(schenney): Remove this workaround when reference builds get past |
| 107 # the change that adds this comment. | 109 # the change that adds this comment. |
| 108 if ('total_pictures_in_pile_size' in data): | 110 if ('total_pictures_in_pile_size' in data): |
| 109 total_pictures_in_pile_size = data['total_pictures_in_pile_size'] | 111 total_pictures_in_pile_size = data['total_pictures_in_pile_size'] |
| 110 else: | 112 else: |
| 111 total_pictures_in_pile_size = 0 | 113 total_pictures_in_pile_size = 0 |
| 112 | 114 |
| 113 results.AddValue(scalar.ScalarValue( | 115 results.AddValue(scalar.ScalarValue( |
| 114 results.current_page, 'total_size_of_pictures_in_piles', 'bytes', | 116 results.current_page, 'total_size_of_pictures_in_piles', 'bytes', |
| 115 total_pictures_in_pile_size)) | 117 total_pictures_in_pile_size, higher_is_better=False)) |
| 116 results.AddValue(scalar.ScalarValue( | 118 results.AddValue(scalar.ScalarValue( |
| 117 results.current_page, 'pixels_rasterized_with_non_solid_color', | 119 results.current_page, 'pixels_rasterized_with_non_solid_color', |
| 118 'pixels', pixels_rasterized_with_non_solid_color)) | 120 'pixels', pixels_rasterized_with_non_solid_color)) |
| 119 results.AddValue(scalar.ScalarValue( | 121 results.AddValue(scalar.ScalarValue( |
| 120 results.current_page, 'pixels_rasterized_as_opaque', 'pixels', | 122 results.current_page, 'pixels_rasterized_as_opaque', 'pixels', |
| 121 pixels_rasterized_as_opaque)) | 123 pixels_rasterized_as_opaque)) |
| 122 results.AddValue(scalar.ScalarValue( | 124 results.AddValue(scalar.ScalarValue( |
| 123 results.current_page, 'total_layers', 'count', total_layers)) | 125 results.current_page, 'total_layers', 'count', total_layers)) |
| 124 results.AddValue(scalar.ScalarValue( | 126 results.AddValue(scalar.ScalarValue( |
| 125 results.current_page, 'total_picture_layers', 'count', | 127 results.current_page, 'total_picture_layers', 'count', |
| 126 total_picture_layers)) | 128 total_picture_layers)) |
| 127 results.AddValue(scalar.ScalarValue( | 129 results.AddValue(scalar.ScalarValue( |
| 128 results.current_page, 'total_picture_layers_with_no_content', 'count', | 130 results.current_page, 'total_picture_layers_with_no_content', 'count', |
| 129 total_picture_layers_with_no_content)) | 131 total_picture_layers_with_no_content)) |
| 130 results.AddValue(scalar.ScalarValue( | 132 results.AddValue(scalar.ScalarValue( |
| 131 results.current_page, 'total_picture_layers_off_screen', 'count', | 133 results.current_page, 'total_picture_layers_off_screen', 'count', |
| 132 total_picture_layers_off_screen)) | 134 total_picture_layers_off_screen)) |
| OLD | NEW |