diff options
| author | tsepez <tsepez@chromium.org> | 2017-01-03 12:50:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2017-01-03 12:50:18 -0800 |
| commit | fa07af3e9b8fe849c973dd62f718ebb6bb4017c7 (patch) | |
| tree | b19f4656c21a5f4bc345d73ee1c457fc25b9a526 /xfa/fwl/cfwl_notedriver.h | |
| parent | eda80ef83f1a28166bbf86c6808dda5f6623f08c (diff) | |
| download | pdfium-fa07af3e9b8fe849c973dd62f718ebb6bb4017c7.tar.xz | |
Remove more CFX_ArrayTemplate in cfwl_notedriver.h.
Also pass some unqiue_ptr further down while we're at it.
Review-Url: https://codereview.chromium.org/2594103002
Diffstat (limited to 'xfa/fwl/cfwl_notedriver.h')
| -rw-r--r-- | xfa/fwl/cfwl_notedriver.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/xfa/fwl/cfwl_notedriver.h b/xfa/fwl/cfwl_notedriver.h index f2ef87aabe..e177494ff1 100644 --- a/xfa/fwl/cfwl_notedriver.h +++ b/xfa/fwl/cfwl_notedriver.h @@ -10,6 +10,7 @@ #include <deque> #include <memory> #include <unordered_map> +#include <vector> #include "xfa/fwl/cfwl_event.h" #include "xfa/fwl/cfwl_widget.h" @@ -49,9 +50,9 @@ class CFWL_NoteDriver { void RegisterForm(CFWL_Widget* pForm); void UnRegisterForm(CFWL_Widget* pForm); + void ProcessMessage(std::unique_ptr<CFWL_Message> pMessage); void QueueMessage(std::unique_ptr<CFWL_Message> pMessage); - void UnqueueMessage(CFWL_NoteLoop* pNoteLoop); - void ProcessMessage(CFWL_Message* pMessage); + void UnqueueMessageAndProcess(CFWL_NoteLoop* pNoteLoop); private: bool DispatchMessage(CFWL_Message* pMessage, CFWL_Widget* pMessageForm); @@ -65,9 +66,9 @@ class CFWL_NoteDriver { bool IsValidMessage(CFWL_Message* pMessage); CFWL_Widget* GetMessageForm(CFWL_Widget* pDstTarget); - CFX_ArrayTemplate<CFWL_Widget*> m_forms; - std::deque<std::unique_ptr<CFWL_Message>> m_noteQueue; - CFX_ArrayTemplate<CFWL_NoteLoop*> m_noteLoopQueue; + std::vector<CFWL_Widget*> m_Forms; + std::deque<std::unique_ptr<CFWL_Message>> m_NoteQueue; + std::vector<CFWL_NoteLoop*> m_NoteLoopQueue; std::unordered_map<uint32_t, CFWL_EventTarget*> m_eventTargets; CFWL_Widget* m_pHover; CFWL_Widget* m_pFocus; |