Changeset 99438 in webkit
- Timestamp:
- Nov 7, 2011 10:04:51 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r99435 r99438 1 2011-11-07 Dominic Cooney <dominicc@chromium.org> 2 3 Remove initCloseEvent method 4 https://bugs.webkit.org/show_bug.cgi?id=71374 5 6 Reviewed by Ojan Vafai. 7 8 * fast/dom/Window/window-properties-expected.txt: 9 * platform/gtk/fast/dom/Window/window-properties-expected.txt: 10 * platform/mac/fast/dom/Window/window-properties-expected.txt: 11 * platform/qt-wk2/fast/dom/Window/window-properties-expected.txt: 12 * platform/qt/fast/dom/Window/window-properties-expected.txt: 13 * platform/win/fast/dom/Window/window-properties-expected.txt: 14 1 15 2011-11-07 Dominic Cooney <dominicc@chromium.org> 2 16 -
trunk/LayoutTests/fast/dom/Window/window-properties-expected.txt
r99389 r99438 510 510 window.CloseEvent.prototype.MOUSEUP [number] 511 511 window.CloseEvent.prototype.SELECT [number] 512 window.CloseEvent.prototype.initCloseEvent [function]513 512 window.CloseEvent.prototype.initEvent [function] 514 513 window.CloseEvent.prototype.preventDefault [function] -
trunk/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt
r99389 r99438 510 510 window.CloseEvent.prototype.MOUSEUP [number] 511 511 window.CloseEvent.prototype.SELECT [number] 512 window.CloseEvent.prototype.initCloseEvent [function]513 512 window.CloseEvent.prototype.initEvent [function] 514 513 window.CloseEvent.prototype.preventDefault [function] -
trunk/LayoutTests/platform/mac/fast/dom/Window/window-properties-expected.txt
r99389 r99438 535 535 window.CloseEvent.prototype.MOUSEUP [number] 536 536 window.CloseEvent.prototype.SELECT [number] 537 window.CloseEvent.prototype.initCloseEvent [function]538 537 window.CloseEvent.prototype.initEvent [function] 539 538 window.CloseEvent.prototype.preventDefault [function] -
trunk/LayoutTests/platform/qt-wk2/fast/dom/Window/window-properties-expected.txt
r99389 r99438 507 507 window.CloseEvent.prototype.MOUSEUP [number] 508 508 window.CloseEvent.prototype.SELECT [number] 509 window.CloseEvent.prototype.initCloseEvent [function]510 509 window.CloseEvent.prototype.initEvent [function] 511 510 window.CloseEvent.prototype.preventDefault [function] -
trunk/LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt
r99389 r99438 508 508 window.CloseEvent.prototype.MOUSEUP [number] 509 509 window.CloseEvent.prototype.SELECT [number] 510 window.CloseEvent.prototype.initCloseEvent [function]511 510 window.CloseEvent.prototype.initEvent [function] 512 511 window.CloseEvent.prototype.preventDefault [function] -
trunk/LayoutTests/platform/win/fast/dom/Window/window-properties-expected.txt
r99389 r99438 509 509 window.CloseEvent.prototype.MOUSEUP [number] 510 510 window.CloseEvent.prototype.SELECT [number] 511 window.CloseEvent.prototype.initCloseEvent [function]512 511 window.CloseEvent.prototype.initEvent [function] 513 512 window.CloseEvent.prototype.preventDefault [function] -
trunk/Source/WebCore/ChangeLog
r99437 r99438 1 2011-11-07 Dominic Cooney <dominicc@chromium.org> 2 3 Remove initCloseEvent method 4 https://bugs.webkit.org/show_bug.cgi?id=71374 5 6 Reviewed by Ojan Vafai. 7 8 Test: fast/dom/Window/window-properties.html 9 10 * websockets/CloseEvent.h: 11 (WebCore::CloseEvent::initCloseEvent): 12 * websockets/CloseEvent.idl: 13 1 14 2011-11-07 Anders Carlsson <andersca@apple.com> 2 15 -
trunk/Source/WebCore/websockets/CloseEvent.h
r98044 r99438 56 56 } 57 57 58 static PassRefPtr<CloseEvent> create(bool wasClean, unsigned short code, const String& reason) 59 { 60 return adoptRef(new CloseEvent(wasClean, code, reason)); 61 } 62 58 63 static PassRefPtr<CloseEvent> create(const AtomicString& type, const CloseEventInit& initializer) 59 64 { 60 65 return adoptRef(new CloseEvent(type, initializer)); 61 }62 63 void initCloseEvent(const AtomicString& type, bool canBubble, bool cancelable, bool wasClean, unsigned short code, const String& reason)64 {65 if (dispatched())66 return;67 68 initEvent(type, canBubble, cancelable);69 70 m_wasClean = wasClean;71 m_code = code;72 m_reason = reason;73 66 } 74 67 … … 86 79 { 87 80 } 81 82 CloseEvent(bool wasClean, int code, const String& reason) 83 : Event(eventNames().closeEvent, false, false) 84 , m_wasClean(wasClean) 85 , m_code(code) 86 , m_reason(reason) 87 { 88 } 89 88 90 CloseEvent(const AtomicString& type, const CloseEventInit& initializer) 89 91 : Event(type, initializer) -
trunk/Source/WebCore/websockets/CloseEvent.idl
r96788 r99438 39 39 readonly attribute unsigned short code; 40 40 readonly attribute [ConvertingNullStringTo=Undefined] DOMString reason; 41 void initCloseEvent(in [Optional=CallWithDefaultValue] DOMString typeArg,42 in [Optional=CallWithDefaultValue] boolean canBubbleArg,43 in [Optional=CallWithDefaultValue] boolean cancelableArg,44 in [Optional=CallWithDefaultValue] boolean wasCleanArg,45 in [Optional=CallWithDefaultValue] unsigned short codeArg,46 in [Optional=CallWithDefaultValue] DOMString reasonArg);47 41 }; 48 42 -
trunk/Source/WebCore/websockets/WebSocket.cpp
r98388 r99438 521 521 m_bufferedAmountAfterClose += unhandledBufferedAmount; 522 522 ASSERT(scriptExecutionContext()); 523 RefPtr<CloseEvent> event = CloseEvent::create(); 524 event->initCloseEvent(eventNames().closeEvent, false, false, wasClean, code, reason); 523 RefPtr<CloseEvent> event = CloseEvent::create(wasClean, code, reason); 525 524 dispatchEvent(event); 526 525 if (m_channel) {
Note: See TracChangeset
for help on using the changeset viewer.