Changeset 76336 in webkit


Ignore:
Timestamp:
Jan 21, 2011 1:34:29 AM (13 years ago)
Author:
yurys@chromium.org
Message:

2011-01-21 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Make userscripts/window-onerror-for-isolated-world-*.html give consistent output
​https://bugs.webkit.org/show_bug.cgi?id=52870

Call setTimeout from "load" event listener to make sure exception in the setTimeout
callback happens after the one in the listener.

  • platform/chromium/userscripts/window-onerror-for-isolated-world-1-expected.txt:
  • platform/chromium/userscripts/window-onerror-for-isolated-world-2-expected.txt:
  • userscripts/window-onerror-for-isolated-world-1-expected.txt:
  • userscripts/window-onerror-for-isolated-world-1.html:
  • userscripts/window-onerror-for-isolated-world-2-expected.txt:
  • userscripts/window-onerror-for-isolated-world-2.html:
Location:
trunk/LayoutTests
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r76333 r76336  
     12011-01-21  Yury Semikhatsky  <yurys@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        Make userscripts/window-onerror-for-isolated-world-*.html give consistent output
     6        https://bugs.webkit.org/show_bug.cgi?id=52870
     7
     8        Call setTimeout from "load" event listener to make sure exception in the setTimeout
     9        callback happens after the one in the listener.
     10
     11        * platform/chromium/userscripts/window-onerror-for-isolated-world-1-expected.txt:
     12        * platform/chromium/userscripts/window-onerror-for-isolated-world-2-expected.txt:
     13        * userscripts/window-onerror-for-isolated-world-1-expected.txt:
     14        * userscripts/window-onerror-for-isolated-world-1.html:
     15        * userscripts/window-onerror-for-isolated-world-2-expected.txt:
     16        * userscripts/window-onerror-for-isolated-world-2.html:
     17
    1182011-01-20  Maciej Stachowiak  <mjs@apple.com>
    219

  • trunk/LayoutTests/platform/chromium/userscripts/window-onerror-for-isolated-world-1-expected.txt

    r76216 r76336  
    55Main world window.onerror: Uncaught Error: Error in user script inline script. at :12
    66Main world error event listener: Uncaught Error: Error in user script inline script. at :12
    7 Main world window.onerror: Uncaught Error: Error in main world load handler. at window-onerror-for-isolated-world-1.html:46
    8 Main world error event listener: Uncaught Error: Error in main world load handler. at window-onerror-for-isolated-world-1.html:46
    9 Main world window.onerror: Uncaught Error: Error in user script load handler. at :4
    10 Main world error event listener: Uncaught Error: Error in user script load handler. at :4
    11 Main world window.onerror: Uncaught Error: Error in main world setTimeout callback. at window-onerror-for-isolated-world-1.html:51
    12 Main world error event listener: Uncaught Error: Error in main world setTimeout callback. at window-onerror-for-isolated-world-1.html:51
    13 Main world window.onerror: Uncaught Error: Error in user script setTimeout callback. at :9
    14 Main world error event listener: Uncaught Error: Error in user script setTimeout callback. at :9
     7Main world window.onerror: Uncaught Error: Error in main world load handler. at window-onerror-for-isolated-world-1.html:50
     8Main world error event listener: Uncaught Error: Error in main world load handler. at window-onerror-for-isolated-world-1.html:50
     9Main world window.onerror: Uncaught Error: Error in user script load handler. at :8
     10Main world error event listener: Uncaught Error: Error in user script load handler. at :8
     11Main world window.onerror: Uncaught Error: Error in main world setTimeout callback. at window-onerror-for-isolated-world-1.html:48
     12Main world error event listener: Uncaught Error: Error in main world setTimeout callback. at window-onerror-for-isolated-world-1.html:48
     13Main world window.onerror: Uncaught Error: Error in user script setTimeout callback. at :6
     14Main world error event listener: Uncaught Error: Error in user script setTimeout callback. at :6

  • trunk/LayoutTests/platform/chromium/userscripts/window-onerror-for-isolated-world-2-expected.txt

    r76216 r76336  
    44user script window.onerror: Uncaught Error: Error in user script inline script. at :33
    55user script error event listener: Uncaught Error: Error in user script inline script. at :33
    6 user script window.onerror: Uncaught Error: Error in main world load handler. at window-onerror-for-isolated-world-2.html:23
    7 user script error event listener: Uncaught Error: Error in main world load handler. at window-onerror-for-isolated-world-2.html:23
    8 user script window.onerror: Uncaught Error: Error in user script load handler. at :26
    9 user script error event listener: Uncaught Error: Error in user script load handler. at :26
    10 user script window.onerror: Uncaught Error: Error in main world setTimeout callback. at window-onerror-for-isolated-world-2.html:27
    11 user script error event listener: Uncaught Error: Error in main world setTimeout callback. at window-onerror-for-isolated-world-2.html:27
    12 user script window.onerror: Uncaught Error: Error in user script setTimeout callback. at :30
    13 user script error event listener: Uncaught Error: Error in user script setTimeout callback. at :30
     6user script window.onerror: Uncaught Error: Error in main world load handler. at window-onerror-for-isolated-world-2.html:27
     7user script error event listener: Uncaught Error: Error in main world load handler. at window-onerror-for-isolated-world-2.html:27
     8user script window.onerror: Uncaught Error: Error in user script load handler. at :30
     9user script error event listener: Uncaught Error: Error in user script load handler. at :30
     10user script window.onerror: Uncaught Error: Error in main world setTimeout callback. at window-onerror-for-isolated-world-2.html:25
     11user script error event listener: Uncaught Error: Error in main world setTimeout callback. at window-onerror-for-isolated-world-2.html:25
     12user script window.onerror: Uncaught Error: Error in user script setTimeout callback. at :28
     13user script error event listener: Uncaught Error: Error in user script setTimeout callback. at :28

  • trunk/LayoutTests/userscripts/window-onerror-for-isolated-world-1-expected.txt

    r76216 r76336  
    55Main world window.onerror: Error: Error in user script inline script. at undefined:11
    66Main world error event listener: Error: Error in user script inline script. at undefined:11
    7 Main world window.onerror: Error: Error in main world load handler. at window-onerror-for-isolated-world-1.html:46
    8 Main world error event listener: Error: Error in main world load handler. at window-onerror-for-isolated-world-1.html:46
    9 Main world window.onerror: Error: Error in user script load handler. at undefined:3
    10 Main world error event listener: Error: Error in user script load handler. at undefined:3
    11 Main world window.onerror: Error: Error in main world setTimeout callback. at window-onerror-for-isolated-world-1.html:51
    12 Main world error event listener: Error: Error in main world setTimeout callback. at window-onerror-for-isolated-world-1.html:51
    13 Main world window.onerror: Error: Error in user script setTimeout callback. at undefined:8
    14 Main world error event listener: Error: Error in user script setTimeout callback. at undefined:8
     7Main world window.onerror: Error: Error in main world load handler. at window-onerror-for-isolated-world-1.html:50
     8Main world error event listener: Error: Error in main world load handler. at window-onerror-for-isolated-world-1.html:50
     9Main world window.onerror: Error: Error in user script load handler. at undefined:7
     10Main world error event listener: Error: Error in user script load handler. at undefined:7
     11Main world window.onerror: Error: Error in main world setTimeout callback. at window-onerror-for-isolated-world-1.html:48
     12Main world error event listener: Error: Error in main world setTimeout callback. at window-onerror-for-isolated-world-1.html:48
     13Main world window.onerror: Error: Error in user script setTimeout callback. at undefined:5
     14Main world error event listener: Error: Error in user script setTimeout callback. at undefined:5

  • trunk/LayoutTests/userscripts/window-onerror-for-isolated-world-1.html

    r76216 r76336  
    4444{
    4545    window.addEventListener("load", function(e) {
     46        // Do the following call from load listener to make sure error in the setTimeout callback always happens after the error in this listener.
     47        setTimeout(function() {
     48            throw new Error("Error in " + isolatedWorld + " setTimeout callback.");
     49        }, 0);
    4650        throw new Error("Error in " + isolatedWorld + " load handler.");
    4751    }, false);
    4852
    49 
    50     setTimeout(function() {
    51         throw new Error("Error in " + isolatedWorld + " setTimeout callback.");
    52     }, 0);
    5353
    5454    throw new Error("Error in "+ isolatedWorld + " inline script.");

  • trunk/LayoutTests/userscripts/window-onerror-for-isolated-world-2-expected.txt

    r76216 r76336  
    44user script window.onerror: Error: Error in user script inline script. at undefined:31
    55user script error event listener: Error: Error in user script inline script. at undefined:31
    6 user script window.onerror: Error: Error in main world load handler. at window-onerror-for-isolated-world-2.html:23
    7 user script error event listener: Error: Error in main world load handler. at window-onerror-for-isolated-world-2.html:23
    8 user script window.onerror: Error: Error in user script load handler. at undefined:24
    9 user script error event listener: Error: Error in user script load handler. at undefined:24
    10 user script window.onerror: Error: Error in main world setTimeout callback. at window-onerror-for-isolated-world-2.html:27
    11 user script error event listener: Error: Error in main world setTimeout callback. at window-onerror-for-isolated-world-2.html:27
    12 user script window.onerror: Error: Error in user script setTimeout callback. at undefined:28
    13 user script error event listener: Error: Error in user script setTimeout callback. at undefined:28
     6user script window.onerror: Error: Error in main world load handler. at window-onerror-for-isolated-world-2.html:27
     7user script error event listener: Error: Error in main world load handler. at window-onerror-for-isolated-world-2.html:27
     8user script window.onerror: Error: Error in user script load handler. at undefined:28
     9user script error event listener: Error: Error in user script load handler. at undefined:28
     10user script window.onerror: Error: Error in main world setTimeout callback. at window-onerror-for-isolated-world-2.html:25
     11user script error event listener: Error: Error in main world setTimeout callback. at window-onerror-for-isolated-world-2.html:25
     12user script window.onerror: Error: Error in user script setTimeout callback. at undefined:26
     13user script error event listener: Error: Error in user script setTimeout callback. at undefined:26

  • trunk/LayoutTests/userscripts/window-onerror-for-isolated-world-2.html

    r76216 r76336  
    2121{
    2222    window.addEventListener("load", function(e) {
     23        // Do the following call from load listener to make sure error in the setTimeout callback always happens after the error in this listener.
     24        setTimeout(function() {
     25            throw new Error("Error in " + isolatedWorld + " setTimeout callback.");
     26        }, 0);
    2327        throw new Error("Error in " + isolatedWorld + " load handler.");
    2428    }, false);
    25 
    26     setTimeout(function() {
    27         throw new Error("Error in " + isolatedWorld + " setTimeout callback.");
    28     }, 0);
    2929   
    3030    throw new Error("Error in "+ isolatedWorld + " inline script.");
Note: See TracChangeset for help on using the changeset viewer.