| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef BASE_MESSAGE_LOOP_MESSAGE_LOOP_H_ | 5 #ifndef BASE_MESSAGE_LOOP_MESSAGE_LOOP_H_ |
| 6 #define BASE_MESSAGE_LOOP_MESSAGE_LOOP_H_ | 6 #define BASE_MESSAGE_LOOP_MESSAGE_LOOP_H_ |
| 7 | 7 |
| 8 #include <queue> | 8 #include <queue> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 502 template <class T, class R> friend class base::subtle::DeleteHelperInternal; | 502 template <class T, class R> friend class base::subtle::DeleteHelperInternal; |
| 503 template <class T, class R> friend class base::subtle::ReleaseHelperInternal; | 503 template <class T, class R> friend class base::subtle::ReleaseHelperInternal; |
| 504 | 504 |
| 505 void DeleteSoonInternal(const tracked_objects::Location& from_here, | 505 void DeleteSoonInternal(const tracked_objects::Location& from_here, |
| 506 void(*deleter)(const void*), | 506 void(*deleter)(const void*), |
| 507 const void* object); | 507 const void* object); |
| 508 void ReleaseSoonInternal(const tracked_objects::Location& from_here, | 508 void ReleaseSoonInternal(const tracked_objects::Location& from_here, |
| 509 void(*releaser)(const void*), | 509 void(*releaser)(const void*), |
| 510 const void* object); | 510 const void* object); |
| 511 | 511 |
| 512 bool on_render_thread_; |
| 513 |
| 512 DISALLOW_COPY_AND_ASSIGN(MessageLoop); | 514 DISALLOW_COPY_AND_ASSIGN(MessageLoop); |
| 513 }; | 515 }; |
| 514 | 516 |
| 515 #if !defined(OS_NACL) | 517 #if !defined(OS_NACL) |
| 516 | 518 |
| 517 //----------------------------------------------------------------------------- | 519 //----------------------------------------------------------------------------- |
| 518 // MessageLoopForUI extends MessageLoop with methods that are particular to a | 520 // MessageLoopForUI extends MessageLoop with methods that are particular to a |
| 519 // MessageLoop instantiated with TYPE_UI. | 521 // MessageLoop instantiated with TYPE_UI. |
| 520 // | 522 // |
| 521 // This class is typically used like so: | 523 // This class is typically used like so: |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 647 | 649 |
| 648 // Do not add any member variables to MessageLoopForIO! This is important b/c | 650 // Do not add any member variables to MessageLoopForIO! This is important b/c |
| 649 // MessageLoopForIO is often allocated via MessageLoop(TYPE_IO). Any extra | 651 // MessageLoopForIO is often allocated via MessageLoop(TYPE_IO). Any extra |
| 650 // data that you need should be stored on the MessageLoop's pump_ instance. | 652 // data that you need should be stored on the MessageLoop's pump_ instance. |
| 651 COMPILE_ASSERT(sizeof(MessageLoop) == sizeof(MessageLoopForIO), | 653 COMPILE_ASSERT(sizeof(MessageLoop) == sizeof(MessageLoopForIO), |
| 652 MessageLoopForIO_should_not_have_extra_member_variables); | 654 MessageLoopForIO_should_not_have_extra_member_variables); |
| 653 | 655 |
| 654 } // namespace base | 656 } // namespace base |
| 655 | 657 |
| 656 #endif // BASE_MESSAGE_LOOP_MESSAGE_LOOP_H_ | 658 #endif // BASE_MESSAGE_LOOP_MESSAGE_LOOP_H_ |
| OLD | NEW |