Index: Source/modules/vibration/NavigatorVibration.cpp |
diff --git a/Source/modules/vibration/NavigatorVibration.cpp b/Source/modules/vibration/NavigatorVibration.cpp |
index 4e9889d56f93dc41e2f93d2260ad390c1d38d247..74b8a60b86c71f0b087c6f1c6e733b5006cad580 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" |
@@ -31,47 +28,30 @@ |
namespace WebCore { |
-NavigatorVibration::NavigatorVibration() |
-{ |
-} |
- |
-NavigatorVibration::~NavigatorVibration() |
+void NavigatorVibration::vibrate(Navigator* navigator, unsigned time) |
{ |
-} |
+ Page* page = navigator->frame()->page(); |
-void NavigatorVibration::vibrate(Navigator* navigator, unsigned time, ExceptionCode& ec) |
-{ |
- if (!navigator->frame()->page()) |
+ if (!page) |
return; |
- if (navigator->frame()->page()->visibilityState() == PageVisibilityStateHidden) |
+ if (page->visibilityState() == PageVisibilityStateHidden) |
return; |
- if (!Vibration::isActive(navigator->frame()->page())) { |
- ec = NOT_SUPPORTED_ERR; |
- 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; |
abarth-chromium
2013/06/11 23:55:36
Can you extract this copy/paste code into a helper
Michael van Ouwerkerk
2013/06/12 16:44:50
I've changed it so the one vibrate method calls th
|
- } |
- Vibration::from(navigator->frame()->page())->vibrate(pattern); |
+ Vibration::from(page)->vibrate(pattern); |
} |
} // namespace WebCore |
- |
-#endif // ENABLE(VIBRATION) |
- |