Diff
Modified: trunk/ChangeLog (113403 => 113404)
--- trunk/ChangeLog 2012-04-06 01:29:16 UTC (rev 113403)
+++ trunk/ChangeLog 2012-04-06 02:27:31 UTC (rev 113404)
@@ -1,3 +1,12 @@
+2012-04-05 George Staikos <[email protected]>
+
+ Compile the vibration module for BlackBerry.
+ https://bugs.webkit.org/show_bug.cgi?id=83340
+
+ Reviewed by Rob Buis.
+
+ * Source/cmake/OptionsBlackBerry.cmake:
+
2012-04-05 Ryosuke Niwa <[email protected]>
perf-o-matic should include unit in runs JSON responses
Modified: trunk/Source/WebKit/ChangeLog (113403 => 113404)
--- trunk/Source/WebKit/ChangeLog 2012-04-06 01:29:16 UTC (rev 113403)
+++ trunk/Source/WebKit/ChangeLog 2012-04-06 02:27:31 UTC (rev 113404)
@@ -1,3 +1,12 @@
+2012-04-05 George Staikos <[email protected]>
+
+ Add the vibration client for BlackBerry.
+ https://bugs.webkit.org/show_bug.cgi?id=83340
+
+ Reviewed by Rob Buis.
+
+ * PlatformBlackBerry.cmake:
+
2012-04-05 Jia Pu <[email protected]>
Move correction panel related functions from EditorClient into separated AlternativeTextClient class.
Modified: trunk/Source/WebKit/PlatformBlackBerry.cmake (113403 => 113404)
--- trunk/Source/WebKit/PlatformBlackBerry.cmake 2012-04-06 01:29:16 UTC (rev 113403)
+++ trunk/Source/WebKit/PlatformBlackBerry.cmake 2012-04-06 02:27:31 UTC (rev 113404)
@@ -17,6 +17,7 @@
"${WEBCORE_DIR}/platform/graphics/skia"
"${WEBCORE_DIR}/platform/network/blackberry"
"${WEBCORE_DIR}/websockets"
+ "${WEBCORE_DIR}/Modules/vibration"
"${WEBKIT_DIR}/blackberry/Api"
"${WEBKIT_DIR}/blackberry/WebCoreSupport"
"${WEBKIT_DIR}/blackberry/WebKitSupport"
@@ -65,6 +66,7 @@
blackberry/WebCoreSupport/InspectorClientBlackBerry.cpp
blackberry/WebCoreSupport/_javascript_DebuggerBlackBerry.cpp
blackberry/WebCoreSupport/NotificationPresenterImpl.cpp
+ blackberry/WebCoreSupport/VibrationClientBlackBerry.cpp
blackberry/WebKitSupport/BackingStoreCompositingSurface.cpp
blackberry/WebKitSupport/BackingStoreTile.cpp
blackberry/WebKitSupport/BackingStoreClient.cpp
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (113403 => 113404)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-04-06 01:29:16 UTC (rev 113403)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-04-06 02:27:31 UTC (rev 113404)
@@ -102,6 +102,9 @@
#include "ThreadCheck.h"
#include "TouchEventHandler.h"
#include "TransformationMatrix.h"
+#if ENABLE(VIBRATION)
+#include "VibrationClientBlackBerry.h"
+#endif
#include "VisiblePosition.h"
#if ENABLE(WEBDOM)
#include "WebDOMDocument.h"
@@ -443,6 +446,9 @@
#endif
WebCore::provideDeviceOrientationTo(m_page, new DeviceOrientationClientBlackBerry(this));
WebCore::provideDeviceMotionTo(m_page, new DeviceMotionClientBlackBerry(this));
+#if ENABLE(VIBRATION)
+ WebCore::provideVibrationTo(m_page, new VibrationClientBlackBerry());
+#endif
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
WebCore::provideNotification(m_page, NotificationPresenterImpl::instance());
Modified: trunk/Source/WebKit/blackberry/ChangeLog (113403 => 113404)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-04-06 01:29:16 UTC (rev 113403)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-04-06 02:27:31 UTC (rev 113404)
@@ -1,3 +1,23 @@
+2012-04-05 George Staikos <[email protected]>
+
+ Add a vibration client for BlackBerry and enable it.
+ https://bugs.webkit.org/show_bug.cgi?id=83340
+
+ Reviewed by Rob Buis.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::init): enable the client
+ * WebCoreSupport/VibrationClientBlackBerry.cpp: Added.
+ (WebCore):
+ (WebCore::VibrationClientBlackBerry::VibrationClientBlackBerry):
+ (WebCore::VibrationClientBlackBerry::vibrate):
+ (WebCore::VibrationClientBlackBerry::cancelVibration):
+ (WebCore::VibrationClientBlackBerry::vibrationDestroyed):
+ * WebCoreSupport/VibrationClientBlackBerry.h: Added.
+ (WebCore):
+ (VibrationClientBlackBerry):
+ (WebCore::VibrationClientBlackBerry::~VibrationClientBlackBerry):
+
2012-04-05 Arvid Nilsson <[email protected]>
[BlackBerry] Force compositing mode when backing store is not active
Added: trunk/Source/WebKit/blackberry/WebCoreSupport/VibrationClientBlackBerry.cpp (0 => 113404)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/VibrationClientBlackBerry.cpp (rev 0)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/VibrationClientBlackBerry.cpp 2012-04-06 02:27:31 UTC (rev 113404)
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "VibrationClientBlackBerry.h"
+
+#include "BlackBerryPlatformVibrate.h"
+
+#if ENABLE(VIBRATION)
+
+namespace WebCore {
+
+VibrationClientBlackBerry::VibrationClientBlackBerry()
+{
+}
+
+void VibrationClientBlackBerry::vibrate(const unsigned long& time)
+{
+ BlackBerryPlatformVibrate::vibrate(time, 1.);
+}
+
+void VibrationClientBlackBerry::cancelVibration()
+{
+}
+
+void VibrationClientBlackBerry::vibrationDestroyed()
+{
+ delete this;
+}
+
+}
+
+#endif
Added: trunk/Source/WebKit/blackberry/WebCoreSupport/VibrationClientBlackBerry.h (0 => 113404)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/VibrationClientBlackBerry.h (rev 0)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/VibrationClientBlackBerry.h 2012-04-06 02:27:31 UTC (rev 113404)
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef VibrationClientBlackBerry_h
+#define VibrationClientBlackBerry_h
+
+#include "VibrationClient.h"
+
+namespace WebCore {
+
+class VibrationClientBlackBerry : public VibrationClient {
+public:
+ VibrationClientBlackBerry();
+ ~VibrationClientBlackBerry() { }
+
+ void vibrate(const unsigned long& time);
+ void cancelVibration();
+ void vibrationDestroyed();
+};
+
+}
+
+#endif
Modified: trunk/Source/cmake/OptionsBlackBerry.cmake (113403 => 113404)
--- trunk/Source/cmake/OptionsBlackBerry.cmake 2012-04-06 01:29:16 UTC (rev 113403)
+++ trunk/Source/cmake/OptionsBlackBerry.cmake 2012-04-06 02:27:31 UTC (rev 113404)
@@ -175,6 +175,7 @@
WEBKIT_FEATURE(ENABLE_SVG_FOREIGN_OBJECT "Enable SVG foreign object" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_SVG_USE "Enable SVG use" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_TOUCH_EVENTS "Enable touch events " DEFAULT ON)
+WEBKIT_FEATURE(ENABLE_VIBRATION "Enable vibration support" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_VIDEO "Enable video" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_VIEWPORT_REFLOW "Enable viewport reflow" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_WEB_SOCKETS "Enable web sockets" DEFAULT ON)
