Changeset 127236 in webkit


Ignore:
Timestamp:
Aug 31, 2012 12:36:34 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[Qt] New inspector/profiler/webgl-profiler-api-changes.html times out
​https://bugs.webkit.org/show_bug.cgi?id=95183

Patch by Andrey Adaikin <​aandrey@chromium.org> on 2012-08-31
Reviewed by Yury Semikhatsky.

Move inspector WebGL test(s) to its own folder so that they are easy to blacklist. Skip them for QT where WebGL is disabled at the moment.
Drive-by: make the test fail instead of timing out when WebGL is disabled.

  • inspector/profiler/webgl/webgl-profiler-api-changes-expected.txt: Renamed from LayoutTests/inspector/profiler/webgl-profiler-api-changes-expected.txt.
  • inspector/profiler/webgl/webgl-profiler-api-changes.html: Renamed from LayoutTests/inspector/profiler/webgl-profiler-api-changes.html.
  • platform/qt/Skipped:
Location:
trunk/LayoutTests
Files:
1 added
2 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r127235 r127236  
     12012-08-31  Andrey Adaikin  <aandrey@chromium.org>
     2
     3        [Qt] New inspector/profiler/webgl-profiler-api-changes.html times out
     4        https://bugs.webkit.org/show_bug.cgi?id=95183
     5
     6        Reviewed by Yury Semikhatsky.
     7
     8        Move inspector WebGL test(s) to its own folder so that they are easy to blacklist. Skip them for QT where WebGL is disabled at the moment.
     9        Drive-by: make the test fail instead of timing out when WebGL is disabled.
     10
     11        * inspector/profiler/webgl/webgl-profiler-api-changes-expected.txt: Renamed from LayoutTests/inspector/profiler/webgl-profiler-api-changes-expected.txt.
     12        * inspector/profiler/webgl/webgl-profiler-api-changes.html: Renamed from LayoutTests/inspector/profiler/webgl-profiler-api-changes.html.
     13        * platform/qt/Skipped:
     14
    1152012-08-31  Yoshifumi Inoue  <yosin@chromium.org>
    216

  • trunk/LayoutTests/inspector/profiler/webgl/webgl-profiler-api-changes.html

    r127235 r127236  
    11<html>
    22<head>
    3 <script src="../../http/tests/inspector/inspector-test.js"></script>
     3<script src="../../../http/tests/inspector/inspector-test.js"></script>
    44<script>
    5 
    6  if (window.testRunner) {
    7     testRunner.overridePreference("WebKitWebGLEnabled", "1");
    8     testRunner.dumpAsText();
    9     testRunner.waitUntilDone();
    10 }
    115
    126function wasError(gl)
    … …  
    1812}
    1913
    20  function createWebGLContext()
    21  {
    22      var canvas = document.createElement("canvas");
    23      var contextIds = ["experimental-webgl", "webkit-3d", "3d"];
    24      for (var i = 0, contextId; contextId = contextIds[i]; ++i) {
    25          var gl = canvas.getContext(contextId);
    26          if (gl)
    27              return gl;
    28      }
    29      output("ERROR: Could not create a WebGL context.");
    30      return null;
    31  }
    32 
    33  WebGLRenderingContextResource = {};
     14function createWebGLContext()
     15{
     16    var canvas = document.createElement("canvas");
     17    var contextIds = ["experimental-webgl", "webkit-3d", "3d"];
     18    for (var i = 0, contextId; contextId = contextIds[i]; ++i) {
     19        var gl = canvas.getContext(contextId);
     20        if (gl)
     21            return gl;
     22    }
     23    output("ERROR: Could not create a WebGL context.");
     24    return null;
     25}
     26
     27WebGLRenderingContextResource = {};
    3428 
    35  /**
    36   * @const
    37   * @type {Array.<string>}
    38   */
    39  WebGLRenderingContextResource.GLCapabilities = [
    40      "BLEND",
    41      "CULL_FACE",
    42      "DEPTH_TEST",
    43      "DITHER",
    44      "POLYGON_OFFSET_FILL",
    45      "SAMPLE_ALPHA_TO_COVERAGE",
    46      "SAMPLE_COVERAGE",
    47      "SCISSOR_TEST",
    48      "STENCIL_TEST"
    49  ];
    50 
    51  /**
    52   * @const
    53   * @type {Array.<string>}
    54   */
    55  WebGLRenderingContextResource.PixelStoreParameters = [
    56      "PACK_ALIGNMENT",
    57      "UNPACK_ALIGNMENT",
    58      "UNPACK_COLORSPACE_CONVERSION_WEBGL",
    59      "UNPACK_FLIP_Y_WEBGL",
    60      "UNPACK_PREMULTIPLY_ALPHA_WEBGL"
    61  ];
    62 
    63  /**
    64   * @const
    65   * @type {Array.<string>}
    66   */
    67  WebGLRenderingContextResource.StateParameters = [
    68      "ACTIVE_TEXTURE",
    69      "ARRAY_BUFFER_BINDING",
    70      "BLEND_COLOR",
    71      "BLEND_DST_ALPHA",
    72      "BLEND_DST_RGB",
    73      "BLEND_EQUATION_ALPHA",
    74      "BLEND_EQUATION_RGB",
    75      "BLEND_SRC_ALPHA",
    76      "BLEND_SRC_RGB",
    77      "COLOR_CLEAR_VALUE",
    78      "COLOR_WRITEMASK",
    79      "CULL_FACE_MODE",
    80      "CURRENT_PROGRAM",
    81      "DEPTH_CLEAR_VALUE",
    82      "DEPTH_FUNC",
    83      "DEPTH_RANGE",
    84      "DEPTH_WRITEMASK",
    85      "ELEMENT_ARRAY_BUFFER_BINDING",
    86      "FRAMEBUFFER_BINDING",
    87      "FRONT_FACE",
    88      "GENERATE_MIPMAP_HINT",
    89      "LINE_WIDTH",
    90      "PACK_ALIGNMENT",
    91      "POLYGON_OFFSET_FACTOR",
    92      "POLYGON_OFFSET_UNITS",
    93      "RENDERBUFFER_BINDING",
    94      "SAMPLE_COVERAGE_INVERT",
    95      "SAMPLE_COVERAGE_VALUE",
    96      "SCISSOR_BOX",
    97      "STENCIL_BACK_FAIL",
    98      "STENCIL_BACK_FUNC",
    99      "STENCIL_BACK_PASS_DEPTH_FAIL",
    100      "STENCIL_BACK_PASS_DEPTH_PASS",
    101      "STENCIL_BACK_REF",
    102      "STENCIL_BACK_VALUE_MASK",
    103      "STENCIL_BACK_WRITEMASK",
    104      "STENCIL_CLEAR_VALUE",
    105      "STENCIL_FAIL",
    106      "STENCIL_FUNC",
    107      "STENCIL_PASS_DEPTH_FAIL",
    108      "STENCIL_PASS_DEPTH_PASS",
    109      "STENCIL_REF",
    110      "STENCIL_VALUE_MASK",
    111      "STENCIL_WRITEMASK",
    112      "UNPACK_ALIGNMENT",
    113      "UNPACK_COLORSPACE_CONVERSION_WEBGL",
    114      "UNPACK_FLIP_Y_WEBGL",
    115      "UNPACK_PREMULTIPLY_ALPHA_WEBGL",
    116      "VIEWPORT"
    117  ];
    118 
    119  WebGLRenderingContextResource.TextureBindings = [
    120      "TEXTURE_BINDING_2D",
    121      "TEXTURE_BINDING_CUBE_MAP"
    122  ];
    123 
    124  function test()
     29/**
     30 * @const
     31 * @type {Array.<string>}
     32 */
     33WebGLRenderingContextResource.GLCapabilities = [
     34    "BLEND",
     35    "CULL_FACE",
     36    "DEPTH_TEST",
     37    "DITHER",
     38    "POLYGON_OFFSET_FILL",
     39    "SAMPLE_ALPHA_TO_COVERAGE",
     40    "SAMPLE_COVERAGE",
     41    "SCISSOR_TEST",
     42    "STENCIL_TEST"
     43];
     44
     45/**
     46 * @const
     47 * @type {Array.<string>}
     48 */
     49WebGLRenderingContextResource.PixelStoreParameters = [
     50    "PACK_ALIGNMENT",
     51    "UNPACK_ALIGNMENT",
     52    "UNPACK_COLORSPACE_CONVERSION_WEBGL",
     53    "UNPACK_FLIP_Y_WEBGL",
     54    "UNPACK_PREMULTIPLY_ALPHA_WEBGL"
     55];
     56
     57/**
     58 * @const
     59 * @type {Array.<string>}
     60 */
     61WebGLRenderingContextResource.StateParameters = [
     62    "ACTIVE_TEXTURE",
     63    "ARRAY_BUFFER_BINDING",
     64    "BLEND_COLOR",
     65    "BLEND_DST_ALPHA",
     66    "BLEND_DST_RGB",
     67    "BLEND_EQUATION_ALPHA",
     68    "BLEND_EQUATION_RGB",
     69    "BLEND_SRC_ALPHA",
     70    "BLEND_SRC_RGB",
     71    "COLOR_CLEAR_VALUE",
     72    "COLOR_WRITEMASK",
     73    "CULL_FACE_MODE",
     74    "CURRENT_PROGRAM",
     75    "DEPTH_CLEAR_VALUE",
     76    "DEPTH_FUNC",
     77    "DEPTH_RANGE",
     78    "DEPTH_WRITEMASK",
     79    "ELEMENT_ARRAY_BUFFER_BINDING",
     80    "FRAMEBUFFER_BINDING",
     81    "FRONT_FACE",
     82    "GENERATE_MIPMAP_HINT",
     83    "LINE_WIDTH",
     84    "PACK_ALIGNMENT",
     85    "POLYGON_OFFSET_FACTOR",
     86    "POLYGON_OFFSET_UNITS",
     87    "RENDERBUFFER_BINDING",
     88    "SAMPLE_COVERAGE_INVERT",
     89    "SAMPLE_COVERAGE_VALUE",
     90    "SCISSOR_BOX",
     91    "STENCIL_BACK_FAIL",
     92    "STENCIL_BACK_FUNC",
     93    "STENCIL_BACK_PASS_DEPTH_FAIL",
     94    "STENCIL_BACK_PASS_DEPTH_PASS",
     95    "STENCIL_BACK_REF",
     96    "STENCIL_BACK_VALUE_MASK",
     97    "STENCIL_BACK_WRITEMASK",
     98    "STENCIL_CLEAR_VALUE",
     99    "STENCIL_FAIL",
     100    "STENCIL_FUNC",
     101    "STENCIL_PASS_DEPTH_FAIL",
     102    "STENCIL_PASS_DEPTH_PASS",
     103    "STENCIL_REF",
     104    "STENCIL_VALUE_MASK",
     105    "STENCIL_WRITEMASK",
     106    "UNPACK_ALIGNMENT",
     107    "UNPACK_COLORSPACE_CONVERSION_WEBGL",
     108    "UNPACK_FLIP_Y_WEBGL",
     109    "UNPACK_PREMULTIPLY_ALPHA_WEBGL",
     110    "VIEWPORT"
     111];
     112
     113WebGLRenderingContextResource.TextureBindings = [
     114    "TEXTURE_BINDING_2D",
     115    "TEXTURE_BINDING_CUBE_MAP"
     116];
     117
     118function test()
    125119{
    126120    var gl = createWebGLContext();
     121    if (!gl)
     122        return;
    127123
    128124    var constantNames = [];
    … …  
    196192            output(property);
    197193    });
    198 
    199     if (window.testRunner)
    200         testRunner.notifyDone();
     194}
     195
     196function runTest()
     197{
     198    if (window.testRunner) {
     199        testRunner.overridePreference("WebKitWebGLEnabled", "1");
     200        testRunner.dumpAsText();
     201        testRunner.waitUntilDone();
     202    }
     203    try {
     204        test();
     205    } finally {
     206        if (window.testRunner)
     207            testRunner.notifyDone();
     208    }
    201209}
    202210
    203211</script>
    204212</head>
    205 <body onload="test()">
     213<body onload="runTest()">
    206214<p>
    207215Test to catch WebGL API changes.

  • trunk/LayoutTests/platform/qt/Skipped

    r127120 r127236  
    138138http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials.html
    139139http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin.html
     140inspector/profiler/webgl
    140141
    141142# ENABLE(LINK_PREFETCH) is disabled.
    … …  
    27642765http/tests/inspector/csp-inline-warning-contains-stacktrace.html
    27652766
    2766 # [Qt] New inspector/profiler/webgl-profiler-api-changes.html times out
    2767 # https://bugs.webkit.org/show_bug.cgi?id=95183
    2768 inspector/profiler/webgl-profiler-api-changes.html
    2769 
    27702767# [Qt] New svg/custom/clamped-masking-clipping.svg asserts
    27712768# https://bugs.webkit.org/show_bug.cgi?id=95431
Note: See TracChangeset for help on using the changeset viewer.