Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Unified Diff: Source/modules/vibration/NavigatorVibration.cpp

Issue 15724023: Vibration API: use runtime flag, change from client to platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Review issues: order vibrate method before cancelVibration, etc. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/vibration/NavigatorVibration.cpp
diff --git a/Source/modules/vibration/NavigatorVibration.cpp b/Source/modules/vibration/NavigatorVibration.cpp
index 4e9889d56f93dc41e2f93d2260ad390c1d38d247..8ddbfed526e39256623fd5ae13ffa929107701d1 100644
--- a/Source/modules/vibration/NavigatorVibration.cpp
+++ b/Source/modules/vibration/NavigatorVibration.cpp
@@ -20,9 +20,6 @@
#include "config.h"
#include "modules/vibration/NavigatorVibration.h"
-#if ENABLE(VIBRATION)
-
-#include "core/dom/ExceptionCode.h"
#include "core/page/Frame.h"
#include "core/page/Navigator.h"
#include "core/page/Page.h"
@@ -39,39 +36,30 @@ NavigatorVibration::~NavigatorVibration()
{
}
-void NavigatorVibration::vibrate(Navigator* navigator, unsigned time, ExceptionCode& ec)
+void NavigatorVibration::vibrate(Navigator* navigator, unsigned time)
{
- if (!navigator->frame()->page())
- return;
+ Page* page = navigator->frame()->page();
- if (navigator->frame()->page()->visibilityState() == PageVisibilityStateHidden)
+ if (!page)
return;
- if (!Vibration::isActive(navigator->frame()->page())) {
- ec = NOT_SUPPORTED_ERR;
+ if (page->visibilityState() == PageVisibilityStateHidden)
return;
- }
- Vibration::from(navigator->frame()->page())->vibrate(time);
+ Vibration::from(page)->vibrate(time);
}
-void NavigatorVibration::vibrate(Navigator* navigator, const VibrationPattern& pattern, ExceptionCode& ec)
+void NavigatorVibration::vibrate(Navigator* navigator, const VibrationPattern& pattern)
{
- if (!navigator->frame()->page())
- return;
+ Page* page = navigator->frame()->page();
- if (navigator->frame()->page()->visibilityState() == PageVisibilityStateHidden)
+ if (!page)
return;
- if (!Vibration::isActive(navigator->frame()->page())) {
- ec = NOT_SUPPORTED_ERR;
+ if (page->visibilityState() == PageVisibilityStateHidden)
return;
- }
- Vibration::from(navigator->frame()->page())->vibrate(pattern);
+ Vibration::from(page)->vibrate(pattern);
}
} // namespace WebCore
-
-#endif // ENABLE(VIBRATION)
-

Powered by Google App Engine
This is Rietveld 408576698