Changeset 150949 in webkit


Ignore:
Timestamp:
May 29, 2013 11:04:29 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

ProgressEvent should not be cancelable
​https://bugs.webkit.org/show_bug.cgi?id=114444

Patch by Praveen R Jadhav <​praveen.j@samsung.com> on 2013-05-29
Reviewed by Darin Adler.

Source/WebCore:

Parameter "cancelable" in ProgressEvent is set to false, by default, as mentioned in the specification. The spec link is given below.

Spec: ​http://www.w3.org/TR/2011/CR-progress-events-20110922/#suggested-names-for-events-using-the-progressevent-interface

No new tests. file-reader-event-listener.html and infoOnProgressEvent-expected.txt are updated.

  • dom/ProgressEvent.cpp:

(WebCore::ProgressEvent::ProgressEvent):
(WebCore):

LayoutTests:

file-reader-event-listener.html, xmlhttprequest-get-expected.txt and infoOnProgressEvent-expected.txt are updated.

  • fast/files/file-reader-event-listener-expected.txt:
  • fast/files/file-reader-event-listener.html:
  • fast/xmlhttprequest/xmlhttprequest-get-expected.txt:
  • http/tests/xmlhttprequest/infoOnProgressEvent-expected.txt:
  • platform/efl/TestExpectations:
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r150941 r150949  
     12013-05-29  Praveen R Jadhav  <praveen.j@samsung.com>
     2
     3        ProgressEvent should not be cancelable
     4        https://bugs.webkit.org/show_bug.cgi?id=114444
     5
     6        Reviewed by Darin Adler.
     7
     8        file-reader-event-listener.html, xmlhttprequest-get-expected.txt and infoOnProgressEvent-expected.txt are updated.
     9
     10        * fast/files/file-reader-event-listener-expected.txt:
     11        * fast/files/file-reader-event-listener.html:
     12        * fast/xmlhttprequest/xmlhttprequest-get-expected.txt:
     13        * http/tests/xmlhttprequest/infoOnProgressEvent-expected.txt:
     14        * platform/efl/TestExpectations:
     15
    1162013-05-29  Dean Jackson  <dino@apple.com>
    217

  • trunk/LayoutTests/fast/files/file-reader-event-listener-expected.txt

    r118622 r150949  
    1 
    21Test that FileReader's event listener works.
    32Received loadstart event
    43Received foo event
     4PASS event.bubbles is false
     5PASS event.cancelable is false
     6PASS event.defaultPrevented is false
    57Received progress event
    68Received load event
    79Received loadend event
    8 DONE
     10PASS successfullyParsed is true
    911
     12TEST COMPLETE
     13

  • trunk/LayoutTests/fast/files/file-reader-event-listener.html

    r120798 r150949  
    22<html>
    33<body>
    4 <input type="file" name="file" id="file" onchange="onInputFileChange()">
    54<pre id='console'></pre>
     5<script src="../js/resources/js-test-pre.js"></script>
    66
    77<script>
    … …  
    2525}
    2626
    27 function onProgress()
     27function onProgress(event)
    2828{
    2929    receivedProgressEvent = true;
     30    shouldBeFalse("event.bubbles");
     31    shouldBeFalse("event.cancelable");
     32
     33    event.preventDefault();
     34    shouldBeFalse("event.defaultPrevented");
    3035}
    3136
    … …  
    4045{
    4146    log("Received loadend event");
    42     log("DONE");
    4347   
    4448    fileReader.removeEventListener("loadstart", onLoadStart, false);
    … …  
    4650    fileReader.removeEventListener("error", onError, false);
    4751
    48     if (window.testRunner)
    49         testRunner.notifyDone();
     52    finishJSTest();
    5053}
    5154
    … …  
    6568}
    6669
    67 function onInputFileChange()
    68 {
     70function runTest() {
     71    if (window.testRunner) {
     72        testRunner.dumpAsText();
     73        testRunner.waitUntilDone();
     74    }
     75
     76    window.jsTestIsAsync = true;
     77
    6978    log("Test that FileReader's event listener works.");
    7079
    71     var file = document.getElementById("file").files[0];
     80    var text = "Hello";
    7281    fileReader = new FileReader();
    73     fileReader.readAsText(file);
     82
    7483    fileReader.addEventListener("loadstart", onLoadStart, false);
    7584    fileReader.addEventListener("progress", onProgress, false);
    … …  
    7988    fileReader.addEventListener("error", onError, false);
    8089    fileReader.addEventListener("foo", onFoo, false);
     90
     91    fileReader.readAsText(new Blob([text]));
    8192}
    8293
    83 function runTests()
    84 {
    85     eventSender.beginDragWithFiles(['resources/UTF8.txt']);
    86     eventSender.mouseMoveTo(10, 10);
    87     eventSender.mouseUp();
    88 }
     94runTest();
    8995
    90 if (window.eventSender) {
    91     if (window.testRunner) {
    92         testRunner.dumpAsText();
    93         testRunner.waitUntilDone();
    94     }
    95     window.onload = runTests;
    96 } else {
    97     log("eventSender is not present.");
    98 }
    9996</script>
     97<script src="../js/resources/js-test-post.js"></script>
    10098</body>
    10199</html>

  • trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-get-expected.txt

    r116070 r150949  
    4646bubbles : 'false'
    4747cancelBubble : 'false'
    48 cancelable : 'true'
     48cancelable : 'false'
    4949clipboardData : 'undefined'
    5050currentTarget : '[object XMLHttpRequest]'

  • trunk/LayoutTests/http/tests/xmlhttprequest/infoOnProgressEvent-expected.txt

    r63680 r150949  
    55Type: progress
    66Bubble: false
    7 Cancelable: true
     7Cancelable: false
    88EventPhase: 2
    99Target: [object XMLHttpRequest]

  • trunk/LayoutTests/platform/efl/TestExpectations

    r150876 r150949  
    884884webkit.org/b/84333 fast/files/file-reader-abort.html [ Failure ]
    885885webkit.org/b/84333 fast/files/file-reader-directory-crash.html [ Failure ]
    886 webkit.org/b/84333 fast/files/file-reader-event-listener.html [ Failure ]
    887886webkit.org/b/84333 fast/files/null-origin-string.html [ Failure ]
    888887webkit.org/b/84333 fast/files/read-blob-async.html [ Failure ]

  • trunk/Source/WebCore/ChangeLog

    r150948 r150949  
     12013-05-29  Praveen R Jadhav  <praveen.j@samsung.com>
     2
     3        ProgressEvent should not be cancelable
     4        https://bugs.webkit.org/show_bug.cgi?id=114444
     5
     6        Reviewed by Darin Adler.
     7
     8        Parameter "cancelable" in ProgressEvent is set to false, by default, as mentioned in the specification. The spec link is given below.
     9
     10        Spec: http://www.w3.org/TR/2011/CR-progress-events-20110922/#suggested-names-for-events-using-the-progressevent-interface
     11
     12        No new tests. file-reader-event-listener.html and infoOnProgressEvent-expected.txt are updated.
     13
     14        * dom/ProgressEvent.cpp:
     15        (WebCore::ProgressEvent::ProgressEvent):
     16        (WebCore):
     17
    1182013-05-29  Simon Fraser  <simon.fraser@apple.com>
    219

  • trunk/Source/WebCore/dom/ProgressEvent.cpp

    r100727 r150949  
    5454
    5555ProgressEvent::ProgressEvent(const AtomicString& type, bool lengthComputable, unsigned long long loaded, unsigned long long total)
    56     : Event(type, false, true)
     56    : Event(type, false, false)
    5757    , m_lengthComputable(lengthComputable)
    5858    , m_loaded(loaded)
    … …  
    6060{
    6161}
    62    
     62
    6363const AtomicString& ProgressEvent::interfaceName() const
    6464{
Note: See TracChangeset for help on using the changeset viewer.