49130 2010-11-06 12:55:33 -0700 Web Inspector: add more event listener breakpoint types, add support for regular breakpoint hit state, beautify hit rendering. 2010-11-12 08:44:45 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman abarth apavlov bweinstein caseq commit-queue eric joepeck keishi loislo pfeldman pmuellr podivilov rik timothy webkit.review.bot yurys oldest_to_newest 305805 0 pfeldman 2010-11-06 12:55:33 -0700 Patch to follow. 305806 1 73174 pfeldman 2010-11-06 12:58:29 -0700 Created attachment 73174 [PATCH] Proposed change. 306058 2 73174 commit-queue 2010-11-08 02:01:21 -0800 Comment on attachment 73174 [PATCH] Proposed change. Rejecting patch 73174 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=eseidel-cq-sl', 'apply-attachment', '--force-clean', '--non-interactive', 73174]" exit_code: 2 Last 500 characters of output: patch 73174 from bug 49130. Failed to run "[u'/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Yury Semikhatsky', u'--force']" exit_code: 9 Parsed 6 diffs from patch file(s). patching file WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. only literal type is supported now at /Projects/CommitQueue/WebKitTools/Scripts/svn-apply line 248. Failed to run "[u'/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Yury Semikhatsky', u'--force']" exit_code: 9 Full output: http://queues.webkit.org/results/5515025 306213 3 eric 2010-11-08 10:50:16 -0800 SUCCESS: Build 20455 (r71507) was the first to show failures: set([u'inspector/debugger-pause-on-breakpoint.html', u'inspector/debugger-pause-on-debugger-statement.html']) 306214 4 eric 2010-11-08 10:50:37 -0800 This landed, yes? It seems to have broken tests. 306238 5 caseq 2010-11-08 11:25:17 -0800 Rolled back at r71550: http://trac.webkit.org/changeset/71550 This broke inspector/debugger-pause-on-breakpoint.html and inspector/debugger-pause-on-debugger-statement.html 306240 6 73256 yurys 2010-11-08 11:27:21 -0800 Created attachment 73256 Layout test fix Here is a patch fixing debugger test failures appeared after the change above was landed. Chromium expectations still need to be updated. 306251 7 webkit.review.bot 2010-11-08 11:41:36 -0800 http://trac.webkit.org/changeset/71506 might have broken Leopard Intel Release (Tests) and SnowLeopard Intel Release (Tests) The following tests are not passing: inspector/debugger-pause-on-breakpoint.html inspector/debugger-pause-on-debugger-statement.html 306800 8 apavlov 2010-11-09 08:18:20 -0800 Even though this has been rolled back, you might want to rework and re-commit the patch. Just in case, localizedStrings.js is not valid JS as it contains the following line: localizedStrings["Device" = "Device"; 308577 9 73750 yurys 2010-11-12 08:38:06 -0800 Created attachment 73750 Improved version of the patch that I'm going to land Compared to the original change this one: - places this.sidebarPanes.eventListenerBreakpoints.reset(); under if (Preferences.nativeInstrumentationEnabled) { guard (ScriptsPanel.js) - checks that a breakpoint has populateStatusMessageElement method, otherwise will get an exception for JS breakpoints(CallStackSidebarPane.js) without these modifications we will get exceptions in runtime, these exceptions caused inspector layout tests to fail. 308580 10 yurys 2010-11-12 08:42:18 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/English.lproj/localizedStrings.js M WebCore/inspector/front-end/BreakpointManager.js M WebCore/inspector/front-end/BreakpointsSidebarPane.js M WebCore/inspector/front-end/CallStackSidebarPane.js M WebCore/inspector/front-end/ScriptsPanel.js M WebCore/inspector/front-end/inspector.css Committed r71917 308581 11 73750 joepeck 2010-11-12 08:44:45 -0800 Comment on attachment 73750 Improved version of the patch that I'm going to land View in context: https://bugs.webkit.org/attachment.cgi?id=73750&action=review Cool, glad to see a bunch of other events in the list that are difficult to debug (like unload)! > WebCore/inspector/front-end/BreakpointsSidebarPane.js:264 > + // FIXME: uncomment following once inspector stops being drop targer in major ports. Typo: "targer" => "target" 73174 2010-11-06 12:58:29 -0700 2010-11-12 08:38:06 -0800 [PATCH] Proposed change. hit_marker text/plain 8440 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MmEzMjc2MC4uNjFiYjkwYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxMC0xMS0wNiAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBhZGQgbW9yZSBldmVudCBsaXN0ZW5l ciBicmVha3BvaW50IHR5cGVzLCBhZGQgc3VwcG9ydCBmb3IgcmVndWxhciBicmVha3BvaW50IGhp dCBzdGF0ZSwgYmVhdXRpZnkgaGl0IHJlbmRlcmluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5MTMwCisKKyAgICAgICAgKiBFbmdsaXNoLmxwcm9q L2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVh a3BvaW50TWFuYWdlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdl ci5wcm90b3R5cGUuZGVidWdnZXJQYXVzZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFr cG9pbnQuanNCcmVha3BvaW50SWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQu cHJvdG90eXBlLmdldCBpZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3Bv aW50c1NpZGViYXJQYW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJC cmVha3BvaW50c1NpZGViYXJQYW5lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FdmVudExpc3Rl bmVyQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5wcm90b3R5cGUuX2NyZWF0ZUNhdGVnb3J5KToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWwpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv aW5zcGVjdG9yLmNzczoKKyAgICAgICAgKCNlbGVtZW50cy1zaWRlYmFyKToKKyAgICAgICAgKC5w YW5lID4gLmJvZHkpOgorICAgICAgICAoI3NjcmlwdHMtc2lkZWJhcik6CisgICAgICAgIChsaS5i cmVha3BvaW50LWhpdCAuYnJlYWtwb2ludC1oaXQtbWFya2VyKToKKwogMjAxMC0xMS0wNSAgQ2hh cmxpZSBSZWlzICA8Y3JlaXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERh cmluIEZpc2hlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRT dHJpbmdzLmpzIGIvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5k ZXggMDJlMjE0MzM4NTAyZDFhNGE0NTZmMjNiMDA0YjUyOTg3MGYzM2E4ZC4uZWFlOTc0OTIxN2Nh NmYwNDk4NWE5NmIyNWYxZGY3MDM4MTgwZmU3MyAxMDA2NDQKR0lUIGJpbmFyeSBwYXRjaApkZWx0 YSAyMDYKemNtWD4hamR7fmQ8XyhAbEJ3Wk1hNyFuIU04SSV9ZTg1OV83Zm1uJEZFSCt0elUzVzVm c0tEZ05CV349QDNeQCMkCnozPFo8QGopP09AKiRoYnhgMyNBWkh4JW5udTA2IVQ/OHtJKGQ0cjUz dytuK21nRD1uJjVQek1seHg1UVFEbmw3aQp6WiEoWnBMYjNyV0kkMXptbSg+U3NRZTJxJDxnRWYp bGxTWHokUUEpYmEhfW1sMz4zKkBDO19AUWZBUnVmLU8yTEQKUHhGJVBJQE5DdlVEJEU3fGxSK3xN CgpkZWx0YSAxMDgKemNtZGxxbGxqbXo8XyhAbENpZm8rXll2ZnxWZW48fVZOaFU1Vjw9KXNXWE5T bVd6YzhIWEdtaG0wPHd9Qk4qSShGCmdWdTctQEsmLT8tSz1vdlc3VHdBSCRHSWp+aFZYMmplQHZK UzBLcFIpbmc5UioKCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJl YWtwb2ludE1hbmFnZXIuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2lu dE1hbmFnZXIuanMKaW5kZXggMjIxYTc3Ny4uM2Q1MTA5MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzCisrKyBiL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5qcwpAQCAtMjMwLDEwICsyMzAsMTcg QEAgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZSA9IHsKIAogICAgIGRl YnVnZ2VyUGF1c2VkOiBmdW5jdGlvbihkZXRhaWxzKQogICAgIHsKLSAgICAgICAgaWYgKGRldGFp bHMuZXZlbnRUeXBlICE9PSBXZWJJbnNwZWN0b3IuRGVidWdnZXJFdmVudFR5cGVzLk5hdGl2ZUJy ZWFrcG9pbnQpCisgICAgICAgIGlmIChkZXRhaWxzLmV2ZW50VHlwZSA9PT0gV2ViSW5zcGVjdG9y LkRlYnVnZ2VyRXZlbnRUeXBlcy5KYXZhU2NyaXB0UGF1c2UpCiAgICAgICAgICAgICByZXR1cm47 CiAKLSAgICAgICAgdmFyIGJyZWFrcG9pbnQgPSB0aGlzLl9icmVha3BvaW50c1tkZXRhaWxzLmV2 ZW50RGF0YS5icmVha3BvaW50SWRdOworICAgICAgICBpZiAoZGV0YWlscy5ldmVudERhdGEgJiYg ZGV0YWlscy5ldmVudERhdGEuYnJlYWtwb2ludElkKQorICAgICAgICAgICAgdmFyIGJyZWFrcG9p bnRJZCA9IGRldGFpbHMuZXZlbnREYXRhLmJyZWFrcG9pbnRJZDsKKyAgICAgICAgZWxzZSBpZiAo ZGV0YWlscy5jYWxsRnJhbWVzICYmIGRldGFpbHMuY2FsbEZyYW1lcy5sZW5ndGgpCisgICAgICAg ICAgICB2YXIgYnJlYWtwb2ludElkID0gV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQuanNCcmVha3Bv aW50SWQoZGV0YWlscy5jYWxsRnJhbWVzWzBdLnNvdXJjZUlELCBkZXRhaWxzLmNhbGxGcmFtZXNb MF0ubGluZSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB2 YXIgYnJlYWtwb2ludCA9IHRoaXMuX2JyZWFrcG9pbnRzW2JyZWFrcG9pbnRJZF07CiAgICAgICAg IGlmICghYnJlYWtwb2ludCkKICAgICAgICAgICAgIHJldHVybjsKIApAQCAtMzIzLDYgKzMzMCwx MSBAQCBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludCA9IGZ1bmN0aW9uKGJyZWFrcG9pbnRNYW5hZ2Vy LCBzb3VyY2VJRCwgdXJsLCBsaW5lLCBlbmFibAogICAgIHRoaXMuX2JyZWFrcG9pbnRNYW5hZ2Vy ID0gYnJlYWtwb2ludE1hbmFnZXI7CiB9CiAKK1dlYkluc3BlY3Rvci5CcmVha3BvaW50LmpzQnJl YWtwb2ludElkID0gZnVuY3Rpb24oc291cmNlSUQsIGxpbmUpCit7CisgICAgcmV0dXJuIHNvdXJj ZUlEICsgIjoiICsgbGluZTsKK30KKwogV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQucHJvdG90eXBl ID0gewogICAgIGdldCBlbmFibGVkKCkKICAgICB7CkBAIC0zNTIsNyArMzY0LDcgQEAgV2ViSW5z cGVjdG9yLkJyZWFrcG9pbnQucHJvdG90eXBlID0gewogCiAgICAgZ2V0IGlkKCkKICAgICB7Ci0g ICAgICAgIHJldHVybiB0aGlzLnNvdXJjZUlEICsgIjoiICsgdGhpcy5saW5lOworICAgICAgICBy ZXR1cm4gV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQuanNCcmVha3BvaW50SWQodGhpcy5zb3VyY2VJ RCwgdGhpcy5saW5lKTsKICAgICB9LAogCiAgICAgZ2V0IGNvbmRpdGlvbigpCmRpZmYgLS1naXQg YS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50c1NpZGViYXJQYW5lLmpzCmlu ZGV4IGYwMTAzMzAuLjQ3MTk0ZGEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9CcmVha3BvaW50c1NpZGViYXJQYW5lLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9CcmVha3BvaW50c1NpZGViYXJQYW5lLmpzCkBAIC0yNTksOSArMjU5LDE2IEBAIFdl Ykluc3BlY3Rvci5FdmVudExpc3RlbmVyQnJlYWtwb2ludHNTaWRlYmFyUGFuZSA9IGZ1bmN0aW9u KCkKICAgICBXZWJJbnNwZWN0b3IuYnJlYWtwb2ludE1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcigi ZXZlbnQtbGlzdGVuZXItYnJlYWtwb2ludC1hZGRlZCIsIHRoaXMuX2JyZWFrcG9pbnRBZGRlZCwg dGhpcyk7CiAKICAgICB0aGlzLl9icmVha3BvaW50SXRlbXMgPSB7fTsKKyAgICB0aGlzLl9jcmVh dGVDYXRlZ29yeSgiS2V5Ym9hcmQiLCAibGlzdGVuZXIiLCBbImtleWRvd24iLCAia2V5dXAiLCAi a2V5cHJlc3MiLCAidGV4dElucHV0Il0pOwogICAgIHRoaXMuX2NyZWF0ZUNhdGVnb3J5KCJNb3Vz ZSIsICJsaXN0ZW5lciIsIFsiY2xpY2siLCAiZGJsY2xpY2siLCAibW91c2Vkb3duIiwgIm1vdXNl dXAiLCAibW91c2VvdmVyIiwgIm1vdXNlbW92ZSIsICJtb3VzZW91dCIsICJtb3VzZXdoZWVsIl0p OwotICAgIHRoaXMuX2NyZWF0ZUNhdGVnb3J5KCJLZXlib2FyZCIsICJsaXN0ZW5lciIsIFsia2V5 ZG93biIsICJrZXlwcmVzcyIsICJrZXl1cCJdKTsKLSAgICB0aGlzLl9jcmVhdGVDYXRlZ29yeSgi SFRNTCBmcmFtZS9vYmplY3QiLCAibGlzdGVuZXIiLCBbImxvYWQiLCAiZXJyb3IiLCAicmVzaXpl IiwgInNjcm9sbCJdKTsKKyAgICAvLyBGSVhNRTogdW5jb21tZW50IGZvbGxvd2luZyBvbmNlIGlu c3BlY3RvciBzdG9wcyBiZWluZyBkcm9wIHRhcmdlciBpbiBtYWpvciBwb3J0cy4KKyAgICAvLyBP dGhlcndpc2UsIGluc3BlY3RvciBwYWdlIHJlYWN0cyBvbiBkcm9wIGV2ZW50IGFuZCB0cmllcyB0 byBsb2FkIHRoZSBldmVudCBkYXRhLgorICAgIC8vIHRoaXMuX2NyZWF0ZUNhdGVnb3J5KCJEcmFn IiwgImxpc3RlbmVyIiwgWyJkcmFnIiwgImRyb3AiLCAiZHJhZ3N0YXJ0IiwgImRyYWdlbmQiLCAi ZHJhZ2VudGVyIiwgImRyYWdsZWF2ZSIsICJkcmFnb3ZlciJdKTsKKyAgICB0aGlzLl9jcmVhdGVD YXRlZ29yeSgiQ29udHJvbCIsICJsaXN0ZW5lciIsIFsicmVzaXplIiwgInNjcm9sbCIsICJ6b29t IiwgImZvY3VzIiwgImJsdXIiLCAic2VsZWN0IiwgImNoYW5nZSIsICJzdWJtaXQiLCAicmVzZXQi XSk7CisgICAgdGhpcy5fY3JlYXRlQ2F0ZWdvcnkoIkNsaXBib2FyZCIsICJsaXN0ZW5lciIsIFsi Y29weSIsICJjdXQiLCAicGFzdGUiLCAiYmVmb3JlY29weSIsICJiZWZvcmVjdXQiLCAiYmVmb3Jl cGFzdGUiXSk7CisgICAgdGhpcy5fY3JlYXRlQ2F0ZWdvcnkoIkxvYWQiLCAibGlzdGVuZXIiLCBb ImxvYWQiLCAidW5sb2FkIiwgImFib3J0IiwgImVycm9yIl0pOworICAgIHRoaXMuX2NyZWF0ZUNh dGVnb3J5KCJET00gTXV0YXRpb24iLCAibGlzdGVuZXIiLCBbIkRPTUFjdGl2YXRlIiwgIkRPTUZv Y3VzSW4iLCAiRE9NRm9jdXNPdXQiLCAiRE9NQXR0ck1vZGlmaWVkIiwgIkRPTUNoYXJhY3RlckRh dGFNb2RpZmllZCIsICJET01Ob2RlSW5zZXJ0ZWQiLCAiRE9NTm9kZUluc2VydGVkSW50b0RvY3Vt ZW50IiwgIkRPTU5vZGVSZW1vdmVkIiwgIkRPTU5vZGVSZW1vdmVkRnJvbURvY3VtZW50IiwgIkRP TVN1YnRyZWVNb2RpZmllZCIsICJET01Db250ZW50TG9hZGVkIl0pOworICAgIHRoaXMuX2NyZWF0 ZUNhdGVnb3J5KCJEZXZpY2UiLCAibGlzdGVuZXIiLCBbImRldmljZW9yaWVudGF0aW9uIiwgImRl dmljZW1vdGlvbiJdKTsKICAgICB0aGlzLl9jcmVhdGVDYXRlZ29yeSgiVGltZXIiLCAiaW5zdHJ1 bWVudGF0aW9uIiwgWyJzZXRUaW1lciIsICJjbGVhclRpbWVyIiwgInRpbWVyRmlyZWQiXSk7CiB9 CiAKQEAgLTI4NSw2ICsyOTIsOSBAQCBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lckJyZWFrcG9p bnRzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogICAgICAgICAgICAgdmFyIHRpdGxlID0gV2Vi SW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJCcmVha3BvaW50LmV2ZW50TmFtZUZvclVJKGV2ZW50TmFt ZSk7CiAgICAgICAgICAgICBicmVha3BvaW50SXRlbS5lbGVtZW50ID0gbmV3IFRyZWVFbGVtZW50 KHRpdGxlKTsKICAgICAgICAgICAgIGNhdGVnb3J5SXRlbS5lbGVtZW50LmFwcGVuZENoaWxkKGJy ZWFrcG9pbnRJdGVtLmVsZW1lbnQpOworICAgICAgICAgICAgdmFyIGhpdE1hcmtlciA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgICAgICAgICAgaGl0TWFya2VyLmNsYXNzTmFt ZSA9ICJicmVha3BvaW50LWhpdC1tYXJrZXIiOworICAgICAgICAgICAgYnJlYWtwb2ludEl0ZW0u ZWxlbWVudC5saXN0SXRlbUVsZW1lbnQuYXBwZW5kQ2hpbGQoaGl0TWFya2VyKTsKICAgICAgICAg ICAgIGJyZWFrcG9pbnRJdGVtLmVsZW1lbnQubGlzdEl0ZW1FbGVtZW50LmFkZFN0eWxlQ2xhc3Mo InNvdXJjZS1jb2RlIik7CiAgICAgICAgICAgICBicmVha3BvaW50SXRlbS5lbGVtZW50LnNlbGVj dGFibGUgPSB0cnVlOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0c1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5l bC5qcwppbmRleCA2NjI2MGY5Li4xNjQzMzI1IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTEzNSw4ICsxMzUsOCBAQCBXZWJJbnNwZWN0b3IuU2Ny aXB0c1BhbmVsID0gZnVuY3Rpb24oKQogICAgIGlmIChQcmVmZXJlbmNlcy5uYXRpdmVJbnN0cnVt ZW50YXRpb25FbmFibGVkKSB7CiAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLmRvbUJyZWFrcG9p bnRzID0gV2ViSW5zcGVjdG9yLmNyZWF0ZURPTUJyZWFrcG9pbnRzU2lkZWJhclBhbmUoKTsKICAg ICAgICAgdGhpcy5zaWRlYmFyUGFuZXMueGhyQnJlYWtwb2ludHMgPSBXZWJJbnNwZWN0b3IuY3Jl YXRlWEhSQnJlYWtwb2ludHNTaWRlYmFyUGFuZSgpOworICAgICAgICB0aGlzLnNpZGViYXJQYW5l cy5ldmVudExpc3RlbmVyQnJlYWtwb2ludHMgPSBuZXcgV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVu ZXJCcmVha3BvaW50c1NpZGViYXJQYW5lKCk7CiAgICAgfQotICAgIHRoaXMuc2lkZWJhclBhbmVz LmV2ZW50TGlzdGVuZXJCcmVha3BvaW50cyA9IG5ldyBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5l ckJyZWFrcG9pbnRzU2lkZWJhclBhbmUoKTsKIAogICAgIHRoaXMuc2lkZWJhclBhbmVzLndvcmtl cnMgPSBuZXcgV2ViSW5zcGVjdG9yLldvcmtlcnNTaWRlYmFyUGFuZSgpOwogCmRpZmYgLS1naXQg YS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcyBiL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCmluZGV4IGIyNmI3NDguLmJlMGJjZjcgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCisrKyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCkBAIC0xMDMzLDcgKzEw MzMsNiBAQCBib2R5LnBsYXRmb3JtLWxpbnV4IC5tb25vc3BhY2UsIGJvZHkucGxhdGZvcm0tbGlu dXggLnNvdXJjZS1jb2RlIHsKICAgICByaWdodDogMDsKICAgICBib3R0b206IDA7CiAgICAgd2lk dGg6IDMyNXB4OwotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyNDUsIDI0NSwgMjQ1KTsKICAg ICBib3JkZXItbGVmdDogMXB4IHNvbGlkIHJnYig2NCUsIDY0JSwgNjQlKTsKICAgICBjdXJzb3I6 IGRlZmF1bHQ7CiAgICAgb3ZlcmZsb3c6IGF1dG87CkBAIC0xNzE2LDcgKzE3MTUsNiBAQCBsaS5l ZGl0aW5nIC5zd2F0Y2gsIGxpLmVkaXRpbmcgLmVuYWJsZWQtYnV0dG9uLCAgbGkuZWRpdGluZy1z dWItcGFydCAuZGVsZXRlLWJ1dAogLnBhbmUgPiAuYm9keSB7CiAgICAgcG9zaXRpb246IHJlbGF0 aXZlOwogICAgIGRpc3BsYXk6IG5vbmU7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogd2hpdGU7CiAg ICAgb3ZlcmZsb3cteTogYXV0bzsKICAgICBvdmVyZmxvdy14OiBoaWRkZW47CiB9CkBAIC0yNjMy LDcgKzI2MzAsNiBAQCBidXR0b24uZW5hYmxlLXRvZ2dsZS1zdGF0dXMtYmFyLWl0ZW0udG9nZ2xl ZC1vbiAuZ2x5cGggewogICAgIHJpZ2h0OiAwOwogICAgIGJvdHRvbTogMDsKICAgICB3aWR0aDog MjI1cHg7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDI0NSwgMjQ1LCAyNDUpOwogICAgIGJv cmRlci1sZWZ0OiAxcHggc29saWQgcmdiKDY0JSwgNjQlLCA2NCUpOwogICAgIGN1cnNvcjogZGVm YXVsdDsKICAgICBvdmVyZmxvdzogYXV0bzsKQEAgLTQxMjUsNiArNDEyMiwxNiBAQCBvbC5icmVh a3BvaW50LWxpc3QgewogICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyNTUsIDI1NSwgMTk0KTsK IH0KIAorbGkuYnJlYWtwb2ludC1oaXQgLmJyZWFrcG9pbnQtaGl0LW1hcmtlciB7CisgICAgYmFj a2dyb3VuZC1jb2xvcjogcmdiKDI1NSwgMjU1LCAxOTQpOworICAgIGhlaWdodDogMThweDsKKyAg ICBsZWZ0OiAwcHg7CisgICAgbWFyZ2luLXRvcDogLTE2cHg7CisgICAgcG9zaXRpb246IGFic29s dXRlOworICAgIHJpZ2h0OiAwcHg7CisgICAgei1pbmRleDogLTE7Cit9CisKIC53ZWJraXQtaHRt bC1qcy1ub2RlLCAud2Via2l0LWh0bWwtY3NzLW5vZGUgewogICAgIHdoaXRlLXNwYWNlOiBwcmU7 CiB9Cg== 73256 2010-11-08 11:27:21 -0800 2010-11-12 08:38:06 -0800 Layout test fix fix-debugger-tests.patch text/plain 2589 yurys ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyZDE3YWFhLi5kZDM4N2NlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsOSBAQAorMjAxMC0xMS0w OCAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBVbnJl dmlld2VkLiBGaXggZGVidWdnZXIgdGVzdHMgdGhhdCBzdGFydGVkIGZhaWxpbmcgcjcxNTA2Lgor CisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyLWF1dG9jb250aW51ZS1vbi1zeW50YXgtZXJy b3IuaHRtbDoKKwogMjAxMC0xMS0wOCAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci1hdXRvY29udGludWUtb24tc3ludGF4LWVycm9y LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci1hdXRvY29udGlu dWUtb24tc3ludGF4LWVycm9yLWV4cGVjdGVkLnR4dAppbmRleCA0YjMxYjZlLi41MmY2ZDNhIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItYXV0b2NvbnRpbnVlLW9u LXN5bnRheC1lcnJvci1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Rl YnVnZ2VyLWF1dG9jb250aW51ZS1vbi1zeW50YXgtZXJyb3ItZXhwZWN0ZWQudHh0CkBAIC00LDUg KzQsNSBAQCBUZXN0cyB0aGF0IGRlYnVnZ2VyIHdvbid0IHN0b3Agb24gc3ludGF4IGVycm9ycyBl dmVuIGlmICJwYXVzZSBvbiB1bmNhdWdodCBleGNlcAogCiBEZWJ1Z2dlciB3YXMgZW5hYmxlZC4K IFBhZ2UgcmVsb2FkZWQuCi1ET05FLgorRGVidWdnZXIgd2FzIGRpc2FibGVkLgogCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItYXV0b2NvbnRpbnVlLW9uLXN5bnRh eC1lcnJvci5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLWF1dG9jb250aW51 ZS1vbi1zeW50YXgtZXJyb3IuaHRtbAppbmRleCBmZDU2MjA4Li45MThlZjVmIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItYXV0b2NvbnRpbnVlLW9uLXN5bnRheC1l cnJvci5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci1hdXRvY29udGlu dWUtb24tc3ludGF4LWVycm9yLmh0bWwKQEAgLTE5LDggKzE5LDcgQEAgZnVuY3Rpb24gdGVzdCgp CiAgICAgZnVuY3Rpb24gcmVsb2FkSW5zcGVjdGVkUGFnZSgpCiAgICAgewogICAgICAgICBJbnNw ZWN0b3JUZXN0LnJlbG9hZFBhZ2UoZnVuY3Rpb24oKSB7Ci0gICAgICAgICAgICBJbnNwZWN0b3JU ZXN0LmFkZFJlc3VsdCgiRE9ORS4iKTsKLSAgICAgICAgICAgIEluc3BlY3RvclRlc3QuY29tcGxl dGVUZXN0KCk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmNvbXBsZXRlRGVidWdnZXJUZXN0 KCk7CiAgICAgICAgIH0pOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkMzc4ZTc2Li4xNWYzNDQ5IDEwMDY0NAotLS0gYS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEwIEBA CisyMDEwLTExLTA4ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFVucmV2aWV3ZWQuIEZpeCBkZWJ1Z2dlciB0ZXN0cyB0aGF0IHN0YXJ0ZWQgZmFpbGlu ZyByNzE1MDYuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5h Z2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQucHJvdG90eXBlLnBvcHVs YXRlU3RhdHVzTWVzc2FnZUVsZW1lbnQpOgorCiAyMDEwLTExLTA4ICBEYXJpbiBBZGxlciAgPGRh cmluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292 LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5h Z2VyLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpz CmluZGV4IDNkNTEwOTIuLjVhZGUzMDkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9CcmVha3BvaW50TWFuYWdlci5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMKQEAgLTQxMCw2ICs0MTAsMTAgQEAgV2ViSW5zcGVj dG9yLkJyZWFrcG9pbnQucHJvdG90eXBlID0gewogICAgICAgICBlbGVtZW50LmFwcGVuZENoaWxk KHNvdXJjZVRleHRFbGVtZW50KTsKICAgICB9LAogCisgICAgcG9wdWxhdGVTdGF0dXNNZXNzYWdl RWxlbWVudDogZnVuY3Rpb24oKQorICAgIHsKKyAgICB9LAorCiAgICAgcmVtb3ZlOiBmdW5jdGlv bigpCiAgICAgewogICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLnJlbW92ZUJyZWFrcG9pbnQodGhp cy5zb3VyY2VJRCwgdGhpcy5saW5lKTsK 73750 2010-11-12 08:38:06 -0800 2010-11-12 08:44:45 -0800 Improved version of the patch that I'm going to land change-to-land.patch text/plain 9934 yurys ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NmZjMDdmMC4uZGQzNjI3ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAxMC0xMS0xMiAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBZdXJ5IFNl bWlraGF0c2t5LgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFkZCBtb3JlIGV2ZW50IGxpc3Rl bmVyIGJyZWFrcG9pbnQgdHlwZXMsIGFkZCBzdXBwb3J0IGZvciByZWd1bGFyIGJyZWFrcG9pbnQg aGl0IHN0YXRlLCBiZWF1dGlmeSBoaXQgcmVuZGVyaW5nLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDkxMzAKKworICAgICAgICAqIEVuZ2xpc2gubHBy b2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0Jy ZWFrcG9pbnRNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5h Z2VyLnByb3RvdHlwZS5kZWJ1Z2dlclBhdXNlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQnJl YWtwb2ludC5qc0JyZWFrcG9pbnRJZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQnJlYWtwb2lu dC5wcm90b3R5cGUuZ2V0IGlkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFr cG9pbnRzU2lkZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5l ckJyZWFrcG9pbnRzU2lkZWJhclBhbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV2ZW50TGlz dGVuZXJCcmVha3BvaW50c1NpZGViYXJQYW5lLnByb3RvdHlwZS5fY3JlYXRlQ2F0ZWdvcnkpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ2FsbFN0YWNrU2lkZWJhclBhbmUuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQ2FsbFN0YWNrU2lkZWJhclBhbmUucHJvdG90eXBlLl9icmVh a3BvaW50SGl0KTogZG9uJ3QgY2FsbCBwb3B1bGF0ZVN0YXR1c01lc3NhZ2UgZm9yIEpTIGJyZWFr cG9pbnRzCisgICAgICAgIHNpbmNlIHRoZXJlIGlzIG5vIHNwZWNpZmljIG1lc3NhZ2UgaW4gdGhh dCBjYXNlLgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5yZXNldCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuY3NzOgorICAgICAgICAoI2VsZW1lbnRzLXNpZGViYXIpOgorICAg ICAgICAoLnBhbmUgPiAuYm9keSk6CisgICAgICAgICgjc2NyaXB0cy1zaWRlYmFyKToKKyAgICAg ICAgKGxpLmJyZWFrcG9pbnQtaGl0IC5icmVha3BvaW50LWhpdC1tYXJrZXIpOgorCiAyMDEwLTEx LTEyICBKb2huIEtub3R0ZW5iZWx0ICA8amtub3R0ZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IFN0ZXZlIEJsb2NrLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9FbmdsaXNoLmxw cm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVk U3RyaW5ncy5qcwppbmRleCAwMmUyMTQzLi40ZWIxMWI5IDEwMDY0NApCaW5hcnkgZmlsZXMgYS9X ZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBhbmQgYi9XZWJDb3JlL0Vu Z2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBkaWZmZXIKZGlmZiAtLWdpdCBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5qcyBiL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5qcwppbmRleCAyMjFhNzc3Li4zZDUx MDkyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1h bmFnZXIuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5h Z2VyLmpzCkBAIC0yMzAsMTAgKzIzMCwxNyBAQCBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFn ZXIucHJvdG90eXBlID0gewogCiAgICAgZGVidWdnZXJQYXVzZWQ6IGZ1bmN0aW9uKGRldGFpbHMp CiAgICAgewotICAgICAgICBpZiAoZGV0YWlscy5ldmVudFR5cGUgIT09IFdlYkluc3BlY3Rvci5E ZWJ1Z2dlckV2ZW50VHlwZXMuTmF0aXZlQnJlYWtwb2ludCkKKyAgICAgICAgaWYgKGRldGFpbHMu ZXZlbnRUeXBlID09PSBXZWJJbnNwZWN0b3IuRGVidWdnZXJFdmVudFR5cGVzLkphdmFTY3JpcHRQ YXVzZSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB2YXIgYnJlYWtwb2ludCA9IHRo aXMuX2JyZWFrcG9pbnRzW2RldGFpbHMuZXZlbnREYXRhLmJyZWFrcG9pbnRJZF07CisgICAgICAg IGlmIChkZXRhaWxzLmV2ZW50RGF0YSAmJiBkZXRhaWxzLmV2ZW50RGF0YS5icmVha3BvaW50SWQp CisgICAgICAgICAgICB2YXIgYnJlYWtwb2ludElkID0gZGV0YWlscy5ldmVudERhdGEuYnJlYWtw b2ludElkOworICAgICAgICBlbHNlIGlmIChkZXRhaWxzLmNhbGxGcmFtZXMgJiYgZGV0YWlscy5j YWxsRnJhbWVzLmxlbmd0aCkKKyAgICAgICAgICAgIHZhciBicmVha3BvaW50SWQgPSBXZWJJbnNw ZWN0b3IuQnJlYWtwb2ludC5qc0JyZWFrcG9pbnRJZChkZXRhaWxzLmNhbGxGcmFtZXNbMF0uc291 cmNlSUQsIGRldGFpbHMuY2FsbEZyYW1lc1swXS5saW5lKTsKKyAgICAgICAgZWxzZQorICAgICAg ICAgICAgcmV0dXJuOworCisgICAgICAgIHZhciBicmVha3BvaW50ID0gdGhpcy5fYnJlYWtwb2lu dHNbYnJlYWtwb2ludElkXTsKICAgICAgICAgaWYgKCFicmVha3BvaW50KQogICAgICAgICAgICAg cmV0dXJuOwogCkBAIC0zMjMsNiArMzMwLDExIEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50ID0g ZnVuY3Rpb24oYnJlYWtwb2ludE1hbmFnZXIsIHNvdXJjZUlELCB1cmwsIGxpbmUsIGVuYWJsCiAg ICAgdGhpcy5fYnJlYWtwb2ludE1hbmFnZXIgPSBicmVha3BvaW50TWFuYWdlcjsKIH0KIAorV2Vi SW5zcGVjdG9yLkJyZWFrcG9pbnQuanNCcmVha3BvaW50SWQgPSBmdW5jdGlvbihzb3VyY2VJRCwg bGluZSkKK3sKKyAgICByZXR1cm4gc291cmNlSUQgKyAiOiIgKyBsaW5lOworfQorCiBXZWJJbnNw ZWN0b3IuQnJlYWtwb2ludC5wcm90b3R5cGUgPSB7CiAgICAgZ2V0IGVuYWJsZWQoKQogICAgIHsK QEAgLTM1Miw3ICszNjQsNyBAQCBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludC5wcm90b3R5cGUgPSB7 CiAKICAgICBnZXQgaWQoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuc291cmNlSUQgKyAi OiIgKyB0aGlzLmxpbmU7CisgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludC5q c0JyZWFrcG9pbnRJZCh0aGlzLnNvdXJjZUlELCB0aGlzLmxpbmUpOwogICAgIH0sCiAKICAgICBn ZXQgY29uZGl0aW9uKCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9C cmVha3BvaW50c1NpZGViYXJQYW5lLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Jy ZWFrcG9pbnRzU2lkZWJhclBhbmUuanMKaW5kZXggZjAxMDMzMC4uNDcxOTRkYSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanMK KysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUu anMKQEAgLTI1OSw5ICsyNTksMTYgQEAgV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJCcmVha3Bv aW50c1NpZGViYXJQYW5lID0gZnVuY3Rpb24oKQogICAgIFdlYkluc3BlY3Rvci5icmVha3BvaW50 TWFuYWdlci5hZGRFdmVudExpc3RlbmVyKCJldmVudC1saXN0ZW5lci1icmVha3BvaW50LWFkZGVk IiwgdGhpcy5fYnJlYWtwb2ludEFkZGVkLCB0aGlzKTsKIAogICAgIHRoaXMuX2JyZWFrcG9pbnRJ dGVtcyA9IHt9OworICAgIHRoaXMuX2NyZWF0ZUNhdGVnb3J5KCJLZXlib2FyZCIsICJsaXN0ZW5l ciIsIFsia2V5ZG93biIsICJrZXl1cCIsICJrZXlwcmVzcyIsICJ0ZXh0SW5wdXQiXSk7CiAgICAg dGhpcy5fY3JlYXRlQ2F0ZWdvcnkoIk1vdXNlIiwgImxpc3RlbmVyIiwgWyJjbGljayIsICJkYmxj bGljayIsICJtb3VzZWRvd24iLCAibW91c2V1cCIsICJtb3VzZW92ZXIiLCAibW91c2Vtb3ZlIiwg Im1vdXNlb3V0IiwgIm1vdXNld2hlZWwiXSk7Ci0gICAgdGhpcy5fY3JlYXRlQ2F0ZWdvcnkoIktl eWJvYXJkIiwgImxpc3RlbmVyIiwgWyJrZXlkb3duIiwgImtleXByZXNzIiwgImtleXVwIl0pOwot ICAgIHRoaXMuX2NyZWF0ZUNhdGVnb3J5KCJIVE1MIGZyYW1lL29iamVjdCIsICJsaXN0ZW5lciIs IFsibG9hZCIsICJlcnJvciIsICJyZXNpemUiLCAic2Nyb2xsIl0pOworICAgIC8vIEZJWE1FOiB1 bmNvbW1lbnQgZm9sbG93aW5nIG9uY2UgaW5zcGVjdG9yIHN0b3BzIGJlaW5nIGRyb3AgdGFyZ2Vy IGluIG1ham9yIHBvcnRzLgorICAgIC8vIE90aGVyd2lzZSwgaW5zcGVjdG9yIHBhZ2UgcmVhY3Rz IG9uIGRyb3AgZXZlbnQgYW5kIHRyaWVzIHRvIGxvYWQgdGhlIGV2ZW50IGRhdGEuCisgICAgLy8g dGhpcy5fY3JlYXRlQ2F0ZWdvcnkoIkRyYWciLCAibGlzdGVuZXIiLCBbImRyYWciLCAiZHJvcCIs ICJkcmFnc3RhcnQiLCAiZHJhZ2VuZCIsICJkcmFnZW50ZXIiLCAiZHJhZ2xlYXZlIiwgImRyYWdv dmVyIl0pOworICAgIHRoaXMuX2NyZWF0ZUNhdGVnb3J5KCJDb250cm9sIiwgImxpc3RlbmVyIiwg WyJyZXNpemUiLCAic2Nyb2xsIiwgInpvb20iLCAiZm9jdXMiLCAiYmx1ciIsICJzZWxlY3QiLCAi Y2hhbmdlIiwgInN1Ym1pdCIsICJyZXNldCJdKTsKKyAgICB0aGlzLl9jcmVhdGVDYXRlZ29yeSgi Q2xpcGJvYXJkIiwgImxpc3RlbmVyIiwgWyJjb3B5IiwgImN1dCIsICJwYXN0ZSIsICJiZWZvcmVj b3B5IiwgImJlZm9yZWN1dCIsICJiZWZvcmVwYXN0ZSJdKTsKKyAgICB0aGlzLl9jcmVhdGVDYXRl Z29yeSgiTG9hZCIsICJsaXN0ZW5lciIsIFsibG9hZCIsICJ1bmxvYWQiLCAiYWJvcnQiLCAiZXJy b3IiXSk7CisgICAgdGhpcy5fY3JlYXRlQ2F0ZWdvcnkoIkRPTSBNdXRhdGlvbiIsICJsaXN0ZW5l ciIsIFsiRE9NQWN0aXZhdGUiLCAiRE9NRm9jdXNJbiIsICJET01Gb2N1c091dCIsICJET01BdHRy TW9kaWZpZWQiLCAiRE9NQ2hhcmFjdGVyRGF0YU1vZGlmaWVkIiwgIkRPTU5vZGVJbnNlcnRlZCIs ICJET01Ob2RlSW5zZXJ0ZWRJbnRvRG9jdW1lbnQiLCAiRE9NTm9kZVJlbW92ZWQiLCAiRE9NTm9k ZVJlbW92ZWRGcm9tRG9jdW1lbnQiLCAiRE9NU3VidHJlZU1vZGlmaWVkIiwgIkRPTUNvbnRlbnRM b2FkZWQiXSk7CisgICAgdGhpcy5fY3JlYXRlQ2F0ZWdvcnkoIkRldmljZSIsICJsaXN0ZW5lciIs IFsiZGV2aWNlb3JpZW50YXRpb24iLCAiZGV2aWNlbW90aW9uIl0pOwogICAgIHRoaXMuX2NyZWF0 ZUNhdGVnb3J5KCJUaW1lciIsICJpbnN0cnVtZW50YXRpb24iLCBbInNldFRpbWVyIiwgImNsZWFy VGltZXIiLCAidGltZXJGaXJlZCJdKTsKIH0KIApAQCAtMjg1LDYgKzI5Miw5IEBAIFdlYkluc3Bl Y3Rvci5FdmVudExpc3RlbmVyQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICB2YXIgdGl0bGUgPSBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lckJyZWFrcG9p bnQuZXZlbnROYW1lRm9yVUkoZXZlbnROYW1lKTsKICAgICAgICAgICAgIGJyZWFrcG9pbnRJdGVt LmVsZW1lbnQgPSBuZXcgVHJlZUVsZW1lbnQodGl0bGUpOwogICAgICAgICAgICAgY2F0ZWdvcnlJ dGVtLmVsZW1lbnQuYXBwZW5kQ2hpbGQoYnJlYWtwb2ludEl0ZW0uZWxlbWVudCk7CisgICAgICAg ICAgICB2YXIgaGl0TWFya2VyID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAg ICAgICAgICBoaXRNYXJrZXIuY2xhc3NOYW1lID0gImJyZWFrcG9pbnQtaGl0LW1hcmtlciI7Cisg ICAgICAgICAgICBicmVha3BvaW50SXRlbS5lbGVtZW50Lmxpc3RJdGVtRWxlbWVudC5hcHBlbmRD aGlsZChoaXRNYXJrZXIpOwogICAgICAgICAgICAgYnJlYWtwb2ludEl0ZW0uZWxlbWVudC5saXN0 SXRlbUVsZW1lbnQuYWRkU3R5bGVDbGFzcygic291cmNlLWNvZGUiKTsKICAgICAgICAgICAgIGJy ZWFrcG9pbnRJdGVtLmVsZW1lbnQuc2VsZWN0YWJsZSA9IHRydWU7CiAKZGlmZiAtLWdpdCBhL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DYWxsU3RhY2tTaWRlYmFyUGFuZS5qcyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DYWxsU3RhY2tTaWRlYmFyUGFuZS5qcwppbmRleCAwOGMx OTQyLi5iMmU2YTVjIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ2Fs bFN0YWNrU2lkZWJhclBhbmUuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nh bGxTdGFja1NpZGViYXJQYW5lLmpzCkBAIC0xNzMsMTEgKzE3MywxMiBAQCBXZWJJbnNwZWN0b3Iu Q2FsbFN0YWNrU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogICAgIF9icmVha3BvaW50SGl0OiAg ZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB2YXIgYnJlYWtwb2ludCA9IGV2ZW50LmRh dGEuYnJlYWtwb2ludDsKLQotICAgICAgICB2YXIgc3RhdHVzTWVzc2FnZUVsZW1lbnQgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgc3RhdHVzTWVzc2FnZUVsZW1lbnQu Y2xhc3NOYW1lID0gImluZm8iOwotICAgICAgICBicmVha3BvaW50LnBvcHVsYXRlU3RhdHVzTWVz c2FnZUVsZW1lbnQoc3RhdHVzTWVzc2FnZUVsZW1lbnQsIGV2ZW50LmRhdGEuZXZlbnREYXRhKTsK LSAgICAgICAgdGhpcy5ib2R5RWxlbWVudC5hcHBlbmRDaGlsZChzdGF0dXNNZXNzYWdlRWxlbWVu dCk7CisgICAgICAgIGlmIChicmVha3BvaW50LnBvcHVsYXRlU3RhdHVzTWVzc2FnZUVsZW1lbnQp IHsKKyAgICAgICAgICAgIHZhciBzdGF0dXNNZXNzYWdlRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoImRpdiIpOworICAgICAgICAgICAgc3RhdHVzTWVzc2FnZUVsZW1lbnQuY2xhc3NO YW1lID0gImluZm8iOworICAgICAgICAgICAgYnJlYWtwb2ludC5wb3B1bGF0ZVN0YXR1c01lc3Nh Z2VFbGVtZW50KHN0YXR1c01lc3NhZ2VFbGVtZW50LCBldmVudC5kYXRhLmV2ZW50RGF0YSk7Cisg ICAgICAgICAgICB0aGlzLmJvZHlFbGVtZW50LmFwcGVuZENoaWxkKHN0YXR1c01lc3NhZ2VFbGVt ZW50KTsKKyAgICAgICAgfQogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggNjYyNjBmOS4uMzJjN2YyMSAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0xMzUsOCArMTM1LDggQEAgV2Vi SW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKCkKICAgICBpZiAoUHJlZmVyZW5jZXMu bmF0aXZlSW5zdHJ1bWVudGF0aW9uRW5hYmxlZCkgewogICAgICAgICB0aGlzLnNpZGViYXJQYW5l cy5kb21CcmVha3BvaW50cyA9IFdlYkluc3BlY3Rvci5jcmVhdGVET01CcmVha3BvaW50c1NpZGVi YXJQYW5lKCk7CiAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLnhockJyZWFrcG9pbnRzID0gV2Vi SW5zcGVjdG9yLmNyZWF0ZVhIUkJyZWFrcG9pbnRzU2lkZWJhclBhbmUoKTsKKyAgICAgICAgdGhp cy5zaWRlYmFyUGFuZXMuZXZlbnRMaXN0ZW5lckJyZWFrcG9pbnRzID0gbmV3IFdlYkluc3BlY3Rv ci5FdmVudExpc3RlbmVyQnJlYWtwb2ludHNTaWRlYmFyUGFuZSgpOwogICAgIH0KLSAgICB0aGlz LnNpZGViYXJQYW5lcy5ldmVudExpc3RlbmVyQnJlYWtwb2ludHMgPSBuZXcgV2ViSW5zcGVjdG9y LkV2ZW50TGlzdGVuZXJCcmVha3BvaW50c1NpZGViYXJQYW5lKCk7CiAKICAgICB0aGlzLnNpZGVi YXJQYW5lcy53b3JrZXJzID0gbmV3IFdlYkluc3BlY3Rvci5Xb3JrZXJzU2lkZWJhclBhbmUoKTsK IApAQCAtNDYyLDggKzQ2Miw4IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBl ID0gewogICAgICAgICAgICAgaWYgKFByZWZlcmVuY2VzLm5hdGl2ZUluc3RydW1lbnRhdGlvbkVu YWJsZWQpIHsKICAgICAgICAgICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5kb21CcmVha3BvaW50 cy5yZXNldCgpOwogICAgICAgICAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLnhockJyZWFrcG9p bnRzLnJlc2V0KCk7CisgICAgICAgICAgICAgICAgdGhpcy5zaWRlYmFyUGFuZXMuZXZlbnRMaXN0 ZW5lckJyZWFrcG9pbnRzLnJlc2V0KCk7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB0aGlz LnNpZGViYXJQYW5lcy5ldmVudExpc3RlbmVyQnJlYWtwb2ludHMucmVzZXQoKTsKICAgICAgICAg ICAgIHRoaXMuc2lkZWJhclBhbmVzLndvcmtlcnMucmVzZXQoKTsKICAgICAgICAgfQogICAgIH0s CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCmluZGV4IDZiZjY5ZmUu LjA4MGI0ODEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0 b3IuY3NzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCkBA IC0xMDMzLDcgKzEwMzMsNiBAQCBib2R5LnBsYXRmb3JtLWxpbnV4IC5tb25vc3BhY2UsIGJvZHku cGxhdGZvcm0tbGludXggLnNvdXJjZS1jb2RlIHsKICAgICByaWdodDogMDsKICAgICBib3R0b206 IDA7CiAgICAgd2lkdGg6IDMyNXB4OwotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyNDUsIDI0 NSwgMjQ1KTsKICAgICBib3JkZXItbGVmdDogMXB4IHNvbGlkIHJnYig2NCUsIDY0JSwgNjQlKTsK ICAgICBjdXJzb3I6IGRlZmF1bHQ7CiAgICAgb3ZlcmZsb3c6IGF1dG87CkBAIC0xNzE2LDcgKzE3 MTUsNiBAQCBsaS5lZGl0aW5nIC5zd2F0Y2gsIGxpLmVkaXRpbmcgLmVuYWJsZWQtYnV0dG9uLCAg bGkuZWRpdGluZy1zdWItcGFydCAuZGVsZXRlLWJ1dAogLnBhbmUgPiAuYm9keSB7CiAgICAgcG9z aXRpb246IHJlbGF0aXZlOwogICAgIGRpc3BsYXk6IG5vbmU7Ci0gICAgYmFja2dyb3VuZC1jb2xv cjogd2hpdGU7CiAgICAgb3ZlcmZsb3cteTogYXV0bzsKICAgICBvdmVyZmxvdy14OiBoaWRkZW47 CiB9CkBAIC0yNjMyLDcgKzI2MzAsNiBAQCBidXR0b24uZW5hYmxlLXRvZ2dsZS1zdGF0dXMtYmFy LWl0ZW0udG9nZ2xlZC1vbiAuZ2x5cGggewogICAgIHJpZ2h0OiAwOwogICAgIGJvdHRvbTogMDsK ICAgICB3aWR0aDogMjI1cHg7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDI0NSwgMjQ1LCAy NDUpOwogICAgIGJvcmRlci1sZWZ0OiAxcHggc29saWQgcmdiKDY0JSwgNjQlLCA2NCUpOwogICAg IGN1cnNvcjogZGVmYXVsdDsKICAgICBvdmVyZmxvdzogYXV0bzsKQEAgLTQxMjUsNiArNDEyMiwx NiBAQCBvbC5icmVha3BvaW50LWxpc3QgewogICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyNTUs IDI1NSwgMTk0KTsKIH0KIAorbGkuYnJlYWtwb2ludC1oaXQgLmJyZWFrcG9pbnQtaGl0LW1hcmtl ciB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDI1NSwgMjU1LCAxOTQpOworICAgIGhlaWdo dDogMThweDsKKyAgICBsZWZ0OiAwcHg7CisgICAgbWFyZ2luLXRvcDogLTE2cHg7CisgICAgcG9z aXRpb246IGFic29sdXRlOworICAgIHJpZ2h0OiAwcHg7CisgICAgei1pbmRleDogLTE7Cit9CisK IC53ZWJraXQtaHRtbC1qcy1ub2RlLCAud2Via2l0LWh0bWwtY3NzLW5vZGUgewogICAgIHdoaXRl LXNwYWNlOiBwcmU7CiB9Cg==