111579 2013-03-06 07:36:17 -0800 Fix GCC with C++11 build 2013-04-05 09:11:38 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 allan.jensen allan.jensen andersca ap esprehn+autocc japhet macpherson menard ojan.autocc rakuco webkit.review.bot zan oldest_to_newest 848850 0 allan.jensen 2013-03-06 07:36:17 -0800 WebCore does not currently build with GCC if C++11 is enabled. The issue is caused by private virtual destructors which are meaningless since private destructors are considered deleted and can not be virtual. 848853 1 191747 allan.jensen 2013-03-06 07:38:05 -0800 Created attachment 191747 Patch 848859 2 allan.jensen 2013-03-06 07:43:47 -0800 Well, more specifically while virtual destructors can be private, you can not inherit from the class if they are, which causes compile errors in MemoryInstrumentation. 849492 3 191747 ap 2013-03-06 17:01:33 -0800 Comment on attachment 191747 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=191747&action=review > Source/WebCore/ChangeLog:8 > + Private destructors are considered deleted and can not be virtual. This is surprising. Is that a gcc bug? 849647 4 andersca 2013-03-06 19:33:45 -0800 What version of GCC is this? 849909 5 allan.jensen 2013-03-07 02:36:12 -0800 (In reply to comment #3) > (From update of attachment 191747 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=191747&action=review > > > Source/WebCore/ChangeLog:8 > > + Private destructors are considered deleted and can not be virtual. > > This is surprising. Is that a gcc bug? That statement wasn't precise, see comment #2. I think MSVC has the same issue, but can be disabled as a warning. The following hack in MemoryInstrumentation.h, will probably also be fixed by this patch: #pragma warning(disable: 4624) // Disable warning: destructor could not be generated because a base class destructor is inaccessible. 849916 6 191960 allan.jensen 2013-03-07 02:45:48 -0800 Created attachment 191960 Patch Corrected changelog 849918 7 allan.jensen 2013-03-07 02:48:45 -0800 (In reply to comment #4) > What version of GCC is this? 4.7 850186 8 ap 2013-03-07 09:53:18 -0800 Sorry for not noticing the comment at first. Anyway, deferring to Anders for review. 854186 9 allan.jensen 2013-03-13 04:11:17 -0700 Anders, does this look okay to you? 854596 10 andersca 2013-03-13 13:53:16 -0700 What's the error message again? 855932 11 allan.jensen 2013-03-15 06:17:58 -0700 (In reply to comment #10) > What's the error message again? Here is one example: /src/webkit/Source/WTF/wtf/MemoryInstrumentation.h: In instantiation of 'struct WTF::MemoryInstrumentation::IsInstrumented<WebCore::StyleRuleCSSStyleDeclaration>::Base': /src/webkit/Source/WTF/wtf/MemoryInstrumentation.h:148:41: required by substitution of 'template<class U> static WTF::MemoryInstrumentation::IsInstrumented<Type>::no WTF::MemoryInstrumentation::IsInstrumented::deduce(U*, WTF::MemoryInstrumentation::IsInstrumented<Type>::Helper<void (WTF::MemoryInstrumentation::IsInstrumented<Type>::BaseMixin::*)(WTF::MemoryObjectInfo*)const, (& U:: reportMemoryUsage)>*) [with U = U; Type = WebCore::StyleRuleCSSStyleDeclaration] [with U = WTF::MemoryInstrumentation::IsInstrumented<WebCore::StyleRuleCSSStyleDeclaration>::Base]' /src/webkit/Source/WTF/wtf/MemoryInstrumentation.h:152:76: required from 'const bool WTF::MemoryInstrumentation::IsInstrumented<WebCore::StyleRuleCSSStyleDeclaration>::result' /src/webkit/Source/WTF/wtf/MemoryInstrumentation.h:283:5: required from 'void WTF::reportMemoryUsage(const T*, WTF::MemoryObjectInfo*) [with T = WebCore::StyleRuleCSSStyleDeclaration]' /src/webkit/Source/WTF/wtf/MemoryInstrumentation.h:292:9: required from 'void WTF::MemoryInstrumentation::addObjectImpl(const T*, WTF::MemoryObjectInfo*, WTF::MemberType, const char*) [with T = WebCore::StyleRuleCSSStyleDeclaration]' /src/webkit/Source/WTF/wtf/MemoryInstrumentation.h:316:5: required from 'void WTF::MemoryInstrumentation::addObjectImpl(const WTF::RefPtr<T>*, WTF::MemoryObjectInfo*, WTF::MemberType, const char*) [with T = WebCore::StyleRuleCSSStyleDeclaration]' /src/webkit/Source/WTF/wtf/MemoryInstrumentation.h:186:13: required from 'static void WTF::MemoryInstrumentation::MemberTypeTraits<T>::addObject(WTF::MemoryInstrumentation*, const T&, WTF::MemoryObjectInfo*, const char*, WTF::MemberType) [with T = WTF::RefPtr<WebCore::StyleRuleCSSStyleDeclaration>; WTF::MemoryInstrumentation = WTF::MemoryInstrumentation]' /src/webkit/Source/WTF/wtf/MemoryInstrumentation.h:171:9: required from 'void WTF::MemoryInstrumentation::addObject(const T&, WTF::MemoryObjectInfo*, const char*, WTF::MemberType) [with T = WTF::RefPtr<WebCore::StyleRuleCSSStyleDeclaration>]' /src/webkit/Source/WTF/wtf/MemoryInstrumentation.h:245:13: required from 'void WTF::MemoryClassInfo::addMember(const M&, const char*, WTF::MemberType) [with M = WTF::RefPtr<WebCore::StyleRuleCSSStyleDeclaration>]' /src/webkit/Source/WebCore/css/CSSFontFaceRule.cpp:78:70: required from here /src/webkit/Source/WTF/wtf/MemoryInstrumentation.h:141:16: error: deleted function 'virtual WTF::MemoryInstrumentation::IsInstrumented<WebCore::StyleRuleCSSStyleDeclaration>::Base::~Base()' In file included from /src/webkit/Source/WebCore/css/CSSFontFaceRule.cpp:25:0: /src/webkit/Source/WebCore/css/PropertySetCSSStyleDeclaration.h:105:13: error: overriding non-deleted function 'virtual WebCore::StyleRuleCSSStyleDeclaration::~StyleRuleCSSStyleDeclaration()' In file included from /src/webkit/Source/WebCore/platform/PlatformMemoryInstrumentation.h:34:0, from /src/webkit/Source/WebCore/dom/WebCoreMemoryInstrumentation.h:34, from /src/webkit/Source/WebCore/css/CSSRule.h:26, from /src/webkit/Source/WebCore/css/CSSFontFaceRule.h:25, from /src/webkit/Source/WebCore/css/CSSFontFaceRule.cpp:23: /src/webkit/Source/WTF/wtf/MemoryInstrumentation.h:141:16: note: 'virtual WTF::MemoryInstrumentation::IsInstrumented<WebCore::StyleRuleCSSStyleDeclaration>::Base::~Base()' is implicitly deleted because the default definition would be ill-formed: In file included from /src/webkit/Source/WebCore/css/CSSFontFaceRule.cpp:25:0: /src/webkit/Source/WebCore/css/PropertySetCSSStyleDeclaration.h:105:13: error: 'virtual WebCore::StyleRuleCSSStyleDeclaration::~StyleRuleCSSStyleDeclaration()' is private In file included from /src/webkit/Source/WebCore/platform/PlatformMemoryInstrumentation.h:34:0, from /src/webkit/Source/WebCore/dom/WebCoreMemoryInstrumentation.h:34, from /src/webkit/Source/WebCore/css/CSSRule.h:26, from /src/webkit/Source/WebCore/css/CSSFontFaceRule.h:25, from /src/webkit/Source/WebCore/css/CSSFontFaceRule.cpp:23: /src/webkit/Source/WTF/wtf/MemoryInstrumentation.h:141:16: error: within this context 863636 12 allan.jensen 2013-03-26 07:01:29 -0700 Anders: Any input on the build error? 869797 13 191960 allan.jensen 2013-04-05 09:11:33 -0700 Comment on attachment 191960 Patch Clearing flags on attachment: 191960 Committed r147751: <http://trac.webkit.org/changeset/147751> 869798 14 allan.jensen 2013-04-05 09:11:38 -0700 All reviewed patches have been landed. Closing bug. 191747 2013-03-06 07:38:05 -0800 2013-03-07 02:45:43 -0800 Patch bug-111579-20130306163321.patch text/plain 3887 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0OTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGNjODg3NmRjMThmNWVm ZjExYmM4YWI2YzBmYzIxMDY3YjZiNmIzZC4uY2VlYmI5OWNmZjBmZmZlMDY1ZjBmMzlmNjVkMDkx NTM0ODU0OGYyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAzLTA2ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIEZp eCBHQ0Mgd2l0aCBDKysxMSBidWlsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTExNTc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUHJpdmF0ZSBkZXN0cnVjdG9ycyBhcmUgY29uc2lkZXJlZCBkZWxldGVk IGFuZCBjYW4gbm90IGJlIHZpcnR1YWwuCisKKyAgICAgICAgKiBjc3MvUHJvcGVydHlTZXRDU1NT dHlsZURlY2xhcmF0aW9uLmg6CisgICAgICAgIChTdHlsZVJ1bGVDU1NTdHlsZURlY2xhcmF0aW9u KToKKyAgICAgICAgKiBkb20vU2hhZG93Um9vdC5oOgorICAgICAgICAoU2hhZG93Um9vdCk6Cisg ICAgICAgICogbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmg6CisgICAgICAgIChTdWJyZXNvdXJj ZUxvYWRlcik6CisgICAgICAgICogcGxhdGZvcm0vVGltZXIuaDoKKwogMjAxMy0wMy0wNiAgTWFy amEgSMO2bHR0w6QgIDxtYXJqYUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTihy MTQ0NjE3KTogV3JvbmcgdXNhZ2Ugb2Ygb3ZlcndyaXR0ZW4gdmFyaWFibGUgaW4gdG9ET01XaW5k b3cgKFY4QmluZGluZy5jcHApCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvUHJvcGVy dHlTZXRDU1NTdHlsZURlY2xhcmF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvUHJvcGVydHlT ZXRDU1NTdHlsZURlY2xhcmF0aW9uLmgKaW5kZXggZWE1MjJmZmE0NDhmODQ0NTMyMWU1ZDYwMWUz Y2Q2N2I4NDAwOTE2Mi4uN2Y0OWEzZGMxYzMxMWEzNWJiZDFhN2U2OWM4YTRhNDJlODM4NjZkMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1Byb3BlcnR5U2V0Q1NTU3R5bGVEZWNsYXJh dGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9Qcm9wZXJ0eVNldENTU1N0eWxlRGVjbGFy YXRpb24uaApAQCAtOTAsNiArOTAsNyBAQCBwdWJsaWM6CiAgICAgewogICAgICAgICByZXR1cm4g YWRvcHRSZWYobmV3IFN0eWxlUnVsZUNTU1N0eWxlRGVjbGFyYXRpb24ocHJvcGVydHlTZXQsIHBh cmVudFJ1bGUpKTsKICAgICB9CisgICAgdmlydHVhbCB+U3R5bGVSdWxlQ1NTU3R5bGVEZWNsYXJh dGlvbigpOwogCiAgICAgdm9pZCBjbGVhclBhcmVudFJ1bGUoKSB7IG1fcGFyZW50UnVsZSA9IDA7 IH0KICAgICAKQEAgLTEwMiw3ICsxMDMsNiBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgU3R5 bGVSdWxlQ1NTU3R5bGVEZWNsYXJhdGlvbihTdHlsZVByb3BlcnR5U2V0KiwgQ1NTUnVsZSopOwot ICAgIHZpcnR1YWwgflN0eWxlUnVsZUNTU1N0eWxlRGVjbGFyYXRpb24oKTsKIAogICAgIHZpcnR1 YWwgQ1NTU3R5bGVTaGVldCogcGFyZW50U3R5bGVTaGVldCgpIGNvbnN0IE9WRVJSSURFOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2hhZG93Um9vdC5oIGIvU291cmNlL1dlYkNv cmUvZG9tL1NoYWRvd1Jvb3QuaAppbmRleCBkYmM3MWRjMGE2Y2Q2MjhlMDNlMDk0NTA2MWVkY2E2 NTYzMjA5OTNjLi41NzRlNjM1YzE3YzU4ZDFjNGE2MmVlY2I4MzYyZDNjYmUyYjIzZGNiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2hhZG93Um9vdC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2RvbS9TaGFkb3dSb290LmgKQEAgLTU3LDYgKzU3LDggQEAgcHVibGljOgogICAgICAgICBy ZXR1cm4gYWRvcHRSZWYobmV3IFNoYWRvd1Jvb3QoZG9jdW1lbnQsIHR5cGUpKTsKICAgICB9CiAK KyAgICB2aXJ0dWFsIH5TaGFkb3dSb290KCk7CisKICAgICB2b2lkIHJlY2FsY1N0eWxlKFN0eWxl Q2hhbmdlKTsKIAogICAgIHZpcnR1YWwgYm9vbCBhcHBseUF1dGhvclN0eWxlcygpIGNvbnN0IE9W RVJSSURFIHsgcmV0dXJuIG1fYXBwbHlBdXRob3JTdHlsZXM7IH0KQEAgLTk4LDcgKzEwMCw2IEBA IHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBTaGFkb3dSb290KERvY3VtZW50KiwgU2hhZG93Um9v dFR5cGUpOwotICAgIHZpcnR1YWwgflNoYWRvd1Jvb3QoKTsKIAogICAgIHZpcnR1YWwgdm9pZCBk aXNwb3NlKCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBib29sIGNoaWxkVHlwZUFsbG93ZWQoTm9k ZVR5cGUpIGNvbnN0IE9WRVJSSURFOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L1N1YnJlc291cmNlTG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VM b2FkZXIuaAppbmRleCBhMDYwMGVkYTI0ZmRmNGQ1NDAzZWM2ZmM4YzcxYzkxNTFlOGM5NTRhLi41 OTBhN2RkNTc5YjM3Mzc5NzJhNDY3MDk5NGIzOTRjNDczY2E4MTQwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuaApAQCAtNDUsNiArNDUsOCBAQCBjbGFzcyBTdWJy ZXNvdXJjZUxvYWRlciA6IHB1YmxpYyBSZXNvdXJjZUxvYWRlciB7CiBwdWJsaWM6CiAgICAgc3Rh dGljIFBhc3NSZWZQdHI8U3VicmVzb3VyY2VMb2FkZXI+IGNyZWF0ZShGcmFtZSosIENhY2hlZFJl c291cmNlKiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgUmVzb3VyY2VMb2FkZXJPcHRp b25zJik7CiAKKyAgICB2aXJ0dWFsIH5TdWJyZXNvdXJjZUxvYWRlcigpOworCiAgICAgdm9pZCBj YW5jZWxJZk5vdEZpbmlzaGluZygpOwogICAgIHZpcnR1YWwgYm9vbCBpc1N1YnJlc291cmNlTG9h ZGVyKCk7CiAgICAgQ2FjaGVkUmVzb3VyY2UqIGNhY2hlZFJlc291cmNlKCk7CkBAIC01Myw3ICs1 NSw2IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBTdWJyZXNvdXJjZUxvYWRlcihGcmFtZSos IENhY2hlZFJlc291cmNlKiwgY29uc3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zJik7Ci0gICAgdmly dHVhbCB+U3VicmVzb3VyY2VMb2FkZXIoKTsKIAogICAgIHZpcnR1YWwgYm9vbCBpbml0KGNvbnN0 IFJlc291cmNlUmVxdWVzdCYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9UaW1lci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVGltZXIuaAppbmRleCBhZDQ3MzEx ZmE4YzNjZTA4YTlhZDMwMDJiMzM1YTRkODJmYzZlMDM3Li5hYWUxNWFmOGZiY2RhYTEzNTZkODI4 NWM1ZDFlMDQ1OTM3YzZjMTIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9U aW1lci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1RpbWVyLmgKQEAgLTEyMiw3ICsx MjIsNyBAQCBpbmxpbmUgYm9vbCBUaW1lckJhc2U6OmlzQWN0aXZlKCkgY29uc3QKICAgICByZXR1 cm4gbV9uZXh0RmlyZVRpbWU7CiB9CiAKLXRlbXBsYXRlIDx0eXBlbmFtZSBUaW1lckZpcmVkQ2xh c3M+IGNsYXNzIERlZmVycmFibGVPbmVTaG90VGltZXIgOiBwcml2YXRlIFRpbWVyQmFzZSB7Cit0 ZW1wbGF0ZSA8dHlwZW5hbWUgVGltZXJGaXJlZENsYXNzPiBjbGFzcyBEZWZlcnJhYmxlT25lU2hv dFRpbWVyIDogcHJvdGVjdGVkIFRpbWVyQmFzZSB7CiBwdWJsaWM6CiAgICAgdHlwZWRlZiB2b2lk IChUaW1lckZpcmVkQ2xhc3M6OipUaW1lckZpcmVkRnVuY3Rpb24pKERlZmVycmFibGVPbmVTaG90 VGltZXIqKTsKIAo= 191960 2013-03-07 02:45:48 -0800 2013-04-05 09:11:33 -0700 Patch bug-111579-20130307114102.patch text/plain 3892 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MDU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDIwYmFjODEyYmVkMjNj NzE3MzJhZjZlMTVjMWFkZWM2ZDA3NDlkNy4uNzMxMDEwZDNiZDNjZWFjMTUyYWUwYTQzMWI4ZDJh NjAyZjc4MzYzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAzLTA3ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIEZp eCBHQ0Mgd2l0aCBDKysxMSBidWlsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTExNTc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgSWYgdGhlIGRlc3RydWN0b3IgaXMgcHJpdmF0ZSwgTWVtb3J5SW5zdHJ1 bWVudGF0aW9uIGNhbiBub3QgY3JlYXRlIGFuIGluaGVyaXRlZCBjbGFzcy4KKworICAgICAgICAq IGNzcy9Qcm9wZXJ0eVNldENTU1N0eWxlRGVjbGFyYXRpb24uaDoKKyAgICAgICAgKFN0eWxlUnVs ZUNTU1N0eWxlRGVjbGFyYXRpb24pOgorICAgICAgICAqIGRvbS9TaGFkb3dSb290Lmg6CisgICAg ICAgIChTaGFkb3dSb290KToKKyAgICAgICAgKiBsb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuaDoK KyAgICAgICAgKFN1YnJlc291cmNlTG9hZGVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9UaW1lci5o OgorCiAyMDEzLTAzLTA3ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAg ICAgICAgV2ViIEluc3BlY3RvcjogaWRlbnRpZnkgbGF5ZXJzIGZvciBDU1MgZ2VuZXJhdGVkIGNv bnRlbnQgaW4gTGF5ZXJUcmVlQWdlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Q cm9wZXJ0eVNldENTU1N0eWxlRGVjbGFyYXRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9Qcm9w ZXJ0eVNldENTU1N0eWxlRGVjbGFyYXRpb24uaAppbmRleCBlYTUyMmZmYTQ0OGY4NDQ1MzIxZTVk NjAxZTNjZDY3Yjg0MDA5MTYyLi43ZjQ5YTNkYzFjMzExYTM1YmJkMWE3ZTY5YzhhNGE0MmU4Mzg2 NmQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvUHJvcGVydHlTZXRDU1NTdHlsZURl Y2xhcmF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1Byb3BlcnR5U2V0Q1NTU3R5bGVE ZWNsYXJhdGlvbi5oCkBAIC05MCw2ICs5MCw3IEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIHJl dHVybiBhZG9wdFJlZihuZXcgU3R5bGVSdWxlQ1NTU3R5bGVEZWNsYXJhdGlvbihwcm9wZXJ0eVNl dCwgcGFyZW50UnVsZSkpOwogICAgIH0KKyAgICB2aXJ0dWFsIH5TdHlsZVJ1bGVDU1NTdHlsZURl Y2xhcmF0aW9uKCk7CiAKICAgICB2b2lkIGNsZWFyUGFyZW50UnVsZSgpIHsgbV9wYXJlbnRSdWxl ID0gMDsgfQogICAgIApAQCAtMTAyLDcgKzEwMyw2IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAg ICBTdHlsZVJ1bGVDU1NTdHlsZURlY2xhcmF0aW9uKFN0eWxlUHJvcGVydHlTZXQqLCBDU1NSdWxl Kik7Ci0gICAgdmlydHVhbCB+U3R5bGVSdWxlQ1NTU3R5bGVEZWNsYXJhdGlvbigpOwogCiAgICAg dmlydHVhbCBDU1NTdHlsZVNoZWV0KiBwYXJlbnRTdHlsZVNoZWV0KCkgY29uc3QgT1ZFUlJJREU7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TaGFkb3dSb290LmggYi9Tb3VyY2Uv V2ViQ29yZS9kb20vU2hhZG93Um9vdC5oCmluZGV4IGRiYzcxZGMwYTZjZDYyOGUwM2UwOTQ1MDYx ZWRjYTY1NjMyMDk5M2MuLjU3NGU2MzVjMTdjNThkMWM0YTYyZWVjYjgzNjJkM2NiZTJiMjNkY2Ig MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TaGFkb3dSb290LmgKKysrIGIvU291cmNl L1dlYkNvcmUvZG9tL1NoYWRvd1Jvb3QuaApAQCAtNTcsNiArNTcsOCBAQCBwdWJsaWM6CiAgICAg ICAgIHJldHVybiBhZG9wdFJlZihuZXcgU2hhZG93Um9vdChkb2N1bWVudCwgdHlwZSkpOwogICAg IH0KIAorICAgIHZpcnR1YWwgflNoYWRvd1Jvb3QoKTsKKwogICAgIHZvaWQgcmVjYWxjU3R5bGUo U3R5bGVDaGFuZ2UpOwogCiAgICAgdmlydHVhbCBib29sIGFwcGx5QXV0aG9yU3R5bGVzKCkgY29u c3QgT1ZFUlJJREUgeyByZXR1cm4gbV9hcHBseUF1dGhvclN0eWxlczsgfQpAQCAtOTgsNyArMTAw LDYgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIFNoYWRvd1Jvb3QoRG9jdW1lbnQqLCBTaGFk b3dSb290VHlwZSk7Ci0gICAgdmlydHVhbCB+U2hhZG93Um9vdCgpOwogCiAgICAgdmlydHVhbCB2 b2lkIGRpc3Bvc2UoKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIGJvb2wgY2hpbGRUeXBlQWxsb3dl ZChOb2RlVHlwZSkgY29uc3QgT1ZFUlJJREU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNv dXJjZUxvYWRlci5oCmluZGV4IGEwNjAwZWRhMjRmZGY0ZDU0MDNlYzZmYzhjNzFjOTE1MWU4Yzk1 NGEuLjU5MGE3ZGQ1NzliMzczNzk3MmE0NjcwOTk0YjM5NGM0NzNjYTgxNDAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5oCkBAIC00NSw2ICs0NSw4IEBAIGNsYXNz IFN1YnJlc291cmNlTG9hZGVyIDogcHVibGljIFJlc291cmNlTG9hZGVyIHsKIHB1YmxpYzoKICAg ICBzdGF0aWMgUGFzc1JlZlB0cjxTdWJyZXNvdXJjZUxvYWRlcj4gY3JlYXRlKEZyYW1lKiwgQ2Fj aGVkUmVzb3VyY2UqLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBSZXNvdXJjZUxvYWRl ck9wdGlvbnMmKTsKIAorICAgIHZpcnR1YWwgflN1YnJlc291cmNlTG9hZGVyKCk7CisKICAgICB2 b2lkIGNhbmNlbElmTm90RmluaXNoaW5nKCk7CiAgICAgdmlydHVhbCBib29sIGlzU3VicmVzb3Vy Y2VMb2FkZXIoKTsKICAgICBDYWNoZWRSZXNvdXJjZSogY2FjaGVkUmVzb3VyY2UoKTsKQEAgLTUz LDcgKzU1LDYgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIFN1YnJlc291cmNlTG9hZGVyKEZy YW1lKiwgQ2FjaGVkUmVzb3VyY2UqLCBjb25zdCBSZXNvdXJjZUxvYWRlck9wdGlvbnMmKTsKLSAg ICB2aXJ0dWFsIH5TdWJyZXNvdXJjZUxvYWRlcigpOwogCiAgICAgdmlydHVhbCBib29sIGluaXQo Y29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1RpbWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9UaW1lci5oCmluZGV4IGFk NDczMTFmYThjM2NlMDhhOWFkMzAwMmIzMzVhNGQ4MmZjNmUwMzcuLmFhZTE1YWY4ZmJjZGFhMTM1 NmQ4Mjg1YzVkMWUwNDU5MzdjNmMxMjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL1RpbWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVGltZXIuaApAQCAtMTIy LDcgKzEyMiw3IEBAIGlubGluZSBib29sIFRpbWVyQmFzZTo6aXNBY3RpdmUoKSBjb25zdAogICAg IHJldHVybiBtX25leHRGaXJlVGltZTsKIH0KIAotdGVtcGxhdGUgPHR5cGVuYW1lIFRpbWVyRmly ZWRDbGFzcz4gY2xhc3MgRGVmZXJyYWJsZU9uZVNob3RUaW1lciA6IHByaXZhdGUgVGltZXJCYXNl IHsKK3RlbXBsYXRlIDx0eXBlbmFtZSBUaW1lckZpcmVkQ2xhc3M+IGNsYXNzIERlZmVycmFibGVP bmVTaG90VGltZXIgOiBwcm90ZWN0ZWQgVGltZXJCYXNlIHsKIHB1YmxpYzoKICAgICB0eXBlZGVm IHZvaWQgKFRpbWVyRmlyZWRDbGFzczo6KlRpbWVyRmlyZWRGdW5jdGlvbikoRGVmZXJyYWJsZU9u ZVNob3RUaW1lciopOwogCg==