| Index: third_party/WebKit/PerformanceTests/resources/runner.js
|
| diff --git a/third_party/WebKit/PerformanceTests/resources/runner.js b/third_party/WebKit/PerformanceTests/resources/runner.js
|
| index 11a063625875bcbc36b1d3bc5da33cf42924a6a0..ff74d8dc00969ca831da38fdb4c1788301c4e212 100644
|
| --- a/third_party/WebKit/PerformanceTests/resources/runner.js
|
| +++ b/third_party/WebKit/PerformanceTests/resources/runner.js
|
| @@ -137,21 +137,8 @@ if (window.testRunner) {
|
| finish();
|
| }
|
|
|
| - // Force a layout (including style recalc) if window.fullFrameMeasurement is false,
|
| - // or a full frame update (including style recalc, layout, compositing update and paint invalidation,
|
| - // not including painting).
|
| - PerfTestRunner.forceLayoutOrFullFrame = function(doc) {
|
| + PerfTestRunner.forceLayout = function(doc) {
|
| doc = doc || document;
|
| - // Forcing full frame is only feasible when window.internals is available.
|
| - if (window.fullFrameMeasurement) {
|
| - if (window.internals)
|
| - internals.forceCompositingUpdate(doc);
|
| - else
|
| - PerfTestRunner.logFatalError('window.internals API is required for full frame measurement.');
|
| - return;
|
| - }
|
| -
|
| - // Otherwise just force style recalc and layout without compositing update and paint invalidation.
|
| if (doc.body)
|
| doc.body.offsetHeight;
|
| else if (doc.documentElement)
|
| @@ -334,7 +321,7 @@ if (window.testRunner) {
|
|
|
| for (var chunkIndex = 0; chunkIndex < chunks.length; chunkIndex++) {
|
| iframe.contentDocument.write(chunks[chunkIndex]);
|
| - PerfTestRunner.forceLayoutOrFullFrame(iframe.contentDocument);
|
| + PerfTestRunner.forceLayout(iframe.contentDocument);
|
| }
|
|
|
| iframe.contentDocument.close();
|
|
|