88988 2012-06-13 04:32:04 -0700 Web Inspector: DebuggerModel should support setting breakpoints without script by sourceURL only. 2012-06-14 09:57:30 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 647900 0 vsevik 2012-06-13 04:32:04 -0700 This change allows setting all saved breakpoints in debugger model by url before the site with corresponding scripts was loaded (allows breaking in onload handler on first load). This change also simplifies implementation of snippets debugging. 647914 1 147294 vsevik 2012-06-13 04:57:16 -0700 Created attachment 147294 Patch 647952 2 147294 pfeldman 2012-06-13 05:49:03 -0700 Comment on attachment 147294 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147294&action=review > Source/WebCore/inspector/front-end/DebuggerModel.js:59 > +WebInspector.DebuggerModel.Location = function(scriptId, sourceURL, lineNumber, columnNumber) Shouldn't sourceURL be optional for debugger location? For example it does not exist for eval scripts. > Source/WebCore/inspector/front-end/DebuggerModel.js:136 > setBreakpointByScriptLocation: function(rawLocation, condition, callback) Should we be more specific here and introduce another method instead? 649223 3 147598 vsevik 2012-06-14 09:22:13 -0700 Created attachment 147598 Patch 649257 4 vsevik 2012-06-14 09:57:30 -0700 Committed r120335: <http://trac.webkit.org/changeset/120335> 147294 2012-06-13 04:57:16 -0700 2012-06-14 09:22:06 -0700 Patch bug-88988-20120613155715.patch text/plain 6620 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjBkODY1ZTA1ZTgxMjdj ZDdlNmEzZWI3MWU5Zjk0NWEzNjZhZGUxZC4uZjExMzE5Y2JmOGI4NjFiYzdhZDNlNWQ5MzM3NWI4 ZDhjYWFiM2ViYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA2LTEzICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IERlYnVnZ2VyTW9kZWwgc2hvdWxkIHN1cHBvcnQgc2V0dGluZyBicmVha3BvaW50cyB3aXRo b3V0IHNjcmlwdCBieSBzb3VyY2VVUkwgb25seS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTg4OTg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgYWxsb3dzIHNldHRpbmcgYWxsIHNhdmVk IGJyZWFrcG9pbnRzIGluIGRlYnVnZ2VyIG1vZGVsIGJ5IHVybCBiZWZvcmUgdGhlIHNpdGUgd2l0 aCBjb3JyZXNwb25kaW5nIHNjcmlwdHMgd2FzIGxvYWRlZCAoYWxsb3dzIGJyZWFraW5nIGluIG9u bG9hZCBoYW5kbGVyIG9uIGZpcnN0IGxvYWQpLgorICAgICAgICBUaGlzIGNoYW5nZSBhbHNvIHNp bXBsaWZpZXMgaW1wbGVtZW50YXRpb24gb2Ygc25pcHBldHMgZGVidWdnaW5nLgorCisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRlYnVnZ2VyTW9kZWwuTG9jYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRl YnVnZ2VyTW9kZWwucHJvdG90eXBlLnNldEJyZWFrcG9pbnRCeVNjcmlwdExvY2F0aW9uKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlwZS5jcmVhdGVSYXdMb2Nh dGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUuY3Jl YXRlUmF3TG9jYXRpb25CeVVSTCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3Jp cHQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0LnByb3RvdHlwZS5yYXdMb2NhdGlv blRvVUlMb2NhdGlvbik6CisKIDIwMTItMDYtMTIgIEhhbnMgV2VubmJvcmcgIDxoYW5zQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBTcGVlY2ggSmF2YVNjcmlwdCBBUEk6IEFkZCB0ZXN0IGZvciBj b25zdHJ1Y3RpbmcgU3BlZWNoUmVjb2duaXRpb25FcnJvciBldmVudHMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcwppbmRleCBmYTE2 ZTBlNmU2MTgyMjcyNTUzMzVmZDk1MjhhZTBkY2NhYWIxYWQ3Li5hMDZiYTRkMzcxYzczN2ExMTgy ZGMwMjU3NzdjMmU3MTAwYzU5YmIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzCkBAIC01MiwxMiArNTIsMTQgQEAgV2ViSW5z cGVjdG9yLkRlYnVnZ2VyTW9kZWwgPSBmdW5jdGlvbigpCiAgKiBAaW1wbGVtZW50cyB7V2ViSW5z cGVjdG9yLlJhd0xvY2F0aW9ufQogICogQGV4dGVuZHMge0RlYnVnZ2VyQWdlbnQuTG9jYXRpb259 CiAgKiBAcGFyYW0ge3N0cmluZ30gc2NyaXB0SWQKKyAqIEBwYXJhbSB7c3RyaW5nfSBzb3VyY2VV UkwKICAqIEBwYXJhbSB7bnVtYmVyfSBsaW5lTnVtYmVyCiAgKiBAcGFyYW0ge251bWJlcn0gY29s dW1uTnVtYmVyCiAgKi8KLVdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkxvY2F0aW9uID0gZnVu Y3Rpb24oc2NyaXB0SWQsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcikKK1dlYkluc3BlY3Rvci5E ZWJ1Z2dlck1vZGVsLkxvY2F0aW9uID0gZnVuY3Rpb24oc2NyaXB0SWQsIHNvdXJjZVVSTCwgbGlu ZU51bWJlciwgY29sdW1uTnVtYmVyKQogewogICAgIHRoaXMuc2NyaXB0SWQgPSBzY3JpcHRJZDsK KyAgICB0aGlzLnNvdXJjZVVSTCA9IHNvdXJjZVVSTDsKICAgICB0aGlzLmxpbmVOdW1iZXIgPSBs aW5lTnVtYmVyOwogICAgIHRoaXMuY29sdW1uTnVtYmVyID0gY29sdW1uTnVtYmVyOwogfQpAQCAt MTMzLDExICsxMzUsMTQgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlID0g ewogICAgICAqLwogICAgIHNldEJyZWFrcG9pbnRCeVNjcmlwdExvY2F0aW9uOiBmdW5jdGlvbihy YXdMb2NhdGlvbiwgY29uZGl0aW9uLCBjYWxsYmFjaykKICAgICB7Ci0gICAgICAgIHZhciBzY3Jp cHQgPSB0aGlzLnNjcmlwdEZvcklkKHJhd0xvY2F0aW9uLnNjcmlwdElkKTsKLSAgICAgICAgaWYg KHNjcmlwdC5zb3VyY2VVUkwpCi0gICAgICAgICAgICB0aGlzLnNldEJyZWFrcG9pbnQoc2NyaXB0 LnNvdXJjZVVSTCwgcmF3TG9jYXRpb24ubGluZU51bWJlciwgcmF3TG9jYXRpb24uY29sdW1uTnVt YmVyLCBjb25kaXRpb24sIGNhbGxiYWNrKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgdGhp cy5zZXRCcmVha3BvaW50QnlTb3VyY2VJZChyYXdMb2NhdGlvbiwgY29uZGl0aW9uLCBjYWxsYmFj ayk7CisgICAgICAgIGlmIChyYXdMb2NhdGlvbi5zY3JpcHRJZCkgeworICAgICAgICAgICAgdmFy IHNjcmlwdCA9IHRoaXMuc2NyaXB0Rm9ySWQocmF3TG9jYXRpb24uc2NyaXB0SWQpOworICAgICAg ICAgICAgaWYgKHNjcmlwdC5zb3VyY2VVUkwpCisgICAgICAgICAgICAgICAgdGhpcy5zZXRCcmVh a3BvaW50KHNjcmlwdC5zb3VyY2VVUkwsIHJhd0xvY2F0aW9uLmxpbmVOdW1iZXIsIHJhd0xvY2F0 aW9uLmNvbHVtbk51bWJlciwgY29uZGl0aW9uLCBjYWxsYmFjayk7CisgICAgICAgICAgICBlbHNl CisgICAgICAgICAgICAgICAgdGhpcy5zZXRCcmVha3BvaW50QnlTb3VyY2VJZChyYXdMb2NhdGlv biwgY29uZGl0aW9uLCBjYWxsYmFjayk7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgdGhp cy5zZXRCcmVha3BvaW50KHJhd0xvY2F0aW9uLnNvdXJjZVVSTCwgcmF3TG9jYXRpb24ubGluZU51 bWJlciwgcmF3TG9jYXRpb24uY29sdW1uTnVtYmVyLCBjb25kaXRpb24sIGNhbGxiYWNrKTsKICAg ICB9LAogCiAgICAgLyoqCkBAIC0zNzgsNyArMzgzLDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy TW9kZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgaWYgKHNjcmlwdC5zb3VyY2VVUkwp CiAgICAgICAgICAgICByZXR1cm4gdGhpcy5jcmVhdGVSYXdMb2NhdGlvbkJ5VVJMKHNjcmlwdC5z b3VyY2VVUkwsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcikKLSAgICAgICAgcmV0dXJuIG5ldyBX ZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5Mb2NhdGlvbihzY3JpcHQuc2NyaXB0SWQsIGxpbmVO dW1iZXIsIGNvbHVtbk51bWJlcik7CisgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkRl YnVnZ2VyTW9kZWwuTG9jYXRpb24oc2NyaXB0LnNjcmlwdElkLCAiIiwgbGluZU51bWJlciwgY29s dW1uTnVtYmVyKTsKICAgICB9LAogCiAgICAgLyoqCkBAIC00MDIsNyArNDA3LDcgQEAgV2ViSW5z cGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgY2xvc2VzdFNj cmlwdCA9IHNjcmlwdDsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9Ci0gICAgICAgIHJl dHVybiBjbG9zZXN0U2NyaXB0ID8gbmV3IFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkxvY2F0 aW9uKGNsb3Nlc3RTY3JpcHQuc2NyaXB0SWQsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcikgOiBu dWxsOworICAgICAgICByZXR1cm4gY2xvc2VzdFNjcmlwdCA/IG5ldyBXZWJJbnNwZWN0b3IuRGVi dWdnZXJNb2RlbC5Mb2NhdGlvbihjbG9zZXN0U2NyaXB0LnNjcmlwdElkLCAiIiwgbGluZU51bWJl ciwgY29sdW1uTnVtYmVyKSA6IG51bGw7CiAgICAgfSwKIAogICAgIC8qKgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qcwppbmRleCBjOWZjZDNhMjNlZmJhMjcw ZDI5MzM1NjE1MGYzNjgxZWQ0MGRkMDQ0Li42YmUwMzE1MTExMmI3OTBlZGE2YWM3YTE0OWM0MzMy OWYxMjU2MWEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Njcmlw dC5qcwpAQCAtMTczLDcgKzE3Myw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHQucHJvdG90eXBlID0g ewogICAgICAqLwogICAgIHJhd0xvY2F0aW9uVG9VSUxvY2F0aW9uOiBmdW5jdGlvbihsaW5lTnVt YmVyLCBjb2x1bW5OdW1iZXIpCiAgICAgewotICAgICAgICB2YXIgdWlMb2NhdGlvbiA9IHRoaXMu X3NvdXJjZU1hcHBpbmcucmF3TG9jYXRpb25Ub1VJTG9jYXRpb24obmV3IFdlYkluc3BlY3Rvci5E ZWJ1Z2dlck1vZGVsLkxvY2F0aW9uKHRoaXMuc2NyaXB0SWQsIGxpbmVOdW1iZXIsIGNvbHVtbk51 bWJlciB8fCAwKSk7CisgICAgICAgIHZhciB1aUxvY2F0aW9uID0gdGhpcy5fc291cmNlTWFwcGlu Zy5yYXdMb2NhdGlvblRvVUlMb2NhdGlvbihuZXcgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwu TG9jYXRpb24odGhpcy5zY3JpcHRJZCwgIiIsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlciB8fCAw KSk7CiAgICAgICAgIHJldHVybiB1aUxvY2F0aW9uLnVpU291cmNlQ29kZS5vdmVycmlkZUxvY2F0 aW9uKHVpTG9jYXRpb24pOwogICAgIH0sCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA0MGFjM2VmZDMyNWJhOTVhNTdhYWRk ZmQ3MTBiNWE0YmQxMTczZDEyLi4xOGJkZTBmOTg2NDQ2ZGY4MTRiZDFjMDVjZDA3NTQ2Nzk3ZmU3 OTRhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTItMDYtMTMgIFZzZXZvbG9kIFZsYXNvdiAg PHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRGVidWdnZXJN b2RlbCBzaG91bGQgc3VwcG9ydCBzZXR0aW5nIGJyZWFrcG9pbnRzIHdpdGhvdXQgc2NyaXB0IGJ5 IHNvdXJjZVVSTCBvbmx5LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODg5ODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9icmVha3BvaW50LW1hbmFnZXIuaHRtbDoKKwog MjAxMi0wNi0xMiAgSGFucyBXZW5uYm9yZyAgPGhhbnNAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFNwZWVjaCBKYXZhU2NyaXB0IEFQSTogQWRkIHRlc3QgZm9yIGNvbnN0cnVjdGluZyBTcGVlY2hS ZWNvZ25pdGlvbkVycm9yIGV2ZW50cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL2JyZWFrcG9pbnQtbWFuYWdlci5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL2JyZWFrcG9pbnQtbWFuYWdlci5odG1sCmluZGV4IDBiNWViNmFlMWY2YzE5MDZm ODUzMmRjOWRlYmY0MmY4NDVkYzQxNWEuLmQ2ZmIxMzg4NzJmNmJlZGM0MjU5NGRmNWViYTdmMmY2 ZDllZDE3ZDggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9icmVh a3BvaW50LW1hbmFnZXIuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIv YnJlYWtwb2ludC1tYW5hZ2VyLmh0bWwKQEAgLTE2LDcgKzE2LDcgQEAgZnVuY3Rpb24gdGVzdCgp CiAKICAgICAgICAgdWlMb2NhdGlvblRvUmF3TG9jYXRpb246IGZ1bmN0aW9uKHVpU291cmNlQ29k ZSwgbGluZU51bWJlcikKICAgICAgICAgewotICAgICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNw ZWN0b3IuRGVidWdnZXJNb2RlbC5Mb2NhdGlvbih1aVNvdXJjZUNvZGUudXJsLCBsaW5lTnVtYmVy LCAwKTsKKyAgICAgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwu TG9jYXRpb24odWlTb3VyY2VDb2RlLnVybCwgIiIsIGxpbmVOdW1iZXIsIDApOwogICAgICAgICB9 CiAgICAgfTsKIApAQCAtMjgsNyArMjgsNyBAQCBmdW5jdGlvbiB0ZXN0KCkKIAogICAgICAgICB1 aUxvY2F0aW9uVG9SYXdMb2NhdGlvbjogZnVuY3Rpb24odWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVy KQogICAgICAgICB7Ci0gICAgICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5EZWJ1Z2dl ck1vZGVsLkxvY2F0aW9uKHVpU291cmNlQ29kZS51cmwsIGxpbmVOdW1iZXIgLSAxMCwgMCk7Cisg ICAgICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkxvY2F0aW9u KHVpU291cmNlQ29kZS51cmwsICIiLCBsaW5lTnVtYmVyIC0gMTAsIDApOwogICAgICAgICB9CiAg ICAgfTsKIAo= 147598 2012-06-14 09:22:13 -0700 2012-06-14 09:52:42 -0700 Patch bug-88988-20120614202212.patch text/plain 3802 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMzI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzA0ZTk4OTQyMDc0YTU3 MmM1ZWU5NTEyNDJiYTkwZGU0YWQ4ODBlYi4uNDk4YzM1M2Q4OTY1MDJiZmQwNDhjMzhkYzRiNTU1 ZWJjZmNkODczZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA2LTE0ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IERlYnVnZ2VyTW9kZWwgc2hvdWxkIHN1cHBvcnQgc2V0dGluZyBicmVha3BvaW50cyB3aXRo b3V0IHNjcmlwdCBieSBzb3VyY2VVUkwgb25seS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTg4OTg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgYWxsb3dzIHNldHRpbmcgYWxsIHNhdmVk IGJyZWFrcG9pbnRzIGluIGRlYnVnZ2VyIG1vZGVsIGJ5IHVybCBiZWZvcmUgdGhlIHNpdGUKKyAg ICAgICAgd2l0aCBjb3JyZXNwb25kaW5nIHNjcmlwdHMgd2FzIGxvYWRlZCAoYWxsb3dzIGJyZWFr aW5nIGluIG9ubG9hZCBoYW5kbGVyIG9uIGZpcnN0IGxvYWQpLgorICAgICAgICBUaGlzIGNoYW5n ZSBhbHNvIHNpbXBsaWZpZXMgaW1wbGVtZW50YXRpb24gb2Ygc25pcHBldHMgZGVidWdnaW5nLgor CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5qczoKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUuc2V0QnJlYWtwb2ludEJ5U2NyaXB0 TG9jYXRpb24pOgorCiAyMDEyLTA2LTE0ICBFcmljIFBlbm5lciAgPGVwZW5uZXJAZ29vZ2xlLmNv bT4KIAogICAgICAgICBbY2hyb21pdW1dIEZpeCByYWNlIGNvbmRpdGlvbiB3aGVyZSBhbmltYXRp b25zIHN0YXJ0LCBmaW5pc2ggYW5kIGFyZSBkZWxldGVkIG9uIHRoZSBjb21wb3NpdGUgdGhyZWFk LCBhbGwgYmVmb3JlIHRoZSBzdGFydCBldmVuIGFycml2ZXMgb24gdGhlIG1haW4gdGhyZWFkLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50 TWFuYWdlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2lu dE1hbmFnZXIuanMKaW5kZXggZGExZTk2ZDc3NTAzMzc5NmU5MjVjNjJkMWQxOTdmMWJiNjZmMDhm NS4uOGJkNmFkMjYxZTBmZDViMDkzZWRkZDBjMWI5ZTdlZWNkNDQyMTU0NSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2Vy LmpzCkBAIC0zNzUsNyArMzc1LDExIEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5C cmVha3BvaW50LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHZhciByYXdMb2NhdGlvbiA9 IHRoaXMuX3ByaW1hcnlVSUxvY2F0aW9uLnVpTG9jYXRpb25Ub1Jhd0xvY2F0aW9uKCk7CiAgICAg ICAgIHZhciBkZWJ1Z2dlck1vZGVsTG9jYXRpb24gPSAvKiogQHR5cGUge1dlYkluc3BlY3Rvci5E ZWJ1Z2dlck1vZGVsLkxvY2F0aW9ufSAqLyByYXdMb2NhdGlvbjsKLSAgICAgICAgdGhpcy5fYnJl YWtwb2ludE1hbmFnZXIuX2RlYnVnZ2VyTW9kZWwuc2V0QnJlYWtwb2ludEJ5U2NyaXB0TG9jYXRp b24oZGVidWdnZXJNb2RlbExvY2F0aW9uLCB0aGlzLl9jb25kaXRpb24sIGRpZFNldEJyZWFrcG9p bnQuYmluZCh0aGlzKSk7CisgICAgICAgIGlmIChkZWJ1Z2dlck1vZGVsTG9jYXRpb24pCisgICAg ICAgICAgICB0aGlzLl9icmVha3BvaW50TWFuYWdlci5fZGVidWdnZXJNb2RlbC5zZXRCcmVha3Bv aW50QnlTY3JpcHRMb2NhdGlvbihkZWJ1Z2dlck1vZGVsTG9jYXRpb24sIHRoaXMuX2NvbmRpdGlv biwgZGlkU2V0QnJlYWtwb2ludC5iaW5kKHRoaXMpKTsKKyAgICAgICAgZWxzZQorICAgICAgICAg ICAgdGhpcy5fYnJlYWtwb2ludE1hbmFnZXIuX2RlYnVnZ2VyTW9kZWwuc2V0QnJlYWtwb2ludEJ5 VVJMKHRoaXMuX3ByaW1hcnlVSUxvY2F0aW9uLnVpU291cmNlQ29kZS51cmwsIHRoaXMuX3ByaW1h cnlVSUxvY2F0aW9uLmxpbmVOdW1iZXIsIDAsIHRoaXMuX2NvbmRpdGlvbiwgZGlkU2V0QnJlYWtw b2ludC5iaW5kKHRoaXMpKTsKKyAgICAgICAgCiAgICAgICAgIC8qKgogICAgICAgICAgKiBAdGhp cyB7V2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLkJyZWFrcG9pbnR9CiAgICAgICAgICAq IEBwYXJhbSB7P0RlYnVnZ2VyQWdlbnQuQnJlYWtwb2ludElkfSBicmVha3BvaW50SWQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcwpp bmRleCBmYTE2ZTBlNmU2MTgyMjcyNTUzMzVmZDk1MjhhZTBkY2NhYWIxYWQ3Li4yZjBmN2JjMmRj OGU0MzRjZWE3MzJlOGQzMGU1ZjVkMDQ5ODRlNzZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzCkBAIC0xMzUsNyArMTM1LDcg QEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAg ICAgdmFyIHNjcmlwdCA9IHRoaXMuc2NyaXB0Rm9ySWQocmF3TG9jYXRpb24uc2NyaXB0SWQpOwog ICAgICAgICBpZiAoc2NyaXB0LnNvdXJjZVVSTCkKLSAgICAgICAgICAgIHRoaXMuc2V0QnJlYWtw b2ludChzY3JpcHQuc291cmNlVVJMLCByYXdMb2NhdGlvbi5saW5lTnVtYmVyLCByYXdMb2NhdGlv bi5jb2x1bW5OdW1iZXIsIGNvbmRpdGlvbiwgY2FsbGJhY2spOworICAgICAgICAgICAgdGhpcy5z ZXRCcmVha3BvaW50QnlVUkwoc2NyaXB0LnNvdXJjZVVSTCwgcmF3TG9jYXRpb24ubGluZU51bWJl ciwgcmF3TG9jYXRpb24uY29sdW1uTnVtYmVyLCBjb25kaXRpb24sIGNhbGxiYWNrKTsKICAgICAg ICAgZWxzZQogICAgICAgICAgICAgdGhpcy5zZXRCcmVha3BvaW50QnlTb3VyY2VJZChyYXdMb2Nh dGlvbiwgY29uZGl0aW9uLCBjYWxsYmFjayk7CiAgICAgfSwKQEAgLTE0Nyw3ICsxNDcsNyBAQCBX ZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICogQHBhcmFtIHtz dHJpbmc9fSBjb25kaXRpb24KICAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKD9EZWJ1Z2dlckFnZW50 LkJyZWFrcG9pbnRJZCwgQXJyYXkuPFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkxvY2F0aW9u Pik9fSBjYWxsYmFjawogICAgICAqLwotICAgIHNldEJyZWFrcG9pbnQ6IGZ1bmN0aW9uKHVybCwg bGluZU51bWJlciwgY29sdW1uTnVtYmVyLCBjb25kaXRpb24sIGNhbGxiYWNrKQorICAgIHNldEJy ZWFrcG9pbnRCeVVSTDogZnVuY3Rpb24odXJsLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIsIGNv bmRpdGlvbiwgY2FsbGJhY2spCiAgICAgewogICAgICAgICAvLyBBZGp1c3QgY29sdW1uIGlmIG5l ZWRlZC4KICAgICAgICAgdmFyIG1pbkNvbHVtbk51bWJlciA9IDA7Cg==