Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. 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 20 matching lines...) Expand all Loading... | |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "WebUserGestureIndicator.h" | 32 #include "WebUserGestureIndicator.h" |
| 33 | 33 |
| 34 #include "WebUserGestureToken.h" | 34 #include "WebUserGestureToken.h" |
| 35 #include "platform/UserGestureIndicator.h" | 35 #include "platform/UserGestureIndicator.h" |
| 36 | 36 |
| 37 using namespace WebCore; | 37 using namespace WebCore; |
| 38 | 38 |
| 39 namespace blink { | 39 namespace blink { |
| 40 | 40 |
| 41 class WebUserGestureHandlerWrapper : public UserGestureHandler { | |
|
abarth-chromium
2013/11/26 19:36:37
WebUserGestureHandlerWrapper -> WebUserGestureHand
jww
2013/11/26 20:11:55
Done.
| |
| 42 public: | |
| 43 WebUserGestureHandlerWrapper() | |
| 44 : m_handler(0) | |
| 45 { | |
| 46 UserGestureIndicator::setHandler(this); | |
| 47 } | |
| 48 | |
| 49 virtual void onGesture() | |
| 50 { | |
| 51 if (m_handler) | |
| 52 m_handler->onGesture(); | |
| 53 } | |
| 54 | |
| 55 void setHandler(WebUserGestureHandler* handler) | |
| 56 { | |
| 57 m_handler = handler; | |
| 58 } | |
| 59 | |
| 60 WebUserGestureHandler* getHandler() | |
| 61 { | |
| 62 return m_handler; | |
| 63 } | |
| 64 | |
| 65 private: | |
| 66 WebUserGestureHandler* m_handler; | |
| 67 }; | |
| 68 | |
| 69 DEFINE_STATIC_LOCAL(WebUserGestureHandlerWrapper, gestureHandler, ()); | |
|
abarth-chromium
2013/11/26 19:36:37
This isn't a local variable. I think you need to
jww
2013/11/26 20:11:55
Done.
| |
| 70 | |
| 41 bool WebUserGestureIndicator::isProcessingUserGesture() | 71 bool WebUserGestureIndicator::isProcessingUserGesture() |
| 42 { | 72 { |
| 43 return UserGestureIndicator::processingUserGesture(); | 73 return UserGestureIndicator::processingUserGesture(); |
| 44 } | 74 } |
| 45 | 75 |
| 46 bool WebUserGestureIndicator::consumeUserGesture() | 76 bool WebUserGestureIndicator::consumeUserGesture() |
| 47 { | 77 { |
| 48 return UserGestureIndicator::consumeUserGesture(); | 78 return UserGestureIndicator::consumeUserGesture(); |
| 49 } | 79 } |
| 50 | 80 |
| 51 WebUserGestureToken WebUserGestureIndicator::currentUserGestureToken() | 81 WebUserGestureToken WebUserGestureIndicator::currentUserGestureToken() |
| 52 { | 82 { |
| 53 return WebUserGestureToken(UserGestureIndicator::currentToken()); | 83 return WebUserGestureToken(UserGestureIndicator::currentToken()); |
| 54 } | 84 } |
| 55 | 85 |
| 86 void WebUserGestureIndicator::setHandler(WebUserGestureHandler* handler) | |
| 87 { | |
| 88 gestureHandler.setHandler(handler); | |
| 89 } | |
| 90 | |
| 91 WebUserGestureHandler* WebUserGestureIndicator::getHandler() | |
| 92 { | |
| 93 return gestureHandler.getHandler(); | |
| 94 } | |
| 95 | |
| 56 } // namespace blink | 96 } // namespace blink |
| OLD | NEW |