42632 2010-07-20 05:54:57 -0700 Following change @62542, webkit doesn't compile when the inspector is disabled 2010-07-20 10:36:00 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 leonclarke webkit-unassigned android-webkit-unforking commit-queue pfeldman yurys oldest_to_newest 253673 0 leonclarke 2010-07-20 05:54:57 -0700 ...and Android currently doesn't use the inspector. 253675 1 62059 leonclarke 2010-07-20 05:58:04 -0700 Created attachment 62059 Proposed fix 253683 2 pfeldman 2010-07-20 06:17:35 -0700 Hm. Can we hide InspectorDOMAgent instead? 253686 3 leonclarke 2010-07-20 06:27:32 -0700 At first glance,it looks like that will be a more complex change, however it may well be philosophically tidier. I'll investigate a bit more... 253707 4 62072 leonclarke 2010-07-20 07:04:11 -0700 Created attachment 62072 Removing whole InspectorDOMAgent That looks like a good idea, removing the whole InspectorDOMAgent 253740 5 leonclarke 2010-07-20 08:26:41 -0700 That patch was missing a file. Hang on... 253743 6 62080 leonclarke 2010-07-20 08:38:29 -0700 Created attachment 62080 And again with all the files 253808 7 62080 commit-queue 2010-07-20 10:35:56 -0700 Comment on attachment 62080 And again with all the files Clearing flags on attachment: 62080 Committed r63753: <http://trac.webkit.org/changeset/63753> 253809 8 commit-queue 2010-07-20 10:36:00 -0700 All reviewed patches have been landed. Closing bug. 62059 2010-07-20 05:58:04 -0700 2010-07-20 07:04:11 -0700 Proposed fix inspector.patch text/plain 3870 leonclarke SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Mzc0MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDctMjAgIExlb24gQ2xhcmtlICA8bGVvbmNsYXJrZUBnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjYzMgorCisgICAgICAg IE5vIG5ldyB0ZXN0cy4gRml4aW5nIGEgYnVpbGQgYnJlYWsuCisKKyAgICAgICAgKiBiaW5kaW5n cy92OC9TY3JpcHRDYWxsU3RhY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q2FsbFN0 YWNrOjpzdGFja1RyYWNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQu aDoKKyAgICAgICAgKiBsb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmNwcDoK KwogMjAxMC0wNy0yMCAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCkluZGV4OiBXZWJDb3JlL2JpbmRp bmdzL3Y4L1NjcmlwdENhbGxTdGFjay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5n cy92OC9TY3JpcHRDYWxsU3RhY2suY3BwCShyZXZpc2lvbiA2MzczOSkKKysrIFdlYkNvcmUvYmlu ZGluZ3MvdjgvU2NyaXB0Q2FsbFN0YWNrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI5LDYgKzEy OSw3IEBAIHVuc2lnbmVkIFNjcmlwdENhbGxTdGFjazo6c2l6ZSgpCiAKIGJvb2wgU2NyaXB0Q2Fs bFN0YWNrOjpzdGFja1RyYWNlKGludCBmcmFtZUxpbWl0LCBjb25zdCBSZWZQdHI8SW5zcGVjdG9y QXJyYXk+JiBzdGFja1RyYWNlKQogeworI2lmIEVOQUJMRShJTlNQRUNUT1IpCiAgICAgaWYgKCF2 ODo6Q29udGV4dDo6SW5Db250ZXh0KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB2ODo6 SGFuZGxlPHY4OjpDb250ZXh0PiBjb250ZXh0ID0gdjg6OkNvbnRleHQ6OkdldEN1cnJlbnQoKTsK QEAgLTE1Miw2ICsxNTMsOSBAQCBib29sIFNjcmlwdENhbGxTdGFjazo6c3RhY2tUcmFjZShpbnQg ZnJhCiAgICAgICAgIHN0YWNrVHJhY2UtPnB1c2goZnJhbWVPYmplY3QpOwogICAgIH0KICAgICBy ZXR1cm4gdHJ1ZTsKKyNlbHNlCisgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCiB9CiAKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFn ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQu aAkocmV2aXNpb24gNjM3MzkpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2Vu dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTMsNiArMTUzLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogCiAgICAgICAgIGJvb2wgcHVzaERvY3VtZW50VG9Gcm9udGVuZCgpOwogCisjaWYgRU5BQkxF KElOU1BFQ1RPUikKICAgICAgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxkT2Jq ZWN0Rm9yQXR0cmlidXRlU3R5bGVzKEVsZW1lbnQqIGVsZW1lbnQpOwogICAgICAgICBQYXNzUmVm UHRyPEluc3BlY3RvckFycmF5PiBidWlsZEFycmF5Rm9yQ1NTUnVsZXMoRG9jdW1lbnQqIG93bmVy RG9jdW1lbnQsIENTU1J1bGVMaXN0Kik7CiAgICAgICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9yQXJy YXk+IGJ1aWxkQXJyYXlGb3JQc2V1ZG9FbGVtZW50cyhFbGVtZW50KiBlbGVtZW50LCBib29sIGF1 dGhvck9ubHkpOwpAQCAtMTYxLDYgKzE2Miw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAg ICAgUGFzc1JlZlB0cjxJbnNwZWN0b3JBcnJheT4gYnVpbGRBcnJheUZvckVsZW1lbnRBdHRyaWJ1 dGVzKEVsZW1lbnQqIGVsZW1lbnQpOwogICAgICAgICBQYXNzUmVmUHRyPEluc3BlY3RvckFycmF5 PiBidWlsZEFycmF5Rm9yQ29udGFpbmVyQ2hpbGRyZW4oTm9kZSogY29udGFpbmVyLCBpbnQgZGVw dGgsIE5vZGVUb0lkTWFwKiBub2Rlc01hcCk7CiAgICAgICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9y T2JqZWN0PiBidWlsZE9iamVjdEZvckV2ZW50TGlzdGVuZXIoY29uc3QgUmVnaXN0ZXJlZEV2ZW50 TGlzdGVuZXImIHJlZ2lzdGVyZWRFdmVudExpc3RlbmVyLCBjb25zdCBBdG9taWNTdHJpbmcmIGV2 ZW50VHlwZSwgTm9kZSogbm9kZSk7CisjZW5kaWYKIAogICAgICAgICAvLyBXZSByZXByZXNlbnQg ZW1iZWRkZWQgZG9tcyBhcyBhIHBhcnQgb2YgdGhlIHNhbWUgaGllcmFyY2h5LiBIZW5jZSB3ZSB0 cmVhdCBjaGlsZHJlbiBvZiBmcmFtZSBvd25lcnMgZGlmZmVyZW50bHkuCiAgICAgICAgIC8vIFdl IGFsc28gc2tpcCB3aGl0ZXNwYWNlIHRleHQgbm9kZXMgY29uZGl0aW9uYWxseS4gRm9sbG93aW5n IG1ldGhvZHMgZW5jYXBzdWxhdGUgdGhlc2Ugc3BlY2lmaWNzLgpAQCAtMTc4LDYgKzE4MCw3IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBvbk1hdGNoSm9ic1RpbWVyKFRpbWVy PEluc3BlY3RvckRPTUFnZW50PiopOwogICAgICAgICB2b2lkIHJlcG9ydE5vZGVzQXNTZWFyY2hS ZXN1bHRzKExpc3RIYXNoU2V0PE5vZGUqPiYgcmVzdWx0Q29sbGVjdG9yKTsKIAorI2lmIEVOQUJM RShJTlNQRUNUT1IpCiAgICAgICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBidWlsZE9i amVjdEZvclN0eWxlKENTU1N0eWxlRGVjbGFyYXRpb24qLCBib29sIGJpbmQpOwogICAgICAgICB2 b2lkIHBvcHVsYXRlT2JqZWN0V2l0aFN0eWxlUHJvcGVydGllcyhDU1NTdHlsZURlY2xhcmF0aW9u KiwgSW5zcGVjdG9yT2JqZWN0KiByZXN1bHQpOwogICAgICAgICBQYXNzUmVmUHRyPEluc3BlY3Rv ckFycmF5PiBidWlsZEFycmF5Rm9yRGlzYWJsZWRTdHlsZVByb3BlcnRpZXMoRGlzYWJsZWRTdHls ZURlY2xhcmF0aW9uKik7CkBAIC0xODksNiArMTkyLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog ICAgICAgICBib29sIHJ1bGVBZmZlY3RzTm9kZShDU1NTdHlsZVJ1bGUqLCBOb2RlKik7CiAgICAg ICAgIE5vZGUqIG5vZGVGb3JQYXRoKGNvbnN0IFN0cmluZyYgcGF0aCk7CiAgICAgICAgIFBhc3NS ZWZQdHI8SW5zcGVjdG9yQXJyYXk+IHRvQXJyYXkoY29uc3QgVmVjdG9yPFN0cmluZz4mIGRhdGEp OworI2VuZGlmCiAKICAgICAgICAgdm9pZCBkaXNjYXJkQmluZGluZ3MoKTsKIApJbmRleDogV2Vi Q29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuY3BwCShy ZXZpc2lvbiA2MzczOSkKKysrIFdlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2Fj aGVHcm91cC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ5LDYgKzQ5LDggQEAKICNpbmNsdWRlICJJ bnNwZWN0b3JBcHBsaWNhdGlvbkNhY2hlQWdlbnQuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JDb250 cm9sbGVyLmgiCiAjaW5jbHVkZSAiUHJvZ3Jlc3NUcmFja2VyLmgiCisjZWxzZQorI2luY2x1ZGUg PHd0Zi9VbnVzZWRQYXJhbS5oPgogI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK 62072 2010-07-20 07:04:11 -0700 2010-07-20 08:38:29 -0700 Removing whole InspectorDOMAgent inspector1.patch text/plain 2947 leonclarke SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Mzc0MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTAtMDctMjAgIExlb24gQ2xhcmtlICA8bGVvbmNsYXJrZUBnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE1ha2UgdGhpbmdzIGNvbXBpbGUgYWdhaW4gd2hlbiB0aGUgaW5zcGVjdG9yIGlzIGRpc2FibGVk LCBmb2xsb3dpbmcKKyAgICAgICAgcmVjZW50IGluc3BlY3RvciBpbXByb3ZlbWVudHMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjYzMgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cy4gRml4aW5nIGEgYnVpbGQgYnJlYWsuCisKKyAgICAgICAgKiBiaW5k aW5ncy92OC9TY3JpcHRDYWxsU3RhY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q2Fs bFN0YWNrOjpzdGFja1RyYWNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJv bGxlci5oOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkSW5zZXJ0 RE9NTm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRSZW1v dmVET01Ob2RlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRpZE1v ZGlmeURPTUF0dHIpOgorICAgICAgICAqIGxvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hl R3JvdXAuY3BwOgorCiAyMDEwLTA3LTIwICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KSW5kZXg6IFdl YkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q2FsbFN0YWNrLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENhbGxTdGFjay5jcHAJKHJldmlzaW9uIDYzNzM5KQorKysg V2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRDYWxsU3RhY2suY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xMjksNiArMTI5LDcgQEAgdW5zaWduZWQgU2NyaXB0Q2FsbFN0YWNrOjpzaXplKCkKIAogYm9v bCBTY3JpcHRDYWxsU3RhY2s6OnN0YWNrVHJhY2UoaW50IGZyYW1lTGltaXQsIGNvbnN0IFJlZlB0 cjxJbnNwZWN0b3JBcnJheT4mIHN0YWNrVHJhY2UpCiB7CisjaWYgRU5BQkxFKElOU1BFQ1RPUikK ICAgICBpZiAoIXY4OjpDb250ZXh0OjpJbkNvbnRleHQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgIHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IGNvbnRleHQgPSB2ODo6Q29udGV4dDo6R2V0 Q3VycmVudCgpOwpAQCAtMTUyLDYgKzE1Myw5IEBAIGJvb2wgU2NyaXB0Q2FsbFN0YWNrOjpzdGFj a1RyYWNlKGludCBmcmEKICAgICAgICAgc3RhY2tUcmFjZS0+cHVzaChmcmFtZU9iamVjdCk7CiAg ICAgfQogICAgIHJldHVybiB0cnVlOworI2Vsc2UKKyAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYK IH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yQ29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnRyb2xsZXIuaAkocmV2aXNpb24gNjM3MzkpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JDb250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQyOCwyMCArNDI4LDI2IEBA IHByaXZhdGU6CiAKIGlubGluZSB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZEluc2VydERP TU5vZGUoTm9kZSogbm9kZSkKIHsKKyNpZiBFTkFCTEUoSU5TUEVDVE9SKQogICAgIGlmIChtX2Rv bUFnZW50KQogICAgICAgICBtX2RvbUFnZW50LT5kaWRJbnNlcnRET01Ob2RlKG5vZGUpOworI2Vu ZGlmCiB9CiAKIGlubGluZSB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZFJlbW92ZURPTU5v ZGUoTm9kZSogbm9kZSkKIHsKKyNpZiBFTkFCTEUoSU5TUEVDVE9SKQogICAgIGlmIChtX2RvbUFn ZW50KQogICAgICAgICBtX2RvbUFnZW50LT5kaWRSZW1vdmVET01Ob2RlKG5vZGUpOworI2VuZGlm CiB9CiAKIGlubGluZSB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZE1vZGlmeURPTUF0dHIo RWxlbWVudCogZWxlbWVudCkKIHsKKyNpZiBFTkFCTEUoSU5TUEVDVE9SKQogICAgIGlmIChtX2Rv bUFnZW50KQogICAgICAgICBtX2RvbUFnZW50LT5kaWRNb2RpZnlET01BdHRyKGVsZW1lbnQpOwor I2VuZGlmCiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFdlYkNvcmUvbG9hZGVy L2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmNwcAkocmV2aXNpb24gNjM3 MzkpCisrKyBXZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC00OSw2ICs0OSw4IEBACiAjaW5jbHVkZSAiSW5zcGVjdG9yQXBw bGljYXRpb25DYWNoZUFnZW50LmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yQ29udHJvbGxlci5oIgog I2luY2x1ZGUgIlByb2dyZXNzVHJhY2tlci5oIgorI2Vsc2UKKyNpbmNsdWRlIDx3dGYvVW51c2Vk UGFyYW0uaD4KICNlbmRpZgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7Cg== 62080 2010-07-20 08:38:29 -0700 2010-07-20 10:35:56 -0700 And again with all the files inspector2.patch text/plain 3837 leonclarke SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Mzc0NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDctMjAgIExlb24gQ2xhcmtlICA8bGVvbmNsYXJrZUBnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE1ha2UgdGhpbmdzIGNvbXBpbGUgYWdhaW4gd2hlbiB0aGUgaW5zcGVjdG9yIGlzIGRpc2FibGVk LCBmb2xsb3dpbmcKKyAgICAgICAgcmVjZW50IGluc3BlY3RvciBpbXByb3ZlbWVudHMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjYzMgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cy4gRml4aW5nIGEgYnVpbGQgYnJlYWsuCisKKworICAgICAgICAqIGJp bmRpbmdzL3Y4L1NjcmlwdENhbGxTdGFjay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRD YWxsU3RhY2s6OnN0YWNrVHJhY2UpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250 cm9sbGVyLmg6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRJbnNl cnRET01Ob2RlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRpZFJl bW92ZURPTU5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlk TW9kaWZ5RE9NQXR0cik6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50Lmg6 CisgICAgICAgICogbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5jcHA6CisK IDIwMTAtMDctMjAgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mv djgvU2NyaXB0Q2FsbFN0YWNrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4 L1NjcmlwdENhbGxTdGFjay5jcHAJKHJldmlzaW9uIDYzNzM5KQorKysgV2ViQ29yZS9iaW5kaW5n cy92OC9TY3JpcHRDYWxsU3RhY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjksNiArMTI5LDcg QEAgdW5zaWduZWQgU2NyaXB0Q2FsbFN0YWNrOjpzaXplKCkKIAogYm9vbCBTY3JpcHRDYWxsU3Rh Y2s6OnN0YWNrVHJhY2UoaW50IGZyYW1lTGltaXQsIGNvbnN0IFJlZlB0cjxJbnNwZWN0b3JBcnJh eT4mIHN0YWNrVHJhY2UpCiB7CisjaWYgRU5BQkxFKElOU1BFQ1RPUikKICAgICBpZiAoIXY4OjpD b250ZXh0OjpJbkNvbnRleHQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHY4OjpIYW5k bGU8djg6OkNvbnRleHQ+IGNvbnRleHQgPSB2ODo6Q29udGV4dDo6R2V0Q3VycmVudCgpOwpAQCAt MTUyLDYgKzE1Myw5IEBAIGJvb2wgU2NyaXB0Q2FsbFN0YWNrOjpzdGFja1RyYWNlKGludCBmcmEK ICAgICAgICAgc3RhY2tUcmFjZS0+cHVzaChmcmFtZU9iamVjdCk7CiAgICAgfQogICAgIHJldHVy biB0cnVlOworI2Vsc2UKKyAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKIH0KIAogfSAvLyBuYW1l c3BhY2UgV2ViQ29yZQpJbmRleDogV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxl ci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIu aAkocmV2aXNpb24gNjM3MzkpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9s bGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQyOCwyMCArNDI4LDI2IEBAIHByaXZhdGU6CiAKIGlu bGluZSB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZEluc2VydERPTU5vZGUoTm9kZSogbm9k ZSkKIHsKKyNpZiBFTkFCTEUoSU5TUEVDVE9SKQogICAgIGlmIChtX2RvbUFnZW50KQogICAgICAg ICBtX2RvbUFnZW50LT5kaWRJbnNlcnRET01Ob2RlKG5vZGUpOworI2VuZGlmCiB9CiAKIGlubGlu ZSB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZFJlbW92ZURPTU5vZGUoTm9kZSogbm9kZSkK IHsKKyNpZiBFTkFCTEUoSU5TUEVDVE9SKQogICAgIGlmIChtX2RvbUFnZW50KQogICAgICAgICBt X2RvbUFnZW50LT5kaWRSZW1vdmVET01Ob2RlKG5vZGUpOworI2VuZGlmCiB9CiAKIGlubGluZSB2 b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZE1vZGlmeURPTUF0dHIoRWxlbWVudCogZWxlbWVu dCkKIHsKKyNpZiBFTkFCTEUoSU5TUEVDVE9SKQogICAgIGlmIChtX2RvbUFnZW50KQogICAgICAg ICBtX2RvbUFnZW50LT5kaWRNb2RpZnlET01BdHRyKGVsZW1lbnQpOworI2VuZGlmCiB9CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRP TUFnZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdl bnQuaAkocmV2aXNpb24gNjM3MzkpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01B Z2VudC5oCSh3b3JraW5nIGNvcHkpCkBAIC01NiwxMiArNTYsMTUgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogICAgIGNsYXNzIENTU1N0eWxlU2hlZXQ7CiAgICAgY2xhc3MgRWxlbWVudDsKICAgICBj bGFzcyBFdmVudDsKKyAgICBjbGFzcyBJbnNwZWN0b3JET01BZ2VudDsKICAgICBjbGFzcyBSZW1v dGVJbnNwZWN0b3JGcm9udGVuZDsKICAgICBjbGFzcyBNYXRjaEpvYjsKICAgICBjbGFzcyBOYW1l Tm9kZU1hcDsKICAgICBjbGFzcyBOb2RlOwogICAgIGNsYXNzIFBhZ2U7CiAKKyNpZiBFTkFCTEUo SU5TUEVDVE9SKQorCiAgICAgc3RydWN0IEV2ZW50TGlzdGVuZXJJbmZvIHsKICAgICAgICAgRXZl bnRMaXN0ZW5lckluZm8oTm9kZSogbm9kZSwgY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUs IGNvbnN0IEV2ZW50TGlzdGVuZXJWZWN0b3ImIGV2ZW50TGlzdGVuZXJWZWN0b3IpCiAgICAgICAg ICAgICA6IG5vZGUobm9kZSkKQEAgLTIwOCw2ICsyMTEsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAgICAgICAgIFZlY3Rvcjxsb25nPiBtX2luc3BlY3RlZE5vZGVzOwogICAgIH07CiAKKyNlbmRp ZgorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyAhZGVmaW5lZChJbnNwZWN0 b3JET01BZ2VudF9oKQpJbmRleDogV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25D YWNoZUdyb3VwLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBs aWNhdGlvbkNhY2hlR3JvdXAuY3BwCShyZXZpc2lvbiA2MzczOSkKKysrIFdlYkNvcmUvbG9hZGVy L2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ5 LDYgKzQ5LDggQEAKICNpbmNsdWRlICJJbnNwZWN0b3JBcHBsaWNhdGlvbkNhY2hlQWdlbnQuaCIK ICNpbmNsdWRlICJJbnNwZWN0b3JDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiUHJvZ3Jlc3NUcmFj a2VyLmgiCisjZWxzZQorI2luY2x1ZGUgPHd0Zi9VbnVzZWRQYXJhbS5oPgogI2VuZGlmCiAKIG5h bWVzcGFjZSBXZWJDb3JlIHsK