3734 2005-06-27 07:52:32 -0700 DumpRenderTree should report editing delegate operations, for regression checking 2005-07-31 19:31:25 -0700 1 1 1 Unclassified WebKit HTML Editing 412 Mac OS X 10.4 RESOLVED FIXED P3 Enhancement --- 4011 1 duncan darin oldest_to_newest 13306 0 duncan 2005-06-27 07:52:34 -0700 With the attached patch DumpRenderTree reports editing delegate method calls: .../DumpRenderTree .../inserting/insert-3907422-fix.html EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 3 of #text > DIV > BODY > HTML > #document EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderCanvas at (0,0) size 800x600 layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x18 RenderBR {BR} at (0,0) size 0x18 selection is CARET: start: position 0 of child 1 {BR} of child 1 {DIV} of root {BODY} upstream: position 0 of child 1 {DIV} of root {BODY} downstream: position 0 of child 1 {BR} of child 1 {DIV} of root {BODY} very few tests trigger webView:should* calls, that's why I picked this one in particular. 13307 1 2671 duncan 2005-06-27 07:54:29 -0700 Created attachment 2671 DumpRenderTree patch 13308 2 2671 duncan 2005-06-27 07:56:37 -0700 Comment on attachment 2671 DumpRenderTree patch Checking this in will break all tests in WebCore/layout-tests/editing. 13323 3 joost 2005-06-27 09:46:11 -0700 Seems reasonable. 13324 4 darin 2005-06-27 09:54:04 -0700 An alternative is to have the editing delegate dumping controlled by a layout test controller method, so it happens only if you request it. But I think I like this as-is. 13381 5 2671 darin 2005-06-27 16:40:54 -0700 Comment on attachment 2671 DumpRenderTree patch This patch has code indented by 8 spaces rather than 4 spaces in it. Otherwise, looks great. 13422 6 2686 duncan 2005-06-28 06:37:57 -0700 Created attachment 2686 DumpRenderTree patch Ooops, 4 spaces now. 13432 7 2686 darin 2005-06-28 10:43:46 -0700 Comment on attachment 2686 DumpRenderTree patch Looks good, r=me 13530 8 2686 darin 2005-06-29 23:25:56 -0700 Comment on attachment 2686 DumpRenderTree patch My testing shows that this makes the a few layout tests fail because their result is influenced by the previous layout test. If the previous test caused a selection, then the next test will have this: EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification We'll have to resolve this before landing the patch. 13541 9 duncan 2005-06-30 06:18:45 -0700 What is happening is that loading a new document (loadRequest:) clears the existing document that trickles all the way to KHTMLPart::clearSelection(), that leads to the notification. I'm not sure this isn't the correct behaviour, however I see how it is a problem in the context of testing. If notifications should be suppressed when loading a new document then I have developed a patch for that. If DumpRenderTree should prevent notifications on its own, isolating one test from the next, I can write a patch that releases the webview and recreates a new one for every test. 13655 10 2743 duncan 2005-07-01 21:43:39 -0700 Created attachment 2743 patch with changelog This patch includes the previous changes plus explicitly clearing the selection after each test. The selection clearing causes a webViewDidChangeSelection notification that is not logged by checking the global "done" flag that signals in-progress tests. 13740 11 2743 mjs 2005-07-02 23:55:06 -0700 Comment on attachment 2743 patch with changelog r=me assuming this doesn't affect anything besides the editing tests where it should add the delegate logging. 2671 2005-06-27 07:54:29 -0700 2005-06-28 06:37:57 -0700 DumpRenderTree patch dumprendertree.txt text/plain 6365 duncan SW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLm0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBS ZW5kZXJUcmVlLm0sdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMwpkaWZmIC1wIC11IC1yMS4zIFdl YktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLm0KLS0tIFdlYktpdFRvb2xz L0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLm0gMjAwNS8wNi8yMiAxODowMTowMiAgICAg MS4zCisrKyBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS5tIDIwMDUv MDYvMjcgMTQ6NDY6MTAKQEAgLTMwLDEwICszMCwxMiBAQAogI2ltcG9ydCA8Rm91bmRhdGlvbi9O U0Vycm9yLmg+CiAKICNpbXBvcnQgPFdlYktpdC9ET01FeHRlbnNpb25zLmg+CisjaW1wb3J0IDxX ZWJLaXQvRE9NUmFuZ2UuaD4KICNpbXBvcnQgPFdlYktpdC9XZWJDb3JlU3RhdGlzdGljcy5oPgog I2ltcG9ydCA8V2ViS2l0L1dlYkRhdGFTb3VyY2UuaD4KICNpbXBvcnQgPFdlYktpdC9XZWJGcmFt ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dlYkZyYW1lTG9hZERlbGVnYXRlLmg+CisjaW1wb3J0IDxX ZWJLaXQvV2ViRWRpdGluZ0RlbGVnYXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV2ViRnJhbWVWaWV3 Lmg+CiAjaW1wb3J0IDxXZWJLaXQvV2ViUHJlZmVyZW5jZXMuaD4KICNpbXBvcnQgPFdlYktpdC9X ZWJWaWV3Lmg+CkBAIC00MSw2ICs0Myw5IEBACiBAaW50ZXJmYWNlIFdhaXRVbnRpbERvbmVEZWxl Z2F0ZSA6IE5TT2JqZWN0CiBAZW5kCiAKK0BpbnRlcmZhY2UgRWRpdGluZ0RlbGVnYXRlIDogTlNP YmplY3QKK0BlbmQKKwogQGludGVyZmFjZSBMYXlvdXRUZXN0Q29udHJvbGxlciA6IE5TT2JqZWN0 CiBAZW5kCiAKQEAgLTgwLDcgKzg1LDkgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNvbnN0IGNoYXIg KmFyZ3ZbXSkKIAogICAgIFdlYlZpZXcgKndlYlZpZXcgPSBbW1dlYlZpZXcgYWxsb2NdIGluaXRX aXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCldOwogICAgIFdhaXRVbnRpbERvbmVE ZWxlZ2F0ZSAqZGVsZWdhdGUgPSBbW1dhaXRVbnRpbERvbmVEZWxlZ2F0ZSBhbGxvY10gaW5pdF07 CisgICAgRWRpdGluZ0RlbGVnYXRlICplZGl0aW5nRGVsZWdhdGUgPSBbW0VkaXRpbmdEZWxlZ2F0 ZSBhbGxvY10gaW5pdF07CiAgICAgW3dlYlZpZXcgc2V0RnJhbWVMb2FkRGVsZWdhdGU6ZGVsZWdh dGVdOworICAgIFt3ZWJWaWV3IHNldEVkaXRpbmdEZWxlZ2F0ZTplZGl0aW5nRGVsZWdhdGVdOwog ICAgIFt3ZWJWaWV3IHNldFVJRGVsZWdhdGU6ZGVsZWdhdGVdOwogICAgIGZyYW1lID0gW3dlYlZp ZXcgbWFpbkZyYW1lXTsKICAgICAKQEAgLTE3Niw2ICsxODMsMTMzIEBAIHN0YXRpYyB2b2lkIGR1 bXAodm9pZCkKIHsKICAgICBpZiAoZHVtcFRpdGxlQ2hhbmdlcykKICAgICAgICAgcHJpbnRmKCJU SVRMRSBDSEFOR0VEOiAlc1xuIiwgW3RpdGxlIFVURjhTdHJpbmddKTsKK30KKworQGVuZAorCitA aW50ZXJmYWNlIERPTU5vZGUgKGR1bXBQYXRoKQorLSAoTlNTdHJpbmcgKilkdW1wUGF0aDsKK0Bl bmQKKworQGltcGxlbWVudGF0aW9uIERPTU5vZGUgKGR1bXBQYXRoKQorLSAoTlNTdHJpbmcgKilk dW1wUGF0aAoreworICAgICAgICBET01Ob2RlICpwYXJlbnQgPSBbc2VsZiBwYXJlbnROb2RlXTsK KyAgICAgICAgTlNTdHJpbmcgKnN0ciA9IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiJUAi LCBbc2VsZiBub2RlTmFtZV1dOworICAgICAgICBpZiAocGFyZW50ICE9IG5pbCkgeworICAgICAg ICAgICAgICAgIHN0ciA9IFtzdHIgc3RyaW5nQnlBcHBlbmRpbmdTdHJpbmc6QCIgPiAiXTsKKyAg ICAgICAgICAgICAgICBzdHIgPSBbc3RyIHN0cmluZ0J5QXBwZW5kaW5nU3RyaW5nOltwYXJlbnQg ZHVtcFBhdGhdXTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gc3RyOworfQorQGVuZAorCitA aW50ZXJmYWNlIERPTVJhbmdlIChkdW1wKQorLSAoTlNTdHJpbmcgKilkdW1wOworQGVuZAorCitA aW1wbGVtZW50YXRpb24gRE9NUmFuZ2UgKGR1bXApCistIChOU1N0cmluZyAqKWR1bXAKK3sKKyAg ICAgICAgcmV0dXJuIFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAicmFuZ2UgZnJvbSAlbGQg b2YgJUAgdG8gJWxkIG9mICVAIiwgW3NlbGYgc3RhcnRPZmZzZXRdLCBbW3NlbGYgc3RhcnRDb250 YWluZXJdIGR1bXBQYXRoXSwgW3NlbGYgZW5kT2Zmc2V0XSwgW1tzZWxmIGVuZENvbnRhaW5lcl0g ZHVtcFBhdGhdXTsKK30KK0BlbmQKKworCitAaW1wbGVtZW50YXRpb24gRWRpdGluZ0RlbGVnYXRl CisKKy0gKEJPT0wpd2ViVmlldzooV2ViVmlldyAqKXdlYlZpZXcgc2hvdWxkQmVnaW5FZGl0aW5n SW5ET01SYW5nZTooRE9NUmFuZ2UgKilyYW5nZQoreworICAgICAgICBwcmludGYoIkVESVRJTkcg REVMRUdBVEU6IHNob3VsZEJlZ2luRWRpdGluZ0luRE9NUmFuZ2U6JXNcbiIsIFtbcmFuZ2UgZHVt cF0gVVRGOFN0cmluZ10pOworICAgICAgICByZXR1cm4gWUVTOworfQorCistIChCT09MKXdlYlZp ZXc6KFdlYlZpZXcgKil3ZWJWaWV3IHNob3VsZEVuZEVkaXRpbmdJbkRPTVJhbmdlOihET01SYW5n ZSAqKXJhbmdlCit7CisgICAgICAgIHByaW50ZigiRURJVElORyBERUxFR0FURTogc2hvdWxkRW5k RWRpdGluZ0luRE9NUmFuZ2U6JXNcbiIsIFtbcmFuZ2UgZHVtcF0gVVRGOFN0cmluZ10pOworICAg ICAgICByZXR1cm4gWUVTOworfQorCistIChCT09MKXdlYlZpZXc6KFdlYlZpZXcgKil3ZWJWaWV3 IHNob3VsZEluc2VydE5vZGU6KERPTU5vZGUgKilub2RlIHJlcGxhY2luZ0RPTVJhbmdlOihET01S YW5nZSAqKXJhbmdlIGdpdmVuQWN0aW9uOihXZWJWaWV3SW5zZXJ0QWN0aW9uKWFjdGlvbgorewor ICAgICAgICBzdGF0aWMgY29uc3QgY2hhciAqaW5zZXJ0YWN0aW9uc3RyaW5nW10gPSB7CisgICAg ICAgICAgICAgICAgIldlYlZpZXdJbnNlcnRBY3Rpb25UeXBlZCIsCisgICAgICAgICAgICAgICAg IldlYlZpZXdJbnNlcnRBY3Rpb25QYXN0ZWQiLAorICAgICAgICAgICAgICAgICJXZWJWaWV3SW5z ZXJ0QWN0aW9uRHJvcHBlZCIsCisgICAgICAgIH07CisKKyAgICAgICAgcHJpbnRmKCJFRElUSU5H IERFTEVHQVRFOiBzaG91bGRJbnNlcnROb2RlOiVzIHJlcGxhY2luZ0RPTVJhbmdlOiVzIGdpdmVu QWN0aW9uOiVzXG4iLCBbW25vZGUgZHVtcFBhdGhdIFVURjhTdHJpbmddLCBbW3JhbmdlIGR1bXBd IFVURjhTdHJpbmddLCBpbnNlcnRhY3Rpb25zdHJpbmdbYWN0aW9uXSk7CisgICAgICAgIHJldHVy biBZRVM7Cit9CisKKy0gKEJPT0wpd2ViVmlldzooV2ViVmlldyAqKXdlYlZpZXcgc2hvdWxkSW5z ZXJ0VGV4dDooTlNTdHJpbmcgKil0ZXh0IHJlcGxhY2luZ0RPTVJhbmdlOihET01SYW5nZSAqKXJh bmdlIGdpdmVuQWN0aW9uOihXZWJWaWV3SW5zZXJ0QWN0aW9uKWFjdGlvbgoreworICAgICAgICBz dGF0aWMgY29uc3QgY2hhciAqaW5zZXJ0YWN0aW9uc3RyaW5nW10gPSB7CisgICAgICAgICAgICAg ICAgIldlYlZpZXdJbnNlcnRBY3Rpb25UeXBlZCIsCisgICAgICAgICAgICAgICAgIldlYlZpZXdJ bnNlcnRBY3Rpb25QYXN0ZWQiLAorICAgICAgICAgICAgICAgICJXZWJWaWV3SW5zZXJ0QWN0aW9u RHJvcHBlZCIsCisgICAgICAgIH07CisKKyAgICAgICAgcHJpbnRmKCJFRElUSU5HIERFTEVHQVRF OiBzaG91bGRJbnNlcnRUZXh0OiVzIHJlcGxhY2luZ0RPTVJhbmdlOiVzIGdpdmVuQWN0aW9uOiVz XG4iLCBbW3RleHQgZGVzY3JpcHRpb25dIFVURjhTdHJpbmddLCBbW3JhbmdlIGR1bXBdIFVURjhT dHJpbmddLCBpbnNlcnRhY3Rpb25zdHJpbmdbYWN0aW9uXSk7CisgICAgICAgIHJldHVybiBZRVM7 Cit9CisKKy0gKEJPT0wpd2ViVmlldzooV2ViVmlldyAqKXdlYlZpZXcgc2hvdWxkRGVsZXRlRE9N UmFuZ2U6KERPTVJhbmdlICopcmFuZ2UKK3sKKyAgICAgICAgcHJpbnRmKCJFRElUSU5HIERFTEVH QVRFOiBzaG91bGREZWxldGVET01SYW5nZTolc1xuIiwgW1tyYW5nZSBkdW1wXSBVVEY4U3RyaW5n XSk7CisgICAgICAgIHJldHVybiBZRVM7Cit9CisKKy0gKEJPT0wpd2ViVmlldzooV2ViVmlldyAq KXdlYlZpZXcgc2hvdWxkQ2hhbmdlU2VsZWN0ZWRET01SYW5nZTooRE9NUmFuZ2UgKiljdXJyZW50 UmFuZ2UgdG9ET01SYW5nZTooRE9NUmFuZ2UgKilwcm9wb3NlZFJhbmdlIGFmZmluaXR5OihOU1Nl bGVjdGlvbkFmZmluaXR5KXNlbGVjdGlvbkFmZmluaXR5IHN0aWxsU2VsZWN0aW5nOihCT09MKWZs YWcKK3sKKyAgICAgICAgc3RhdGljIGNvbnN0IGNoYXIgKmFmZmluaXR5c3RyaW5nW10gPSB7Cisg ICAgICAgICAgICAgICAgIk5TU2VsZWN0aW9uQWZmaW5pdHlVcHN0cmVhbSIsCisgICAgICAgICAg ICAgICAgIk5TU2VsZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFtIgorICAgICAgICB9OworICAgICAg ICBzdGF0aWMgY29uc3QgY2hhciAqYm9vbHN0cmluZ1tdID0geworICAgICAgICAgICAgICAgICJG QUxTRSIsCisgICAgICAgICAgICAgICAgIlRSVUUiCisgICAgICAgIH07CisKKyAgICAgICAgcHJp bnRmKCJFRElUSU5HIERFTEVHQVRFOiBzaG91bGRDaGFuZ2VTZWxlY3RlZERPTVJhbmdlOiVzIHRv RE9NUmFuZ2U6JXMgYWZmaW5pdHk6JXMgc3RpbGxTZWxlY3Rpbmc6JXNcbiIsIFtbY3VycmVudFJh bmdlIGR1bXBdIFVURjhTdHJpbmddLCBbW3Byb3Bvc2VkUmFuZ2UgZHVtcF0gVVRGOFN0cmluZ10s IGFmZmluaXR5c3RyaW5nW3NlbGVjdGlvbkFmZmluaXR5XSwgYm9vbHN0cmluZ1tmbGFnXSk7Cisg ICAgICAgIHJldHVybiBZRVM7Cit9CisKKy0gKEJPT0wpd2ViVmlldzooV2ViVmlldyAqKXdlYlZp ZXcgc2hvdWxkQXBwbHlTdHlsZTooRE9NQ1NTU3R5bGVEZWNsYXJhdGlvbiAqKXN0eWxlIHRvRWxl bWVudHNJbkRPTVJhbmdlOihET01SYW5nZSAqKXJhbmdlCit7CisgICAgICAgIHByaW50ZigiRURJ VElORyBERUxFR0FURTogc2hvdWxkQXBwbHlTdHlsZTolcyB0b0VsZW1lbnRzSW5ET01SYW5nZTol c1xuIiwgW1tzdHlsZSBkZXNjcmlwdGlvbl0gVVRGOFN0cmluZ10sIFtbcmFuZ2UgZHVtcF0gVVRG OFN0cmluZ10pOworICAgICAgICByZXR1cm4gWUVTOworfQorCistIChCT09MKXdlYlZpZXc6KFdl YlZpZXcgKil3ZWJWaWV3IHNob3VsZENoYW5nZVR5cGluZ1N0eWxlOihET01DU1NTdHlsZURlY2xh cmF0aW9uICopY3VycmVudFN0eWxlIHRvU3R5bGU6KERPTUNTU1N0eWxlRGVjbGFyYXRpb24gKilw cm9wb3NlZFN0eWxlCit7CisgICAgICAgIHByaW50ZigiRURJVElORyBERUxFR0FURTogc2hvdWxk Q2hhbmdlVHlwaW5nU3R5bGU6JXMgdG9TdHlsZTolc1xuIiwgW1tjdXJyZW50U3R5bGUgZGVzY3Jp cHRpb25dIFVURjhTdHJpbmddLCBbW3Byb3Bvc2VkU3R5bGUgZGVzY3JpcHRpb25dIFVURjhTdHJp bmddKTsKKyAgICAgICAgcmV0dXJuIFlFUzsKK30KKworLSAodm9pZCl3ZWJWaWV3RGlkQmVnaW5F ZGl0aW5nOihOU05vdGlmaWNhdGlvbiAqKW5vdGlmaWNhdGlvbgoreworICAgICAgICBwcmludGYo IkVESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRCZWdpbkVkaXRpbmc6JXNcbiIsIFtbbm90aWZp Y2F0aW9uIG5hbWVdIFVURjhTdHJpbmddKTsKK30KKworLSAodm9pZCl3ZWJWaWV3RGlkQ2hhbmdl OihOU05vdGlmaWNhdGlvbiAqKW5vdGlmaWNhdGlvbgoreworICAgICAgICBwcmludGYoIkVESVRJ TkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2U6JXNcbiIsIFtbbm90aWZpY2F0aW9uIG5hbWVd IFVURjhTdHJpbmddKTsKK30KKworLSAodm9pZCl3ZWJWaWV3RGlkRW5kRWRpdGluZzooTlNOb3Rp ZmljYXRpb24gKilub3RpZmljYXRpb24KK3sKKyAgICAgICAgcHJpbnRmKCJFRElUSU5HIERFTEVH QVRFOiB3ZWJWaWV3RGlkRW5kRWRpdGluZzolc1xuIiwgW1tub3RpZmljYXRpb24gbmFtZV0gVVRG OFN0cmluZ10pOworfQorCistICh2b2lkKXdlYlZpZXdEaWRDaGFuZ2VUeXBpbmdTdHlsZTooTlNO b3RpZmljYXRpb24gKilub3RpZmljYXRpb24KK3sKKyAgICAgICAgcHJpbnRmKCJFRElUSU5HIERF TEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlVHlwaW5nU3R5bGU6JXNcbiIsIFtbbm90aWZpY2F0aW9u IG5hbWVdIFVURjhTdHJpbmddKTsKK30KKworLSAodm9pZCl3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0 aW9uOihOU05vdGlmaWNhdGlvbiAqKW5vdGlmaWNhdGlvbgoreworICAgICAgICBwcmludGYoIkVE SVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246JXNcbiIsIFtbbm90aWZp Y2F0aW9uIG5hbWVdIFVURjhTdHJpbmddKTsKIH0KIAogQGVuZAo= 2686 2005-06-28 06:37:57 -0700 2005-07-01 21:43:39 -0700 DumpRenderTree patch dumprendertree.txt text/plain 6125 duncan SW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLm0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBS ZW5kZXJUcmVlLm0sdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMwpkaWZmIC1wIC11IC1yMS4zIFdl YktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLm0KLS0tIFdlYktpdFRvb2xz L0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLm0JMjAwNS8wNi8yMiAxODowMTowMgkxLjMK KysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLm0JMjAwNS8wNi8y OCAxMzoyODowMwpAQCAtMzAsMTAgKzMwLDEyIEBACiAjaW1wb3J0IDxGb3VuZGF0aW9uL05TRXJy b3IuaD4KIAogI2ltcG9ydCA8V2ViS2l0L0RPTUV4dGVuc2lvbnMuaD4KKyNpbXBvcnQgPFdlYktp dC9ET01SYW5nZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dlYkNvcmVTdGF0aXN0aWNzLmg+CiAjaW1w b3J0IDxXZWJLaXQvV2ViRGF0YVNvdXJjZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dlYkZyYW1lLmg+ CiAjaW1wb3J0IDxXZWJLaXQvV2ViRnJhbWVMb2FkRGVsZWdhdGUuaD4KKyNpbXBvcnQgPFdlYktp dC9XZWJFZGl0aW5nRGVsZWdhdGUuaD4KICNpbXBvcnQgPFdlYktpdC9XZWJGcmFtZVZpZXcuaD4K ICNpbXBvcnQgPFdlYktpdC9XZWJQcmVmZXJlbmNlcy5oPgogI2ltcG9ydCA8V2ViS2l0L1dlYlZp ZXcuaD4KQEAgLTQxLDYgKzQzLDkgQEAKIEBpbnRlcmZhY2UgV2FpdFVudGlsRG9uZURlbGVnYXRl IDogTlNPYmplY3QKIEBlbmQKIAorQGludGVyZmFjZSBFZGl0aW5nRGVsZWdhdGUgOiBOU09iamVj dAorQGVuZAorCiBAaW50ZXJmYWNlIExheW91dFRlc3RDb250cm9sbGVyIDogTlNPYmplY3QKIEBl bmQKIApAQCAtODAsNyArODUsOSBAQCBpbnQgbWFpbihpbnQgYXJnYywgY29uc3QgY2hhciAqYXJn dltdKQogCiAgICAgV2ViVmlldyAqd2ViVmlldyA9IFtbV2ViVmlldyBhbGxvY10gaW5pdFdpdGhG cmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKV07CiAgICAgV2FpdFVudGlsRG9uZURlbGVn YXRlICpkZWxlZ2F0ZSA9IFtbV2FpdFVudGlsRG9uZURlbGVnYXRlIGFsbG9jXSBpbml0XTsKKyAg ICBFZGl0aW5nRGVsZWdhdGUgKmVkaXRpbmdEZWxlZ2F0ZSA9IFtbRWRpdGluZ0RlbGVnYXRlIGFs bG9jXSBpbml0XTsKICAgICBbd2ViVmlldyBzZXRGcmFtZUxvYWREZWxlZ2F0ZTpkZWxlZ2F0ZV07 CisgICAgW3dlYlZpZXcgc2V0RWRpdGluZ0RlbGVnYXRlOmVkaXRpbmdEZWxlZ2F0ZV07CiAgICAg W3dlYlZpZXcgc2V0VUlEZWxlZ2F0ZTpkZWxlZ2F0ZV07CiAgICAgZnJhbWUgPSBbd2ViVmlldyBt YWluRnJhbWVdOwogICAgIApAQCAtMTc2LDYgKzE4MywxMzMgQEAgc3RhdGljIHZvaWQgZHVtcCh2 b2lkKQogewogICAgIGlmIChkdW1wVGl0bGVDaGFuZ2VzKQogICAgICAgICBwcmludGYoIlRJVExF IENIQU5HRUQ6ICVzXG4iLCBbdGl0bGUgVVRGOFN0cmluZ10pOworfQorCitAZW5kCisKK0BpbnRl cmZhY2UgRE9NTm9kZSAoZHVtcFBhdGgpCistIChOU1N0cmluZyAqKWR1bXBQYXRoOworQGVuZAor CitAaW1wbGVtZW50YXRpb24gRE9NTm9kZSAoZHVtcFBhdGgpCistIChOU1N0cmluZyAqKWR1bXBQ YXRoCit7CisgICAgRE9NTm9kZSAqcGFyZW50ID0gW3NlbGYgcGFyZW50Tm9kZV07CisgICAgTlNT dHJpbmcgKnN0ciA9IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiJUAiLCBbc2VsZiBub2Rl TmFtZV1dOworICAgIGlmIChwYXJlbnQgIT0gbmlsKSB7CisgICAgICAgIHN0ciA9IFtzdHIgc3Ry aW5nQnlBcHBlbmRpbmdTdHJpbmc6QCIgPiAiXTsKKyAgICAgICAgc3RyID0gW3N0ciBzdHJpbmdC eUFwcGVuZGluZ1N0cmluZzpbcGFyZW50IGR1bXBQYXRoXV07CisgICAgfQorICAgIHJldHVybiBz dHI7Cit9CitAZW5kCisKK0BpbnRlcmZhY2UgRE9NUmFuZ2UgKGR1bXApCistIChOU1N0cmluZyAq KWR1bXA7CitAZW5kCisKK0BpbXBsZW1lbnRhdGlvbiBET01SYW5nZSAoZHVtcCkKKy0gKE5TU3Ry aW5nICopZHVtcAoreworICAgIHJldHVybiBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAInJh bmdlIGZyb20gJWxkIG9mICVAIHRvICVsZCBvZiAlQCIsIFtzZWxmIHN0YXJ0T2Zmc2V0XSwgW1tz ZWxmIHN0YXJ0Q29udGFpbmVyXSBkdW1wUGF0aF0sIFtzZWxmIGVuZE9mZnNldF0sIFtbc2VsZiBl bmRDb250YWluZXJdIGR1bXBQYXRoXV07Cit9CitAZW5kCisKKworQGltcGxlbWVudGF0aW9uIEVk aXRpbmdEZWxlZ2F0ZQorCistIChCT09MKXdlYlZpZXc6KFdlYlZpZXcgKil3ZWJWaWV3IHNob3Vs ZEJlZ2luRWRpdGluZ0luRE9NUmFuZ2U6KERPTVJhbmdlICopcmFuZ2UKK3sKKyAgICBwcmludGYo IkVESVRJTkcgREVMRUdBVEU6IHNob3VsZEJlZ2luRWRpdGluZ0luRE9NUmFuZ2U6JXNcbiIsIFtb cmFuZ2UgZHVtcF0gVVRGOFN0cmluZ10pOworICAgIHJldHVybiBZRVM7Cit9CisKKy0gKEJPT0wp d2ViVmlldzooV2ViVmlldyAqKXdlYlZpZXcgc2hvdWxkRW5kRWRpdGluZ0luRE9NUmFuZ2U6KERP TVJhbmdlICopcmFuZ2UKK3sKKyAgICBwcmludGYoIkVESVRJTkcgREVMRUdBVEU6IHNob3VsZEVu ZEVkaXRpbmdJbkRPTVJhbmdlOiVzXG4iLCBbW3JhbmdlIGR1bXBdIFVURjhTdHJpbmddKTsKKyAg ICByZXR1cm4gWUVTOworfQorCistIChCT09MKXdlYlZpZXc6KFdlYlZpZXcgKil3ZWJWaWV3IHNo b3VsZEluc2VydE5vZGU6KERPTU5vZGUgKilub2RlIHJlcGxhY2luZ0RPTVJhbmdlOihET01SYW5n ZSAqKXJhbmdlIGdpdmVuQWN0aW9uOihXZWJWaWV3SW5zZXJ0QWN0aW9uKWFjdGlvbgoreworICAg IHN0YXRpYyBjb25zdCBjaGFyICppbnNlcnRhY3Rpb25zdHJpbmdbXSA9IHsKKyAgICAgICAgIldl YlZpZXdJbnNlcnRBY3Rpb25UeXBlZCIsCisgICAgICAgICJXZWJWaWV3SW5zZXJ0QWN0aW9uUGFz dGVkIiwKKyAgICAgICAgIldlYlZpZXdJbnNlcnRBY3Rpb25Ecm9wcGVkIiwKKyAgICB9OworCisg ICAgcHJpbnRmKCJFRElUSU5HIERFTEVHQVRFOiBzaG91bGRJbnNlcnROb2RlOiVzIHJlcGxhY2lu Z0RPTVJhbmdlOiVzIGdpdmVuQWN0aW9uOiVzXG4iLCBbW25vZGUgZHVtcFBhdGhdIFVURjhTdHJp bmddLCBbW3JhbmdlIGR1bXBdIFVURjhTdHJpbmddLCBpbnNlcnRhY3Rpb25zdHJpbmdbYWN0aW9u XSk7CisgICAgcmV0dXJuIFlFUzsKK30KKworLSAoQk9PTCl3ZWJWaWV3OihXZWJWaWV3ICopd2Vi VmlldyBzaG91bGRJbnNlcnRUZXh0OihOU1N0cmluZyAqKXRleHQgcmVwbGFjaW5nRE9NUmFuZ2U6 KERPTVJhbmdlICopcmFuZ2UgZ2l2ZW5BY3Rpb246KFdlYlZpZXdJbnNlcnRBY3Rpb24pYWN0aW9u Cit7CisgICAgc3RhdGljIGNvbnN0IGNoYXIgKmluc2VydGFjdGlvbnN0cmluZ1tdID0geworICAg ICAgICAiV2ViVmlld0luc2VydEFjdGlvblR5cGVkIiwKKyAgICAgICAgIldlYlZpZXdJbnNlcnRB Y3Rpb25QYXN0ZWQiLAorICAgICAgICAiV2ViVmlld0luc2VydEFjdGlvbkRyb3BwZWQiLAorICAg IH07CisKKyAgICBwcmludGYoIkVESVRJTkcgREVMRUdBVEU6IHNob3VsZEluc2VydFRleHQ6JXMg cmVwbGFjaW5nRE9NUmFuZ2U6JXMgZ2l2ZW5BY3Rpb246JXNcbiIsIFtbdGV4dCBkZXNjcmlwdGlv bl0gVVRGOFN0cmluZ10sIFtbcmFuZ2UgZHVtcF0gVVRGOFN0cmluZ10sIGluc2VydGFjdGlvbnN0 cmluZ1thY3Rpb25dKTsKKyAgICByZXR1cm4gWUVTOworfQorCistIChCT09MKXdlYlZpZXc6KFdl YlZpZXcgKil3ZWJWaWV3IHNob3VsZERlbGV0ZURPTVJhbmdlOihET01SYW5nZSAqKXJhbmdlCit7 CisgICAgcHJpbnRmKCJFRElUSU5HIERFTEVHQVRFOiBzaG91bGREZWxldGVET01SYW5nZTolc1xu IiwgW1tyYW5nZSBkdW1wXSBVVEY4U3RyaW5nXSk7CisgICAgcmV0dXJuIFlFUzsKK30KKworLSAo Qk9PTCl3ZWJWaWV3OihXZWJWaWV3ICopd2ViVmlldyBzaG91bGRDaGFuZ2VTZWxlY3RlZERPTVJh bmdlOihET01SYW5nZSAqKWN1cnJlbnRSYW5nZSB0b0RPTVJhbmdlOihET01SYW5nZSAqKXByb3Bv c2VkUmFuZ2UgYWZmaW5pdHk6KE5TU2VsZWN0aW9uQWZmaW5pdHkpc2VsZWN0aW9uQWZmaW5pdHkg c3RpbGxTZWxlY3Rpbmc6KEJPT0wpZmxhZworeworICAgIHN0YXRpYyBjb25zdCBjaGFyICphZmZp bml0eXN0cmluZ1tdID0geworICAgICAgICAiTlNTZWxlY3Rpb25BZmZpbml0eVVwc3RyZWFtIiwK KyAgICAgICAgIk5TU2VsZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFtIgorICAgIH07CisgICAgc3Rh dGljIGNvbnN0IGNoYXIgKmJvb2xzdHJpbmdbXSA9IHsKKyAgICAgICAgIkZBTFNFIiwKKyAgICAg ICAgIlRSVUUiCisgICAgfTsKKworICAgIHByaW50ZigiRURJVElORyBERUxFR0FURTogc2hvdWxk Q2hhbmdlU2VsZWN0ZWRET01SYW5nZTolcyB0b0RPTVJhbmdlOiVzIGFmZmluaXR5OiVzIHN0aWxs U2VsZWN0aW5nOiVzXG4iLCBbW2N1cnJlbnRSYW5nZSBkdW1wXSBVVEY4U3RyaW5nXSwgW1twcm9w b3NlZFJhbmdlIGR1bXBdIFVURjhTdHJpbmddLCBhZmZpbml0eXN0cmluZ1tzZWxlY3Rpb25BZmZp bml0eV0sIGJvb2xzdHJpbmdbZmxhZ10pOworICAgIHJldHVybiBZRVM7Cit9CisKKy0gKEJPT0wp d2ViVmlldzooV2ViVmlldyAqKXdlYlZpZXcgc2hvdWxkQXBwbHlTdHlsZTooRE9NQ1NTU3R5bGVE ZWNsYXJhdGlvbiAqKXN0eWxlIHRvRWxlbWVudHNJbkRPTVJhbmdlOihET01SYW5nZSAqKXJhbmdl Cit7CisgICAgcHJpbnRmKCJFRElUSU5HIERFTEVHQVRFOiBzaG91bGRBcHBseVN0eWxlOiVzIHRv RWxlbWVudHNJbkRPTVJhbmdlOiVzXG4iLCBbW3N0eWxlIGRlc2NyaXB0aW9uXSBVVEY4U3RyaW5n XSwgW1tyYW5nZSBkdW1wXSBVVEY4U3RyaW5nXSk7CisgICAgcmV0dXJuIFlFUzsKK30KKworLSAo Qk9PTCl3ZWJWaWV3OihXZWJWaWV3ICopd2ViVmlldyBzaG91bGRDaGFuZ2VUeXBpbmdTdHlsZToo RE9NQ1NTU3R5bGVEZWNsYXJhdGlvbiAqKWN1cnJlbnRTdHlsZSB0b1N0eWxlOihET01DU1NTdHls ZURlY2xhcmF0aW9uICopcHJvcG9zZWRTdHlsZQoreworICAgIHByaW50ZigiRURJVElORyBERUxF R0FURTogc2hvdWxkQ2hhbmdlVHlwaW5nU3R5bGU6JXMgdG9TdHlsZTolc1xuIiwgW1tjdXJyZW50 U3R5bGUgZGVzY3JpcHRpb25dIFVURjhTdHJpbmddLCBbW3Byb3Bvc2VkU3R5bGUgZGVzY3JpcHRp b25dIFVURjhTdHJpbmddKTsKKyAgICByZXR1cm4gWUVTOworfQorCistICh2b2lkKXdlYlZpZXdE aWRCZWdpbkVkaXRpbmc6KE5TTm90aWZpY2F0aW9uICopbm90aWZpY2F0aW9uCit7CisgICAgcHJp bnRmKCJFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQmVnaW5FZGl0aW5nOiVzXG4iLCBbW25v dGlmaWNhdGlvbiBuYW1lXSBVVEY4U3RyaW5nXSk7Cit9CisKKy0gKHZvaWQpd2ViVmlld0RpZENo YW5nZTooTlNOb3RpZmljYXRpb24gKilub3RpZmljYXRpb24KK3sKKyAgICBwcmludGYoIkVESVRJ TkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2U6JXNcbiIsIFtbbm90aWZpY2F0aW9uIG5hbWVd IFVURjhTdHJpbmddKTsKK30KKworLSAodm9pZCl3ZWJWaWV3RGlkRW5kRWRpdGluZzooTlNOb3Rp ZmljYXRpb24gKilub3RpZmljYXRpb24KK3sKKyAgICBwcmludGYoIkVESVRJTkcgREVMRUdBVEU6 IHdlYlZpZXdEaWRFbmRFZGl0aW5nOiVzXG4iLCBbW25vdGlmaWNhdGlvbiBuYW1lXSBVVEY4U3Ry aW5nXSk7Cit9CisKKy0gKHZvaWQpd2ViVmlld0RpZENoYW5nZVR5cGluZ1N0eWxlOihOU05vdGlm aWNhdGlvbiAqKW5vdGlmaWNhdGlvbgoreworICAgIHByaW50ZigiRURJVElORyBERUxFR0FURTog d2ViVmlld0RpZENoYW5nZVR5cGluZ1N0eWxlOiVzXG4iLCBbW25vdGlmaWNhdGlvbiBuYW1lXSBV VEY4U3RyaW5nXSk7Cit9CisKKy0gKHZvaWQpd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjooTlNO b3RpZmljYXRpb24gKilub3RpZmljYXRpb24KK3sKKyAgICBwcmludGYoIkVESVRJTkcgREVMRUdB VEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246JXNcbiIsIFtbbm90aWZpY2F0aW9uIG5hbWVd IFVURjhTdHJpbmddKTsKIH0KIAogQGVuZAo= 2743 2005-07-01 21:43:39 -0700 2005-07-02 23:55:06 -0700 patch with changelog dumprendertree.txt text/plain 8375 duncan SW5kZXg6IC4vV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMv cm9vdC9XZWJLaXRUb29scy9DaGFuZ2VMb2csdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMzgKZGlm ZiAtcCAtdSAtcjEuMzggLi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKLS0tIC4vV2ViS2l0VG9vbHMv Q2hhbmdlTG9nCTIwMDUvMDYvMzAgMjM6MTg6MzMJMS4zOAorKysgLi9XZWJLaXRUb29scy9DaGFu Z2VMb2cJMjAwNS8wNy8wMiAwNDo0NDozNApAQCAtMSwzICsxLDM3IEBACisyMDA1LTA3LTAyICBE dW5jYW4gV2lsY294ICA8ZHVuY2FuQG1jbGluay5pdD4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgbG9nZ2luZyBvZiBlZGl0aW5nIGRlbGVnYXRl IGNhbGxzIGZvciByZWdyZXNzaW9uIGNoZWNraW5nLgorCisgICAgICAgICogRHVtcFJlbmRlclRy ZWUvRHVtcFJlbmRlclRyZWUubToKKyAgICAgICAgKG1haW4pOgorICAgICAgICAgIHNldHVwIGVk aXRpbmcgZGVsZWdhdGUKKworICAgICAgICAoLVtET01Ob2RlIGR1bXBQYXRoXSk6CisgICAgICAg ICgtW0RPTVJhbmdlIGR1bXBdKToKKyAgICAgICAgICB1dGlsaXR5IGZvciBlZGl0aW5nIGRlbGVn YXRlIGxvZ2dpbmcKKworICAgICAgICAoLVtFZGl0aW5nRGVsZWdhdGUgd2ViVmlldzpzaG91bGRC ZWdpbkVkaXRpbmdJbkRPTVJhbmdlOl0pOgorICAgICAgICAoLVtFZGl0aW5nRGVsZWdhdGUgd2Vi VmlldzpzaG91bGRFbmRFZGl0aW5nSW5ET01SYW5nZTpdKToKKyAgICAgICAgKC1bRWRpdGluZ0Rl bGVnYXRlIHdlYlZpZXc6c2hvdWxkSW5zZXJ0Tm9kZTpyZXBsYWNpbmdET01SYW5nZTpnaXZlbkFj dGlvbjpdKToKKyAgICAgICAgKC1bRWRpdGluZ0RlbGVnYXRlIHdlYlZpZXc6c2hvdWxkSW5zZXJ0 VGV4dDpyZXBsYWNpbmdET01SYW5nZTpnaXZlbkFjdGlvbjpdKToKKyAgICAgICAgKC1bRWRpdGlu Z0RlbGVnYXRlIHdlYlZpZXc6c2hvdWxkRGVsZXRlRE9NUmFuZ2U6XSk6CisgICAgICAgICgtW0Vk aXRpbmdEZWxlZ2F0ZSB3ZWJWaWV3OnNob3VsZENoYW5nZVNlbGVjdGVkRE9NUmFuZ2U6dG9ET01S YW5nZTphZmZpbml0eTpzdGlsbFNlbGVjdGluZzpdKToKKyAgICAgICAgKC1bRWRpdGluZ0RlbGVn YXRlIHdlYlZpZXc6c2hvdWxkQXBwbHlTdHlsZTp0b0VsZW1lbnRzSW5ET01SYW5nZTpdKToKKyAg ICAgICAgKC1bRWRpdGluZ0RlbGVnYXRlIHdlYlZpZXc6c2hvdWxkQ2hhbmdlVHlwaW5nU3R5bGU6 dG9TdHlsZTpdKToKKyAgICAgICAgKC1bRWRpdGluZ0RlbGVnYXRlIHdlYlZpZXdEaWRCZWdpbkVk aXRpbmc6XSk6CisgICAgICAgICgtW0VkaXRpbmdEZWxlZ2F0ZSB3ZWJWaWV3RGlkQ2hhbmdlOl0p OgorICAgICAgICAoLVtFZGl0aW5nRGVsZWdhdGUgd2ViVmlld0RpZEVuZEVkaXRpbmc6XSk6Cisg ICAgICAgICgtW0VkaXRpbmdEZWxlZ2F0ZSB3ZWJWaWV3RGlkQ2hhbmdlVHlwaW5nU3R5bGU6XSk6 CisgICAgICAgICAgbG9nIGNvcnJlc3BvbmRpbmcgZWRpdGluZyBkZWxlZ2F0ZSBtZXRob2RzCisK KyAgICAgICAgKC1bRWRpdGluZ0RlbGVnYXRlIHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246XSk6 CisgICAgICAgICAgbG9nIHNlbGVjdGlvbiBleGNlcHQgd2hlbiBjbGVhcmluZyBzZWxlY3Rpb24g YWZ0ZXIgZW5kIG9mIHRlc3QgKHVzZXMgZXhpc3RpbmcgImRvbmUiIGZsYWcpCisKKyAgICAgICAg KGR1bXBSZW5kZXJUcmVlKToKKyAgICAgICAgICBhZGRlZCBjbGVhcmluZyBvZiBzZWxlY3Rpb24g YWZ0ZXIgdGVzdAorCiAyMDA1LTA2LTMwICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4K IAogICAgICAgICBDaGFuZ2VzIGJhc2VkIG9uIGlucHV0IGZyb20gTWljaGFlbCBLYWhsLgpJbmRl eDogLi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS5tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVu ZGVyVHJlZS5tLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjQKZGlmZiAtcCAtdSAtcjEuNCAuL1dl YktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLm0KLS0tIC4vV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUubQkyMDA1LzA2LzMwIDA1OjQxOjM4CTEu NAorKysgLi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS5tCTIwMDUv MDcvMDIgMDQ6NDQ6MzcKQEAgLTMwLDEwICszMCwxMiBAQAogI2ltcG9ydCA8Rm91bmRhdGlvbi9O U0Vycm9yLmg+CiAKICNpbXBvcnQgPFdlYktpdC9ET01FeHRlbnNpb25zLmg+CisjaW1wb3J0IDxX ZWJLaXQvRE9NUmFuZ2UuaD4KICNpbXBvcnQgPFdlYktpdC9XZWJDb3JlU3RhdGlzdGljcy5oPgog I2ltcG9ydCA8V2ViS2l0L1dlYkRhdGFTb3VyY2UuaD4KICNpbXBvcnQgPFdlYktpdC9XZWJGcmFt ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dlYkZyYW1lTG9hZERlbGVnYXRlLmg+CisjaW1wb3J0IDxX ZWJLaXQvV2ViRWRpdGluZ0RlbGVnYXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV2ViRnJhbWVWaWV3 Lmg+CiAjaW1wb3J0IDxXZWJLaXQvV2ViUHJlZmVyZW5jZXMuaD4KICNpbXBvcnQgPFdlYktpdC9X ZWJWaWV3Lmg+CkBAIC00MSw2ICs0Myw5IEBACiBAaW50ZXJmYWNlIFdhaXRVbnRpbERvbmVEZWxl Z2F0ZSA6IE5TT2JqZWN0CiBAZW5kCiAKK0BpbnRlcmZhY2UgRWRpdGluZ0RlbGVnYXRlIDogTlNP YmplY3QKK0BlbmQKKwogQGludGVyZmFjZSBMYXlvdXRUZXN0Q29udHJvbGxlciA6IE5TT2JqZWN0 CiBAZW5kCiAKQEAgLTgxLDcgKzg2LDkgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNvbnN0IGNoYXIg KmFyZ3ZbXSkKIAogICAgIFdlYlZpZXcgKndlYlZpZXcgPSBbW1dlYlZpZXcgYWxsb2NdIGluaXRX aXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCldOwogICAgIFdhaXRVbnRpbERvbmVE ZWxlZ2F0ZSAqZGVsZWdhdGUgPSBbW1dhaXRVbnRpbERvbmVEZWxlZ2F0ZSBhbGxvY10gaW5pdF07 CisgICAgRWRpdGluZ0RlbGVnYXRlICplZGl0aW5nRGVsZWdhdGUgPSBbW0VkaXRpbmdEZWxlZ2F0 ZSBhbGxvY10gaW5pdF07CiAgICAgW3dlYlZpZXcgc2V0RnJhbWVMb2FkRGVsZWdhdGU6ZGVsZWdh dGVdOworICAgIFt3ZWJWaWV3IHNldEVkaXRpbmdEZWxlZ2F0ZTplZGl0aW5nRGVsZWdhdGVdOwog ICAgIFt3ZWJWaWV3IHNldFVJRGVsZWdhdGU6ZGVsZWdhdGVdOwogICAgIGZyYW1lID0gW3dlYlZp ZXcgbWFpbkZyYW1lXTsKICAgICAKQEAgLTE4NCw2ICsxOTEsMTM0IEBAIHN0YXRpYyB2b2lkIGR1 bXAodm9pZCkKIAogQGVuZAogCitAaW50ZXJmYWNlIERPTU5vZGUgKGR1bXBQYXRoKQorLSAoTlNT dHJpbmcgKilkdW1wUGF0aDsKK0BlbmQKKworQGltcGxlbWVudGF0aW9uIERPTU5vZGUgKGR1bXBQ YXRoKQorLSAoTlNTdHJpbmcgKilkdW1wUGF0aAoreworICAgIERPTU5vZGUgKnBhcmVudCA9IFtz ZWxmIHBhcmVudE5vZGVdOworICAgIE5TU3RyaW5nICpzdHIgPSBbTlNTdHJpbmcgc3RyaW5nV2l0 aEZvcm1hdDpAIiVAIiwgW3NlbGYgbm9kZU5hbWVdXTsKKyAgICBpZiAocGFyZW50ICE9IG5pbCkg eworICAgICAgICBzdHIgPSBbc3RyIHN0cmluZ0J5QXBwZW5kaW5nU3RyaW5nOkAiID4gIl07Cisg ICAgICAgIHN0ciA9IFtzdHIgc3RyaW5nQnlBcHBlbmRpbmdTdHJpbmc6W3BhcmVudCBkdW1wUGF0 aF1dOworICAgIH0KKyAgICByZXR1cm4gc3RyOworfQorQGVuZAorCitAaW50ZXJmYWNlIERPTVJh bmdlIChkdW1wKQorLSAoTlNTdHJpbmcgKilkdW1wOworQGVuZAorCitAaW1wbGVtZW50YXRpb24g RE9NUmFuZ2UgKGR1bXApCistIChOU1N0cmluZyAqKWR1bXAKK3sKKyAgICByZXR1cm4gW05TU3Ry aW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJyYW5nZSBmcm9tICVsZCBvZiAlQCB0byAlbGQgb2YgJUAi LCBbc2VsZiBzdGFydE9mZnNldF0sIFtbc2VsZiBzdGFydENvbnRhaW5lcl0gZHVtcFBhdGhdLCBb c2VsZiBlbmRPZmZzZXRdLCBbW3NlbGYgZW5kQ29udGFpbmVyXSBkdW1wUGF0aF1dOworfQorQGVu ZAorCisKK0BpbXBsZW1lbnRhdGlvbiBFZGl0aW5nRGVsZWdhdGUKKworLSAoQk9PTCl3ZWJWaWV3 OihXZWJWaWV3ICopd2ViVmlldyBzaG91bGRCZWdpbkVkaXRpbmdJbkRPTVJhbmdlOihET01SYW5n ZSAqKXJhbmdlCit7CisgICAgcHJpbnRmKCJFRElUSU5HIERFTEVHQVRFOiBzaG91bGRCZWdpbkVk aXRpbmdJbkRPTVJhbmdlOiVzXG4iLCBbW3JhbmdlIGR1bXBdIFVURjhTdHJpbmddKTsKKyAgICBy ZXR1cm4gWUVTOworfQorCistIChCT09MKXdlYlZpZXc6KFdlYlZpZXcgKil3ZWJWaWV3IHNob3Vs ZEVuZEVkaXRpbmdJbkRPTVJhbmdlOihET01SYW5nZSAqKXJhbmdlCit7CisgICAgcHJpbnRmKCJF RElUSU5HIERFTEVHQVRFOiBzaG91bGRFbmRFZGl0aW5nSW5ET01SYW5nZTolc1xuIiwgW1tyYW5n ZSBkdW1wXSBVVEY4U3RyaW5nXSk7CisgICAgcmV0dXJuIFlFUzsKK30KKworLSAoQk9PTCl3ZWJW aWV3OihXZWJWaWV3ICopd2ViVmlldyBzaG91bGRJbnNlcnROb2RlOihET01Ob2RlICopbm9kZSBy ZXBsYWNpbmdET01SYW5nZTooRE9NUmFuZ2UgKilyYW5nZSBnaXZlbkFjdGlvbjooV2ViVmlld0lu c2VydEFjdGlvbilhY3Rpb24KK3sKKyAgICBzdGF0aWMgY29uc3QgY2hhciAqaW5zZXJ0YWN0aW9u c3RyaW5nW10gPSB7CisgICAgICAgICJXZWJWaWV3SW5zZXJ0QWN0aW9uVHlwZWQiLAorICAgICAg ICAiV2ViVmlld0luc2VydEFjdGlvblBhc3RlZCIsCisgICAgICAgICJXZWJWaWV3SW5zZXJ0QWN0 aW9uRHJvcHBlZCIsCisgICAgfTsKKworICAgIHByaW50ZigiRURJVElORyBERUxFR0FURTogc2hv dWxkSW5zZXJ0Tm9kZTolcyByZXBsYWNpbmdET01SYW5nZTolcyBnaXZlbkFjdGlvbjolc1xuIiwg W1tub2RlIGR1bXBQYXRoXSBVVEY4U3RyaW5nXSwgW1tyYW5nZSBkdW1wXSBVVEY4U3RyaW5nXSwg aW5zZXJ0YWN0aW9uc3RyaW5nW2FjdGlvbl0pOworICAgIHJldHVybiBZRVM7Cit9CisKKy0gKEJP T0wpd2ViVmlldzooV2ViVmlldyAqKXdlYlZpZXcgc2hvdWxkSW5zZXJ0VGV4dDooTlNTdHJpbmcg Kil0ZXh0IHJlcGxhY2luZ0RPTVJhbmdlOihET01SYW5nZSAqKXJhbmdlIGdpdmVuQWN0aW9uOihX ZWJWaWV3SW5zZXJ0QWN0aW9uKWFjdGlvbgoreworICAgIHN0YXRpYyBjb25zdCBjaGFyICppbnNl cnRhY3Rpb25zdHJpbmdbXSA9IHsKKyAgICAgICAgIldlYlZpZXdJbnNlcnRBY3Rpb25UeXBlZCIs CisgICAgICAgICJXZWJWaWV3SW5zZXJ0QWN0aW9uUGFzdGVkIiwKKyAgICAgICAgIldlYlZpZXdJ bnNlcnRBY3Rpb25Ecm9wcGVkIiwKKyAgICB9OworCisgICAgcHJpbnRmKCJFRElUSU5HIERFTEVH QVRFOiBzaG91bGRJbnNlcnRUZXh0OiVzIHJlcGxhY2luZ0RPTVJhbmdlOiVzIGdpdmVuQWN0aW9u OiVzXG4iLCBbW3RleHQgZGVzY3JpcHRpb25dIFVURjhTdHJpbmddLCBbW3JhbmdlIGR1bXBdIFVU RjhTdHJpbmddLCBpbnNlcnRhY3Rpb25zdHJpbmdbYWN0aW9uXSk7CisgICAgcmV0dXJuIFlFUzsK K30KKworLSAoQk9PTCl3ZWJWaWV3OihXZWJWaWV3ICopd2ViVmlldyBzaG91bGREZWxldGVET01S YW5nZTooRE9NUmFuZ2UgKilyYW5nZQoreworICAgIHByaW50ZigiRURJVElORyBERUxFR0FURTog c2hvdWxkRGVsZXRlRE9NUmFuZ2U6JXNcbiIsIFtbcmFuZ2UgZHVtcF0gVVRGOFN0cmluZ10pOwor ICAgIHJldHVybiBZRVM7Cit9CisKKy0gKEJPT0wpd2ViVmlldzooV2ViVmlldyAqKXdlYlZpZXcg c2hvdWxkQ2hhbmdlU2VsZWN0ZWRET01SYW5nZTooRE9NUmFuZ2UgKiljdXJyZW50UmFuZ2UgdG9E T01SYW5nZTooRE9NUmFuZ2UgKilwcm9wb3NlZFJhbmdlIGFmZmluaXR5OihOU1NlbGVjdGlvbkFm ZmluaXR5KXNlbGVjdGlvbkFmZmluaXR5IHN0aWxsU2VsZWN0aW5nOihCT09MKWZsYWcKK3sKKyAg ICBzdGF0aWMgY29uc3QgY2hhciAqYWZmaW5pdHlzdHJpbmdbXSA9IHsKKyAgICAgICAgIk5TU2Vs ZWN0aW9uQWZmaW5pdHlVcHN0cmVhbSIsCisgICAgICAgICJOU1NlbGVjdGlvbkFmZmluaXR5RG93 bnN0cmVhbSIKKyAgICB9OworICAgIHN0YXRpYyBjb25zdCBjaGFyICpib29sc3RyaW5nW10gPSB7 CisgICAgICAgICJGQUxTRSIsCisgICAgICAgICJUUlVFIgorICAgIH07CisKKyAgICBwcmludGYo IkVESVRJTkcgREVMRUdBVEU6IHNob3VsZENoYW5nZVNlbGVjdGVkRE9NUmFuZ2U6JXMgdG9ET01S YW5nZTolcyBhZmZpbml0eTolcyBzdGlsbFNlbGVjdGluZzolc1xuIiwgW1tjdXJyZW50UmFuZ2Ug ZHVtcF0gVVRGOFN0cmluZ10sIFtbcHJvcG9zZWRSYW5nZSBkdW1wXSBVVEY4U3RyaW5nXSwgYWZm aW5pdHlzdHJpbmdbc2VsZWN0aW9uQWZmaW5pdHldLCBib29sc3RyaW5nW2ZsYWddKTsKKyAgICBy ZXR1cm4gWUVTOworfQorCistIChCT09MKXdlYlZpZXc6KFdlYlZpZXcgKil3ZWJWaWV3IHNob3Vs ZEFwcGx5U3R5bGU6KERPTUNTU1N0eWxlRGVjbGFyYXRpb24gKilzdHlsZSB0b0VsZW1lbnRzSW5E T01SYW5nZTooRE9NUmFuZ2UgKilyYW5nZQoreworICAgIHByaW50ZigiRURJVElORyBERUxFR0FU RTogc2hvdWxkQXBwbHlTdHlsZTolcyB0b0VsZW1lbnRzSW5ET01SYW5nZTolc1xuIiwgW1tzdHls ZSBkZXNjcmlwdGlvbl0gVVRGOFN0cmluZ10sIFtbcmFuZ2UgZHVtcF0gVVRGOFN0cmluZ10pOwor ICAgIHJldHVybiBZRVM7Cit9CisKKy0gKEJPT0wpd2ViVmlldzooV2ViVmlldyAqKXdlYlZpZXcg c2hvdWxkQ2hhbmdlVHlwaW5nU3R5bGU6KERPTUNTU1N0eWxlRGVjbGFyYXRpb24gKiljdXJyZW50 U3R5bGUgdG9TdHlsZTooRE9NQ1NTU3R5bGVEZWNsYXJhdGlvbiAqKXByb3Bvc2VkU3R5bGUKK3sK KyAgICBwcmludGYoIkVESVRJTkcgREVMRUdBVEU6IHNob3VsZENoYW5nZVR5cGluZ1N0eWxlOiVz IHRvU3R5bGU6JXNcbiIsIFtbY3VycmVudFN0eWxlIGRlc2NyaXB0aW9uXSBVVEY4U3RyaW5nXSwg W1twcm9wb3NlZFN0eWxlIGRlc2NyaXB0aW9uXSBVVEY4U3RyaW5nXSk7CisgICAgcmV0dXJuIFlF UzsKK30KKworLSAodm9pZCl3ZWJWaWV3RGlkQmVnaW5FZGl0aW5nOihOU05vdGlmaWNhdGlvbiAq KW5vdGlmaWNhdGlvbgoreworICAgIHByaW50ZigiRURJVElORyBERUxFR0FURTogd2ViVmlld0Rp ZEJlZ2luRWRpdGluZzolc1xuIiwgW1tub3RpZmljYXRpb24gbmFtZV0gVVRGOFN0cmluZ10pOwor fQorCistICh2b2lkKXdlYlZpZXdEaWRDaGFuZ2U6KE5TTm90aWZpY2F0aW9uICopbm90aWZpY2F0 aW9uCit7CisgICAgcHJpbnRmKCJFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlOiVz XG4iLCBbW25vdGlmaWNhdGlvbiBuYW1lXSBVVEY4U3RyaW5nXSk7Cit9CisKKy0gKHZvaWQpd2Vi Vmlld0RpZEVuZEVkaXRpbmc6KE5TTm90aWZpY2F0aW9uICopbm90aWZpY2F0aW9uCit7CisgICAg cHJpbnRmKCJFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkRW5kRWRpdGluZzolc1xuIiwgW1tu b3RpZmljYXRpb24gbmFtZV0gVVRGOFN0cmluZ10pOworfQorCistICh2b2lkKXdlYlZpZXdEaWRD aGFuZ2VUeXBpbmdTdHlsZTooTlNOb3RpZmljYXRpb24gKilub3RpZmljYXRpb24KK3sKKyAgICBw cmludGYoIkVESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VUeXBpbmdTdHlsZTolc1xu IiwgW1tub3RpZmljYXRpb24gbmFtZV0gVVRGOFN0cmluZ10pOworfQorCistICh2b2lkKXdlYlZp ZXdEaWRDaGFuZ2VTZWxlY3Rpb246KE5TTm90aWZpY2F0aW9uICopbm90aWZpY2F0aW9uCit7Cisg ICAgaWYgKCFkb25lKQorICAgICAgICBwcmludGYoIkVESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdE aWRDaGFuZ2VTZWxlY3Rpb246JXNcbiIsIFtbbm90aWZpY2F0aW9uIG5hbWVdIFVURjhTdHJpbmdd KTsKK30KKworQGVuZAorCiBAaW1wbGVtZW50YXRpb24gTGF5b3V0VGVzdENvbnRyb2xsZXIKIAog KyAoQk9PTClpc1NlbGVjdG9yRXhjbHVkZWRGcm9tV2ViU2NyaXB0OihTRUwpYVNlbGVjdG9yCkBA IC0yNDcsNCArMzgyLDUgQEAgc3RhdGljIHZvaWQgZHVtcFJlbmRlclRyZWUoY29uc3QgY2hhciAq ZgogICAgICAgICBbW05TUnVuTG9vcCBjdXJyZW50UnVuTG9vcF0gcnVuTW9kZTpOU0RlZmF1bHRS dW5Mb29wTW9kZSBiZWZvcmVEYXRlOltOU0RhdGUgZGlzdGFudFBhc3RdXTsKICAgICAgICAgW3Bv b2wgcmVsZWFzZV07CiAgICAgfQorICAgIFtbZnJhbWUgd2ViVmlld10gc2V0U2VsZWN0ZWRET01S YW5nZTpuaWwgYWZmaW5pdHk6TlNTZWxlY3Rpb25BZmZpbml0eURvd25zdHJlYW1dOwogfQo=