Changeset 162300 in webkit

Timestamp:

Jan 19, 2014 8:13:16 PM (10 years ago)

Author:

jinwoo7.song@samsung.com

Message:

[EFL][WK2] build fix after r162276
​https://bugs.webkit.org/show_bug.cgi?id=127259

Reviewed by Anders Carlsson.

• Platform/efl/DispatchQueueEfl.cpp:

(DispatchQueue::performTimerWork):
(DispatchQueue::getNextTimeOut):

• Platform/efl/DispatchQueueWorkItemEfl.h:

(WorkItem::create):
(WorkItem::WorkItem):
(TimerWorkItem::create):
(TimerWorkItem::TimerWorkItem):

• Platform/efl/WorkQueueEfl.cpp:

(WorkQueue::dispatch):
(WorkQueue::dispatchAfter):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/efl/DispatchQueueEfl.cpp (modified) (2 diffs)
• Platform/efl/DispatchQueueWorkItemEfl.h (modified) (3 diffs)
• Platform/efl/WorkQueueEfl.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-19  Jinwoo Song  <jinwoo7.song@samsung.com>
+
+        [EFL][WK2] build fix after r162276
+        https://bugs.webkit.org/show_bug.cgi?id=127259
+
+        Reviewed by Anders Carlsson.
+
+        * Platform/efl/DispatchQueueEfl.cpp:
+        (DispatchQueue::performTimerWork):
+        (DispatchQueue::getNextTimeOut):
+        * Platform/efl/DispatchQueueWorkItemEfl.h:
+        (WorkItem::create):
+        (WorkItem::WorkItem):
+        (TimerWorkItem::create):
+        (TimerWorkItem::TimerWorkItem):
+        * Platform/efl/WorkQueueEfl.cpp:
+        (WorkQueue::dispatch):
+        (WorkQueue::dispatchAfter):
+
 2014-01-18  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Platform/efl/DispatchQueueEfl.cpp

@@ -171 +171 @@
     }
 
-    double currentTimeSeconds = currentTime();
+    double currentTimeSeconds = monotonicallyIncreasingTime();
 
     for (size_t i = 0; i < timerWorkItems.size(); ++i) {
@@ -242 +242 @@
     timeValue.tv_sec = 0;
     timeValue.tv_usec = 0;
-    double timeOut = m_timerWorkItems[0]->expirationTimeSeconds() - currentTime();
+    double timeOut = m_timerWorkItems[0]->expirationTimeSeconds() - monotonicallyIncreasingTime();
     if (timeOut > 0) {
         timeValue.tv_sec = static_cast<long>(timeOut);

trunk/Source/WebKit2/Platform/efl/DispatchQueueWorkItemEfl.h

@@ -35 +35 @@
 class WorkItem {
 public:
-    static std::unique_ptr<WorkItem> create(PassRefPtr<WorkQueue> workQueue, const Function<void()>& function)
+    static std::unique_ptr<WorkItem> create(PassRefPtr<WorkQueue> workQueue, std::function<void ()> function)
     {
-        return std::unique_ptr<WorkItem>(new WorkItem(workQueue, function));
+        return std::unique_ptr<WorkItem>(new WorkItem(workQueue, std::move(function)));
     }
     void dispatch() { m_function(); }
 
 protected:
-    WorkItem(PassRefPtr<WorkQueue> workQueue, const Function<void()>& function)
+    WorkItem(PassRefPtr<WorkQueue> workQueue, std::function<void ()> function)
         : m_workQueue(workQueue)
-        , m_function(function)
+        , m_function(std::move(function))
     {
     }
@@ -50 +50 @@
 private:
     RefPtr<WorkQueue> m_workQueue;
-    Function<void()> m_function;
+    std::function<void ()> m_function;
 };
 
 class TimerWorkItem : public WorkItem {
 public:
-    static std::unique_ptr<TimerWorkItem> create(PassRefPtr<WorkQueue> workQueue, const Function<void()>& function, double delaySeconds)
+    static std::unique_ptr<TimerWorkItem> create(PassRefPtr<WorkQueue> workQueue, std::function<void ()> function, std::chrono::nanoseconds delay)
     {
         ASSERT(delaySeconds >= 0);
-        return std::unique_ptr<TimerWorkItem>(new TimerWorkItem(workQueue, function, currentTime() + delaySeconds));
+        return std::unique_ptr<TimerWorkItem>(new TimerWorkItem(workQueue, std::move(function), monotonicallyIncreasingTime() + delay.count() / 1000000000ULL));
     }
     double expirationTimeSeconds() const { return m_expirationTimeSeconds; }
@@ -64 +64 @@
 
 protected:
-    TimerWorkItem(PassRefPtr<WorkQueue> workQueue, const Function<void()>& function, double expirationTimeSeconds)
-        : WorkItem(workQueue, function)
+    TimerWorkItem(PassRefPtr<WorkQueue> workQueue, std::function<void ()> function, double expirationTimeSeconds)
+        : WorkItem(workQueue, std::move(function))
         , m_expirationTimeSeconds(expirationTimeSeconds)
     {

trunk/Source/WebKit2/Platform/efl/WorkQueueEfl.cpp

@@ -53 +53 @@
 }
 
-void WorkQueue::dispatch(const Function<void()>& function)
+void WorkQueue::dispatch(std::function<void ()> function)
 {
     if (!m_dispatchQueue)
         return;
 
-    m_dispatchQueue->dispatch(WorkItem::create(this, function));
+    m_dispatchQueue->dispatch(WorkItem::create(this, std::move(function)));
 }
 
-void WorkQueue::dispatchAfterDelay(const Function<void()>& function, double delay)
+void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, std::function<void ()> function)
 {
     if (!m_dispatchQueue)
         return;
 
-    m_dispatchQueue->dispatch(TimerWorkItem::create(this, function, delay));
+    m_dispatchQueue->dispatch(TimerWorkItem::create(this, std::move(function), duration));
 }