57329 2011-03-29 05:14:26 -0700 Web Inspector: InspectorDOMAgent has unnecessary dependency from InspectorAgent 2011-03-29 10:58:02 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 loislo loislo abarth apavlov bweinstein eric joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 375205 0 loislo 2011-03-29 05:14:26 -0700 %subj% It was introduced at r81771. 375206 1 87300 loislo 2011-03-29 05:18:18 -0700 Created attachment 87300 [patch] initial version 375237 2 87304 loislo 2011-03-29 06:16:40 -0700 Created attachment 87304 [patch] second version. Assert in inspect() was changed to if. 375297 3 87304 yurys 2011-03-29 07:28:03 -0700 Comment on attachment 87304 [patch] second version. Assert in inspect() was changed to if. View in context: https://bugs.webkit.org/attachment.cgi?id=87304&action=review > Source/WebCore/inspector/InspectorDOMAgent.h:163 > + void focusNode(); This one should be private. 375409 4 loislo 2011-03-29 09:13:56 -0700 Landed r82263 375531 5 webkit.review.bot 2011-03-29 10:58:02 -0700 http://trac.webkit.org/changeset/82263 might have broken GTK Linux 32-bit Release The following tests are not passing: fast/loader/onload-willSendRequest-null-for-frame.html 87300 2011-03-29 05:18:18 -0700 2011-03-29 06:16:40 -0700 [patch] initial version patch text/plain 11165 loislo ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhNGJkZTYyLi41NDk3NDBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTEtMDMtMjkgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IEluc3BlY3RvckRPTUFnZW50IGhhcyB1bm5lY2Vzc2FyeSBkZXBlbmRlbmN5IGZyb20g SW5zcGVjdG9yQWdlbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01NzMyOQorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckFnZW50OjpJbnNwZWN0b3JBZ2VudCk6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JBZ2VudDo6c2V0RnJvbnRlbmQpOgorICAgICAgICAqIGlu c3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6Omlu c3BlY3QpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6SW5zcGVjdG9yRE9NQWdlbnQpOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OnNldEZyb250ZW5kKToKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjpoYW5kbGVNb3VzZVByZXNzKToKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjppbnNwZWN0KToKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvckRPTUFnZW50Ojpmb2N1c05vZGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yRE9NQWdlbnQ6OmhpZ2hsaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01B Z2VudDo6aGlkZUhpZ2hsaWdodCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTUFn ZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6Y3JlYXRlKToKKwog MjAxMS0wMy0yOSAgTWlraGFpbCBOYWdhbm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckFnZW50LmNwcAppbmRleCBjYWFhZTNkLi4yMmY0NmU1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5jcHAKQEAgLTEwMCw3ICsxMDAsNyBA QCBJbnNwZWN0b3JBZ2VudDo6SW5zcGVjdG9yQWdlbnQoUGFnZSogcGFnZSwgSW5zcGVjdG9yQ2xp ZW50KiBjbGllbnQsIEluamVjdGVkU2NyaQogICAgICwgbV9pbnN0cnVtZW50aW5nQWdlbnRzKG5l dyBJbnN0cnVtZW50aW5nQWdlbnRzKCkpCiAgICAgLCBtX2luamVjdGVkU2NyaXB0TWFuYWdlcihp bmplY3RlZFNjcmlwdE1hbmFnZXIpCiAgICAgLCBtX3N0YXRlKG5ldyBJbnNwZWN0b3JTdGF0ZShj bGllbnQpKQotICAgICwgbV9kb21BZ2VudChJbnNwZWN0b3JET01BZ2VudDo6Y3JlYXRlKG1faW5z dHJ1bWVudGluZ0FnZW50cy5nZXQoKSwgcGFnZSwgbV9zdGF0ZS5nZXQoKSwgaW5qZWN0ZWRTY3Jp cHRNYW5hZ2VyKSkKKyAgICAsIG1fZG9tQWdlbnQoSW5zcGVjdG9yRE9NQWdlbnQ6OmNyZWF0ZSht X2luc3RydW1lbnRpbmdBZ2VudHMuZ2V0KCksIHBhZ2UsIG1fY2xpZW50LCBtX3N0YXRlLmdldCgp LCBpbmplY3RlZFNjcmlwdE1hbmFnZXIpKQogICAgICwgbV9jc3NBZ2VudChuZXcgSW5zcGVjdG9y Q1NTQWdlbnQobV9pbnN0cnVtZW50aW5nQWdlbnRzLmdldCgpLCBtX2RvbUFnZW50LmdldCgpKSkK ICNpZiBFTkFCTEUoREFUQUJBU0UpCiAgICAgLCBtX2RhdGFiYXNlQWdlbnQoSW5zcGVjdG9yRGF0 YWJhc2VBZ2VudDo6Y3JlYXRlKG1faW5zdHJ1bWVudGluZ0FnZW50cy5nZXQoKSkpCkBAIC0xODYs NDMgKzE4Niw2IEBAIHZvaWQgSW5zcGVjdG9yQWdlbnQ6OnJlc3RvcmVJbnNwZWN0b3JTdGF0ZUZy b21Db29raWUoY29uc3QgU3RyaW5nJiBpbnNwZWN0b3JTdGF0CiAjZW5kaWYKIH0KIAotdm9pZCBJ bnNwZWN0b3JBZ2VudDo6aW5zcGVjdChOb2RlKiBub2RlKQotewotICAgIGlmIChub2RlLT5ub2Rl VHlwZSgpICE9IE5vZGU6OkVMRU1FTlRfTk9ERSAmJiBub2RlLT5ub2RlVHlwZSgpICE9IE5vZGU6 OkRPQ1VNRU5UX05PREUpCi0gICAgICAgIG5vZGUgPSBub2RlLT5wYXJlbnROb2RlKCk7Ci0gICAg bV9ub2RlVG9Gb2N1cyA9IG5vZGU7Ci0KLSAgICBpZiAoIW1fZnJvbnRlbmQpCi0gICAgICAgIHJl dHVybjsKLQotICAgIGZvY3VzTm9kZSgpOwotfQotCi12b2lkIEluc3BlY3RvckFnZW50Ojpmb2N1 c05vZGUoKQotewotICAgIGlmICghZW5hYmxlZCgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBB U1NFUlQobV9mcm9udGVuZCk7Ci0gICAgQVNTRVJUKG1fbm9kZVRvRm9jdXMpOwotCi0gICAgUmVm UHRyPE5vZGU+IG5vZGUgPSBtX25vZGVUb0ZvY3VzLmdldCgpOwotICAgIG1fbm9kZVRvRm9jdXMg PSAwOwotCi0gICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gbm9kZS0+b3duZXJEb2N1bWVudCgpOwot ICAgIGlmICghZG9jdW1lbnQpCi0gICAgICAgIHJldHVybjsKLSAgICBGcmFtZSogZnJhbWUgPSBk b2N1bWVudC0+ZnJhbWUoKTsKLSAgICBpZiAoIWZyYW1lKQotICAgICAgICByZXR1cm47Ci0KLSAg ICBJbmplY3RlZFNjcmlwdCBpbmplY3RlZFNjcmlwdCA9IG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2Vy LT5pbmplY3RlZFNjcmlwdEZvcihtYWluV29ybGRTY3JpcHRTdGF0ZShmcmFtZSkpOwotICAgIGlm IChpbmplY3RlZFNjcmlwdC5oYXNOb1ZhbHVlKCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIGlu amVjdGVkU2NyaXB0Lmluc3BlY3ROb2RlKG5vZGUuZ2V0KCkpOwotfQotCiB2b2lkIEluc3BlY3Rv ckFnZW50OjpkaWRDbGVhcldpbmRvd09iamVjdEluV29ybGQoRnJhbWUqIGZyYW1lLCBET01XcmFw cGVyV29ybGQqIHdvcmxkKQogewogICAgIGlmICh3b3JsZCAhPSBtYWluVGhyZWFkTm9ybWFsV29y bGQoKSkKQEAgLTI3Nyw4ICsyNDAsNiBAQCB2b2lkIEluc3BlY3RvckFnZW50OjpzZXRGcm9udGVu ZChJbnNwZWN0b3JGcm9udGVuZCogaW5zcGVjdG9yRnJvbnRlbmQpCiAgICAgICAgIG1fZnJvbnRl bmQtPmluc3BlY3RvcigpLT5zaG93UGFuZWwobV9zaG93UGFuZWxBZnRlclZpc2libGUpOwogICAg ICAgICBtX3Nob3dQYW5lbEFmdGVyVmlzaWJsZSA9IFN0cmluZygpOwogICAgIH0KLSAgICBpZiAo bV9ub2RlVG9Gb2N1cykKLSAgICAgICAgZm9jdXNOb2RlKCk7CiAjaWYgRU5BQkxFKEpBVkFTQ1JJ UFRfREVCVUdHRVIpICYmIEVOQUJMRShXT1JLRVJTKQogICAgIFdvcmtlcnNNYXA6Oml0ZXJhdG9y IHdvcmtlcnNFbmQgPSBtX3dvcmtlcnMuZW5kKCk7CiAgICAgZm9yIChXb3JrZXJzTWFwOjppdGVy YXRvciBpdCA9IG1fd29ya2Vycy5iZWdpbigpOyBpdCAhPSB3b3JrZXJzRW5kOyArK2l0KSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuaCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5oCmluZGV4IDYyYzllODIuLjlh NTI1YTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2Vu dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5oCkBAIC0x MTUsOCArMTE1LDYgQEAgcHVibGljOgogCiAgICAgdm9pZCByZXN0b3JlSW5zcGVjdG9yU3RhdGVG cm9tQ29va2llKGNvbnN0IFN0cmluZyYgaW5zcGVjdG9yQ29va2llKTsKIAotICAgIHZvaWQgaW5z cGVjdChOb2RlKik7Ci0KICAgICB2b2lkIHNldEZyb250ZW5kKEluc3BlY3RvckZyb250ZW5kKik7 CiAgICAgSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kKCkgY29uc3QgeyByZXR1cm4gbV9mcm9u dGVuZDsgfQogICAgIHZvaWQgZGlzY29ubmVjdEZyb250ZW5kKCk7CkBAIC0yMDMsNyArMjAxLDYg QEAgcHJpdmF0ZToKICAgICBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gYnVpbGRPYmplY3RG b3JDb29raWUoY29uc3QgQ29va2llJik7CiAgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3JBcnJheT4g YnVpbGRBcnJheUZvckNvb2tpZXMoTGlzdEhhc2hTZXQ8Q29va2llPiYpOwogCi0gICAgdm9pZCBm b2N1c05vZGUoKTsKICAgICBib29sIGlzTWFpblJlc291cmNlTG9hZGVyKERvY3VtZW50TG9hZGVy KiwgY29uc3QgS1VSTCYgcmVxdWVzdFVybCk7CiAgICAgdm9pZCBpc3N1ZUV2YWx1YXRlRm9yVGVz dENvbW1hbmRzKCk7CiAKQEAgLTIzMCw3ICsyMjcsNiBAQCBwcml2YXRlOgogICAgIE93blB0cjxJ bnNwZWN0b3JBcHBsaWNhdGlvbkNhY2hlQWdlbnQ+IG1fYXBwbGljYXRpb25DYWNoZUFnZW50Owog I2VuZGlmCiAKLSAgICBSZWZQdHI8Tm9kZT4gbV9ub2RlVG9Gb2N1czsKICAgICBSZWZQdHI8SW5z cGVjdG9yUmVzb3VyY2VBZ2VudD4gbV9yZXNvdXJjZUFnZW50OwogICAgIE93blB0cjxJbnNwZWN0 b3JSdW50aW1lQWdlbnQ+IG1fcnVudGltZUFnZW50OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggODBhNWU4OS4uZmU1ZjA2YSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNw cApAQCAtMjE5LDcgKzIxOSw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6aW5zcGVjdChO b2RlKiBub2RlKQogCiAgICAgc2hvdygpOwogCi0gICAgbV9pbnNwZWN0b3JBZ2VudC0+aW5zcGVj dChub2RlKTsKKyAgICBtX2luc3BlY3RvckFnZW50LT5kb21BZ2VudCgpLT5pbnNwZWN0KG5vZGUp OwogfQogCiBib29sIEluc3BlY3RvckNvbnRyb2xsZXI6OmVuYWJsZWQoKSBjb25zdApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKaW5kZXggNWIzMmQ5 Yi4uNThiNmE0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckRPTUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9N QWdlbnQuY3BwCkBAIC02Miw3ICs2Miw2IEBACiAjaW5jbHVkZSAiSFRNTEVsZW1lbnQuaCIKICNp bmNsdWRlICJIVE1MRnJhbWVPd25lckVsZW1lbnQuaCIKICNpbmNsdWRlICJJbmplY3RlZFNjcmlw dE1hbmFnZXIuaCIKLSNpbmNsdWRlICJJbnNwZWN0b3JBZ2VudC5oIgogI2luY2x1ZGUgIkluc3Bl Y3RvckNsaWVudC5oIgogI2luY2x1ZGUgIkluc3BlY3RvckZyb250ZW5kLmgiCiAjaW5jbHVkZSAi SW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5oIgpAQCAtMjU4LDkgKzI1NywxMCBAQCB2b2lkIFJldmFs aWRhdGVTdHlsZUF0dHJpYnV0ZVRhc2s6Om9uVGltZXIoVGltZXI8UmV2YWxpZGF0ZVN0eWxlQXR0 cmlidXRlVGFzaz4qKQogICAgIG1fZWxlbWVudHMuY2xlYXIoKTsKIH0KIAotSW5zcGVjdG9yRE9N QWdlbnQ6Okluc3BlY3RvckRPTUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRp bmdBZ2VudHMsIFBhZ2UqIGluc3BlY3RlZFBhZ2UsIEluc3BlY3RvclN0YXRlKiBpbnNwZWN0b3JT dGF0ZSwgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKiBpbmplY3RlZFNjcmlwdE1hbmFnZXIpCitJbnNw ZWN0b3JET01BZ2VudDo6SW5zcGVjdG9yRE9NQWdlbnQoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5z dHJ1bWVudGluZ0FnZW50cywgUGFnZSogaW5zcGVjdGVkUGFnZSwgSW5zcGVjdG9yQ2xpZW50KiBj bGllbnQsIEluc3BlY3RvclN0YXRlKiBpbnNwZWN0b3JTdGF0ZSwgSW5qZWN0ZWRTY3JpcHRNYW5h Z2VyKiBpbmplY3RlZFNjcmlwdE1hbmFnZXIpCiAgICAgOiBtX2luc3RydW1lbnRpbmdBZ2VudHMo aW5zdHJ1bWVudGluZ0FnZW50cykKICAgICAsIG1faW5zcGVjdGVkUGFnZShpbnNwZWN0ZWRQYWdl KQorICAgICwgbV9jbGllbnQoY2xpZW50KQogICAgICwgbV9pbnNwZWN0b3JTdGF0ZShpbnNwZWN0 b3JTdGF0ZSkKICAgICAsIG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKGluamVjdGVkU2NyaXB0TWFu YWdlcikKICAgICAsIG1fZnJvbnRlbmQoMCkKQEAgLTI4NCw2ICsyODQsOSBAQCB2b2lkIEluc3Bl Y3RvckRPTUFnZW50OjpzZXRGcm9udGVuZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQpCiAg ICAgbV9mcm9udGVuZCA9IGZyb250ZW5kLT5kb20oKTsKICAgICBtX2luc3RydW1lbnRpbmdBZ2Vu dHMtPnNldEluc3BlY3RvckRPTUFnZW50KHRoaXMpOwogICAgIG1fZG9jdW1lbnQgPSBtX2luc3Bl Y3RlZFBhZ2UtPm1haW5GcmFtZSgpLT5kb2N1bWVudCgpOworCisgICAgaWYgKG1fbm9kZVRvRm9j dXMpCisgICAgICAgIGZvY3VzTm9kZSgpOwogfQogCiB2b2lkIEluc3BlY3RvckRPTUFnZW50Ojpj bGVhckZyb250ZW5kKCkKQEAgLTg5NSwxMSArODk4LDQyIEBAIGJvb2wgSW5zcGVjdG9yRE9NQWdl bnQ6OmhhbmRsZU1vdXNlUHJlc3MoKQogICAgIGlmIChtX2hpZ2hsaWdodGVkTm9kZSkgewogICAg ICAgICBSZWZQdHI8Tm9kZT4gbm9kZSA9IG1faGlnaGxpZ2h0ZWROb2RlOwogICAgICAgICBzZXRT ZWFyY2hpbmdGb3JOb2RlKGZhbHNlKTsKLSAgICAgICAgbV9pbnN0cnVtZW50aW5nQWdlbnRzLT5p bnNwZWN0b3JBZ2VudCgpLT5pbnNwZWN0KG5vZGUuZ2V0KCkpOworICAgICAgICBpbnNwZWN0KG5v ZGUuZ2V0KCkpOwogICAgIH0KICAgICByZXR1cm4gdHJ1ZTsKIH0KIAordm9pZCBJbnNwZWN0b3JE T01BZ2VudDo6aW5zcGVjdChOb2RlKiBub2RlKQoreworICAgIGlmIChub2RlLT5ub2RlVHlwZSgp ICE9IE5vZGU6OkVMRU1FTlRfTk9ERSAmJiBub2RlLT5ub2RlVHlwZSgpICE9IE5vZGU6OkRPQ1VN RU5UX05PREUpCisgICAgICAgIG5vZGUgPSBub2RlLT5wYXJlbnROb2RlKCk7CisgICAgbV9ub2Rl VG9Gb2N1cyA9IG5vZGU7CisKKyAgICBmb2N1c05vZGUoKTsKK30KKwordm9pZCBJbnNwZWN0b3JE T01BZ2VudDo6Zm9jdXNOb2RlKCkKK3sKKyAgICBBU1NFUlQobV9mcm9udGVuZCk7CisgICAgQVNT RVJUKG1fbm9kZVRvRm9jdXMpOworCisgICAgUmVmUHRyPE5vZGU+IG5vZGUgPSBtX25vZGVUb0Zv Y3VzLmdldCgpOworICAgIG1fbm9kZVRvRm9jdXMgPSAwOworCisgICAgRG9jdW1lbnQqIGRvY3Vt ZW50ID0gbm9kZS0+b3duZXJEb2N1bWVudCgpOworICAgIGlmICghZG9jdW1lbnQpCisgICAgICAg IHJldHVybjsKKyAgICBGcmFtZSogZnJhbWUgPSBkb2N1bWVudC0+ZnJhbWUoKTsKKyAgICBpZiAo IWZyYW1lKQorICAgICAgICByZXR1cm47CisKKyAgICBJbmplY3RlZFNjcmlwdCBpbmplY3RlZFNj cmlwdCA9IG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLT5pbmplY3RlZFNjcmlwdEZvcihtYWluV29y bGRTY3JpcHRTdGF0ZShmcmFtZSkpOworICAgIGlmIChpbmplY3RlZFNjcmlwdC5oYXNOb1ZhbHVl KCkpCisgICAgICAgIHJldHVybjsKKworICAgIGluamVjdGVkU2NyaXB0Lmluc3BlY3ROb2RlKG5v ZGUuZ2V0KCkpOworfQorCiB2b2lkIEluc3BlY3RvckRPTUFnZW50Ojptb3VzZURpZE1vdmVPdmVy RWxlbWVudChjb25zdCBIaXRUZXN0UmVzdWx0JiByZXN1bHQsIHVuc2lnbmVkKQogewogICAgIGlm ICghbV9zZWFyY2hpbmdGb3JOb2RlKQpAQCAtOTM1LDcgKzk2OSw3IEBAIHZvaWQgSW5zcGVjdG9y RE9NQWdlbnQ6OmhpZ2hsaWdodChFcnJvclN0cmluZyosIE5vZGUqIG5vZGUpCiB7CiAgICAgQVNT RVJUX0FSRyhub2RlLCBub2RlKTsKICAgICBtX2hpZ2hsaWdodGVkTm9kZSA9IG5vZGU7Ci0gICAg bV9pbnN0cnVtZW50aW5nQWdlbnRzLT5pbnNwZWN0b3JBZ2VudCgpLT5pbnNwZWN0b3JDbGllbnQo KS0+aGlnaGxpZ2h0KG5vZGUpOworICAgIG1fY2xpZW50LT5oaWdobGlnaHQobm9kZSk7CiB9CiAK IHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OmhpZ2hsaWdodERPTU5vZGUoRXJyb3JTdHJpbmcqIGVy cm9yLCBpbnQgbm9kZUlkKQpAQCAtOTU0LDcgKzk4OCw3IEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdl bnQ6OmhpZ2hsaWdodEZyYW1lKEVycm9yU3RyaW5nKiBlcnJvciwgY29uc3QgU3RyaW5nJiBmcmFt ZUlkCiB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpoaWRlSGlnaGxpZ2h0KEVycm9yU3RyaW5nKikK IHsKICAgICBtX2hpZ2hsaWdodGVkTm9kZSA9IDA7Ci0gICAgbV9pbnN0cnVtZW50aW5nQWdlbnRz LT5pbnNwZWN0b3JBZ2VudCgpLT5pbnNwZWN0b3JDbGllbnQoKS0+aGlkZUhpZ2hsaWdodCgpOwor ICAgIG1fY2xpZW50LT5oaWRlSGlnaGxpZ2h0KCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yRE9NQWdl bnQ6OnJlc29sdmVOb2RlKEVycm9yU3RyaW5nKiBlcnJvciwgaW50IG5vZGVJZCwgUmVmUHRyPElu c3BlY3Rvck9iamVjdD4qIHJlc3VsdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JET01BZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckRPTUFnZW50LmgKaW5kZXggZGZlNzY2OS4uOGFlYjY2YiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmgKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmgKQEAgLTU0LDYgKzU0LDcgQEAgY2xhc3Mg RG9jdW1lbnQ7CiBjbGFzcyBFbGVtZW50OwogY2xhc3MgRXZlbnQ7CiBjbGFzcyBHcmFwaGljc0Nv bnRleHQ7CitjbGFzcyBJbnNwZWN0b3JDbGllbnQ7CiBjbGFzcyBJbnNwZWN0b3JET01BZ2VudDsK IGNsYXNzIEluc3BlY3RvckZyb250ZW5kOwogY2xhc3MgSGl0VGVzdFJlc3VsdDsKQEAgLTk1LDkg Kzk2LDkgQEAgcHVibGljOgogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkTW9kaWZ5RE9NQXR0cihF bGVtZW50KikgPSAwOwogICAgIH07CiAKLSAgICBzdGF0aWMgUGFzc093blB0cjxJbnNwZWN0b3JE T01BZ2VudD4gY3JlYXRlKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMs IFBhZ2UqIHBhZ2UsIEluc3BlY3RvclN0YXRlKiBpbnNwZWN0b3JTdGF0ZSwgSW5qZWN0ZWRTY3Jp cHRNYW5hZ2VyKiBpbmplY3RlZFNjcmlwdE1hbmFnZXIpCisgICAgc3RhdGljIFBhc3NPd25QdHI8 SW5zcGVjdG9yRE9NQWdlbnQ+IGNyZWF0ZShJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50 aW5nQWdlbnRzLCBQYWdlKiBwYWdlLCBJbnNwZWN0b3JDbGllbnQqIGNsaWVudCwgSW5zcGVjdG9y U3RhdGUqIGluc3BlY3RvclN0YXRlLCBJbmplY3RlZFNjcmlwdE1hbmFnZXIqIGluamVjdGVkU2Ny aXB0TWFuYWdlcikKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgSW5zcGVjdG9y RE9NQWdlbnQoaW5zdHJ1bWVudGluZ0FnZW50cywgcGFnZSwgaW5zcGVjdG9yU3RhdGUsIGluamVj dGVkU2NyaXB0TWFuYWdlcikpOworICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IEluc3BlY3Rv ckRPTUFnZW50KGluc3RydW1lbnRpbmdBZ2VudHMsIHBhZ2UsIGNsaWVudCwgaW5zcGVjdG9yU3Rh dGUsIGluamVjdGVkU2NyaXB0TWFuYWdlcikpOwogICAgIH0KIAogICAgIH5JbnNwZWN0b3JET01B Z2VudCgpOwpAQCAtMTU4LDYgKzE1OSw4IEBAIHB1YmxpYzoKICAgICBib29sIGhhbmRsZU1vdXNl UHJlc3MoKTsKICAgICBib29sIHNlYXJjaGluZ0Zvck5vZGVJblBhZ2UoKSBjb25zdDsKICAgICB2 b2lkIG1vdXNlRGlkTW92ZU92ZXJFbGVtZW50KGNvbnN0IEhpdFRlc3RSZXN1bHQmLCB1bnNpZ25l ZCBtb2RpZmllckZsYWdzKTsKKyAgICB2b2lkIGluc3BlY3QoTm9kZSopOworICAgIHZvaWQgZm9j dXNOb2RlKCk7CiAKICAgICB2b2lkIGRyYXdOb2RlSGlnaGxpZ2h0KEdyYXBoaWNzQ29udGV4dCYp IGNvbnN0OwogCkBAIC0xNzEsNyArMTc0LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBib29sIGlz V2hpdGVzcGFjZShOb2RlKik7CiAKIHByaXZhdGU6Ci0gICAgSW5zcGVjdG9yRE9NQWdlbnQoSW5z dHJ1bWVudGluZ0FnZW50cyosIFBhZ2UqLCBJbnNwZWN0b3JTdGF0ZSosIEluamVjdGVkU2NyaXB0 TWFuYWdlciopOworICAgIEluc3BlY3RvckRPTUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqLCBQ YWdlKiwgSW5zcGVjdG9yQ2xpZW50KiwgSW5zcGVjdG9yU3RhdGUqLCBJbmplY3RlZFNjcmlwdE1h bmFnZXIqKTsKIAogICAgIHZvaWQgc2V0U2VhcmNoaW5nRm9yTm9kZShib29sIGVuYWJsZWQpOwog ICAgIHZvaWQgaGlnaGxpZ2h0KEVycm9yU3RyaW5nKiwgTm9kZSopOwpAQCAtMjA3LDYgKzIxMCw3 IEBAIHByaXZhdGU6CiAKICAgICBJbnN0cnVtZW50aW5nQWdlbnRzKiBtX2luc3RydW1lbnRpbmdB Z2VudHM7CiAgICAgUGFnZSogbV9pbnNwZWN0ZWRQYWdlOworICAgIEluc3BlY3RvckNsaWVudCog bV9jbGllbnQ7CiAgICAgSW5zcGVjdG9yU3RhdGUqIG1faW5zcGVjdG9yU3RhdGU7CiAgICAgSW5q ZWN0ZWRTY3JpcHRNYW5hZ2VyKiBtX2luamVjdGVkU2NyaXB0TWFuYWdlcjsKICAgICBJbnNwZWN0 b3JGcm9udGVuZDo6RE9NKiBtX2Zyb250ZW5kOwpAQCAtMjI0LDYgKzIyOCw3IEBAIHByaXZhdGU6 CiAgICAgSGFzaFNldDxSZWZQdHI8Tm9kZT4gPiBtX3NlYXJjaFJlc3VsdHM7CiAgICAgT3duUHRy PFJldmFsaWRhdGVTdHlsZUF0dHJpYnV0ZVRhc2s+IG1fcmV2YWxpZGF0ZVN0eWxlQXR0clRhc2s7 CiAgICAgUmVmUHRyPE5vZGU+IG1faGlnaGxpZ2h0ZWROb2RlOworICAgIFJlZlB0cjxOb2RlPiBt X25vZGVUb0ZvY3VzOwogICAgIGJvb2wgbV9zZWFyY2hpbmdGb3JOb2RlOwogfTsKIAo= 87304 2011-03-29 06:16:40 -0700 2011-03-29 09:14:07 -0700 [patch] second version. Assert in inspect() was changed to if. patch text/plain 11172 loislo ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhYWIwNTUwLi5mNmY5ZmVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTEtMDMtMjkgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IEluc3BlY3RvckRPTUFnZW50IGhhcyB1bm5lY2Vzc2FyeSBkZXBlbmRlbmN5IGZyb20g SW5zcGVjdG9yQWdlbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01NzMyOQorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckFnZW50OjpJbnNwZWN0b3JBZ2VudCk6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JBZ2VudDo6c2V0RnJvbnRlbmQpOgorICAgICAgICAqIGlu c3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6Omlu c3BlY3QpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6SW5zcGVjdG9yRE9NQWdlbnQpOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OnNldEZyb250ZW5kKToKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjpoYW5kbGVNb3VzZVByZXNzKToKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjppbnNwZWN0KToKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvckRPTUFnZW50Ojpmb2N1c05vZGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yRE9NQWdlbnQ6OmhpZ2hsaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01B Z2VudDo6aGlkZUhpZ2hsaWdodCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTUFn ZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6Y3JlYXRlKToKKwog MjAxMS0wMy0yOSAgRW1pbCBBIEVrbHVuZCAgPGVhZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckFnZW50LmNwcAppbmRleCBjYWFhZTNkLi4yMmY0NmU1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5jcHAKQEAgLTEwMCw3ICsxMDAsNyBAQCBJbnNwZWN0 b3JBZ2VudDo6SW5zcGVjdG9yQWdlbnQoUGFnZSogcGFnZSwgSW5zcGVjdG9yQ2xpZW50KiBjbGll bnQsIEluamVjdGVkU2NyaQogICAgICwgbV9pbnN0cnVtZW50aW5nQWdlbnRzKG5ldyBJbnN0cnVt ZW50aW5nQWdlbnRzKCkpCiAgICAgLCBtX2luamVjdGVkU2NyaXB0TWFuYWdlcihpbmplY3RlZFNj cmlwdE1hbmFnZXIpCiAgICAgLCBtX3N0YXRlKG5ldyBJbnNwZWN0b3JTdGF0ZShjbGllbnQpKQot ICAgICwgbV9kb21BZ2VudChJbnNwZWN0b3JET01BZ2VudDo6Y3JlYXRlKG1faW5zdHJ1bWVudGlu Z0FnZW50cy5nZXQoKSwgcGFnZSwgbV9zdGF0ZS5nZXQoKSwgaW5qZWN0ZWRTY3JpcHRNYW5hZ2Vy KSkKKyAgICAsIG1fZG9tQWdlbnQoSW5zcGVjdG9yRE9NQWdlbnQ6OmNyZWF0ZShtX2luc3RydW1l bnRpbmdBZ2VudHMuZ2V0KCksIHBhZ2UsIG1fY2xpZW50LCBtX3N0YXRlLmdldCgpLCBpbmplY3Rl ZFNjcmlwdE1hbmFnZXIpKQogICAgICwgbV9jc3NBZ2VudChuZXcgSW5zcGVjdG9yQ1NTQWdlbnQo bV9pbnN0cnVtZW50aW5nQWdlbnRzLmdldCgpLCBtX2RvbUFnZW50LmdldCgpKSkKICNpZiBFTkFC TEUoREFUQUJBU0UpCiAgICAgLCBtX2RhdGFiYXNlQWdlbnQoSW5zcGVjdG9yRGF0YWJhc2VBZ2Vu dDo6Y3JlYXRlKG1faW5zdHJ1bWVudGluZ0FnZW50cy5nZXQoKSkpCkBAIC0xODYsNDMgKzE4Niw2 IEBAIHZvaWQgSW5zcGVjdG9yQWdlbnQ6OnJlc3RvcmVJbnNwZWN0b3JTdGF0ZUZyb21Db29raWUo Y29uc3QgU3RyaW5nJiBpbnNwZWN0b3JTdGF0CiAjZW5kaWYKIH0KIAotdm9pZCBJbnNwZWN0b3JB Z2VudDo6aW5zcGVjdChOb2RlKiBub2RlKQotewotICAgIGlmIChub2RlLT5ub2RlVHlwZSgpICE9 IE5vZGU6OkVMRU1FTlRfTk9ERSAmJiBub2RlLT5ub2RlVHlwZSgpICE9IE5vZGU6OkRPQ1VNRU5U X05PREUpCi0gICAgICAgIG5vZGUgPSBub2RlLT5wYXJlbnROb2RlKCk7Ci0gICAgbV9ub2RlVG9G b2N1cyA9IG5vZGU7Ci0KLSAgICBpZiAoIW1fZnJvbnRlbmQpCi0gICAgICAgIHJldHVybjsKLQot ICAgIGZvY3VzTm9kZSgpOwotfQotCi12b2lkIEluc3BlY3RvckFnZW50Ojpmb2N1c05vZGUoKQot ewotICAgIGlmICghZW5hYmxlZCgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBBU1NFUlQobV9m cm9udGVuZCk7Ci0gICAgQVNTRVJUKG1fbm9kZVRvRm9jdXMpOwotCi0gICAgUmVmUHRyPE5vZGU+ IG5vZGUgPSBtX25vZGVUb0ZvY3VzLmdldCgpOwotICAgIG1fbm9kZVRvRm9jdXMgPSAwOwotCi0g ICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gbm9kZS0+b3duZXJEb2N1bWVudCgpOwotICAgIGlmICgh ZG9jdW1lbnQpCi0gICAgICAgIHJldHVybjsKLSAgICBGcmFtZSogZnJhbWUgPSBkb2N1bWVudC0+ ZnJhbWUoKTsKLSAgICBpZiAoIWZyYW1lKQotICAgICAgICByZXR1cm47Ci0KLSAgICBJbmplY3Rl ZFNjcmlwdCBpbmplY3RlZFNjcmlwdCA9IG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLT5pbmplY3Rl ZFNjcmlwdEZvcihtYWluV29ybGRTY3JpcHRTdGF0ZShmcmFtZSkpOwotICAgIGlmIChpbmplY3Rl ZFNjcmlwdC5oYXNOb1ZhbHVlKCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIGluamVjdGVkU2Ny aXB0Lmluc3BlY3ROb2RlKG5vZGUuZ2V0KCkpOwotfQotCiB2b2lkIEluc3BlY3RvckFnZW50Ojpk aWRDbGVhcldpbmRvd09iamVjdEluV29ybGQoRnJhbWUqIGZyYW1lLCBET01XcmFwcGVyV29ybGQq IHdvcmxkKQogewogICAgIGlmICh3b3JsZCAhPSBtYWluVGhyZWFkTm9ybWFsV29ybGQoKSkKQEAg LTI3Nyw4ICsyNDAsNiBAQCB2b2lkIEluc3BlY3RvckFnZW50OjpzZXRGcm9udGVuZChJbnNwZWN0 b3JGcm9udGVuZCogaW5zcGVjdG9yRnJvbnRlbmQpCiAgICAgICAgIG1fZnJvbnRlbmQtPmluc3Bl Y3RvcigpLT5zaG93UGFuZWwobV9zaG93UGFuZWxBZnRlclZpc2libGUpOwogICAgICAgICBtX3No b3dQYW5lbEFmdGVyVmlzaWJsZSA9IFN0cmluZygpOwogICAgIH0KLSAgICBpZiAobV9ub2RlVG9G b2N1cykKLSAgICAgICAgZm9jdXNOb2RlKCk7CiAjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdH RVIpICYmIEVOQUJMRShXT1JLRVJTKQogICAgIFdvcmtlcnNNYXA6Oml0ZXJhdG9yIHdvcmtlcnNF bmQgPSBtX3dvcmtlcnMuZW5kKCk7CiAgICAgZm9yIChXb3JrZXJzTWFwOjppdGVyYXRvciBpdCA9 IG1fd29ya2Vycy5iZWdpbigpOyBpdCAhPSB3b3JrZXJzRW5kOyArK2l0KSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuaCBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5oCmluZGV4IDYyYzllODIuLjlhNTI1YTQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5oCkBAIC0xMTUsOCArMTE1 LDYgQEAgcHVibGljOgogCiAgICAgdm9pZCByZXN0b3JlSW5zcGVjdG9yU3RhdGVGcm9tQ29va2ll KGNvbnN0IFN0cmluZyYgaW5zcGVjdG9yQ29va2llKTsKIAotICAgIHZvaWQgaW5zcGVjdChOb2Rl Kik7Ci0KICAgICB2b2lkIHNldEZyb250ZW5kKEluc3BlY3RvckZyb250ZW5kKik7CiAgICAgSW5z cGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kKCkgY29uc3QgeyByZXR1cm4gbV9mcm9udGVuZDsgfQog ICAgIHZvaWQgZGlzY29ubmVjdEZyb250ZW5kKCk7CkBAIC0yMDMsNyArMjAxLDYgQEAgcHJpdmF0 ZToKICAgICBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gYnVpbGRPYmplY3RGb3JDb29raWUo Y29uc3QgQ29va2llJik7CiAgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3JBcnJheT4gYnVpbGRBcnJh eUZvckNvb2tpZXMoTGlzdEhhc2hTZXQ8Q29va2llPiYpOwogCi0gICAgdm9pZCBmb2N1c05vZGUo KTsKICAgICBib29sIGlzTWFpblJlc291cmNlTG9hZGVyKERvY3VtZW50TG9hZGVyKiwgY29uc3Qg S1VSTCYgcmVxdWVzdFVybCk7CiAgICAgdm9pZCBpc3N1ZUV2YWx1YXRlRm9yVGVzdENvbW1hbmRz KCk7CiAKQEAgLTIzMCw3ICsyMjcsNiBAQCBwcml2YXRlOgogICAgIE93blB0cjxJbnNwZWN0b3JB cHBsaWNhdGlvbkNhY2hlQWdlbnQ+IG1fYXBwbGljYXRpb25DYWNoZUFnZW50OwogI2VuZGlmCiAK LSAgICBSZWZQdHI8Tm9kZT4gbV9ub2RlVG9Gb2N1czsKICAgICBSZWZQdHI8SW5zcGVjdG9yUmVz b3VyY2VBZ2VudD4gbV9yZXNvdXJjZUFnZW50OwogICAgIE93blB0cjxJbnNwZWN0b3JSdW50aW1l QWdlbnQ+IG1fcnVudGltZUFnZW50OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggODBhNWU4OS4uZmU1ZjA2YSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAtMjE5 LDcgKzIxOSw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6aW5zcGVjdChOb2RlKiBub2Rl KQogCiAgICAgc2hvdygpOwogCi0gICAgbV9pbnNwZWN0b3JBZ2VudC0+aW5zcGVjdChub2RlKTsK KyAgICBtX2luc3BlY3RvckFnZW50LT5kb21BZ2VudCgpLT5pbnNwZWN0KG5vZGUpOwogfQogCiBi b29sIEluc3BlY3RvckNvbnRyb2xsZXI6OmVuYWJsZWQoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKaW5kZXggNWIzMmQ5Yi4uMDZjNTk3 NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3Bw CkBAIC02Miw3ICs2Miw2IEBACiAjaW5jbHVkZSAiSFRNTEVsZW1lbnQuaCIKICNpbmNsdWRlICJI VE1MRnJhbWVPd25lckVsZW1lbnQuaCIKICNpbmNsdWRlICJJbmplY3RlZFNjcmlwdE1hbmFnZXIu aCIKLSNpbmNsdWRlICJJbnNwZWN0b3JBZ2VudC5oIgogI2luY2x1ZGUgIkluc3BlY3RvckNsaWVu dC5oIgogI2luY2x1ZGUgIkluc3BlY3RvckZyb250ZW5kLmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9y UmVzb3VyY2VBZ2VudC5oIgpAQCAtMjU4LDkgKzI1NywxMCBAQCB2b2lkIFJldmFsaWRhdGVTdHls ZUF0dHJpYnV0ZVRhc2s6Om9uVGltZXIoVGltZXI8UmV2YWxpZGF0ZVN0eWxlQXR0cmlidXRlVGFz az4qKQogICAgIG1fZWxlbWVudHMuY2xlYXIoKTsKIH0KIAotSW5zcGVjdG9yRE9NQWdlbnQ6Oklu c3BlY3RvckRPTUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMs IFBhZ2UqIGluc3BlY3RlZFBhZ2UsIEluc3BlY3RvclN0YXRlKiBpbnNwZWN0b3JTdGF0ZSwgSW5q ZWN0ZWRTY3JpcHRNYW5hZ2VyKiBpbmplY3RlZFNjcmlwdE1hbmFnZXIpCitJbnNwZWN0b3JET01B Z2VudDo6SW5zcGVjdG9yRE9NQWdlbnQoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGlu Z0FnZW50cywgUGFnZSogaW5zcGVjdGVkUGFnZSwgSW5zcGVjdG9yQ2xpZW50KiBjbGllbnQsIElu c3BlY3RvclN0YXRlKiBpbnNwZWN0b3JTdGF0ZSwgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKiBpbmpl Y3RlZFNjcmlwdE1hbmFnZXIpCiAgICAgOiBtX2luc3RydW1lbnRpbmdBZ2VudHMoaW5zdHJ1bWVu dGluZ0FnZW50cykKICAgICAsIG1faW5zcGVjdGVkUGFnZShpbnNwZWN0ZWRQYWdlKQorICAgICwg bV9jbGllbnQoY2xpZW50KQogICAgICwgbV9pbnNwZWN0b3JTdGF0ZShpbnNwZWN0b3JTdGF0ZSkK ICAgICAsIG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKGluamVjdGVkU2NyaXB0TWFuYWdlcikKICAg ICAsIG1fZnJvbnRlbmQoMCkKQEAgLTI4NCw2ICsyODQsOSBAQCB2b2lkIEluc3BlY3RvckRPTUFn ZW50OjpzZXRGcm9udGVuZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQpCiAgICAgbV9mcm9u dGVuZCA9IGZyb250ZW5kLT5kb20oKTsKICAgICBtX2luc3RydW1lbnRpbmdBZ2VudHMtPnNldElu c3BlY3RvckRPTUFnZW50KHRoaXMpOwogICAgIG1fZG9jdW1lbnQgPSBtX2luc3BlY3RlZFBhZ2Ut Pm1haW5GcmFtZSgpLT5kb2N1bWVudCgpOworCisgICAgaWYgKG1fbm9kZVRvRm9jdXMpCisgICAg ICAgIGZvY3VzTm9kZSgpOwogfQogCiB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpjbGVhckZyb250 ZW5kKCkKQEAgLTg5NSwxMSArODk4LDQ0IEBAIGJvb2wgSW5zcGVjdG9yRE9NQWdlbnQ6OmhhbmRs ZU1vdXNlUHJlc3MoKQogICAgIGlmIChtX2hpZ2hsaWdodGVkTm9kZSkgewogICAgICAgICBSZWZQ dHI8Tm9kZT4gbm9kZSA9IG1faGlnaGxpZ2h0ZWROb2RlOwogICAgICAgICBzZXRTZWFyY2hpbmdG b3JOb2RlKGZhbHNlKTsKLSAgICAgICAgbV9pbnN0cnVtZW50aW5nQWdlbnRzLT5pbnNwZWN0b3JB Z2VudCgpLT5pbnNwZWN0KG5vZGUuZ2V0KCkpOworICAgICAgICBpbnNwZWN0KG5vZGUuZ2V0KCkp OwogICAgIH0KICAgICByZXR1cm4gdHJ1ZTsKIH0KIAordm9pZCBJbnNwZWN0b3JET01BZ2VudDo6 aW5zcGVjdChOb2RlKiBub2RlKQoreworICAgIGlmIChub2RlLT5ub2RlVHlwZSgpICE9IE5vZGU6 OkVMRU1FTlRfTk9ERSAmJiBub2RlLT5ub2RlVHlwZSgpICE9IE5vZGU6OkRPQ1VNRU5UX05PREUp CisgICAgICAgIG5vZGUgPSBub2RlLT5wYXJlbnROb2RlKCk7CisgICAgbV9ub2RlVG9Gb2N1cyA9 IG5vZGU7CisKKyAgICBmb2N1c05vZGUoKTsKK30KKwordm9pZCBJbnNwZWN0b3JET01BZ2VudDo6 Zm9jdXNOb2RlKCkKK3sKKyAgICBpZiAoIW1fZnJvbnRlbmQpCisgICAgICAgIHJldHVybjsKKwor ICAgIEFTU0VSVChtX25vZGVUb0ZvY3VzKTsKKworICAgIFJlZlB0cjxOb2RlPiBub2RlID0gbV9u b2RlVG9Gb2N1cy5nZXQoKTsKKyAgICBtX25vZGVUb0ZvY3VzID0gMDsKKworICAgIERvY3VtZW50 KiBkb2N1bWVudCA9IG5vZGUtPm93bmVyRG9jdW1lbnQoKTsKKyAgICBpZiAoIWRvY3VtZW50KQor ICAgICAgICByZXR1cm47CisgICAgRnJhbWUqIGZyYW1lID0gZG9jdW1lbnQtPmZyYW1lKCk7Cisg ICAgaWYgKCFmcmFtZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgSW5qZWN0ZWRTY3JpcHQgaW5q ZWN0ZWRTY3JpcHQgPSBtX2luamVjdGVkU2NyaXB0TWFuYWdlci0+aW5qZWN0ZWRTY3JpcHRGb3Io bWFpbldvcmxkU2NyaXB0U3RhdGUoZnJhbWUpKTsKKyAgICBpZiAoaW5qZWN0ZWRTY3JpcHQuaGFz Tm9WYWx1ZSgpKQorICAgICAgICByZXR1cm47CisKKyAgICBpbmplY3RlZFNjcmlwdC5pbnNwZWN0 Tm9kZShub2RlLmdldCgpKTsKK30KKwogdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6bW91c2VEaWRN b3ZlT3ZlckVsZW1lbnQoY29uc3QgSGl0VGVzdFJlc3VsdCYgcmVzdWx0LCB1bnNpZ25lZCkKIHsK ICAgICBpZiAoIW1fc2VhcmNoaW5nRm9yTm9kZSkKQEAgLTkzNSw3ICs5NzEsNyBAQCB2b2lkIElu c3BlY3RvckRPTUFnZW50OjpoaWdobGlnaHQoRXJyb3JTdHJpbmcqLCBOb2RlKiBub2RlKQogewog ICAgIEFTU0VSVF9BUkcobm9kZSwgbm9kZSk7CiAgICAgbV9oaWdobGlnaHRlZE5vZGUgPSBub2Rl OwotICAgIG1faW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yQWdlbnQoKS0+aW5zcGVjdG9y Q2xpZW50KCktPmhpZ2hsaWdodChub2RlKTsKKyAgICBtX2NsaWVudC0+aGlnaGxpZ2h0KG5vZGUp OwogfQogCiB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpoaWdobGlnaHRET01Ob2RlKEVycm9yU3Ry aW5nKiBlcnJvciwgaW50IG5vZGVJZCkKQEAgLTk1NCw3ICs5OTAsNyBAQCB2b2lkIEluc3BlY3Rv ckRPTUFnZW50OjpoaWdobGlnaHRGcmFtZShFcnJvclN0cmluZyogZXJyb3IsIGNvbnN0IFN0cmlu ZyYgZnJhbWVJZAogdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6aGlkZUhpZ2hsaWdodChFcnJvclN0 cmluZyopCiB7CiAgICAgbV9oaWdobGlnaHRlZE5vZGUgPSAwOwotICAgIG1faW5zdHJ1bWVudGlu Z0FnZW50cy0+aW5zcGVjdG9yQWdlbnQoKS0+aW5zcGVjdG9yQ2xpZW50KCktPmhpZGVIaWdobGln aHQoKTsKKyAgICBtX2NsaWVudC0+aGlkZUhpZ2hsaWdodCgpOwogfQogCiB2b2lkIEluc3BlY3Rv ckRPTUFnZW50OjpyZXNvbHZlTm9kZShFcnJvclN0cmluZyogZXJyb3IsIGludCBub2RlSWQsIFJl ZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiByZXN1bHQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JET01BZ2VudC5oCmluZGV4IGRmZTc2NjkuLjhhZWI2NmIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oCkBAIC01NCw2ICs1NCw3IEBA IGNsYXNzIERvY3VtZW50OwogY2xhc3MgRWxlbWVudDsKIGNsYXNzIEV2ZW50OwogY2xhc3MgR3Jh cGhpY3NDb250ZXh0OworY2xhc3MgSW5zcGVjdG9yQ2xpZW50OwogY2xhc3MgSW5zcGVjdG9yRE9N QWdlbnQ7CiBjbGFzcyBJbnNwZWN0b3JGcm9udGVuZDsKIGNsYXNzIEhpdFRlc3RSZXN1bHQ7CkBA IC05NSw5ICs5Niw5IEBAIHB1YmxpYzoKICAgICAgICAgdmlydHVhbCB2b2lkIGRpZE1vZGlmeURP TUF0dHIoRWxlbWVudCopID0gMDsKICAgICB9OwogCi0gICAgc3RhdGljIFBhc3NPd25QdHI8SW5z cGVjdG9yRE9NQWdlbnQ+IGNyZWF0ZShJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5n QWdlbnRzLCBQYWdlKiBwYWdlLCBJbnNwZWN0b3JTdGF0ZSogaW5zcGVjdG9yU3RhdGUsIEluamVj dGVkU2NyaXB0TWFuYWdlciogaW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKQorICAgIHN0YXRpYyBQYXNz T3duUHRyPEluc3BlY3RvckRPTUFnZW50PiBjcmVhdGUoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5z dHJ1bWVudGluZ0FnZW50cywgUGFnZSogcGFnZSwgSW5zcGVjdG9yQ2xpZW50KiBjbGllbnQsIElu c3BlY3RvclN0YXRlKiBpbnNwZWN0b3JTdGF0ZSwgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKiBpbmpl Y3RlZFNjcmlwdE1hbmFnZXIpCiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IElu c3BlY3RvckRPTUFnZW50KGluc3RydW1lbnRpbmdBZ2VudHMsIHBhZ2UsIGluc3BlY3RvclN0YXRl LCBpbmplY3RlZFNjcmlwdE1hbmFnZXIpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBJ bnNwZWN0b3JET01BZ2VudChpbnN0cnVtZW50aW5nQWdlbnRzLCBwYWdlLCBjbGllbnQsIGluc3Bl Y3RvclN0YXRlLCBpbmplY3RlZFNjcmlwdE1hbmFnZXIpKTsKICAgICB9CiAKICAgICB+SW5zcGVj dG9yRE9NQWdlbnQoKTsKQEAgLTE1OCw2ICsxNTksOCBAQCBwdWJsaWM6CiAgICAgYm9vbCBoYW5k bGVNb3VzZVByZXNzKCk7CiAgICAgYm9vbCBzZWFyY2hpbmdGb3JOb2RlSW5QYWdlKCkgY29uc3Q7 CiAgICAgdm9pZCBtb3VzZURpZE1vdmVPdmVyRWxlbWVudChjb25zdCBIaXRUZXN0UmVzdWx0Jiwg dW5zaWduZWQgbW9kaWZpZXJGbGFncyk7CisgICAgdm9pZCBpbnNwZWN0KE5vZGUqKTsKKyAgICB2 b2lkIGZvY3VzTm9kZSgpOwogCiAgICAgdm9pZCBkcmF3Tm9kZUhpZ2hsaWdodChHcmFwaGljc0Nv bnRleHQmKSBjb25zdDsKIApAQCAtMTcxLDcgKzE3NCw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMg Ym9vbCBpc1doaXRlc3BhY2UoTm9kZSopOwogCiBwcml2YXRlOgotICAgIEluc3BlY3RvckRPTUFn ZW50KEluc3RydW1lbnRpbmdBZ2VudHMqLCBQYWdlKiwgSW5zcGVjdG9yU3RhdGUqLCBJbmplY3Rl ZFNjcmlwdE1hbmFnZXIqKTsKKyAgICBJbnNwZWN0b3JET01BZ2VudChJbnN0cnVtZW50aW5nQWdl bnRzKiwgUGFnZSosIEluc3BlY3RvckNsaWVudCosIEluc3BlY3RvclN0YXRlKiwgSW5qZWN0ZWRT Y3JpcHRNYW5hZ2VyKik7CiAKICAgICB2b2lkIHNldFNlYXJjaGluZ0Zvck5vZGUoYm9vbCBlbmFi bGVkKTsKICAgICB2b2lkIGhpZ2hsaWdodChFcnJvclN0cmluZyosIE5vZGUqKTsKQEAgLTIwNyw2 ICsyMTAsNyBAQCBwcml2YXRlOgogCiAgICAgSW5zdHJ1bWVudGluZ0FnZW50cyogbV9pbnN0cnVt ZW50aW5nQWdlbnRzOwogICAgIFBhZ2UqIG1faW5zcGVjdGVkUGFnZTsKKyAgICBJbnNwZWN0b3JD bGllbnQqIG1fY2xpZW50OwogICAgIEluc3BlY3RvclN0YXRlKiBtX2luc3BlY3RvclN0YXRlOwog ICAgIEluamVjdGVkU2NyaXB0TWFuYWdlciogbV9pbmplY3RlZFNjcmlwdE1hbmFnZXI7CiAgICAg SW5zcGVjdG9yRnJvbnRlbmQ6OkRPTSogbV9mcm9udGVuZDsKQEAgLTIyNCw2ICsyMjgsNyBAQCBw cml2YXRlOgogICAgIEhhc2hTZXQ8UmVmUHRyPE5vZGU+ID4gbV9zZWFyY2hSZXN1bHRzOwogICAg IE93blB0cjxSZXZhbGlkYXRlU3R5bGVBdHRyaWJ1dGVUYXNrPiBtX3JldmFsaWRhdGVTdHlsZUF0 dHJUYXNrOwogICAgIFJlZlB0cjxOb2RlPiBtX2hpZ2hsaWdodGVkTm9kZTsKKyAgICBSZWZQdHI8 Tm9kZT4gbV9ub2RlVG9Gb2N1czsKICAgICBib29sIG1fc2VhcmNoaW5nRm9yTm9kZTsKIH07CiAK