Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)

New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes

1 files changed, 14 insertions, 6 deletions

diff --git a/Source/WebKit2/UIProcess/API/efl/VibrationProvider.cpp b/Source/WebKit2/UIProcess/API/efl/VibrationProvider.cpp
index 29fb6a4fc..13d4de6d6 100644
--- a/Source/WebKit2/UIProcess/API/efl/VibrationProvider.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/VibrationProvider.cpp
@@ -29,6 +29,7 @@
 #if ENABLE(VIBRATION)
 
 #include "WKAPICast.h"
+#include "WKContext.h"
 #include "WKVibration.h"
 #include <Evas.h>
 
@@ -65,15 +66,18 @@ static void cancelVibrationCallback(WKVibrationRef, const void* clientInfo)
     toVibrationProvider(clientInfo)->cancelVibration();
 }
 
-PassRefPtr<VibrationProvider> VibrationProvider::create(WKVibrationRef wkVibrationRef)
+PassRefPtr<VibrationProvider> VibrationProvider::create(WKContextRef wkContext)
 {
-    return adoptRef(new VibrationProvider(wkVibrationRef));
+    return adoptRef(new VibrationProvider(wkContext));
 }
 
-VibrationProvider::VibrationProvider(WKVibrationRef wkVibrationRef)
-    : m_wkVibrationRef(wkVibrationRef)
+VibrationProvider::VibrationProvider(WKContextRef wkContext)
+    : m_wkContext(wkContext)
 {
-    ASSERT(wkVibrationRef);
+    ASSERT(m_wkContext.get());
+
+    WKVibrationRef wkVibration = WKContextGetVibration(m_wkContext.get());
+    ASSERT(wkVibration);
 
     WKVibrationProvider wkVibrationProvider = {
         kWKVibrationProviderCurrentVersion,
@@ -81,11 +85,15 @@ VibrationProvider::VibrationProvider(WKVibrationRef wkVibrationRef)
         vibrateCallback,
         cancelVibrationCallback
     };
-    WKVibrationSetProvider(m_wkVibrationRef.get(), &wkVibrationProvider);
+    WKVibrationSetProvider(wkVibration, &wkVibrationProvider);
 }
 
 VibrationProvider::~VibrationProvider()
 {
+    WKVibrationRef wkVibration = WKContextGetVibration(m_wkContext.get());
+    ASSERT(wkVibration);
+
+    WKVibrationSetProvider(wkVibration, 0);
 }
 
 void VibrationProvider::vibrate(uint64_t vibrationTime)