Merge pull request #1019 from ahocevar/chrome-optimized

Deal with recent Chrome optimizations to avoid failing TileManager and tests
2013-07-09 01:51:04 -07:00
parent d020e8f666
commit 49dd5a4fd8
5 changed files with 49 additions and 52 deletions
@@ -382,12 +382,9 @@

            t.delay_call(5, function() {
                var tile = layer.grid[0][0];
-                if (tile.isLoading) {
-                    t.ok(false, "test_getCanvasContext timeout");
-                } else {
-                    t.ok(tile.getCanvasContext() instanceof CanvasRenderingContext2D,
-                         "getCanvasContext() returns CanvasRenderingContext2D instance");
-                }
+                tile.onImageLoad();
+                t.ok(tile.getCanvasContext() instanceof CanvasRenderingContext2D,
+                     "getCanvasContext() returns CanvasRenderingContext2D instance");
                map.destroy();
            });
        }