| Index: tracing/tracing/ui/base/camera_test.html
|
| diff --git a/tracing/tracing/ui/base/camera_test.html b/tracing/tracing/ui/base/camera_test.html
|
| index 1908781b10de3ff5b4efc87704c750d33603234e..b7c6d632a9990315ea8af53bce3e00d94d413fbe 100644
|
| --- a/tracing/tracing/ui/base/camera_test.html
|
| +++ b/tracing/tracing/ui/base/camera_test.html
|
| @@ -4,9 +4,9 @@ Copyright (c) 2014 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.
|
| -->
|
| -<link rel="import" href="/tracing/base/bbox2.html">
|
| -<link rel="import" href="/tracing/base/quad.html">
|
| -<link rel="import" href="/tracing/base/rect.html">
|
| +<link rel="import" href="/tracing/base/math/bbox2.html">
|
| +<link rel="import" href="/tracing/base/math/quad.html">
|
| +<link rel="import" href="/tracing/base/math/rect.html">
|
| <link rel="import" href="/tracing/ui/base/quad_stack_view.html">
|
| <script>
|
| 'use strict';
|
| @@ -14,14 +14,14 @@ found in the LICENSE file.
|
| tr.b.unittest.testSuite(function() {
|
| function createQuads() {
|
| var quads = [
|
| - tr.b.Quad.fromXYWH(-500, -500, 30, 30), // 4 corners
|
| - tr.b.Quad.fromXYWH(-500, 470, 30, 30),
|
| - tr.b.Quad.fromXYWH(470, -500, 30, 30),
|
| - tr.b.Quad.fromXYWH(470, 470, 30, 30),
|
| - tr.b.Quad.fromXYWH(-250, -250, 250, 250), // crosshairs
|
| - tr.b.Quad.fromXYWH(0, -250, 250, 250), // crosshairs
|
| - tr.b.Quad.fromXYWH(-250, 0, 250, 250), // crosshairs
|
| - tr.b.Quad.fromXYWH(0, 0, 250, 250) // crosshairs
|
| + tr.b.math.Quad.fromXYWH(-500, -500, 30, 30), // 4 corners
|
| + tr.b.math.Quad.fromXYWH(-500, 470, 30, 30),
|
| + tr.b.math.Quad.fromXYWH(470, -500, 30, 30),
|
| + tr.b.math.Quad.fromXYWH(470, 470, 30, 30),
|
| + tr.b.math.Quad.fromXYWH(-250, -250, 250, 250), // crosshairs
|
| + tr.b.math.Quad.fromXYWH(0, -250, 250, 250), // crosshairs
|
| + tr.b.math.Quad.fromXYWH(-250, 0, 250, 250), // crosshairs
|
| + tr.b.math.Quad.fromXYWH(0, 0, 250, 250) // crosshairs
|
| ];
|
| quads[0].stackingGroupId = 0;
|
| quads[1].stackingGroupId = 0;
|
| @@ -40,7 +40,7 @@ tr.b.unittest.testSuite(function() {
|
| // simulate the constraints of the layer-tree-view
|
| view.style.height = '400px';
|
| view.style.width = '800px';
|
| - view.deviceRect = tr.b.Rect.fromXYWH(-250, -250, 500, 500);
|
| + view.deviceRect = tr.b.math.Rect.fromXYWH(-250, -250, 500, 500);
|
| view.quads = quads;
|
|
|
| testFramework.addHTMLOutput(view);
|
|
|