109603 2013-02-12 12:10:46 -0800 [GTK] Errors when building WebKit2 with Clang 2013-02-14 13:41:50 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 109314 1 zan zan ap cgarcia gustavo mrobinson webkit.review.bot oldest_to_newest 831145 0 zan 2013-02-12 12:10:46 -0800 [GTK] Errors when building WebKit2 with Clang 831769 1 188047 zan 2013-02-13 03:06:53 -0800 Created attachment 188047 Patch 831770 2 zan 2013-02-13 03:09:28 -0800 Hi ap -- could you take a look at the patch or point me to another WK2 owner that would be willing to? 831774 3 webkit.review.bot 2013-02-13 03:18:23 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 831839 4 188047 mrobinson 2013-02-13 05:52:06 -0800 Comment on attachment 188047 Patch The GTK+ bits looks good to me. 831985 5 188047 ap 2013-02-13 09:41:14 -0800 Comment on attachment 188047 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188047&action=review > Source/WebKit2/ChangeLog:13 > + * UIProcess/Authentication/WebCredential.h: Include the WebCertificateInfo.h and remove the forward declaration. Clang > + was throwing build errors because of the incomplete type used in a RefPtr member of the WebCredential class, these > + changes fix that. What were the errors? I think that it's generally fine to use an incomplete type in a RefPtr, and obviously, we successfully build this code with clang on Mac. 832223 6 zan 2013-02-13 12:49:20 -0800 In file included from ../../Source/WebKit2/UIProcess/API/gtk/WebKit2GtkAuthenticationDialog.cpp:21: In file included from ../../Source/WebKit2/UIProcess/API/gtk/WebKit2GtkAuthenticationDialog.h:23: In file included from ../../Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h:30: In file included from ./DerivedSources/WebKit2/include/WebCore/AuthenticationChallenge.h:1: In file included from ../../Source/WebCore/platform/network/soup/AuthenticationChallenge.h:28: In file included from ../../Source/WebCore/platform/network/AuthenticationChallengeBase.h:28: In file included from ../../Source/WebCore/platform/network/Credential.h:28: In file included from ../../Source/WTF/wtf/text/WTFString.h:29: In file included from ../../Source/WTF/wtf/text/StringImpl.h:31: In file included from ../../Source/WTF/wtf/Vector.h:31: In file included from ../../Source/WTF/wtf/VectorTraits.h:25: In file included from ../../Source/WTF/wtf/RefPtr.h:28: ../../Source/WTF/wtf/PassRefPtr.h:53:16: error: member access into incomplete type 'WebKit::WebCertificateInfo' ptr->deref(); ^ ../../Source/WTF/wtf/RefPtr.h:56:35: note: in instantiation of function template specialization 'WTF::derefIfNotNull<WebKit::WebCertificateInfo>' requested here ALWAYS_INLINE ~RefPtr() { derefIfNotNull(m_ptr); } ^ ../../Source/WebKit2/UIProcess/Authentication/WebCredential.h:40:7: note: in instantiation of member function 'WTF::RefPtr<WebKit::WebCertificateInfo>::~RefPtr' requested here class WebCredential : public APIObject { ^ ../../Source/WebKit2/UIProcess/Authentication/WebCredential.h:38:7: note: forward declaration of 'WebKit::WebCertificateInfo' class WebCertificateInfo; ^ 1 error generated. Using Clang 3.0 with libstdc++. 832294 7 ap 2013-02-13 13:40:46 -0800 I think that the right fix for that would be to have a non-generated destructor in the class, and to implement it in a .cpp file. 833303 8 188397 zan 2013-02-14 12:09:43 -0800 Created attachment 188397 Patch 833371 9 188397 zan 2013-02-14 13:41:08 -0800 Comment on attachment 188397 Patch Thanks! 833373 10 188397 zan 2013-02-14 13:41:45 -0800 Comment on attachment 188397 Patch Clearing flags on attachment: 188397 Committed r142908: <http://trac.webkit.org/changeset/142908> 833374 11 zan 2013-02-14 13:41:50 -0800 All reviewed patches have been landed. Closing bug. 188047 2013-02-13 03:06:53 -0800 2013-02-14 12:09:30 -0800 Patch bug-109603-20130213120322.patch text/plain 5483 zan SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MjczMikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAyLTEzICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBFcnJvcnMgd2hl biBidWlsZGluZyBXZWJLaXQyIHdpdGggQ2xhbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTYwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VUlDbGllbnQu Y3BwOgorICAgICAgICAoc2V0V2luZG93RnJhbWUpOiBDYXN0IHRoZSBwb3NpdGlvbiBwYXJhbWV0 ZXJzIHRvIHRoZSBpbnRlZ2VyIHR5cGUgd2hlbiBjb25zdHJ1Y3RpbmcgdGhlIEdka1JlY3Rhbmds ZS4KKyAgICAgICAgKiBVSVByb2Nlc3MvQXV0aGVudGljYXRpb24vV2ViQ3JlZGVudGlhbC5jcHA6 IFJlbW92ZSB0aGUgV2ViQ2VydGlmaWNhdGVJbmZvLmggaW5jbHVzaW9uIGFzIGl0IHdhcyBtb3Zl ZCB0byB0aGUgaGVhZGVyLgorICAgICAgICAqIFVJUHJvY2Vzcy9BdXRoZW50aWNhdGlvbi9XZWJD cmVkZW50aWFsLmg6IEluY2x1ZGUgdGhlIFdlYkNlcnRpZmljYXRlSW5mby5oIGFuZCByZW1vdmUg dGhlIGZvcndhcmQgZGVjbGFyYXRpb24uIENsYW5nCisgICAgICAgIHdhcyB0aHJvd2luZyBidWls ZCBlcnJvcnMgYmVjYXVzZSBvZiB0aGUgaW5jb21wbGV0ZSB0eXBlIHVzZWQgaW4gYSBSZWZQdHIg bWVtYmVyIG9mIHRoZSBXZWJDcmVkZW50aWFsIGNsYXNzLCB0aGVzZQorICAgICAgICBjaGFuZ2Vz IGZpeCB0aGF0LgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9y Q2xpZW50Lmg6IFRoZSBHVEstc3BlY2lmaWMgbWV0aG9kcyBhcmUgbm90IHZpcnR1YWwgYW5kIGFz IHN1Y2ggY2Fubm90IGJlIG92ZXJyaWRlbi4KKyAgICAgICAgVGhlIE9WRVJSSURFIGtleXdvcmRz IGFyZSB0aHVzIHVubmVjZXNzYXJ5LgorCiAyMDEzLTAyLTEyICBBZGVuaWxzb24gQ2F2YWxjYW50 aSAgPGNhdmFsY2FudGlpQGdtYWlsLmNvbT4KIAogICAgICAgICBbV0syXSBQYWdlIHJlbG9hZGlu ZyB3aWxsIGNyYXNoIFVJUHJvY2VzcyBhZnRlciBXZWJQcm9jZXNzIHdhcyBraWxsZWQKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVJQ2xpZW50LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVSUNsaWVu dC5jcHAJKHJldmlzaW9uIDE0MjczMikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdFVJQ2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI2LDcgKzEyNiw4IEBA IHN0YXRpYyBXS1JlY3QgZ2V0V2luZG93RnJhbWUoV0tQYWdlUmVmIHAKIHN0YXRpYyB2b2lkIHNl dFdpbmRvd0ZyYW1lKFdLUGFnZVJlZiBwYWdlLCBXS1JlY3QgZnJhbWUsIGNvbnN0IHZvaWQqIGNs aWVudEluZm8pCiB7CiAgICAgV2ViS2l0V2luZG93UHJvcGVydGllcyogd2luZG93UHJvcGVydGll cyA9IHdlYmtpdF93ZWJfdmlld19nZXRfd2luZG93X3Byb3BlcnRpZXMoV0VCS0lUX1dFQl9WSUVX KGNsaWVudEluZm8pKTsKLSAgICBHZGtSZWN0YW5nbGUgZ2VvbWV0cnkgPSB7IGZyYW1lLm9yaWdp bi54LCBmcmFtZS5vcmlnaW4ueSwgZnJhbWUuc2l6ZS53aWR0aCwgZnJhbWUuc2l6ZS5oZWlnaHQg fTsKKyAgICBHZGtSZWN0YW5nbGUgZ2VvbWV0cnkgPSB7IHN0YXRpY19jYXN0PGludD4oZnJhbWUu b3JpZ2luLngpLCBzdGF0aWNfY2FzdDxpbnQ+KGZyYW1lLm9yaWdpbi55KSwKKyAgICAgICAgc3Rh dGljX2Nhc3Q8aW50PihmcmFtZS5zaXplLndpZHRoKSwgc3RhdGljX2Nhc3Q8aW50PihmcmFtZS5z aXplLmhlaWdodCkgfTsKICAgICB3ZWJraXRXaW5kb3dQcm9wZXJ0aWVzU2V0R2VvbWV0cnkod2lu ZG93UHJvcGVydGllcywgJmdlb21ldHJ5KTsKIH0KIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0F1dGhlbnRpY2F0aW9uL1dlYkNyZWRlbnRpYWwuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BdXRoZW50aWNhdGlvbi9XZWJDcmVkZW50aWFsLmNwcAko cmV2aXNpb24gMTQyNzMyKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0F1dGhlbnRpY2F0 aW9uL1dlYkNyZWRlbnRpYWwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw4ICsyNiw2IEBACiAj aW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiV2ViQ3JlZGVudGlhbC5oIgogCi0jaW5jbHVk ZSAiV2ViQ2VydGlmaWNhdGVJbmZvLmgiCi0KIG5hbWVzcGFjZSBXZWJLaXQgewogCiBXZWJDcmVk ZW50aWFsOjpXZWJDcmVkZW50aWFsKGNvbnN0IFdlYkNvcmU6OkNyZWRlbnRpYWwmIGNyZWRlbnRp YWwpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0aGVudGljYXRpb24vV2ViQ3Jl ZGVudGlhbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BdXRoZW50 aWNhdGlvbi9XZWJDcmVkZW50aWFsLmgJKHJldmlzaW9uIDE0MjczMikKKysrIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BdXRoZW50aWNhdGlvbi9XZWJDcmVkZW50aWFsLmgJKHdvcmtpbmcgY29w eSkKQEAgLTI3LDYgKzI3LDcgQEAKICNkZWZpbmUgV2ViQ3JlZGVudGlhbF9oCiAKICNpbmNsdWRl ICJBUElPYmplY3QuaCIKKyNpbmNsdWRlICJXZWJDZXJ0aWZpY2F0ZUluZm8uaCIKICNpbmNsdWRl ICJXZWJTdHJpbmcuaCIKIAogI2luY2x1ZGUgPFdlYkNvcmUvQ3JlZGVudGlhbC5oPgpAQCAtMzUs OCArMzYsNiBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotY2xhc3MgV2ViQ2VydGlmaWNhdGVJ bmZvOwotCiBjbGFzcyBXZWJDcmVkZW50aWFsIDogcHVibGljIEFQSU9iamVjdCB7CiBwdWJsaWM6 CiAgICAgc3RhdGljIGNvbnN0IFR5cGUgQVBJVHlwZSA9IFR5cGVDcmVkZW50aWFsOwpJbmRleDog U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkVkaXRvckNsaWVudC5oCShyZXZpc2lvbiAxNDI3MzIpCisrKyBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5oCSh3b3JraW5nIGNvcHkp CkBAIC0xMjcsOCArMTI3LDggQEAgcHJpdmF0ZToKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oR1RL KQotICAgIGJvb2wgZXhlY3V0ZVBlbmRpbmdFZGl0b3JDb21tYW5kcyhXZWJDb3JlOjpGcmFtZSos IFZlY3RvcjxXVEY6OlN0cmluZz4sIGJvb2wpIE9WRVJSSURFOwotICAgIHZvaWQgZ2V0RWRpdG9y Q29tbWFuZHNGb3JLZXlFdmVudChjb25zdCBXZWJDb3JlOjpLZXlib2FyZEV2ZW50KiwgVmVjdG9y PFdURjo6U3RyaW5nPiYpIE9WRVJSSURFOworICAgIGJvb2wgZXhlY3V0ZVBlbmRpbmdFZGl0b3JD b21tYW5kcyhXZWJDb3JlOjpGcmFtZSosIFZlY3RvcjxXVEY6OlN0cmluZz4sIGJvb2wpOworICAg IHZvaWQgZ2V0RWRpdG9yQ29tbWFuZHNGb3JLZXlFdmVudChjb25zdCBXZWJDb3JlOjpLZXlib2Fy ZEV2ZW50KiwgVmVjdG9yPFdURjo6U3RyaW5nPiYpOwogI2VuZGlmCiAjaWYgUExBVEZPUk0oR1RL KSB8fCBQTEFURk9STShRVCkKICAgICB2b2lkIHVwZGF0ZUdsb2JhbFNlbGVjdGlvbihXZWJDb3Jl OjpGcmFtZSopOwpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0No YW5nZUxvZwkocmV2aXNpb24gMTQyNzMyKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTMtMDItMTMgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNl a0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEVycm9ycyB3aGVuIGJ1aWxkaW5nIFdlYktp dDIgd2l0aCBDbGFuZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTA5NjAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL2d0ay9QbGF0Zm9ybVdlYlZpZXdHdGsuY3BwOgorICAg ICAgICAoV1RSOjpQbGF0Zm9ybVdlYlZpZXc6OnJlc2l6ZVRvKTogQ2FzdCB0aGUgd2lkdGggYW5k IGhlaWdodCBwYXJhbWV0ZXJzIHRvIHRoZSBpbnRlZ2VyCisgICAgICAgIHR5cGUgd2hlbiBjb25z dHJ1Y3RpbmcgdGhlIEd0a0FsbG9jYXRpb24uCisKIDIwMTMtMDItMTIgIEFkZW5pbHNvbiBDYXZh bGNhbnRpICA8Y2F2YWxjYW50aWlAZ21haWwuY29tPgogCiAgICAgICAgIFtXSzJdIFBhZ2UgcmVs b2FkaW5nIHdpbGwgY3Jhc2ggVUlQcm9jZXNzIGFmdGVyIFdlYlByb2Nlc3Mgd2FzIGtpbGxlZApJ bmRleDogVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9ndGsvUGxhdGZvcm1XZWJWaWV3R3RrLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9XZWJLaXRUZXN0UnVubmVyL2d0ay9QbGF0Zm9ybVdlYlZpZXdH dGsuY3BwCShyZXZpc2lvbiAxNDI3MzIpCisrKyBUb29scy9XZWJLaXRUZXN0UnVubmVyL2d0ay9Q bGF0Zm9ybVdlYlZpZXdHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Nyw3ICs1Nyw3IEBAIFBs YXRmb3JtV2ViVmlldzo6flBsYXRmb3JtV2ViVmlldygpCiAKIHZvaWQgUGxhdGZvcm1XZWJWaWV3 OjpyZXNpemVUbyh1bnNpZ25lZCB3aWR0aCwgdW5zaWduZWQgaGVpZ2h0KQogewotICAgIEd0a0Fs bG9jYXRpb24gc2l6ZSA9IHsgMCwgMCwgd2lkdGgsIGhlaWdodCB9OworICAgIEd0a0FsbG9jYXRp b24gc2l6ZSA9IHsgMCwgMCwgc3RhdGljX2Nhc3Q8aW50Pih3aWR0aCksIHN0YXRpY19jYXN0PGlu dD4oaGVpZ2h0KSB9OwogICAgIGd0a193aWRnZXRfc2l6ZV9hbGxvY2F0ZShtX3dpbmRvdywgJnNp emUpOwogICAgIGd0a193aW5kb3dfcmVzaXplKEdUS19XSU5ET1cobV93aW5kb3cpLCB3aWR0aCwg aGVpZ2h0KTsKIAo= 188397 2013-02-14 12:09:43 -0800 2013-02-14 13:41:45 -0800 Patch bug-109603-20130214210611.patch text/plain 5293 zan SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0Mjg5NykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEzLTAyLTE0ICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBFcnJvcnMgd2hl biBidWlsZGluZyBXZWJLaXQyIHdpdGggQ2xhbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTYwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VUlDbGllbnQu Y3BwOgorICAgICAgICAoc2V0V2luZG93RnJhbWUpOiBDYXN0IHRoZSBwb3NpdGlvbiBwYXJhbWV0 ZXJzIHRvIHRoZSBpbnRlZ2VyIHR5cGUgd2hlbiBjb25zdHJ1Y3RpbmcgdGhlIEdka1JlY3Rhbmds ZS4KKyAgICAgICAgKiBVSVByb2Nlc3MvQXV0aGVudGljYXRpb24vV2ViQ3JlZGVudGlhbC5jcHA6 IEFkZCBhbiBlbXB0eSBpbXBsZW1lbnRhdGlvbiBvZiB0aGUgbmV3bHkgc3BlY2lmaWVkIGRlc3Ry dWN0b3IuCisgICAgICAgICogVUlQcm9jZXNzL0F1dGhlbnRpY2F0aW9uL1dlYkNyZWRlbnRpYWwu aDogV29yayBhcm91bmQgdGhlIGluY29tcGxldGUgV2ViQ2VydGlmaWNhdGVJbmZvIHR5cGUgZXJy b3JzIHRocm93biBpbiB0aGUgaW5saW5lCisgICAgICAgIFJlZlB0ciBkZXN0cnVjdG9yIG9mIHRo ZSBtX2NlcnRpZmljYXRlSW5mbyBjbGFzcyBtZW1iZXIgYnkgZGVmaW5pbmcgYSBkZXN0cnVjdG9y IGluIHRoZSBjbGFzcy4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkVk aXRvckNsaWVudC5oOiBUaGUgR1RLLXNwZWNpZmljIG1ldGhvZHMgYXJlIG5vdCB2aXJ0dWFsIGFu ZCBhcyBzdWNoIGNhbm5vdCBiZSBvdmVycmlkZW4uCisgICAgICAgIFRoZSBPVkVSUklERSBrZXl3 b3JkcyBhcmUgdGh1cyB1bm5lY2Vzc2FyeS4KKwogMjAxMy0wMi0xMyAgQW5kZXJzIENhcmxzc29u ICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBTdHJpbmdQYWlyVmVjdG9y CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVSUNsaWVudC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 VUlDbGllbnQuY3BwCShyZXZpc2lvbiAxNDI4OTcpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9XZWJLaXRVSUNsaWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyNiw3ICsx MjYsOCBAQCBzdGF0aWMgV0tSZWN0IGdldFdpbmRvd0ZyYW1lKFdLUGFnZVJlZiBwCiBzdGF0aWMg dm9pZCBzZXRXaW5kb3dGcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tSZWN0IGZyYW1lLCBjb25zdCB2 b2lkKiBjbGllbnRJbmZvKQogewogICAgIFdlYktpdFdpbmRvd1Byb3BlcnRpZXMqIHdpbmRvd1By b3BlcnRpZXMgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3dpbmRvd19wcm9wZXJ0aWVzKFdFQktJVF9X RUJfVklFVyhjbGllbnRJbmZvKSk7Ci0gICAgR2RrUmVjdGFuZ2xlIGdlb21ldHJ5ID0geyBmcmFt ZS5vcmlnaW4ueCwgZnJhbWUub3JpZ2luLnksIGZyYW1lLnNpemUud2lkdGgsIGZyYW1lLnNpemUu aGVpZ2h0IH07CisgICAgR2RrUmVjdGFuZ2xlIGdlb21ldHJ5ID0geyBzdGF0aWNfY2FzdDxpbnQ+ KGZyYW1lLm9yaWdpbi54KSwgc3RhdGljX2Nhc3Q8aW50PihmcmFtZS5vcmlnaW4ueSksCisgICAg ICAgIHN0YXRpY19jYXN0PGludD4oZnJhbWUuc2l6ZS53aWR0aCksIHN0YXRpY19jYXN0PGludD4o ZnJhbWUuc2l6ZS5oZWlnaHQpIH07CiAgICAgd2Via2l0V2luZG93UHJvcGVydGllc1NldEdlb21l dHJ5KHdpbmRvd1Byb3BlcnRpZXMsICZnZW9tZXRyeSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BdXRoZW50aWNhdGlvbi9XZWJDcmVkZW50aWFsLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0aGVudGljYXRpb24vV2ViQ3JlZGVudGlh bC5jcHAJKHJldmlzaW9uIDE0Mjg5NykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BdXRo ZW50aWNhdGlvbi9XZWJDcmVkZW50aWFsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDAsNiArNDAs MTAgQEAgV2ViQ3JlZGVudGlhbDo6V2ViQ3JlZGVudGlhbChXZWJDZXJ0aWZpYwogewogfQogCitX ZWJDcmVkZW50aWFsOjp+V2ViQ3JlZGVudGlhbCgpCit7Cit9CisKIFdlYkNlcnRpZmljYXRlSW5m byogV2ViQ3JlZGVudGlhbDo6Y2VydGlmaWNhdGVJbmZvKCkKIHsKICAgICByZXR1cm4gbV9jZXJ0 aWZpY2F0ZUluZm8uZ2V0KCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0aGVu dGljYXRpb24vV2ViQ3JlZGVudGlhbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BdXRoZW50aWNhdGlvbi9XZWJDcmVkZW50aWFsLmgJKHJldmlzaW9uIDE0Mjg5NykK KysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BdXRoZW50aWNhdGlvbi9XZWJDcmVkZW50aWFs LmgJKHdvcmtpbmcgY29weSkKQEAgLTM5LDYgKzM5LDggQEAgY2xhc3MgV2ViQ2VydGlmaWNhdGVJ bmZvOwogCiBjbGFzcyBXZWJDcmVkZW50aWFsIDogcHVibGljIEFQSU9iamVjdCB7CiBwdWJsaWM6 CisgICAgfldlYkNyZWRlbnRpYWwoKTsKKwogICAgIHN0YXRpYyBjb25zdCBUeXBlIEFQSVR5cGUg PSBUeXBlQ3JlZGVudGlhbDsKIAogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYkNyZWRlbnRpYWw+ IGNyZWF0ZShjb25zdCBXZWJDb3JlOjpDcmVkZW50aWFsJiBjcmVkZW50aWFsKQpJbmRleDogU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkVkaXRvckNsaWVudC5oCShyZXZpc2lvbiAxNDI4OTcpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBA IC0xMjcsOCArMTI3LDggQEAgcHJpdmF0ZToKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oR1RLKQot ICAgIGJvb2wgZXhlY3V0ZVBlbmRpbmdFZGl0b3JDb21tYW5kcyhXZWJDb3JlOjpGcmFtZSosIFZl Y3RvcjxXVEY6OlN0cmluZz4sIGJvb2wpIE9WRVJSSURFOwotICAgIHZvaWQgZ2V0RWRpdG9yQ29t bWFuZHNGb3JLZXlFdmVudChjb25zdCBXZWJDb3JlOjpLZXlib2FyZEV2ZW50KiwgVmVjdG9yPFdU Rjo6U3RyaW5nPiYpIE9WRVJSSURFOworICAgIGJvb2wgZXhlY3V0ZVBlbmRpbmdFZGl0b3JDb21t YW5kcyhXZWJDb3JlOjpGcmFtZSosIFZlY3RvcjxXVEY6OlN0cmluZz4sIGJvb2wpOworICAgIHZv aWQgZ2V0RWRpdG9yQ29tbWFuZHNGb3JLZXlFdmVudChjb25zdCBXZWJDb3JlOjpLZXlib2FyZEV2 ZW50KiwgVmVjdG9yPFdURjo6U3RyaW5nPiYpOwogI2VuZGlmCiAjaWYgUExBVEZPUk0oR1RLKSB8 fCBQTEFURk9STShRVCkKICAgICB2b2lkIHVwZGF0ZUdsb2JhbFNlbGVjdGlvbihXZWJDb3JlOjpG cmFtZSopOwpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5n ZUxvZwkocmV2aXNpb24gMTQyODk3KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMTQgQEAKKzIwMTMtMDItMTQgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0Bp Z2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEVycm9ycyB3aGVuIGJ1aWxkaW5nIFdlYktpdDIg d2l0aCBDbGFuZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTA5NjAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBXZWJLaXRUZXN0UnVubmVyL2d0ay9QbGF0Zm9ybVdlYlZpZXdHdGsuY3BwOgorICAgICAg ICAoV1RSOjpQbGF0Zm9ybVdlYlZpZXc6OnJlc2l6ZVRvKTogQ2FzdCB0aGUgd2lkdGggYW5kIGhl aWdodCBwYXJhbWV0ZXJzIHRvIHRoZSBpbnRlZ2VyCisgICAgICAgIHR5cGUgd2hlbiBjb25zdHJ1 Y3RpbmcgdGhlIEd0a0FsbG9jYXRpb24uCisKIDIwMTMtMDItMTQgIFJvZ2VyIEZvbmcgIDxyb2dl cl9mb25nQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgZW9sLXN0eWxlPW5hdGl2ZSB0byBzb2x1 dGlvbiBmaWxlcy4gQWRkIGEgbmV3IHNvbHV0aW9uIGZpbGUuCkluZGV4OiBUb29scy9XZWJLaXRU ZXN0UnVubmVyL2d0ay9QbGF0Zm9ybVdlYlZpZXdHdGsuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1dlYktpdFRlc3RSdW5uZXIvZ3RrL1BsYXRmb3JtV2ViVmlld0d0ay5jcHAJKHJldmlzaW9uIDE0 Mjg5NykKKysrIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvZ3RrL1BsYXRmb3JtV2ViVmlld0d0ay5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTU3LDcgKzU3LDcgQEAgUGxhdGZvcm1XZWJWaWV3Ojp+UGxh dGZvcm1XZWJWaWV3KCkKIAogdm9pZCBQbGF0Zm9ybVdlYlZpZXc6OnJlc2l6ZVRvKHVuc2lnbmVk IHdpZHRoLCB1bnNpZ25lZCBoZWlnaHQpCiB7Ci0gICAgR3RrQWxsb2NhdGlvbiBzaXplID0geyAw LCAwLCB3aWR0aCwgaGVpZ2h0IH07CisgICAgR3RrQWxsb2NhdGlvbiBzaXplID0geyAwLCAwLCBz dGF0aWNfY2FzdDxpbnQ+KHdpZHRoKSwgc3RhdGljX2Nhc3Q8aW50PihoZWlnaHQpIH07CiAgICAg Z3RrX3dpZGdldF9zaXplX2FsbG9jYXRlKG1fd2luZG93LCAmc2l6ZSk7CiAgICAgZ3RrX3dpbmRv d19yZXNpemUoR1RLX1dJTkRPVyhtX3dpbmRvdyksIHdpZHRoLCBoZWlnaHQpOwogCg==