| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 // Creates a new X11 Display for the |display_name|. NULL is returned if X11 | 42 // Creates a new X11 Display for the |display_name|. NULL is returned if X11 |
| 43 // connection failed. Equivalent to CreateDefault() when |display_name| is | 43 // connection failed. Equivalent to CreateDefault() when |display_name| is |
| 44 // empty. | 44 // empty. |
| 45 static rtc::scoped_refptr<SharedXDisplay> Create( | 45 static rtc::scoped_refptr<SharedXDisplay> Create( |
| 46 const std::string& display_name); | 46 const std::string& display_name); |
| 47 | 47 |
| 48 // Creates X11 Display connection for the default display (e.g. specified in | 48 // Creates X11 Display connection for the default display (e.g. specified in |
| 49 // DISPLAY). NULL is returned if X11 connection failed. | 49 // DISPLAY). NULL is returned if X11 connection failed. |
| 50 static rtc::scoped_refptr<SharedXDisplay> CreateDefault(); | 50 static rtc::scoped_refptr<SharedXDisplay> CreateDefault(); |
| 51 | 51 |
| 52 void AddRef() { ++ref_count_; } | 52 void AddRef() const { ++ref_count_; } |
| 53 void Release() { | 53 void Release() const { |
| 54 if (--ref_count_ == 0) | 54 if (--ref_count_ == 0) |
| 55 delete this; | 55 delete this; |
| 56 } | 56 } |
| 57 | 57 |
| 58 Display* display() { return display_; } | 58 Display* display() { return display_; } |
| 59 | 59 |
| 60 // Adds a new event |handler| for XEvent's of |type|. | 60 // Adds a new event |handler| for XEvent's of |type|. |
| 61 void AddEventHandler(int type, XEventHandler* handler); | 61 void AddEventHandler(int type, XEventHandler* handler); |
| 62 | 62 |
| 63 // Removes event |handler| added using |AddEventHandler|. Doesn't do anything | 63 // Removes event |handler| added using |AddEventHandler|. Doesn't do anything |
| 64 // if |handler| is not registered. | 64 // if |handler| is not registered. |
| 65 void RemoveEventHandler(int type, XEventHandler* handler); | 65 void RemoveEventHandler(int type, XEventHandler* handler); |
| 66 | 66 |
| 67 // Processes pending XEvents, calling corresponding event handlers. | 67 // Processes pending XEvents, calling corresponding event handlers. |
| 68 void ProcessPendingXEvents(); | 68 void ProcessPendingXEvents(); |
| 69 | 69 |
| 70 private: | 70 private: |
| 71 typedef std::map<int, std::vector<XEventHandler*> > EventHandlersMap; | 71 typedef std::map<int, std::vector<XEventHandler*> > EventHandlersMap; |
| 72 | 72 |
| 73 ~SharedXDisplay(); | 73 ~SharedXDisplay(); |
| 74 | 74 |
| 75 Atomic32 ref_count_; | 75 mutable Atomic32 ref_count_; |
| 76 Display* display_; | 76 Display* display_; |
| 77 | 77 |
| 78 EventHandlersMap event_handlers_; | 78 EventHandlersMap event_handlers_; |
| 79 | 79 |
| 80 RTC_DISALLOW_COPY_AND_ASSIGN(SharedXDisplay); | 80 RTC_DISALLOW_COPY_AND_ASSIGN(SharedXDisplay); |
| 81 }; | 81 }; |
| 82 | 82 |
| 83 } // namespace webrtc | 83 } // namespace webrtc |
| 84 | 84 |
| 85 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_ | 85 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_ |
| OLD | NEW |