Backed out changeset df85150b8d2f
authorChris Jones <jones.chris.g@gmail.com>
Thu, 23 Aug 2012 17:33:12 -0700
changeset 105293 5e5711c63caa76923b613046d4224e3167399aff
parent 105292 df85150b8d2fd9c8d2b7d75b48951600d4c0c4f5
child 105294 ea32388d45a805c72f179375dc2b763c75454f6d
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
milestone17.0a1
backs outdf85150b8d2fd9c8d2b7d75b48951600d4c0c4f5
Backed out changeset df85150b8d2f
hal/Hal.cpp
--- a/hal/Hal.cpp
+++ b/hal/Hal.cpp
@@ -154,17 +154,17 @@ CancelVibrate(const WindowIdentifier &id
   //
   // To solve this problem, we keep track of the id of the last window
   // to start a vibration, and only accepts cancellation requests from
   // the same window.  All other cancellation requests are ignored.
 
   if (InSandbox()) {
     hal_sandbox::CancelVibrate(id);
   }
-  else if (gLastIDToVibrate && *gLastIDToVibrate == id.AsArray()) {
+  else if (*gLastIDToVibrate == id.AsArray()) {
     // Don't forward our ID to hal_impl. It doesn't need it, and we
     // don't want it to be tempted to read it.  The empty identifier
     // will assert if it's used.
     HAL_LOG(("CancelVibrate: Forwarding to hal_impl."));
     hal_impl::CancelVibrate(WindowIdentifier());
   }
 }