[webkit-changes] [130836] trunk/Source/WebKit2

Tue, 09 Oct 2012 18:40:20 -0700

Title: [130836] trunk/Source/WebKit2
Revision
130836
Author
commit-qu...@webkit.org
Date
2012-10-09 18:41:30 -0700 (Tue, 09 Oct 2012)

Log Message

[EFL][WK2] Move timeout callback to the CallbackDataTimer class.
https://bugs.webkit.org/show_bug.cgi?id=97861

Patch by Byungwoo Lee <bw80....@samsung.com> on 2012-10-09
Reviewed by Gyuyoung Kim.

Timeout callbacks for waitUntil{LoadFinished,TitleChanged,URIChanged}
can be moved to the CallbackDataTimer class.

Moved the callback implementation to the CallbackDataTimer class.

* UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp:
(EWK2UnitTest::CallbackDataTimer::CallbackDataTimer):
(CallbackDataTimer):
(EWK2UnitTest::CallbackDataTimer::timeOutCallback):
(EWK2UnitTest::CallbackDataExpectedValue::CallbackDataExpectedValue):
(EWK2UnitTest::EWK2UnitTestBase::waitUntilLoadFinished):
(EWK2UnitTest::EWK2UnitTestBase::waitUntilTitleChangedTo):
(EWK2UnitTest::EWK2UnitTestBase::waitUntilURIChangedTo):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (130835 => 130836)


--- trunk/Source/WebKit2/ChangeLog	2012-10-10 01:40:11 UTC (rev 130835)
+++ trunk/Source/WebKit2/ChangeLog	2012-10-10 01:41:30 UTC (rev 130836)
@@ -1,3 +1,24 @@
+2012-10-09  Byungwoo Lee  <bw80....@samsung.com>
+
+        [EFL][WK2] Move timeout callback to the CallbackDataTimer class.
+        https://bugs.webkit.org/show_bug.cgi?id=97861
+
+        Reviewed by Gyuyoung Kim.
+
+        Timeout callbacks for waitUntil{LoadFinished,TitleChanged,URIChanged}
+        can be moved to the CallbackDataTimer class.
+
+        Moved the callback implementation to the CallbackDataTimer class.
+
+        * UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp:
+        (EWK2UnitTest::CallbackDataTimer::CallbackDataTimer):
+        (CallbackDataTimer):
+        (EWK2UnitTest::CallbackDataTimer::timeOutCallback):
+        (EWK2UnitTest::CallbackDataExpectedValue::CallbackDataExpectedValue):
+        (EWK2UnitTest::EWK2UnitTestBase::waitUntilLoadFinished):
+        (EWK2UnitTest::EWK2UnitTestBase::waitUntilTitleChangedTo):
+        (EWK2UnitTest::EWK2UnitTestBase::waitUntilURIChangedTo):
+
 2012-10-09  Jian Li  <jia...@chromium.org>
 
         Update the CSS property used to support draggable regions.

Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp (130835 => 130836)


--- trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp	2012-10-10 01:40:11 UTC (rev 130835)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp	2012-10-10 01:41:30 UTC (rev 130836)
@@ -79,9 +79,9 @@
 
 class CallbackDataTimer {
 public:
-    CallbackDataTimer(double timeoutSeconds, Ecore_Task_Cb callback)
+    explicit CallbackDataTimer(double timeoutSeconds)
         : m_done(false)
-        , m_timer(timeoutSeconds >= 0 ? ecore_timer_add(timeoutSeconds, callback, this) : 0)
+        , m_timer(timeoutSeconds >= 0 ? ecore_timer_add(timeoutSeconds, reinterpret_cast<Ecore_Task_Cb>(timeOutCallback), this) : 0)
         , m_didTimeOut(false)
     {
     }
@@ -105,6 +105,19 @@
 
     bool didTimeOut() const { return m_didTimeOut; }
 
+protected:
+    bool m_done;
+    Ecore_Timer* m_timer;
+    bool m_didTimeOut;
+
+private:
+    static bool timeOutCallback(void* userData)
+    {
+        CallbackDataTimer* data = ""
+        data->setTimedOut();
+        return ECORE_CALLBACK_CANCEL;
+    }
+
     void setTimedOut()
     {
         m_done = true;
@@ -112,17 +125,13 @@
         m_didTimeOut = true;
     }
 
-protected:
-    bool m_done;
-    Ecore_Timer* m_timer;
-    bool m_didTimeOut;
 };
 
 template <class T>
 class CallbackDataExpectedValue : public CallbackDataTimer {
 public:
-    CallbackDataExpectedValue(const T& expectedValue, double timeoutSeconds, Ecore_Task_Cb callback)
-        : CallbackDataTimer(timeoutSeconds, callback)
+    CallbackDataExpectedValue(const T& expectedValue, double timeoutSeconds)
+        : CallbackDataTimer(timeoutSeconds)
         , m_expectedValue(expectedValue)
     {
     }
@@ -142,17 +151,9 @@
     data->setDone();
 }
 
-static bool timeOutWhileWaitingUntilLoadFinished(void* userData)
-{
-    CallbackDataTimer* data = ""
-    data->setTimedOut();
-
-    return ECORE_CALLBACK_CANCEL;
-}
-
 bool EWK2UnitTestBase::waitUntilLoadFinished(double timeoutSeconds)
 {
-    CallbackDataTimer data(timeoutSeconds, reinterpret_cast<Ecore_Task_Cb>(timeOutWhileWaitingUntilLoadFinished));
+    CallbackDataTimer data(timeoutSeconds);
 
     evas_object_smart_callback_add(m_webView, "load,finished", onLoadFinished, &data);
 
@@ -174,17 +175,9 @@
     data->setDone();
 }
 
-static bool timeOutWhileWaitingUntilTitleChangedTo(void* userData)
-{
-    CallbackDataExpectedValue<CString>* data = ""
-    data->setTimedOut();
-
-    return ECORE_CALLBACK_CANCEL;
-}
-
 bool EWK2UnitTestBase::waitUntilTitleChangedTo(const char* expectedTitle, double timeoutSeconds)
 {
-    CallbackDataExpectedValue<CString> data(expectedTitle, timeoutSeconds, reinterpret_cast<Ecore_Task_Cb>(timeOutWhileWaitingUntilTitleChangedTo));
+    CallbackDataExpectedValue<CString> data(expectedTitle, timeoutSeconds);
 
     evas_object_smart_callback_add(m_webView, "title,changed", onTitleChanged, &data);
 
@@ -206,17 +199,9 @@
     data->setDone();
 }
 
-static bool timeOutWhileWaitingUntilURLChangedTo(void* userData)
-{
-    CallbackDataExpectedValue<CString>* data = ""
-    data->setTimedOut();
-
-    return ECORE_CALLBACK_CANCEL;
-}
-
 bool EWK2UnitTestBase::waitUntilURLChangedTo(const char* expectedURL, double timeoutSeconds)
 {
-    CallbackDataExpectedValue<CString> data(expectedURL, timeoutSeconds, reinterpret_cast<Ecore_Task_Cb>(timeOutWhileWaitingUntilURLChangedTo));
+    CallbackDataExpectedValue<CString> data(expectedURL, timeoutSeconds);
 
     evas_object_smart_callback_add(m_webView, "url,changed", onURLChanged, &data);
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to