Attachment 60226 Details for Bug 40233 – RunLoop

[patch] RunLoop

qtwebkit2-runloop-2.patch (text/plain), 6.43 KB, created by Antti Koivisto on 2010-07-01 05:32:48 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Antti Koivisto

Created: 2010-07-01 05:32:48 PDT

Size: 6.43 KB

patch

obsolete

>Index: WebKit2/ChangeLog
>===================================================================
>--- WebKit2/ChangeLog	(revision 62252)
>+++ WebKit2/ChangeLog	(working copy)
>@@ -1,3 +1,31 @@
>+2010-07-01  Antti Koivisto  <koivisto@iki.fi>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [Qt] Initial WebKit2 implementation
>+        https://bugs.webkit.org/show_bug.cgi?id=40233
>+        
>+        Implement RunLoop for Qt. Not build yet.
>+
>+        * Platform/RunLoop.h:
>+        * Platform/qt: Added.
>+        * Platform/qt/RunLoopQt.cpp: Added.
>+        (RunLoop::TimerObject::TimerObject):
>+        (RunLoop::TimerObject::performWork):
>+        (RunLoop::TimerObject::wakeUp):
>+        (RunLoop::TimerObject::timerEvent):
>+        (RunLoop::run):
>+        (RunLoop::stop):
>+        (RunLoop::RunLoop):
>+        (RunLoop::~RunLoop):
>+        (RunLoop::wakeUp):
>+        (RunLoop::TimerBase::timerFired):
>+        (RunLoop::TimerBase::TimerBase):
>+        (RunLoop::TimerBase::~TimerBase):
>+        (RunLoop::TimerBase::start):
>+        (RunLoop::TimerBase::stop):
>+        (RunLoop::TimerBase::isActive):
>+
> 2010-06-30  Sam Weinig  <sam@webkit.org>
> 
>         Reviewed by Darin Adler.
>Index: WebKit2/Platform/RunLoop.h
>===================================================================
>--- WebKit2/Platform/RunLoop.h	(revision 62124)
>+++ WebKit2/Platform/RunLoop.h	(working copy)
>@@ -1,5 +1,6 @@
> /*
>  * Copyright (C) 2010 Apple Inc. All rights reserved.
>+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -43,7 +44,7 @@ public:
>     static RunLoop* main();
> 
>     void scheduleWork(std::auto_ptr<WorkItem>);
>-    
>+
>     static void run();
>     void stop();
> 
>@@ -72,7 +73,10 @@ public:
> #elif PLATFORM(MAC)
>         static void timerFired(CFRunLoopTimerRef, void*);
>         CFRunLoopTimerRef m_timer;
>-#endif    
>+#elif PLATFORM(QT)
>+        static void timerFired(RunLoop*, int ID);
>+        int m_ID;
>+#endif
>     };
> 
>     template <typename TimerFiredClass>
>@@ -99,7 +103,7 @@ private:
> 
>     RunLoop();
>     ~RunLoop();
>-    
>+
>     void performWork();
>     void wakeUp();
> 
>@@ -118,6 +122,11 @@ private:
>     static void performWork(void*);
>     CFRunLoopRef m_runLoop;
>     CFRunLoopSourceRef m_runLoopSource;
>+#elif PLATFORM(QT)
>+    typedef HashMap<int, TimerBase*> TimerMap;
>+    TimerMap m_activeTimers;
>+    class TimerObject;
>+    TimerObject* m_timerObject;
> #endif
> };
> 
>Index: WebKit2/Platform/qt/RunLoopQt.cpp
>===================================================================
>--- WebKit2/Platform/qt/RunLoopQt.cpp	(revision 0)
>+++ WebKit2/Platform/qt/RunLoopQt.cpp	(revision 0)
>@@ -0,0 +1,139 @@
>+/*
>+ * Copyright (C) 2010 Apple Inc. All rights reserved.
>+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "RunLoop.h"
>+
>+#include "WorkItem.h"
>+
>+#include <QApplication>
>+#include <QAbstractEventDispatcher>
>+#include <QObject>
>+#include <QMetaMethod>
>+#include <QMetaObject>
>+#include <QTimerEvent>
>+
>+class RunLoop::TimerObject : public QObject
>+{
>+    Q_OBJECT
>+public:
>+    TimerObject(RunLoop* runLoop) : m_runLoop(runLoop)
>+    {
>+        int methodIndex = metaObject()->indexOfMethod("performWork()");
>+        m_method = metaObject()->method(methodIndex);
>+    }
>+
>+    Q_SLOT void performWork() { m_runLoop->performWork(); }
>+    inline void wakeUp() { m_method.invoke(this, Qt::QueuedConnection); }
>+
>+protected:
>+    virtual void timerEvent(QTimerEvent* event)
>+    {
>+        RunLoop::TimerBase::timerFired(m_runLoop, event->timerId());
>+    }
>+
>+private:
>+    RunLoop* m_runLoop;
>+    QMetaMethod m_method;
>+};
>+
>+void RunLoop::run()
>+{
>+    QCoreApplication::exec();
>+}
>+
>+void RunLoop::stop()
>+{
>+    // implement
>+}
>+
>+RunLoop::RunLoop()
>+    : m_timerObject(new TimerObject(this))
>+{
>+}
>+
>+RunLoop::~RunLoop()
>+{
>+    delete m_timerObject;
>+}
>+
>+void RunLoop::wakeUp()
>+{
>+    m_timerObject->wakeUp();
>+}
>+
>+// RunLoop::Timer
>+
>+void RunLoop::TimerBase::timerFired(RunLoop* runLoop, int ID)
>+{
>+    TimerMap::iterator it = runLoop->m_activeTimers.find(ID);
>+    ASSERT(it != runLoop->m_activeTimers.end());
>+    TimerBase* timer = it->second;
>+
>+    // FIMXE: Support repeating timers.
>+    timer->stop();
>+    timer->fired();
>+}
>+
>+RunLoop::TimerBase::TimerBase(RunLoop* runLoop)
>+    : m_runLoop(runLoop)
>+    , m_ID(0)
>+{
>+}
>+
>+RunLoop::TimerBase::~TimerBase()
>+{
>+    stop();
>+}
>+
>+void RunLoop::TimerBase::start(double nextFireInterval, double /*repeatInterval*/)
>+{
>+    // FIMXE: Support repeating timers.
>+    stop();
>+    int millis = static_cast<int>(nextFireInterval * 1000);
>+    m_ID = m_runLoop->m_timerObject->startTimer(millis);
>+    ASSERT(m_ID);
>+    m_runLoop->m_activeTimers.set(m_ID, this);
>+}
>+
>+void RunLoop::TimerBase::stop()
>+{
>+    if (!m_ID)
>+        return;
>+    TimerMap::iterator it = m_runLoop->m_activeTimers.find(m_ID);
>+    if (it == m_runLoop->m_activeTimers.end())
>+        return;
>+
>+    m_runLoop->m_activeTimers.remove(it);
>+    m_runLoop->m_timerObject->killTimer(m_ID);
>+    m_ID = 0;
>+}
>+
>+bool RunLoop::TimerBase::isActive() const
>+{
>+    return m_ID;
>+}
>+
>+#include "RunLoopQt.moc"

Actions: View | Formatted Diff | Diff

Attachments on bug 40233: 58029 | 58037 | 60226 | 60231 | 60233 | 60234 | 60235 | 60236 | 60238 | 60239 | 60243 | 60244 | 60246 | 60248 | 60250 | 60251 | 60252 | 60255 | 60264 | 60266 | 60512 | 60516 | 60520 | 60521 | 60523 | 60524 | 60525 | 60526 | 60528 | 60531 | 60617 | 60713 | 60719 | 60722 | 60870 | 60952