Imported WebKit commit 7bcdfab9a40db7d16b4b95bb77d78b8a59c9e701 (http://svn.webkit.org/repository/webkit/trunk@134025)

New snapshot with numerious build fixes, including MSVC 2012 and ARM Thumb-2.

4 files changed, 12 insertions, 10 deletions

diff --git a/Source/WebKit2/UIProcess/API/C/WKContext.cpp b/Source/WebKit2/UIProcess/API/C/WKContext.cpp
index 117bbeda3..ac461157f 100644
--- a/Source/WebKit2/UIProcess/API/C/WKContext.cpp
+++ b/Source/WebKit2/UIProcess/API/C/WKContext.cpp
@@ -242,15 +242,6 @@ WKResourceCacheManagerRef WKContextGetResourceCacheManager(WKContextRef contextR
     return toAPI(toImpl(contextRef)->resourceCacheManagerProxy());
 }
 
-WKVibrationRef WKContextGetVibration(WKContextRef contextRef)
-{
-#if ENABLE(VIBRATION)
-    return toAPI(toImpl(contextRef)->vibrationProxy());
-#else
-    return 0;
-#endif
-}
-
 void WKContextStartMemorySampler(WKContextRef contextRef, WKDoubleRef interval)
 {
     toImpl(contextRef)->startMemorySampler(toImpl(interval)->value());
diff --git a/Source/WebKit2/UIProcess/API/C/WKContext.h b/Source/WebKit2/UIProcess/API/C/WKContext.h
index 69d129805..8f77cbd8f 100644
--- a/Source/WebKit2/UIProcess/API/C/WKContext.h
+++ b/Source/WebKit2/UIProcess/API/C/WKContext.h
@@ -167,7 +167,6 @@ WK_EXPORT WKNetworkInfoManagerRef WKContextGetNetworkInfoManager(WKContextRef co
 WK_EXPORT WKNotificationManagerRef WKContextGetNotificationManager(WKContextRef context);
 WK_EXPORT WKPluginSiteDataManagerRef WKContextGetPluginSiteDataManager(WKContextRef context);
 WK_EXPORT WKResourceCacheManagerRef WKContextGetResourceCacheManager(WKContextRef context);
-WK_EXPORT WKVibrationRef WKContextGetVibration(WKContextRef context);
     
 typedef void (*WKContextGetStatisticsFunction)(WKDictionaryRef statistics, WKErrorRef error, void* functionContext);
 WK_EXPORT void WKContextGetStatistics(WKContextRef context, void* functionContext, WKContextGetStatisticsFunction function);
diff --git a/Source/WebKit2/UIProcess/API/C/WKPage.cpp b/Source/WebKit2/UIProcess/API/C/WKPage.cpp
index bdbcb554d..259bca727 100644
--- a/Source/WebKit2/UIProcess/API/C/WKPage.cpp
+++ b/Source/WebKit2/UIProcess/API/C/WKPage.cpp
@@ -191,6 +191,16 @@ WKInspectorRef WKPageGetInspector(WKPageRef pageRef)
 #endif
 }
 
+WKVibrationRef WKPageGetVibration(WKPageRef page)
+{
+#if ENABLE(VIBRATION)
+    return toAPI(toImpl(page)->vibration());
+#else
+    UNUSED_PARAM(page);
+    return 0;
+#endif
+}
+
 double WKPageGetEstimatedProgress(WKPageRef pageRef)
 {
     return toImpl(pageRef)->estimatedProgress();
diff --git a/Source/WebKit2/UIProcess/API/C/WKPage.h b/Source/WebKit2/UIProcess/API/C/WKPage.h
index dadebbc91..4a25bb63b 100644
--- a/Source/WebKit2/UIProcess/API/C/WKPage.h
+++ b/Source/WebKit2/UIProcess/API/C/WKPage.h
@@ -389,6 +389,8 @@ WK_EXPORT void WKPageSetMemoryCacheClientCallsEnabled(WKPageRef page, bool memor
 
 WK_EXPORT WKInspectorRef WKPageGetInspector(WKPageRef page);
 
+WK_EXPORT WKVibrationRef WKPageGetVibration(WKPageRef page);
+
 WK_EXPORT WKStringRef WKPageCopyUserAgent(WKPageRef page);
 
 WK_EXPORT WKStringRef WKPageCopyApplicationNameForUserAgent(WKPageRef page);