85708 2012-05-05 05:50:23 -0700 Web Inspector: get rid of InspectorAgent::emitCommitLoadIfNeeded method 2012-05-11 01:41:27 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 85612 0 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 616955 0 yurys 2012-05-05 05:50:23 -0700 The method is special in that it is called by InspectorController when render process changes right after restore() has been called on all agents. The method makes front-end see the cross process navigation as one that doesn't lead to process change. Instead of having a special method we should send "reset" events from corresponding restore methods. 617444 1 140491 yurys 2012-05-07 01:12:39 -0700 Created attachment 140491 Patch 620477 2 140491 pfeldman 2012-05-10 05:01:46 -0700 Comment on attachment 140491 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=140491&action=review > Source/WebCore/inspector/InspectorResourceAgent.cpp:97 > + mainFrameNavigated(m_pageAgent->mainFrame()->loader()->documentLoader()); I don't think you need this. 620478 3 141148 yurys 2012-05-10 05:06:59 -0700 Created attachment 141148 Patch for landing 620479 4 yurys 2012-05-10 05:07:09 -0700 (In reply to comment #2) > (From update of attachment 140491 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=140491&action=review > > > Source/WebCore/inspector/InspectorResourceAgent.cpp:97 > > + mainFrameNavigated(m_pageAgent->mainFrame()->loader()->documentLoader()); > > I don't think you need this. Done. 621388 5 yurys 2012-05-11 01:41:27 -0700 Committed r116740: <http://trac.webkit.org/changeset/116740> 140491 2012-05-07 01:12:39 -0700 2012-05-10 05:06:59 -0700 Patch bug-85708-20120507121237.patch text/plain 10443 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2MjIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2NmOWQxNWIwZGEyM2I1 NDViMzllNTY0Y2VmZjNiOTc4NmExYjQ0NS4uMWI0ZTVhMjAyNjg3YzRiYzk1MzFmYTI3NWEyNWUz MGFhNDVlY2RiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTA1LTA3ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGdldCByaWQgb2YgSW5zcGVjdG9yQWdlbnQ6OmVtaXRDb21taXRMb2FkSWZOZWVkZWQgbWV0 aG9kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTcw OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3Rl YWQgb2YgY2FsbGluZyBlbWl0Q29tbWl0TG9hZElmTmVlZGVkIGFmdGVyIGFsbCBhZ2VudHMgYXJl IHJlc3RvcmVkCisgICAgICAgIHJlcXVpcmVkIGFjdGlvbnMgYXJlIHBlcmZvcm1lZCBkaXJlY3Rs eSBpbiB0aGUgcmVzdG9yZSgpIG1ldGhvZHMuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVj dG9yQWdlbnQuY3BwOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5oOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQWdlbnQ6OmRpZENvbW1pdExvYWRGaXJlZCk6CisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6SW5zcGVjdG9yQ29udHJvbGxlcik6CisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpyZXN0b3JlSW5zcGVjdG9yU3RhdGVGcm9tQ29v a2llKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRGF0YWJhc2VBZ2VudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JEYXRhYmFzZUFnZW50OjpyZXN0b3JlKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvclBhZ2VBZ2VudDo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv clBhZ2VBZ2VudDo6SW5zcGVjdG9yUGFnZUFnZW50KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvclBhZ2VBZ2VudDo6cmVzdG9yZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclBh Z2VBZ2VudC5oOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3Bl Y3RvclJlc291cmNlQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUmVzb3Vy Y2VBZ2VudDo6cmVzdG9yZSk6CisKIDIwMTItMDUtMDUgIElseWEgVGlraG9ub3Zza3kgIDxsb2lz bG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNvbnZlcnQgc3RhbmRh bG9uZSBmdW5jdGlvbnMgc2F2ZS9hcHBlbmQvc2F2ZWRVUkwvYXBwZW5kZWRUb1VSTCBpbnRvIFdl Ykluc3BlY3Rvci5GaWxlTWFuYWdlciBvYmplY3QuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckFnZW50LmNwcAppbmRleCBiYTdhNzMzNTFjMDljODkyMzVlNDZiYzE0YWM4ODJh MTRlOWRmMjY2Li4zNWU1MzE0Mzk4ZWFhZjg3ZDg2OGQ5MmFlYTkxZmFkNmVmYTlkMjllIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5jcHAKQEAgLTgwLDEyICs4 MCw2IEBAIEluc3BlY3RvckFnZW50Ojp+SW5zcGVjdG9yQWdlbnQoKQogICAgIG1faW5zdHJ1bWVu dGluZ0FnZW50cy0+c2V0SW5zcGVjdG9yQWdlbnQoMCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yQWdl bnQ6OmVtaXRDb21taXRMb2FkSWZOZWVkZWQoKQotewotICAgIGlmIChtX2RpZENvbW1pdExvYWRG aXJlZCkKLSAgICAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRDb21taXRMb2FkKG1f aW5zcGVjdGVkUGFnZS0+bWFpbkZyYW1lKCksIG1faW5zcGVjdGVkUGFnZS0+bWFpbkZyYW1lKCkt PmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpKTsKLX0KLQogdm9pZCBJbnNwZWN0b3JBZ2VudDo6 ZGlkQ2xlYXJXaW5kb3dPYmplY3RJbldvcmxkKEZyYW1lKiBmcmFtZSwgRE9NV3JhcHBlcldvcmxk KiB3b3JsZCkKIHsKICAgICBpZiAod29ybGQgIT0gbWFpblRocmVhZE5vcm1hbFdvcmxkKCkpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuaCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5oCmluZGV4IDQ5ZTc5ZmEwZjVl MDMxNDU0YjhhZDQyOTE5NWY3YWQ2ZWVhMzJhOTUuLjUyZjMxZTJjODFhZGE4MzIyOGIzY2NmNWI1 ZmMyOWFmMDY3ODAwN2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2Vu dC5oCkBAIC04MCw3ICs4MCw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgZGlkQ29tbWl0TG9hZCgp OwogICAgIHZvaWQgZG9tQ29udGVudExvYWRlZEV2ZW50RmlyZWQoKTsKLSAgICB2b2lkIGVtaXRD b21taXRMb2FkSWZOZWVkZWQoKTsKKyAgICBib29sIGRpZENvbW1pdExvYWRGaXJlZCgpIHsgcmV0 dXJuIG1fZGlkQ29tbWl0TG9hZEZpcmVkOyB9CiAKICNpZiBFTkFCTEUoV09SS0VSUykKICAgICB2 b2lkIGRpZENyZWF0ZVdvcmtlcihpbnRwdHJfdCwgY29uc3QgU3RyaW5nJiB1cmwsIGJvb2wgaXNT aGFyZWRXb3JrZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuY3BwCmluZGV4IGQ4M2Q2YzZjODRhY2RmNzNjMmVlYzUyZDc3YmZlZWM1YTNlMjQ4 OTcuLmU5YzU4ZmUyNmQ3NDRjMjBlYWM1ZTUwOTA4YzUwNmExNmNiYmM2ODEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTg0LDcg Kzg0LDcgQEAgSW5zcGVjdG9yQ29udHJvbGxlcjo6SW5zcGVjdG9yQ29udHJvbGxlcihQYWdlKiBw YWdlLCBJbnNwZWN0b3JDbGllbnQqIGluc3BlY3RvckMKICAgICBtX2luc3BlY3RvckFnZW50ID0g aW5zcGVjdG9yQWdlbnRQdHIuZ2V0KCk7CiAgICAgbV9hZ2VudHMuYXBwZW5kKGluc3BlY3RvckFn ZW50UHRyLnJlbGVhc2UoKSk7CiAKLSAgICBPd25QdHI8SW5zcGVjdG9yUGFnZUFnZW50PiBwYWdl QWdlbnRQdHIoSW5zcGVjdG9yUGFnZUFnZW50OjpjcmVhdGUobV9pbnN0cnVtZW50aW5nQWdlbnRz LmdldCgpLCBwYWdlLCBtX3N0YXRlLmdldCgpLCBtX2luamVjdGVkU2NyaXB0TWFuYWdlci5nZXQo KSwgaW5zcGVjdG9yQ2xpZW50KSk7CisgICAgT3duUHRyPEluc3BlY3RvclBhZ2VBZ2VudD4gcGFn ZUFnZW50UHRyKEluc3BlY3RvclBhZ2VBZ2VudDo6Y3JlYXRlKG1faW5zdHJ1bWVudGluZ0FnZW50 cy5nZXQoKSwgcGFnZSwgbV9pbnNwZWN0b3JBZ2VudCwgbV9zdGF0ZS5nZXQoKSwgbV9pbmplY3Rl ZFNjcmlwdE1hbmFnZXIuZ2V0KCksIGluc3BlY3RvckNsaWVudCkpOwogICAgIEluc3BlY3RvclBh Z2VBZ2VudCogcGFnZUFnZW50ID0gcGFnZUFnZW50UHRyLmdldCgpOwogICAgIG1fcGFnZUFnZW50 ID0gcGFnZUFnZW50UHRyLmdldCgpOwogICAgIG1fYWdlbnRzLmFwcGVuZChwYWdlQWdlbnRQdHIu cmVsZWFzZSgpKTsKQEAgLTI3Myw3ICsyNzMsNiBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6 OnJlc3RvcmVJbnNwZWN0b3JTdGF0ZUZyb21Db29raWUoY29uc3QgU3RyaW5nJiBpbnNwZWN0bwog CiAgICAgZm9yIChBZ2VudHM6Oml0ZXJhdG9yIGl0ID0gbV9hZ2VudHMuYmVnaW4oKTsgaXQgIT0g bV9hZ2VudHMuZW5kKCk7ICsraXQpCiAgICAgICAgICgqaXQpLT5yZXN0b3JlKCk7Ci0gICAgbV9p bnNwZWN0b3JBZ2VudC0+ZW1pdENvbW1pdExvYWRJZk5lZWRlZCgpOwogfQogCiB2b2lkIEluc3Bl Y3RvckNvbnRyb2xsZXI6OnNldFByb2Nlc3NJZChsb25nIHByb2Nlc3NJZCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEYXRhYmFzZUFnZW50LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEYXRhYmFzZUFnZW50LmNwcAppbmRleCBl OGY1ZDRhZWMwNmZhYTI3NTE0MjI2ODAwYjE0NGU3M2VmY2Q3OGZhLi5jY2IwMDNjM2ZmMzAyZTVh ZmE0MGRmMDY4ZjgxMDNiOTNmNjlmZDExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRGF0YWJhc2VBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckRhdGFiYXNlQWdlbnQuY3BwCkBAIC0yODgsNyArMjg4LDcgQEAgdm9p ZCBJbnNwZWN0b3JEYXRhYmFzZUFnZW50OjpkaXNhYmxlKEVycm9yU3RyaW5nKikKIAogdm9pZCBJ bnNwZWN0b3JEYXRhYmFzZUFnZW50OjpyZXN0b3JlKCkKIHsKLSAgICBtX2VuYWJsZWQgPSAgbV9z dGF0ZS0+Z2V0Qm9vbGVhbihEYXRhYmFzZUFnZW50U3RhdGU6OmRhdGFiYXNlQWdlbnRFbmFibGVk KTsKKyAgICBtX2VuYWJsZWQgPSBtX3N0YXRlLT5nZXRCb29sZWFuKERhdGFiYXNlQWdlbnRTdGF0 ZTo6ZGF0YWJhc2VBZ2VudEVuYWJsZWQpOwogfQogCiB2b2lkIEluc3BlY3RvckRhdGFiYXNlQWdl bnQ6OmdldERhdGFiYXNlVGFibGVOYW1lcyhFcnJvclN0cmluZyogZXJyb3IsIGNvbnN0IFN0cmlu ZyYgZGF0YWJhc2VJZCwgUmVmUHRyPFR5cGVCdWlsZGVyOjpBcnJheTxTdHJpbmc+ID4mIG5hbWVz KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2Vu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcApp bmRleCA2MWZlMGE3ZThkMGEzYjNiYmY4MDA4ZTJkYzMwNmE5Y2E5YmYyODVmLi40ZTA2YTQzNmI1 YzY3MTRiYTBhMzI4NjkyNmEzNmY5YzVhZjNhMmE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcApAQCAtNTUsNiArNTUsNyBAQAogI2luY2x1 ZGUgIkhUTUxOYW1lcy5oIgogI2luY2x1ZGUgIklkZW50aWZpZXJzRmFjdG9yeS5oIgogI2luY2x1 ZGUgIkluamVjdGVkU2NyaXB0TWFuYWdlci5oIgorI2luY2x1ZGUgIkluc3BlY3RvckFnZW50Lmgi CiAjaW5jbHVkZSAiSW5zcGVjdG9yQ2xpZW50LmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yRnJvbnRl bmQuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaCIKQEAgLTIyMiw5ICsy MjMsOSBAQCBib29sIEluc3BlY3RvclBhZ2VBZ2VudDo6c2hhcmVkQnVmZmVyQ29udGVudChQYXNz UmVmUHRyPFNoYXJlZEJ1ZmZlcj4gYnVmZmVyLCBjbwogICAgIHJldHVybiBkZWNvZGVTaGFyZWRC dWZmZXIoYnVmZmVyLCB0ZXh0RW5jb2RpbmdOYW1lLCByZXN1bHQpOwogfQogCi1QYXNzT3duUHRy PEluc3BlY3RvclBhZ2VBZ2VudD4gSW5zcGVjdG9yUGFnZUFnZW50OjpjcmVhdGUoSW5zdHJ1bWVu dGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgUGFnZSogcGFnZSwgSW5zcGVjdG9yU3Rh dGUqIHN0YXRlLCBJbmplY3RlZFNjcmlwdE1hbmFnZXIqIGluamVjdGVkU2NyaXB0TWFuYWdlciwg SW5zcGVjdG9yQ2xpZW50KiBjbGllbnQpCitQYXNzT3duUHRyPEluc3BlY3RvclBhZ2VBZ2VudD4g SW5zcGVjdG9yUGFnZUFnZW50OjpjcmVhdGUoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVu dGluZ0FnZW50cywgUGFnZSogcGFnZSwgSW5zcGVjdG9yQWdlbnQqIGluc3BlY3RvckFnZW50LCBJ bnNwZWN0b3JTdGF0ZSogc3RhdGUsIEluamVjdGVkU2NyaXB0TWFuYWdlciogaW5qZWN0ZWRTY3Jp cHRNYW5hZ2VyLCBJbnNwZWN0b3JDbGllbnQqIGNsaWVudCkKIHsKLSAgICByZXR1cm4gYWRvcHRQ dHIobmV3IEluc3BlY3RvclBhZ2VBZ2VudChpbnN0cnVtZW50aW5nQWdlbnRzLCBwYWdlLCBzdGF0 ZSwgaW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLCBjbGllbnQpKTsKKyAgICByZXR1cm4gYWRvcHRQdHIo bmV3IEluc3BlY3RvclBhZ2VBZ2VudChpbnN0cnVtZW50aW5nQWdlbnRzLCBwYWdlLCBpbnNwZWN0 b3JBZ2VudCwgc3RhdGUsIGluamVjdGVkU2NyaXB0TWFuYWdlciwgY2xpZW50KSk7CiB9CiAKIC8v IHN0YXRpYwpAQCAtMzA3LDkgKzMwOCwxMCBAQCBUeXBlQnVpbGRlcjo6UGFnZTo6UmVzb3VyY2VU eXBlOjpFbnVtIEluc3BlY3RvclBhZ2VBZ2VudDo6Y2FjaGVkUmVzb3VyY2VUeXBlSnNvbgogICAg IHJldHVybiByZXNvdXJjZVR5cGVKc29uKGNhY2hlZFJlc291cmNlVHlwZShjYWNoZWRSZXNvdXJj ZSkpOwogfQogCi1JbnNwZWN0b3JQYWdlQWdlbnQ6Okluc3BlY3RvclBhZ2VBZ2VudChJbnN0cnVt ZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzLCBQYWdlKiBwYWdlLCBJbnNwZWN0b3JT dGF0ZSogaW5zcGVjdG9yU3RhdGUsIEluamVjdGVkU2NyaXB0TWFuYWdlciogaW5qZWN0ZWRTY3Jp cHRNYW5hZ2VyLCBJbnNwZWN0b3JDbGllbnQqIGNsaWVudCkKK0luc3BlY3RvclBhZ2VBZ2VudDo6 SW5zcGVjdG9yUGFnZUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2Vu dHMsIFBhZ2UqIHBhZ2UsIEluc3BlY3RvckFnZW50KiBpbnNwZWN0b3JBZ2VudCwgSW5zcGVjdG9y U3RhdGUqIGluc3BlY3RvclN0YXRlLCBJbmplY3RlZFNjcmlwdE1hbmFnZXIqIGluamVjdGVkU2Ny aXB0TWFuYWdlciwgSW5zcGVjdG9yQ2xpZW50KiBjbGllbnQpCiAgICAgOiBJbnNwZWN0b3JCYXNl QWdlbnQ8SW5zcGVjdG9yUGFnZUFnZW50PigiUGFnZSIsIGluc3RydW1lbnRpbmdBZ2VudHMsIGlu c3BlY3RvclN0YXRlKQogICAgICwgbV9wYWdlKHBhZ2UpCisgICAgLCBtX2luc3BlY3RvckFnZW50 KGluc3BlY3RvckFnZW50KQogICAgICwgbV9pbmplY3RlZFNjcmlwdE1hbmFnZXIoaW5qZWN0ZWRT Y3JpcHRNYW5hZ2VyKQogICAgICwgbV9jbGllbnQoY2xpZW50KQogICAgICwgbV9mcm9udGVuZCgw KQpAQCAtMzQzLDYgKzM0NSw5IEBAIHZvaWQgSW5zcGVjdG9yUGFnZUFnZW50OjpyZXN0b3JlKCkK ICAgICAgICAgZG91YmxlIGZvbnRTY2FsZUZhY3RvciA9IG1fc3RhdGUtPmdldERvdWJsZShQYWdl QWdlbnRTdGF0ZTo6cGFnZUFnZW50Rm9udFNjYWxlRmFjdG9yT3ZlcnJpZGUpOwogICAgICAgICBi b29sIGZpdFdpbmRvdyA9IG1fc3RhdGUtPmdldEJvb2xlYW4oUGFnZUFnZW50U3RhdGU6OnBhZ2VB Z2VudEZpdFdpbmRvdyk7CiAgICAgICAgIHVwZGF0ZVZpZXdNZXRyaWNzKHdpZHRoLCBoZWlnaHQs IGZvbnRTY2FsZUZhY3RvciwgZml0V2luZG93KTsKKworICAgICAgICBpZiAobV9pbnNwZWN0b3JB Z2VudC0+ZGlkQ29tbWl0TG9hZEZpcmVkKCkpCisgICAgICAgICAgICBmcmFtZU5hdmlnYXRlZCht X3BhZ2UtPm1haW5GcmFtZSgpLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKSk7CiAgICAgfQog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFn ZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmgKaW5k ZXggYWNjNzdkNjNjMTEzMzQwZGM3ZDI3MzEzZmVkMDU4Zjk1NzYxODcyZC4uOTY0YmM4NWZjNjM2 NDhhZjM4ZjJkYzEyZmM4M2Y3OTcxYjkzYTY2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuaApAQCAtNDksNiArNDksNyBAQCBjbGFzcyBEb2N1bWVu dExvYWRlcjsKIGNsYXNzIEZyYW1lOwogY2xhc3MgRnJvbnRlbmQ7CiBjbGFzcyBJbmplY3RlZFNj cmlwdE1hbmFnZXI7CitjbGFzcyBJbnNwZWN0b3JBZ2VudDsKIGNsYXNzIEluc3BlY3RvckFycmF5 OwogY2xhc3MgSW5zcGVjdG9yQ2xpZW50OwogY2xhc3MgSW5zcGVjdG9yT2JqZWN0OwpAQCAtNzYs NyArNzcsNyBAQCBwdWJsaWM6CiAgICAgICAgIE90aGVyUmVzb3VyY2UKICAgICB9OwogCi0gICAg c3RhdGljIFBhc3NPd25QdHI8SW5zcGVjdG9yUGFnZUFnZW50PiBjcmVhdGUoSW5zdHJ1bWVudGlu Z0FnZW50cyosIFBhZ2UqLCBJbnNwZWN0b3JTdGF0ZSosIEluamVjdGVkU2NyaXB0TWFuYWdlcios IEluc3BlY3RvckNsaWVudCopOworICAgIHN0YXRpYyBQYXNzT3duUHRyPEluc3BlY3RvclBhZ2VB Z2VudD4gY3JlYXRlKEluc3RydW1lbnRpbmdBZ2VudHMqLCBQYWdlKiwgSW5zcGVjdG9yQWdlbnQq LCBJbnNwZWN0b3JTdGF0ZSosIEluamVjdGVkU2NyaXB0TWFuYWdlciosIEluc3BlY3RvckNsaWVu dCopOwogCiAgICAgc3RhdGljIGJvb2wgY2FjaGVkUmVzb3VyY2VDb250ZW50KENhY2hlZFJlc291 cmNlKiwgU3RyaW5nKiByZXN1bHQsIGJvb2wqIGJhc2U2NEVuY29kZWQpOwogICAgIHN0YXRpYyBi b29sIHNoYXJlZEJ1ZmZlckNvbnRlbnQoUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+LCBjb25zdCBT dHJpbmcmIHRleHRFbmNvZGluZ05hbWUsIGJvb2wgd2l0aEJhc2U2NEVuY29kZSwgU3RyaW5nKiBy ZXN1bHQpOwpAQCAtMTM2LDEyICsxMzcsMTMgQEAgcHVibGljOgogICAgIHN0YXRpYyBEb2N1bWVu dExvYWRlciogYXNzZXJ0RG9jdW1lbnRMb2FkZXIoRXJyb3JTdHJpbmcqLCBGcmFtZSopOwogCiBw cml2YXRlOgotICAgIEluc3BlY3RvclBhZ2VBZ2VudChJbnN0cnVtZW50aW5nQWdlbnRzKiwgUGFn ZSosIEluc3BlY3RvclN0YXRlKiwgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKiwgSW5zcGVjdG9yQ2xp ZW50Kik7CisgICAgSW5zcGVjdG9yUGFnZUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqLCBQYWdl KiwgSW5zcGVjdG9yQWdlbnQqLCBJbnNwZWN0b3JTdGF0ZSosIEluamVjdGVkU2NyaXB0TWFuYWdl ciosIEluc3BlY3RvckNsaWVudCopOwogICAgIHZvaWQgdXBkYXRlVmlld01ldHJpY3MoaW50LCBp bnQsIGRvdWJsZSwgYm9vbCk7CiAKICAgICBQYXNzUmVmUHRyPFR5cGVCdWlsZGVyOjpQYWdlOjpG cmFtZT4gYnVpbGRPYmplY3RGb3JGcmFtZShGcmFtZSopOwogICAgIFBhc3NSZWZQdHI8VHlwZUJ1 aWxkZXI6OlBhZ2U6OkZyYW1lUmVzb3VyY2VUcmVlPiBidWlsZE9iamVjdEZvckZyYW1lVHJlZShG cmFtZSopOwogICAgIFBhZ2UqIG1fcGFnZTsKKyAgICBJbnNwZWN0b3JBZ2VudCogbV9pbnNwZWN0 b3JBZ2VudDsKICAgICBJbmplY3RlZFNjcmlwdE1hbmFnZXIqIG1faW5qZWN0ZWRTY3JpcHRNYW5h Z2VyOwogICAgIEluc3BlY3RvckNsaWVudCogbV9jbGllbnQ7CiAgICAgSW5zcGVjdG9yRnJvbnRl bmQ6OlBhZ2UqIG1fZnJvbnRlbmQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKaW5kZXggODc3NmJiODU1MTRhZDY3MTdjYzUwMjRm NTBjNmUyZTVjMjhlM2E4Zi4uZDNiMDAwODJhN2EyZmUxOGRjNTI1ZWI2YjdmNjQ2ZmU0NjVmYmYy YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNl QWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJj ZUFnZW50LmNwcApAQCAtOTIsOCArOTIsMTAgQEAgdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50 OjpjbGVhckZyb250ZW5kKCkKIAogdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpyZXN0b3Jl KCkKIHsKLSAgICBpZiAobV9zdGF0ZS0+Z2V0Qm9vbGVhbihSZXNvdXJjZUFnZW50U3RhdGU6OnJl c291cmNlQWdlbnRFbmFibGVkKSkKKyAgICBpZiAobV9zdGF0ZS0+Z2V0Qm9vbGVhbihSZXNvdXJj ZUFnZW50U3RhdGU6OnJlc291cmNlQWdlbnRFbmFibGVkKSkgewogICAgICAgICBlbmFibGUoKTsK KyAgICAgICAgbWFpbkZyYW1lTmF2aWdhdGVkKG1fcGFnZUFnZW50LT5tYWluRnJhbWUoKS0+bG9h ZGVyKCktPmRvY3VtZW50TG9hZGVyKCkpOworICAgIH0KIH0KIAogc3RhdGljIFBhc3NSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0PiBidWlsZE9iamVjdEZvckhlYWRlcnMoY29uc3QgSFRUUEhlYWRlck1h cCYgaGVhZGVycykK 141148 2012-05-10 05:06:59 -0700 2012-05-10 05:06:59 -0700 Patch for landing emitCommitLoadIfNeeded.patch text/plain 9082 yurys ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhZDNiMGU2Li5hMGI1OWYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTItMDUtMDcgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgV2ViIEluc3BlY3RvcjogZ2V0IHJpZCBvZiBJbnNwZWN0b3JBZ2VudDo6ZW1pdENv bW1pdExvYWRJZk5lZWRlZCBtZXRob2QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg1NzA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgSW5zdGVhZCBvZiBjYWxsaW5nIGVtaXRDb21taXRMb2FkSWZOZWVkZWQg YWZ0ZXIgYWxsIGFnZW50cyBhcmUgcmVzdG9yZWQKKyAgICAgICAgcmVxdWlyZWQgYWN0aW9ucyBh cmUgcGVyZm9ybWVkIGRpcmVjdGx5IGluIHRoZSByZXN0b3JlKCkgbWV0aG9kcy4KKworICAgICAg ICAqIGluc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5jcHA6CisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3RvckFnZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JBZ2VudDo6ZGlkQ29t bWl0TG9hZEZpcmVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpJbnNwZWN0b3JDb250 cm9sbGVyKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OnJlc3RvcmVJ bnNwZWN0b3JTdGF0ZUZyb21Db29raWUpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JE YXRhYmFzZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRhdGFiYXNlQWdl bnQ6OnJlc3RvcmUpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUGFnZUFnZW50OjpjcmVhdGUpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yUGFnZUFnZW50OjpJbnNwZWN0b3JQYWdlQWdlbnQpOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUGFnZUFnZW50OjpyZXN0b3JlKToKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50Lmg6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpyZXN0b3JlKToKKwogMjAxMi0wNS0xMCAgTU9S SVRBIEhhamltZSAgPG1vcnJpdGFAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZW1vdmUgc3VwcG9y dCBmb3IgTm9kZTo6d2lsbFJlbW92ZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckFnZW50LmNwcAppbmRleCBiYTdhNzMzLi4zNWU1MzE0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5jcHAKQEAgLTgwLDEyICs4MCw2IEBAIEluc3BlY3Rv ckFnZW50Ojp+SW5zcGVjdG9yQWdlbnQoKQogICAgIG1faW5zdHJ1bWVudGluZ0FnZW50cy0+c2V0 SW5zcGVjdG9yQWdlbnQoMCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yQWdlbnQ6OmVtaXRDb21taXRM b2FkSWZOZWVkZWQoKQotewotICAgIGlmIChtX2RpZENvbW1pdExvYWRGaXJlZCkKLSAgICAgICAg SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRDb21taXRMb2FkKG1faW5zcGVjdGVkUGFnZS0+ bWFpbkZyYW1lKCksIG1faW5zcGVjdGVkUGFnZS0+bWFpbkZyYW1lKCktPmxvYWRlcigpLT5kb2N1 bWVudExvYWRlcigpKTsKLX0KLQogdm9pZCBJbnNwZWN0b3JBZ2VudDo6ZGlkQ2xlYXJXaW5kb3dP YmplY3RJbldvcmxkKEZyYW1lKiBmcmFtZSwgRE9NV3JhcHBlcldvcmxkKiB3b3JsZCkKIHsKICAg ICBpZiAod29ybGQgIT0gbWFpblRocmVhZE5vcm1hbFdvcmxkKCkpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5oCmluZGV4IDQ5ZTc5ZmEuLjUyZjMxZTIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5oCkBAIC04MCw3ICs4MCw3IEBAIHB1 YmxpYzoKIAogICAgIHZvaWQgZGlkQ29tbWl0TG9hZCgpOwogICAgIHZvaWQgZG9tQ29udGVudExv YWRlZEV2ZW50RmlyZWQoKTsKLSAgICB2b2lkIGVtaXRDb21taXRMb2FkSWZOZWVkZWQoKTsKKyAg ICBib29sIGRpZENvbW1pdExvYWRGaXJlZCgpIHsgcmV0dXJuIG1fZGlkQ29tbWl0TG9hZEZpcmVk OyB9CiAKICNpZiBFTkFCTEUoV09SS0VSUykKICAgICB2b2lkIGRpZENyZWF0ZVdvcmtlcihpbnRw dHJfdCwgY29uc3QgU3RyaW5nJiB1cmwsIGJvb2wgaXNTaGFyZWRXb3JrZXIpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCmluZGV4IDJkYjhh MDkuLjk1MTczM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y Q29udHJvbGxlci5jcHAKQEAgLTg0LDcgKzg0LDcgQEAgSW5zcGVjdG9yQ29udHJvbGxlcjo6SW5z cGVjdG9yQ29udHJvbGxlcihQYWdlKiBwYWdlLCBJbnNwZWN0b3JDbGllbnQqIGluc3BlY3RvckMK ICAgICBtX2luc3BlY3RvckFnZW50ID0gaW5zcGVjdG9yQWdlbnRQdHIuZ2V0KCk7CiAgICAgbV9h Z2VudHMuYXBwZW5kKGluc3BlY3RvckFnZW50UHRyLnJlbGVhc2UoKSk7CiAKLSAgICBPd25QdHI8 SW5zcGVjdG9yUGFnZUFnZW50PiBwYWdlQWdlbnRQdHIoSW5zcGVjdG9yUGFnZUFnZW50OjpjcmVh dGUobV9pbnN0cnVtZW50aW5nQWdlbnRzLmdldCgpLCBwYWdlLCBtX3N0YXRlLmdldCgpLCBtX2lu amVjdGVkU2NyaXB0TWFuYWdlci5nZXQoKSwgaW5zcGVjdG9yQ2xpZW50KSk7CisgICAgT3duUHRy PEluc3BlY3RvclBhZ2VBZ2VudD4gcGFnZUFnZW50UHRyKEluc3BlY3RvclBhZ2VBZ2VudDo6Y3Jl YXRlKG1faW5zdHJ1bWVudGluZ0FnZW50cy5nZXQoKSwgcGFnZSwgbV9pbnNwZWN0b3JBZ2VudCwg bV9zdGF0ZS5nZXQoKSwgbV9pbmplY3RlZFNjcmlwdE1hbmFnZXIuZ2V0KCksIGluc3BlY3RvckNs aWVudCkpOwogICAgIEluc3BlY3RvclBhZ2VBZ2VudCogcGFnZUFnZW50ID0gcGFnZUFnZW50UHRy LmdldCgpOwogICAgIG1fcGFnZUFnZW50ID0gcGFnZUFnZW50UHRyLmdldCgpOwogICAgIG1fYWdl bnRzLmFwcGVuZChwYWdlQWdlbnRQdHIucmVsZWFzZSgpKTsKQEAgLTI3NCw3ICsyNzQsNiBAQCB2 b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnJlc3RvcmVJbnNwZWN0b3JTdGF0ZUZyb21Db29raWUo Y29uc3QgU3RyaW5nJiBpbnNwZWN0bwogCiAgICAgZm9yIChBZ2VudHM6Oml0ZXJhdG9yIGl0ID0g bV9hZ2VudHMuYmVnaW4oKTsgaXQgIT0gbV9hZ2VudHMuZW5kKCk7ICsraXQpCiAgICAgICAgICgq aXQpLT5yZXN0b3JlKCk7Ci0gICAgbV9pbnNwZWN0b3JBZ2VudC0+ZW1pdENvbW1pdExvYWRJZk5l ZWRlZCgpOwogfQogCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnNldFByb2Nlc3NJZChsb25n IHByb2Nlc3NJZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JEYXRhYmFzZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JE YXRhYmFzZUFnZW50LmNwcAppbmRleCBlOGY1ZDRhLi5jY2IwMDNjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGF0YWJhc2VBZ2VudC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRhdGFiYXNlQWdlbnQuY3BwCkBAIC0yODgs NyArMjg4LDcgQEAgdm9pZCBJbnNwZWN0b3JEYXRhYmFzZUFnZW50OjpkaXNhYmxlKEVycm9yU3Ry aW5nKikKIAogdm9pZCBJbnNwZWN0b3JEYXRhYmFzZUFnZW50OjpyZXN0b3JlKCkKIHsKLSAgICBt X2VuYWJsZWQgPSAgbV9zdGF0ZS0+Z2V0Qm9vbGVhbihEYXRhYmFzZUFnZW50U3RhdGU6OmRhdGFi YXNlQWdlbnRFbmFibGVkKTsKKyAgICBtX2VuYWJsZWQgPSBtX3N0YXRlLT5nZXRCb29sZWFuKERh dGFiYXNlQWdlbnRTdGF0ZTo6ZGF0YWJhc2VBZ2VudEVuYWJsZWQpOwogfQogCiB2b2lkIEluc3Bl Y3RvckRhdGFiYXNlQWdlbnQ6OmdldERhdGFiYXNlVGFibGVOYW1lcyhFcnJvclN0cmluZyogZXJy b3IsIGNvbnN0IFN0cmluZyYgZGF0YWJhc2VJZCwgUmVmUHRyPFR5cGVCdWlsZGVyOjpBcnJheTxT dHJpbmc+ID4mIG5hbWVzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclBhZ2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y UGFnZUFnZW50LmNwcAppbmRleCA2MWZlMGE3Li40ZTA2YTQzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcApAQCAtNTUsNiArNTUsNyBAQAog I2luY2x1ZGUgIkhUTUxOYW1lcy5oIgogI2luY2x1ZGUgIklkZW50aWZpZXJzRmFjdG9yeS5oIgog I2luY2x1ZGUgIkluamVjdGVkU2NyaXB0TWFuYWdlci5oIgorI2luY2x1ZGUgIkluc3BlY3RvckFn ZW50LmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yQ2xpZW50LmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9y RnJvbnRlbmQuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaCIKQEAgLTIy Miw5ICsyMjMsOSBAQCBib29sIEluc3BlY3RvclBhZ2VBZ2VudDo6c2hhcmVkQnVmZmVyQ29udGVu dChQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gYnVmZmVyLCBjbwogICAgIHJldHVybiBkZWNvZGVT aGFyZWRCdWZmZXIoYnVmZmVyLCB0ZXh0RW5jb2RpbmdOYW1lLCByZXN1bHQpOwogfQogCi1QYXNz T3duUHRyPEluc3BlY3RvclBhZ2VBZ2VudD4gSW5zcGVjdG9yUGFnZUFnZW50OjpjcmVhdGUoSW5z dHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgUGFnZSogcGFnZSwgSW5zcGVj dG9yU3RhdGUqIHN0YXRlLCBJbmplY3RlZFNjcmlwdE1hbmFnZXIqIGluamVjdGVkU2NyaXB0TWFu YWdlciwgSW5zcGVjdG9yQ2xpZW50KiBjbGllbnQpCitQYXNzT3duUHRyPEluc3BlY3RvclBhZ2VB Z2VudD4gSW5zcGVjdG9yUGFnZUFnZW50OjpjcmVhdGUoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5z dHJ1bWVudGluZ0FnZW50cywgUGFnZSogcGFnZSwgSW5zcGVjdG9yQWdlbnQqIGluc3BlY3RvckFn ZW50LCBJbnNwZWN0b3JTdGF0ZSogc3RhdGUsIEluamVjdGVkU2NyaXB0TWFuYWdlciogaW5qZWN0 ZWRTY3JpcHRNYW5hZ2VyLCBJbnNwZWN0b3JDbGllbnQqIGNsaWVudCkKIHsKLSAgICByZXR1cm4g YWRvcHRQdHIobmV3IEluc3BlY3RvclBhZ2VBZ2VudChpbnN0cnVtZW50aW5nQWdlbnRzLCBwYWdl LCBzdGF0ZSwgaW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLCBjbGllbnQpKTsKKyAgICByZXR1cm4gYWRv cHRQdHIobmV3IEluc3BlY3RvclBhZ2VBZ2VudChpbnN0cnVtZW50aW5nQWdlbnRzLCBwYWdlLCBp bnNwZWN0b3JBZ2VudCwgc3RhdGUsIGluamVjdGVkU2NyaXB0TWFuYWdlciwgY2xpZW50KSk7CiB9 CiAKIC8vIHN0YXRpYwpAQCAtMzA3LDkgKzMwOCwxMCBAQCBUeXBlQnVpbGRlcjo6UGFnZTo6UmVz b3VyY2VUeXBlOjpFbnVtIEluc3BlY3RvclBhZ2VBZ2VudDo6Y2FjaGVkUmVzb3VyY2VUeXBlSnNv bgogICAgIHJldHVybiByZXNvdXJjZVR5cGVKc29uKGNhY2hlZFJlc291cmNlVHlwZShjYWNoZWRS ZXNvdXJjZSkpOwogfQogCi1JbnNwZWN0b3JQYWdlQWdlbnQ6Okluc3BlY3RvclBhZ2VBZ2VudChJ bnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzLCBQYWdlKiBwYWdlLCBJbnNw ZWN0b3JTdGF0ZSogaW5zcGVjdG9yU3RhdGUsIEluamVjdGVkU2NyaXB0TWFuYWdlciogaW5qZWN0 ZWRTY3JpcHRNYW5hZ2VyLCBJbnNwZWN0b3JDbGllbnQqIGNsaWVudCkKK0luc3BlY3RvclBhZ2VB Z2VudDo6SW5zcGVjdG9yUGFnZUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRp bmdBZ2VudHMsIFBhZ2UqIHBhZ2UsIEluc3BlY3RvckFnZW50KiBpbnNwZWN0b3JBZ2VudCwgSW5z cGVjdG9yU3RhdGUqIGluc3BlY3RvclN0YXRlLCBJbmplY3RlZFNjcmlwdE1hbmFnZXIqIGluamVj dGVkU2NyaXB0TWFuYWdlciwgSW5zcGVjdG9yQ2xpZW50KiBjbGllbnQpCiAgICAgOiBJbnNwZWN0 b3JCYXNlQWdlbnQ8SW5zcGVjdG9yUGFnZUFnZW50PigiUGFnZSIsIGluc3RydW1lbnRpbmdBZ2Vu dHMsIGluc3BlY3RvclN0YXRlKQogICAgICwgbV9wYWdlKHBhZ2UpCisgICAgLCBtX2luc3BlY3Rv ckFnZW50KGluc3BlY3RvckFnZW50KQogICAgICwgbV9pbmplY3RlZFNjcmlwdE1hbmFnZXIoaW5q ZWN0ZWRTY3JpcHRNYW5hZ2VyKQogICAgICwgbV9jbGllbnQoY2xpZW50KQogICAgICwgbV9mcm9u dGVuZCgwKQpAQCAtMzQzLDYgKzM0NSw5IEBAIHZvaWQgSW5zcGVjdG9yUGFnZUFnZW50OjpyZXN0 b3JlKCkKICAgICAgICAgZG91YmxlIGZvbnRTY2FsZUZhY3RvciA9IG1fc3RhdGUtPmdldERvdWJs ZShQYWdlQWdlbnRTdGF0ZTo6cGFnZUFnZW50Rm9udFNjYWxlRmFjdG9yT3ZlcnJpZGUpOwogICAg ICAgICBib29sIGZpdFdpbmRvdyA9IG1fc3RhdGUtPmdldEJvb2xlYW4oUGFnZUFnZW50U3RhdGU6 OnBhZ2VBZ2VudEZpdFdpbmRvdyk7CiAgICAgICAgIHVwZGF0ZVZpZXdNZXRyaWNzKHdpZHRoLCBo ZWlnaHQsIGZvbnRTY2FsZUZhY3RvciwgZml0V2luZG93KTsKKworICAgICAgICBpZiAobV9pbnNw ZWN0b3JBZ2VudC0+ZGlkQ29tbWl0TG9hZEZpcmVkKCkpCisgICAgICAgICAgICBmcmFtZU5hdmln YXRlZChtX3BhZ2UtPm1haW5GcmFtZSgpLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKSk7CiAg ICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y UGFnZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50 LmgKaW5kZXggYWNjNzdkNi4uOTY0YmM4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JQYWdlQWdlbnQuaApAQCAtNDksNiArNDksNyBAQCBjbGFzcyBEb2N1bWVudExv YWRlcjsKIGNsYXNzIEZyYW1lOwogY2xhc3MgRnJvbnRlbmQ7CiBjbGFzcyBJbmplY3RlZFNjcmlw dE1hbmFnZXI7CitjbGFzcyBJbnNwZWN0b3JBZ2VudDsKIGNsYXNzIEluc3BlY3RvckFycmF5Owog Y2xhc3MgSW5zcGVjdG9yQ2xpZW50OwogY2xhc3MgSW5zcGVjdG9yT2JqZWN0OwpAQCAtNzYsNyAr NzcsNyBAQCBwdWJsaWM6CiAgICAgICAgIE90aGVyUmVzb3VyY2UKICAgICB9OwogCi0gICAgc3Rh dGljIFBhc3NPd25QdHI8SW5zcGVjdG9yUGFnZUFnZW50PiBjcmVhdGUoSW5zdHJ1bWVudGluZ0Fn ZW50cyosIFBhZ2UqLCBJbnNwZWN0b3JTdGF0ZSosIEluamVjdGVkU2NyaXB0TWFuYWdlciosIElu c3BlY3RvckNsaWVudCopOworICAgIHN0YXRpYyBQYXNzT3duUHRyPEluc3BlY3RvclBhZ2VBZ2Vu dD4gY3JlYXRlKEluc3RydW1lbnRpbmdBZ2VudHMqLCBQYWdlKiwgSW5zcGVjdG9yQWdlbnQqLCBJ bnNwZWN0b3JTdGF0ZSosIEluamVjdGVkU2NyaXB0TWFuYWdlciosIEluc3BlY3RvckNsaWVudCop OwogCiAgICAgc3RhdGljIGJvb2wgY2FjaGVkUmVzb3VyY2VDb250ZW50KENhY2hlZFJlc291cmNl KiwgU3RyaW5nKiByZXN1bHQsIGJvb2wqIGJhc2U2NEVuY29kZWQpOwogICAgIHN0YXRpYyBib29s IHNoYXJlZEJ1ZmZlckNvbnRlbnQoUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+LCBjb25zdCBTdHJp bmcmIHRleHRFbmNvZGluZ05hbWUsIGJvb2wgd2l0aEJhc2U2NEVuY29kZSwgU3RyaW5nKiByZXN1 bHQpOwpAQCAtMTM2LDEyICsxMzcsMTMgQEAgcHVibGljOgogICAgIHN0YXRpYyBEb2N1bWVudExv YWRlciogYXNzZXJ0RG9jdW1lbnRMb2FkZXIoRXJyb3JTdHJpbmcqLCBGcmFtZSopOwogCiBwcml2 YXRlOgotICAgIEluc3BlY3RvclBhZ2VBZ2VudChJbnN0cnVtZW50aW5nQWdlbnRzKiwgUGFnZSos IEluc3BlY3RvclN0YXRlKiwgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKiwgSW5zcGVjdG9yQ2xpZW50 Kik7CisgICAgSW5zcGVjdG9yUGFnZUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqLCBQYWdlKiwg SW5zcGVjdG9yQWdlbnQqLCBJbnNwZWN0b3JTdGF0ZSosIEluamVjdGVkU2NyaXB0TWFuYWdlcios IEluc3BlY3RvckNsaWVudCopOwogICAgIHZvaWQgdXBkYXRlVmlld01ldHJpY3MoaW50LCBpbnQs IGRvdWJsZSwgYm9vbCk7CiAKICAgICBQYXNzUmVmUHRyPFR5cGVCdWlsZGVyOjpQYWdlOjpGcmFt ZT4gYnVpbGRPYmplY3RGb3JGcmFtZShGcmFtZSopOwogICAgIFBhc3NSZWZQdHI8VHlwZUJ1aWxk ZXI6OlBhZ2U6OkZyYW1lUmVzb3VyY2VUcmVlPiBidWlsZE9iamVjdEZvckZyYW1lVHJlZShGcmFt ZSopOwogICAgIFBhZ2UqIG1fcGFnZTsKKyAgICBJbnNwZWN0b3JBZ2VudCogbV9pbnNwZWN0b3JB Z2VudDsKICAgICBJbmplY3RlZFNjcmlwdE1hbmFnZXIqIG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2Vy OwogICAgIEluc3BlY3RvckNsaWVudCogbV9jbGllbnQ7CiAgICAgSW5zcGVjdG9yRnJvbnRlbmQ6 OlBhZ2UqIG1fZnJvbnRlbmQ7Cg==