Chromium Code Reviews Chromium Code Reviews
Issue 1241613004:
Rework dispatchEvent so it is consistent for isTrusted support. (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2012, 2013 Apple Inc. All rights reserved. | 3 * Copyright (C) 2012, 2013 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 67 double endTime() const { return m_endTime; } | 67 double endTime() const { return m_endTime; } |
| 68 void setEndTime(double); | 68 void setEndTime(double); |
| 69 | 69 |
| 70 bool pauseOnExit() const { return m_pauseOnExit; } | 70 bool pauseOnExit() const { return m_pauseOnExit; } |
| 71 void setPauseOnExit(bool); | 71 void setPauseOnExit(bool); |
| 72 | 72 |
| 73 unsigned cueIndex(); | 73 unsigned cueIndex(); |
| 74 void updateCueIndex(unsigned cueIndex) { m_cueIndex = cueIndex; } | 74 void updateCueIndex(unsigned cueIndex) { m_cueIndex = cueIndex; } |
| 75 void invalidateCueIndex(); | 75 void invalidateCueIndex(); |
| 76 | 76 |
| 77 using EventTarget::dispatchEvent; | |
| 78 bool dispatchEvent(PassRefPtrWillBeRawPtr<Event>) override; | |
| 79 | |
| 80 bool isActive() const { return m_isActive; } | 77 bool isActive() const { return m_isActive; } |
| 81 void setIsActive(bool active) { m_isActive = active; } | 78 void setIsActive(bool active) { m_isActive = active; } |
| 82 | 79 |
| 83 // Updates the display tree and appends it to container if it has not | 80 // Updates the display tree and appends it to container if it has not |
| 84 // already been added. | 81 // already been added. |
| 85 virtual void updateDisplay(HTMLDivElement& container) = 0; | 82 virtual void updateDisplay(HTMLDivElement& container) = 0; |
| 86 | 83 |
| 87 // Marks the nodes of the display tree as past or future relative to | 84 // Marks the nodes of the display tree as past or future relative to |
| 88 // movieTime. If updateDisplay() has not been called there is no display | 85 // movieTime. If updateDisplay() has not been called there is no display |
| 89 // tree and nothing is done. | 86 // tree and nothing is done. |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 105 DEFINE_ATTRIBUTE_EVENT_LISTENER(enter); | 102 DEFINE_ATTRIBUTE_EVENT_LISTENER(enter); |
| 106 DEFINE_ATTRIBUTE_EVENT_LISTENER(exit); | 103 DEFINE_ATTRIBUTE_EVENT_LISTENER(exit); |
| 107 | 104 |
| 108 DECLARE_VIRTUAL_TRACE(); | 105 DECLARE_VIRTUAL_TRACE(); |
| 109 | 106 |
| 110 protected: | 107 protected: |
| 111 TextTrackCue(double start, double end); | 108 TextTrackCue(double start, double end); |
| 112 | 109 |
| 113 void cueWillChange(); | 110 void cueWillChange(); |
| 114 virtual void cueDidChange(); | 111 virtual void cueDidChange(); |
| 112 bool dispatchEventInternal(PassRefPtrWillBeRawPtr<Event>) override; | |
|
grt (UTC plus 2)
2015/07/16 13:40:40
"override" here is causing a compile error on chro
| |
| 115 | 113 |
| 116 private: | 114 private: |
| 117 AtomicString m_id; | 115 AtomicString m_id; |
| 118 double m_startTime; | 116 double m_startTime; |
| 119 double m_endTime; | 117 double m_endTime; |
| 120 | 118 |
| 121 RawPtrWillBeMember<TextTrack> m_track; | 119 RawPtrWillBeMember<TextTrack> m_track; |
| 122 | 120 |
| 123 unsigned m_cueIndex; | 121 unsigned m_cueIndex; |
| 124 | 122 |
| 125 bool m_isActive : 1; | 123 bool m_isActive : 1; |
| 126 bool m_pauseOnExit : 1; | 124 bool m_pauseOnExit : 1; |
| 127 }; | 125 }; |
| 128 | 126 |
| 129 } // namespace blink | 127 } // namespace blink |
| 130 | 128 |
| 131 #endif // TextTrackCue_h | 129 #endif // TextTrackCue_h |
| OLD | NEW |
