diff options
Diffstat (limited to 'desktop/inc/lib/init.hxx')
| -rw-r--r-- | desktop/inc/lib/init.hxx | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx index e27f0563cd58..e6b4f00a5427 100644 --- a/desktop/inc/lib/init.hxx +++ b/desktop/inc/lib/init.hxx @@ -93,9 +93,8 @@ namespace desktop { struct CallbackData { - CallbackData(int type, const std::string& payload) - : Type(type) - , PayloadString(payload) + CallbackData(const std::string& payload) + : PayloadString(payload) { } @@ -118,7 +117,6 @@ namespace desktop { /// Returns true iff there is cached data. bool isCached() const { return PayloadObject.which() != 0; } - int Type; std::string PayloadString; private: @@ -126,14 +124,19 @@ namespace desktop { boost::variant<boost::blank, RectangleAndPart, boost::property_tree::ptree> PayloadObject; }; - typedef std::vector<CallbackData> queue_type; + typedef std::vector<int> queue_type1; + typedef std::vector<CallbackData> queue_type2; private: - bool removeAll(const std::function<bool (const queue_type::value_type&)>& rTestFunc); - bool processInvalidateTilesEvent(CallbackData& aCallbackData); - bool processWindowEvent(CallbackData& aCallbackData); - - queue_type m_queue; + bool removeAll(const std::function<bool (int, const CallbackData&)>& rTestFunc); + bool processInvalidateTilesEvent(int type, CallbackData& aCallbackData); + bool processWindowEvent(int type, CallbackData& aCallbackData); + queue_type2::reverse_iterator toQueue2(queue_type1::reverse_iterator); + + /** we frequently want to scan the queue, and mostly when we do so, we only care about the element type + so we split the queue in 2 to make the scanning cache friendly. */ + queue_type1 m_queue1; + queue_type2 m_queue2; std::map<int, std::string> m_states; std::unordered_map<int, std::unordered_map<int, std::string>> m_viewStates; LibreOfficeKitDocument* m_pDocument; |