OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Samsung Electronics. All rights reserved. | 2 * Copyright (C) 2013 Samsung Electronics. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 22 matching lines...) Expand all Loading... |
33 #include "core/frame/Navigator.h" | 33 #include "core/frame/Navigator.h" |
34 #include "core/testing/Internals.h" | 34 #include "core/testing/Internals.h" |
35 #include "modules/vibration/NavigatorVibration.h" | 35 #include "modules/vibration/NavigatorVibration.h" |
36 #include "modules/vibration/VibrationController.h" | 36 #include "modules/vibration/VibrationController.h" |
37 | 37 |
38 namespace blink { | 38 namespace blink { |
39 | 39 |
40 bool InternalsVibration::isVibrating(Internals&, Navigator* navigator) | 40 bool InternalsVibration::isVibrating(Internals&, Navigator* navigator) |
41 { | 41 { |
42 DCHECK(navigator && navigator->frame()); | 42 DCHECK(navigator && navigator->frame()); |
43 return NavigatorVibration::from(*navigator).controller()->isRunning(); | 43 return NavigatorVibration::from(*navigator).controller(*navigator->frame())-
>isRunning(); |
44 } | 44 } |
45 | 45 |
46 Vector<unsigned> InternalsVibration::pendingVibrationPattern(Internals&, Navigat
or* navigator) | 46 Vector<unsigned> InternalsVibration::pendingVibrationPattern(Internals&, Navigat
or* navigator) |
47 { | 47 { |
48 DCHECK(navigator && navigator->frame()); | 48 DCHECK(navigator && navigator->frame()); |
49 return NavigatorVibration::from(*navigator).controller()->pattern(); | 49 return NavigatorVibration::from(*navigator).controller(*navigator->frame())-
>pattern(); |
50 } | 50 } |
51 | 51 |
52 } // namespace blink | 52 } // namespace blink |
OLD | NEW |