| Index: third_party/WebKit/Source/wtf/LeakAnnotations.h
|
| diff --git a/third_party/WebKit/Source/wtf/LeakAnnotations.h b/third_party/WebKit/Source/wtf/LeakAnnotations.h
|
| index f330e170ad2ca939361de7de92b6bff8eec52274..2e9017b5005f6adac63cd2c8e4874abf2f0aa6ca 100644
|
| --- a/third_party/WebKit/Source/wtf/LeakAnnotations.h
|
| +++ b/third_party/WebKit/Source/wtf/LeakAnnotations.h
|
| @@ -56,36 +56,36 @@ extern "C" {
|
| void __lsan_disable();
|
| void __lsan_enable();
|
| void __lsan_ignore_object(const void* p);
|
| -} // extern "C"
|
| +} // extern "C"
|
|
|
| class LeakSanitizerDisabler {
|
| - WTF_MAKE_NONCOPYABLE(LeakSanitizerDisabler);
|
| -public:
|
| - LeakSanitizerDisabler()
|
| - {
|
| - __lsan_disable();
|
| - }
|
| + WTF_MAKE_NONCOPYABLE(LeakSanitizerDisabler);
|
|
|
| - ~LeakSanitizerDisabler()
|
| - {
|
| - __lsan_enable();
|
| - }
|
| + public:
|
| + LeakSanitizerDisabler() {
|
| + __lsan_disable();
|
| + }
|
| +
|
| + ~LeakSanitizerDisabler() {
|
| + __lsan_enable();
|
| + }
|
| };
|
|
|
| -#define WTF_ANNOTATE_SCOPED_MEMORY_LEAK \
|
| - WTF::LeakSanitizerDisabler leakSanitizerDisabler; static_cast<void>(0)
|
| +#define WTF_ANNOTATE_SCOPED_MEMORY_LEAK \
|
| + WTF::LeakSanitizerDisabler leakSanitizerDisabler; \
|
| + static_cast<void>(0)
|
|
|
| #define WTF_ANNOTATE_LEAKING_OBJECT_PTR(X) \
|
| - WTF::__lsan_ignore_object(X)
|
| + WTF::__lsan_ignore_object(X)
|
|
|
| -#else // USE(LEAK_SANITIZER)
|
| +#else // USE(LEAK_SANITIZER)
|
|
|
| // If Leak Sanitizer is not being used, the annotations should be no-ops.
|
| #define WTF_ANNOTATE_SCOPED_MEMORY_LEAK
|
| #define WTF_ANNOTATE_LEAKING_OBJECT_PTR(X)
|
|
|
| -#endif // USE(LEAK_SANITIZER)
|
| +#endif // USE(LEAK_SANITIZER)
|
|
|
| -} // namespace WTF
|
| +} // namespace WTF
|
|
|
| -#endif // WTF_LeakAnnotations_h
|
| +#endif // WTF_LeakAnnotations_h
|
|
|