Changeset 161257 in webkit

Timestamp:

Jan 3, 2014 12:45:06 AM (10 years ago)

Author:

jinwoo7.song@samsung.com

Message:

VibrationPattern should allocate an single vector instance for single integer input
​https://bugs.webkit.org/show_bug.cgi?id=126417

Reviewed by Gyuyoung Kim.

Source/WebCore:

When the Vibration pattern is set with a single integer, the VibrationPattern should
be set with this integer as a vibration time. But the VibrationPattern(unsigned vector) was
initialized with a single parameter, the vibration time, so the time was used to set
the size of vector.

• Modules/vibration/NavigatorVibration.cpp:

(WebCore::NavigatorVibration::vibrate):

Source/WebKit2:

Fix a vibration unit test regression after r161139. Also remove unnecessary test cases.

• UIProcess/API/efl/tests/test_ewk2_view.cpp:

(EWK2ViewTest::loadVibrationHTMLString):
(TEST_F):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/vibration/NavigatorVibration.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-03  Jinwoo Song  <jinwoo7.song@samsung.com>
+
+        VibrationPattern should allocate an single vector instance for single integer input
+        https://bugs.webkit.org/show_bug.cgi?id=126417
+
+        Reviewed by Gyuyoung Kim.
+
+        When the Vibration pattern is set with a single integer, the VibrationPattern should
+        be set with this integer as a vibration time. But the VibrationPattern(unsigned vector) was
+        initialized with a single parameter, the vibration time, so the time was used to set
+        the size of vector.
+
+        * Modules/vibration/NavigatorVibration.cpp:
+        (WebCore::NavigatorVibration::vibrate):
+
 2014-01-02  Jaehun Lim  <ljaehun.lim@samsung.com>
 

trunk/Source/WebCore/Modules/vibration/NavigatorVibration.cpp

@@ -41 +41 @@
 bool NavigatorVibration::vibrate(Navigator* navigator, unsigned time)
 {
-    return NavigatorVibration::vibrate(navigator, VibrationPattern(time));
+    return NavigatorVibration::vibrate(navigator, VibrationPattern(1, time));
 }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-03  Jinwoo Song  <jinwoo7.song@samsung.com>
+
+        VibrationPattern should allocate an single vector instance for single integer input
+        https://bugs.webkit.org/show_bug.cgi?id=126417
+
+        Reviewed by Gyuyoung Kim.
+
+        Fix a vibration unit test regression after r161139. Also remove unnecessary test cases. 
+
+        * UIProcess/API/efl/tests/test_ewk2_view.cpp:
+        (EWK2ViewTest::loadVibrationHTMLString):
+        (TEST_F):
+
 2014-01-02  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp

@@ -174 +174 @@
     }
 
-    static void loadVibrationHTMLString(Evas_Object* webView, const char* vibrationPattern, bool waitForVibrationEvent, VibrationCbData* data)
+    static void loadVibrationHTMLString(Evas_Object* webView, const char* vibrationPattern, VibrationCbData* data)
     {
         const char* content =
@@ -188 +188 @@
         ewk_view_html_string_load(webView, eina_strbuf_string_get(buffer), 0, 0);
         eina_strbuf_free(buffer);
-
-        if (!waitForVibrationEvent)
-            return;
     }
 
@@ -919 +916 @@
 TEST_F(EWK2ViewTest, ewk_context_vibration_client_callbacks_set)
 {
-    VibrationCbData data = { false, false, 0, 5000 };
+    VibrationCbData data = { false, false, false, 0, 5000 };
     evas_object_smart_callback_add(webView(), "vibrate", onVibrate, &data);
     evas_object_smart_callback_add(webView(), "cancel,vibration", onCancelVibration, &data);
 
     // Vibrate for 5 seconds.
-    loadVibrationHTMLString(webView(), "5000", true, &data);
+    loadVibrationHTMLString(webView(), "5000", &data);
     waitUntilTrue(data.testFinished);
     ASSERT_TRUE(data.didReceiveVibrate);
 
     // Cancel any existing vibrations.
-    loadVibrationHTMLString(webView(), "0", true, &data);
+    loadVibrationHTMLString(webView(), "0", &data);
     waitUntilTrue(data.testFinished);
     ASSERT_TRUE(data.didReceiveCancelVibration);
 
     // This case the pattern will cause the device to vibrate for 200 ms, be still for 100 ms, and then vibrate for 5000 ms.
-    loadVibrationHTMLString(webView(), "[200, 100, 5000]", true, &data);
+    loadVibrationHTMLString(webView(), "[200, 100, 5000]", &data);
     waitUntilTrue(data.testFinished);
     ASSERT_EQ(2, data.vibrateCalledCount);
@@ -940 +937 @@
 
     // Cancel outstanding vibration pattern.
-    loadVibrationHTMLString(webView(), "[0]", true, &data);
+    loadVibrationHTMLString(webView(), "[0]", &data);
     waitUntilTrue(data.testFinished);
     ASSERT_TRUE(data.didReceiveCancelVibration);
@@ -947 +944 @@
     evas_object_smart_callback_del(webView(), "vibrate", onVibrate);
     evas_object_smart_callback_del(webView(), "cancel,vibration", onCancelVibration);
-
-    // Make sure we don't receive vibration event.
-    loadVibrationHTMLString(webView(), "[5000]", false, &data);
-    waitUntilTrue(data.testFinished);
-    ASSERT_TRUE(waitUntilTitleChangedTo("Loaded"));
-    ASSERT_STREQ("Loaded", ewk_view_title_get(webView()));
-    ASSERT_FALSE(data.didReceiveVibrate);
-
-    // Make sure we don't receive cancel vibration event.
-    loadVibrationHTMLString(webView(), "0", false, &data);
-    waitUntilTrue(data.testFinished);
-    ASSERT_TRUE(waitUntilTitleChangedTo("Loaded"));
-    ASSERT_STREQ("Loaded", ewk_view_title_get(webView()));
-    ASSERT_FALSE(data.didReceiveCancelVibration);
 }