From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebCore/dom/ProgressEvent.h | 42 +++++++++++++++----------------------- 1 file changed, 17 insertions(+), 25 deletions(-) (limited to 'Source/WebCore/dom/ProgressEvent.h') diff --git a/Source/WebCore/dom/ProgressEvent.h b/Source/WebCore/dom/ProgressEvent.h index 8d23506cb..ffabcb8b1 100644 --- a/Source/WebCore/dom/ProgressEvent.h +++ b/Source/WebCore/dom/ProgressEvent.h @@ -10,10 +10,10 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR @@ -23,52 +23,44 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ProgressEvent_h -#define ProgressEvent_h +#pragma once #include "Event.h" namespace WebCore { -struct ProgressEventInit : public EventInit { - ProgressEventInit(); - - bool lengthComputable; - unsigned long long loaded; - unsigned long long total; -}; - class ProgressEvent : public Event { public: - static PassRefPtr create() + static Ref create(const AtomicString& type, bool lengthComputable, unsigned long long loaded, unsigned long long total) { - return adoptRef(new ProgressEvent); + return adoptRef(*new ProgressEvent(type, lengthComputable, loaded, total)); } - static PassRefPtr create(const AtomicString& type, bool lengthComputable, unsigned long long loaded, unsigned long long total) - { - return adoptRef(new ProgressEvent(type, lengthComputable, loaded, total)); - } - static PassRefPtr create(const AtomicString& type, const ProgressEventInit& initializer) + + struct Init : EventInit { + bool lengthComputable { false }; + unsigned long long loaded { 0 }; + unsigned long long total { 0 }; + }; + + static Ref create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) { - return adoptRef(new ProgressEvent(type, initializer)); + return adoptRef(*new ProgressEvent(type, initializer, isTrusted)); } bool lengthComputable() const { return m_lengthComputable; } unsigned long long loaded() const { return m_loaded; } unsigned long long total() const { return m_total; } - virtual EventInterface eventInterface() const override; + EventInterface eventInterface() const override; protected: - ProgressEvent(); ProgressEvent(const AtomicString& type, bool lengthComputable, unsigned long long loaded, unsigned long long total); - ProgressEvent(const AtomicString&, const ProgressEventInit&); + ProgressEvent(const AtomicString&, const Init&, IsTrusted); private: bool m_lengthComputable; unsigned long long m_loaded; unsigned long long m_total; }; -} -#endif // ProgressEvent_h +} // namespace WebCore -- cgit v1.2.1