20221 2008-07-29 21:08:15 -0700 [Qt] ToggleBold, ToggleItalic, and ToggleUnderline page actions should update during navigation. 2008-08-04 09:02:39 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 elbunce webkit-unassigned oldest_to_newest 87350 0 elbunce 2008-07-29 21:08:15 -0700 Currently when editing a page the ToggleBold, ToggleItalic, and ToggleUnderline page actions don't update as you navigation the page being edited. Can be demonstrated with the QtLauncher included in the patch attached to bug 20220. 87351 1 22547 elbunce 2008-07-29 21:10:41 -0700 Created attachment 22547 Adds support for updating more editing related actions. Add updateAction() support to ToggleBold, ToggleItalic, and ToggleUnderline. Add lookup table for mapping web actions to editor commands. 87355 2 22547 elbunce 2008-07-29 21:24:35 -0700 Comment on attachment 22547 Adds support for updating more editing related actions. Part of the great bug 20207 patch split. 87749 3 22547 hausmann 2008-08-04 02:50:08 -0700 Comment on attachment 22547 Adds support for updating more editing related actions. I agree with the patch in principle (thanks!), but there are a few minor cosmetic glitches: 1) Please make the editorCommandWebActions array local to qwebpage.cpp by prepending 'static'. 2) You commented out the cases for all the editor actions and handle it in default: instead. That's fine, but I don't think we should leave the old code commented out, please just remove it :) 3) The last item in the array should probably not end with a comma :) r- because of those, but I'd be happy to r+ with them fixed. 87759 4 22633 elbunce 2008-08-04 08:22:25 -0700 Created attachment 22633 Adds support for updating more editing related actions. Updated based on Simon Hausmann's comments. 87761 5 hausmann 2008-08-04 09:02:39 -0700 Landed in r35537 22547 2008-07-29 21:10:41 -0700 2008-08-04 08:22:25 -0700 Adds support for updating more editing related actions. update_editing_actions.txt text/plain 9598 elbunce SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gMzU0MzUpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDgtMDctMjkgIEVyaWsgQnVuY2UgIDxlbGJ1bmNlQHRo ZWhpdmUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisJQWRk IHVwZGF0ZUFjdGlvbigpIHN1cHBvcnQgdG8gVG9nZ2xlQm9sZCwgVG9nZ2xlSXRhbGljLCBhbmQg VG9nZ2xlVW5kZXJsaW5lLgorCUFkZCBsb29rdXAgdGFibGUgZm9yIG1hcHBpbmcgd2ViIGFjdGlv bnMgdG8gZWRpdG9yIGNvbW1hbmRzLgorCisgICAgICAgICogQXBpL3F3ZWJwYWdlLmNwcDoKKyAg ICAgICAgKGVkaXRvckNvbW1hbmRGb3JXZWJBY3Rpb25zKToKKyAgICAgICAgKFFXZWJQYWdlUHJp dmF0ZTo6dXBkYXRlQWN0aW9uKToKKyAgICAgICAgKFFXZWJQYWdlUHJpdmF0ZTo6dXBkYXRlRWRp dG9yQWN0aW9ucyk6CisgICAgICAgIChRV2ViUGFnZTo6dHJpZ2dlckFjdGlvbik6CisgICAgICAg IChRV2ViUGFnZTo6c2V0RWRpdGFibGUpOgorCiAyMDA4LTA3LTI3ICBEYXZpZCBLaWx6ZXIgIDxk ZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IFF0IGJ1aWxkIGZhaWx1cmUuCkluZGV4 OiBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBp L3F3ZWJwYWdlLmNwcAkocmV2aXNpb24gMzU0MzQpCisrKyBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdl LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTEsNiArOTEsODEgQEAKIAogdXNpbmcgbmFtZXNwYWNl IFdlYkNvcmU7CiAKKy8vIExvb2t1cCB0YWJsZSBtYXBwaW5nIFFXZWJQYWdlOjpXZWJBY3Rpb25z IHRvIHRoZSBhc3NvY2lhdGVkIEVkaXRvciBjb21tYW5kcworY29uc3QgY2hhciogZWRpdG9yQ29t bWFuZFdlYkFjdGlvbnNbXSA9IAoreworICAgIDAsIC8vIE9wZW5MaW5rLAorCisgICAgMCwgLy8g T3BlbkxpbmtJbk5ld1dpbmRvdywKKyAgICAwLCAvLyBPcGVuRnJhbWVJbk5ld1dpbmRvdywKKyAg ICAKKyAgICAwLCAvLyBEb3dubG9hZExpbmtUb0Rpc2ssCisgICAgMCwgLy8gQ29weUxpbmtUb0Ns aXBib2FyZCwKKyAgICAKKyAgICAwLCAvLyBPcGVuSW1hZ2VJbk5ld1dpbmRvdywKKyAgICAwLCAv LyBEb3dubG9hZEltYWdlVG9EaXNrLAorICAgIDAsIC8vIENvcHlJbWFnZVRvQ2xpcGJvYXJkLAor ICAgIAorICAgIDAsIC8vIEJhY2ssCisgICAgMCwgLy8gRm9yd2FyZCwKKyAgICAwLCAvLyBTdG9w LAorICAgIDAsIC8vIFJlbG9hZCwKKyAgICAKKyAgICAiQ3V0IiwgLy8gQ3V0LAorICAgICJDb3B5 IiwgLy8gQ29weSwKKyAgICAiUGFzdGUiLCAvLyBQYXN0ZSwKKyAgICAKKyAgICAiVW5kbyIsIC8v IFVuZG8sCisgICAgIlJlZG8iLCAvLyBSZWRvLAorICAgICJNb3ZlRm9yd2FyZCIsIC8vIE1vdmVU b05leHRDaGFyLAorICAgICJNb3ZlQmFja3dhcmQiLCAvLyBNb3ZlVG9QcmV2aW91c0NoYXIsCisg ICAgIk1vdmVXb3JkRm9yd2FyZCIsIC8vIE1vdmVUb05leHRXb3JkLAorICAgICJNb3ZlV29yZEJh Y2t3YXJkIiwgLy8gTW92ZVRvUHJldmlvdXNXb3JkLAorICAgICJNb3ZlRG93biIsIC8vIE1vdmVU b05leHRMaW5lLAorICAgICJNb3ZlVXAiLCAvLyBNb3ZlVG9QcmV2aW91c0xpbmUsCisgICAgIk1v dmVUb0JlZ2lubmluZ09mTGluZSIsIC8vIE1vdmVUb1N0YXJ0T2ZMaW5lLAorICAgICJNb3ZlVG9F bmRPZkxpbmUiLCAvLyBNb3ZlVG9FbmRPZkxpbmUsCisgICAgIk1vdmVUb0JlZ2lubmluZ09mUGFy YWdyYXBoIiwgLy8gTW92ZVRvU3RhcnRPZkJsb2NrLAorICAgICJNb3ZlVG9FbmRPZlBhcmFncmFw aCIsIC8vIE1vdmVUb0VuZE9mQmxvY2ssCisgICAgIk1vdmVUb0JlZ2lubmluZ09mRG9jdW1lbnQi LCAvLyBNb3ZlVG9TdGFydE9mRG9jdW1lbnQsCisgICAgIk1vdmVUb0VuZE9mRG9jdW1lbnQiLCAv LyBNb3ZlVG9FbmRPZkRvY3VtZW50LAorICAgICJNb3ZlRm9yd2FyZEFuZE1vZGlmeVNlbGVjdGlv biIsIC8vIFNlbGVjdE5leHRDaGFyLAorICAgICJNb3ZlQmFja3dhcmRBbmRNb2RpZnlTZWxlY3Rp b24iLCAvLyBTZWxlY3RQcmV2aW91c0NoYXIsCisgICAgIk1vdmVXb3JkRm9yd2FyZEFuZE1vZGlm eVNlbGVjdGlvbiIsIC8vIFNlbGVjdE5leHRXb3JkLAorICAgICJNb3ZlV29yZEJhY2t3YXJkQW5k TW9kaWZ5U2VsZWN0aW9uIiwgLy8gU2VsZWN0UHJldmlvdXNXb3JkLAorICAgICJNb3ZlRG93bkFu ZE1vZGlmeVNlbGVjdGlvbiIsIC8vIFNlbGVjdE5leHRMaW5lLAorICAgICJNb3ZlVXBBbmRNb2Rp ZnlTZWxlY3Rpb24iLCAvLyBTZWxlY3RQcmV2aW91c0xpbmUsCisgICAgIk1vdmVUb0JlZ2lubmlu Z09mTGluZUFuZE1vZGlmeVNlbGVjdGlvbiIsIC8vIFNlbGVjdFN0YXJ0T2ZMaW5lLAorICAgICJN b3ZlVG9FbmRPZkxpbmVBbmRNb2RpZnlTZWxlY3Rpb24iLCAvLyBTZWxlY3RFbmRPZkxpbmUsCisg ICAgIk1vdmVUb0JlZ2lubmluZ09mUGFyYWdyYXBoQW5kTW9kaWZ5U2VsZWN0aW9uIiwgLy8gU2Vs ZWN0U3RhcnRPZkJsb2NrLAorICAgICJNb3ZlVG9FbmRPZlBhcmFncmFwaEFuZE1vZGlmeVNlbGVj dGlvbiIsIC8vIFNlbGVjdEVuZE9mQmxvY2ssCisgICAgIk1vdmVUb0JlZ2lubmluZ09mRG9jdW1l bnRBbmRNb2RpZnlTZWxlY3Rpb24iLCAvL1NlbGVjdFN0YXJ0T2ZEb2N1bWVudCwKKyAgICAiTW92 ZVRvRW5kT2ZEb2N1bWVudEFuZE1vZGlmeVNlbGVjdGlvbiIsIC8vIFNlbGVjdEVuZE9mRG9jdW1l bnQsCisgICAgIkRlbGV0ZVdvcmRCYWNrd2FyZCIsIC8vIERlbGV0ZVN0YXJ0T2ZXb3JkLAorICAg ICJEZWxldGVXb3JkRm9yd2FyZCIsIC8vIERlbGV0ZUVuZE9mV29yZCwKKyAgICAKKyAgICAwLCAv LyBTZXRUZXh0RGlyZWN0aW9uRGVmYXVsdCwKKyAgICAwLCAvLyBTZXRUZXh0RGlyZWN0aW9uTGVm dFRvUmlnaHQsCisgICAgMCwgLy8gU2V0VGV4dERpcmVjdGlvblJpZ2h0VG9MZWZ0LAorICAgIAor ICAgICJUb2dnbGVCb2xkIiwgLy8gVG9nZ2xlQm9sZCwKKyAgICAiVG9nZ2xlSXRhbGljIiwgLy8g VG9nZ2xlSXRhbGljLAorICAgICJUb2dnbGVVbmRlcmxpbmUiLCAvLyBUb2dnbGVVbmRlcmxpbmUs CisgICAgCisgICAgMCwgLy8gSW5zcGVjdEVsZW1lbnQsCisKKyAgICAwLCAvLyBXZWJBY3Rpb25D b3VudAorfTsKKworLy8gTG9va3VwIHRoZSBhcHByb3ByaWF0ZSBlZGl0b3IgY29tbWFuZCB0byB1 c2UgZm9yIFdlYkFjdGlvbiBcYSBhY3Rpb24KK3N0YXRpYyBjb25zdCBjaGFyKiBlZGl0b3JDb21t YW5kRm9yV2ViQWN0aW9ucyhRV2ViUGFnZTo6V2ViQWN0aW9uIGFjdGlvbikKK3sKKyAgICBpZiAo KGFjdGlvbiA+IFFXZWJQYWdlOjpOb1dlYkFjdGlvbikgJiYgKGFjdGlvbiA8IGludChzaXplb2Yo ZWRpdG9yQ29tbWFuZFdlYkFjdGlvbnMpIC8gc2l6ZW9mKGNvbnN0IGNoYXIqKSkpKQorICAgICAg ICByZXR1cm4gZWRpdG9yQ29tbWFuZFdlYkFjdGlvbnNbYWN0aW9uXTsKKyAgICAKKyAgICByZXR1 cm4gMDsKK30KKwogI2lmbmRlZiBRVF9OT19DVVJTT1IKIFNldEN1cnNvckV2ZW50OjpTZXRDdXJz b3JFdmVudChjb25zdCBRQ3Vyc29yJiBjdXJzb3IpCiAgICAgOiBRRXZlbnQoc3RhdGljX2Nhc3Q8 UUV2ZW50OjpUeXBlPihFdmVudFR5cGUpKQpAQCAtMzI1LDYgKzQwMCw3IEBAIHZvaWQgUVdlYlBh Z2VQcml2YXRlOjp1cGRhdGVBY3Rpb24oUVdlYlAKICAgICBXZWJDb3JlOjpFZGl0b3IgKmVkaXRv ciA9IHBhZ2UtPmZvY3VzQ29udHJvbGxlcigpLT5mb2N1c2VkT3JNYWluRnJhbWUoKS0+ZWRpdG9y KCk7CiAKICAgICBib29sIGVuYWJsZWQgPSBhLT5pc0VuYWJsZWQoKTsKKyAgICBib29sIGNoZWNr ZWQgPSBhLT5pc0NoZWNrZWQoKTsKIAogICAgIHN3aXRjaCAoYWN0aW9uKSB7CiAgICAgICAgIGNh c2UgUVdlYlBhZ2U6OkJhY2s6CkBAIC0zNTIsMTAgKzQyOCwyMiBAQCB2b2lkIFFXZWJQYWdlUHJp dmF0ZTo6dXBkYXRlQWN0aW9uKFFXZWJQCiAgICAgICAgIGNhc2UgUVdlYlBhZ2U6OlJlZG86CiAg ICAgICAgICAgICAvLyB0aG9zZSB0d28gYXJlIGhhbmRsZWQgYnkgUVVuZG9TdGFjawogICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgUVdlYlBhZ2U6OlRvZ2dsZUJvbGQ6CisgICAgICAg IGNhc2UgUVdlYlBhZ2U6OlRvZ2dsZUl0YWxpYzoKKyAgICAgICAgY2FzZSBRV2ViUGFnZTo6VG9n Z2xlVW5kZXJsaW5lOgorICAgICAgICAgICAgZW5hYmxlZCA9IGVkaXRvci0+Y2FuRWRpdFJpY2hs eSgpOworICAgICAgICAgICAgaWYgKGVuYWJsZWQpCisgICAgICAgICAgICAgICAgY2hlY2tlZCA9 IGVkaXRvci0+Y29tbWFuZChlZGl0b3JDb21tYW5kRm9yV2ViQWN0aW9ucyhhY3Rpb24pKS5zdGF0 ZSgpICE9IEZhbHNlVHJpU3RhdGU7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAg Y2hlY2tlZCA9IGZhbHNlOworICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGRlZmF1bHQ6IGJy ZWFrOwogICAgIH0KIAogICAgIGEtPnNldEVuYWJsZWQoZW5hYmxlZCk7CisKKyAgICBpZiAoYS0+ aXNDaGVja2FibGUoKSkKKyAgICAgICAgYS0+c2V0Q2hlY2tlZChjaGVja2VkKTsKIH0KIAogdm9p ZCBRV2ViUGFnZVByaXZhdGU6OnVwZGF0ZU5hdmlnYXRpb25BY3Rpb25zKCkKQEAgLTM3MSw2ICs0 NTksOSBAQCB2b2lkIFFXZWJQYWdlUHJpdmF0ZTo6dXBkYXRlRWRpdG9yQWN0aW9uCiAgICAgdXBk YXRlQWN0aW9uKFFXZWJQYWdlOjpDdXQpOwogICAgIHVwZGF0ZUFjdGlvbihRV2ViUGFnZTo6Q29w eSk7CiAgICAgdXBkYXRlQWN0aW9uKFFXZWJQYWdlOjpQYXN0ZSk7CisgICAgdXBkYXRlQWN0aW9u KFFXZWJQYWdlOjpUb2dnbGVCb2xkKTsKKyAgICB1cGRhdGVBY3Rpb24oUVdlYlBhZ2U6OlRvZ2ds ZUl0YWxpYyk7CisgICAgdXBkYXRlQWN0aW9uKFFXZWJQYWdlOjpUb2dnbGVVbmRlcmxpbmUpOwog fQogCiB2b2lkIFFXZWJQYWdlUHJpdmF0ZTo6dGltZXJFdmVudChRVGltZXJFdmVudCAqZXYpCkBA IC0xMjY0LDEwMiArMTM1NSw0MSBAQCB2b2lkIFFXZWJQYWdlOjp0cmlnZ2VyQWN0aW9uKFdlYkFj dGlvbiBhCiAgICAgICAgIGNhc2UgUmVsb2FkOgogICAgICAgICAgICAgbWFpbkZyYW1lKCktPmQt PmZyYW1lLT5sb2FkZXIoKS0+cmVsb2FkKCk7CiAgICAgICAgICAgICBicmVhazsKKy8qCiAgICAg ICAgIGNhc2UgQ3V0OgotICAgICAgICAgICAgY29tbWFuZCA9ICJDdXQiOwotICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgIGNhc2UgQ29weToKLSAgICAgICAgICAgIGNvbW1hbmQgPSAiQ29weSI7 Ci0gICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBQYXN0ZToKLSAgICAgICAgICAgIGNv bW1hbmQgPSAiUGFzdGUiOwotICAgICAgICAgICAgYnJlYWs7Ci0KICAgICAgICAgY2FzZSBVbmRv OgotICAgICAgICAgICAgY29tbWFuZCA9ICJVbmRvIjsKLSAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICBjYXNlIFJlZG86Ci0gICAgICAgICAgICBjb21tYW5kID0gIlJlZG8iOwotICAgICAgICAg ICAgYnJlYWs7Ci0KICAgICAgICAgY2FzZSBNb3ZlVG9OZXh0Q2hhcjoKLSAgICAgICAgICAgIGNv bW1hbmQgPSAiTW92ZUZvcndhcmQiOwotICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2Ug TW92ZVRvUHJldmlvdXNDaGFyOgotICAgICAgICAgICAgY29tbWFuZCA9ICJNb3ZlQmFja3dhcmQi OwotICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgTW92ZVRvTmV4dFdvcmQ6Ci0gICAg ICAgICAgICBjb21tYW5kID0gIk1vdmVXb3JkRm9yd2FyZCI7Ci0gICAgICAgICAgICBicmVhazsK ICAgICAgICAgY2FzZSBNb3ZlVG9QcmV2aW91c1dvcmQ6Ci0gICAgICAgICAgICBjb21tYW5kID0g Ik1vdmVXb3JkQmFja3dhcmQiOwotICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgTW92 ZVRvTmV4dExpbmU6Ci0gICAgICAgICAgICBjb21tYW5kID0gIk1vdmVEb3duIjsKLSAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICBjYXNlIE1vdmVUb1ByZXZpb3VzTGluZToKLSAgICAgICAgICAg IGNvbW1hbmQgPSAiTW92ZVVwIjsKLSAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIE1v dmVUb1N0YXJ0T2ZMaW5lOgotICAgICAgICAgICAgY29tbWFuZCA9ICJNb3ZlVG9CZWdpbm5pbmdP ZkxpbmUiOwotICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgTW92ZVRvRW5kT2ZMaW5l OgotICAgICAgICAgICAgY29tbWFuZCA9ICJNb3ZlVG9FbmRPZkxpbmUiOwotICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgIGNhc2UgTW92ZVRvU3RhcnRPZkJsb2NrOgotICAgICAgICAgICAgY29t bWFuZCA9ICJNb3ZlVG9CZWdpbm5pbmdPZlBhcmFncmFwaCI7Ci0gICAgICAgICAgICBicmVhazsK ICAgICAgICAgY2FzZSBNb3ZlVG9FbmRPZkJsb2NrOgotICAgICAgICAgICAgY29tbWFuZCA9ICJN b3ZlVG9FbmRPZlBhcmFncmFwaCI7Ci0gICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBN b3ZlVG9TdGFydE9mRG9jdW1lbnQ6Ci0gICAgICAgICAgICBjb21tYW5kID0gIk1vdmVUb0JlZ2lu bmluZ09mRG9jdW1lbnQiOwotICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgTW92ZVRv RW5kT2ZEb2N1bWVudDoKLSAgICAgICAgICAgIGNvbW1hbmQgPSAiTW92ZVRvRW5kT2ZEb2N1bWVu dCI7Ci0gICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBTZWxlY3ROZXh0Q2hhcjoKLSAg ICAgICAgICAgIGNvbW1hbmQgPSAiTW92ZUZvcndhcmRBbmRNb2RpZnlTZWxlY3Rpb24iOwotICAg ICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgU2VsZWN0UHJldmlvdXNDaGFyOgotICAgICAg ICAgICAgY29tbWFuZCA9ICJNb3ZlQmFja3dhcmRBbmRNb2RpZnlTZWxlY3Rpb24iOwotICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgU2VsZWN0TmV4dFdvcmQ6Ci0gICAgICAgICAgICBj b21tYW5kID0gIk1vdmVXb3JkRm9yd2FyZEFuZE1vZGlmeVNlbGVjdGlvbiI7Ci0gICAgICAgICAg ICBicmVhazsKICAgICAgICAgY2FzZSBTZWxlY3RQcmV2aW91c1dvcmQ6Ci0gICAgICAgICAgICBj b21tYW5kID0gIk1vdmVXb3JkQmFja3dhcmRBbmRNb2RpZnlTZWxlY3Rpb24iOwotICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgIGNhc2UgU2VsZWN0TmV4dExpbmU6Ci0gICAgICAgICAgICBjb21t YW5kID0gIk1vdmVEb3duQW5kTW9kaWZ5U2VsZWN0aW9uIjsKLSAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICBjYXNlIFNlbGVjdFByZXZpb3VzTGluZToKLSAgICAgICAgICAgIGNvbW1hbmQgPSAi TW92ZVVwQW5kTW9kaWZ5U2VsZWN0aW9uIjsKLSAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBj YXNlIFNlbGVjdFN0YXJ0T2ZMaW5lOgotICAgICAgICAgICAgY29tbWFuZCA9ICJNb3ZlVG9CZWdp bm5pbmdPZkxpbmVBbmRNb2RpZnlTZWxlY3Rpb24iOwotICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIGNhc2UgU2VsZWN0RW5kT2ZMaW5lOgotICAgICAgICAgICAgY29tbWFuZCA9ICJNb3ZlVG9F bmRPZkxpbmVBbmRNb2RpZnlTZWxlY3Rpb24iOwotICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg IGNhc2UgU2VsZWN0U3RhcnRPZkJsb2NrOgotICAgICAgICAgICAgY29tbWFuZCA9ICJNb3ZlVG9C ZWdpbm5pbmdPZlBhcmFncmFwaEFuZE1vZGlmeVNlbGVjdGlvbiI7Ci0gICAgICAgICAgICBicmVh azsKICAgICAgICAgY2FzZSBTZWxlY3RFbmRPZkJsb2NrOgotICAgICAgICAgICAgY29tbWFuZCA9 ICJNb3ZlVG9FbmRPZlBhcmFncmFwaEFuZE1vZGlmeVNlbGVjdGlvbiI7Ci0gICAgICAgICAgICBi cmVhazsKICAgICAgICAgY2FzZSBTZWxlY3RTdGFydE9mRG9jdW1lbnQ6Ci0gICAgICAgICAgICBj b21tYW5kID0gIk1vdmVUb0JlZ2lubmluZ09mRG9jdW1lbnRBbmRNb2RpZnlTZWxlY3Rpb24iOwot ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgU2VsZWN0RW5kT2ZEb2N1bWVudDoKLSAg ICAgICAgICAgIGNvbW1hbmQgPSAiTW92ZVRvRW5kT2ZEb2N1bWVudEFuZE1vZGlmeVNlbGVjdGlv biI7Ci0gICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBEZWxldGVTdGFydE9mV29yZDoK LSAgICAgICAgICAgIGNvbW1hbmQgPSAiRGVsZXRlV29yZEJhY2t3YXJkIjsKLSAgICAgICAgICAg IGJyZWFrOwogICAgICAgICBjYXNlIERlbGV0ZUVuZE9mV29yZDoKLSAgICAgICAgICAgIGNvbW1h bmQgPSAiRGVsZXRlV29yZEZvcndhcmQiOworICAgICAgICAgICAgY29tbWFuZCA9IGVkaXRvckNv bW1hbmRGb3JXZWJBY3Rpb25zKGFjdGlvbik7CiAgICAgICAgICAgICBicmVhazsKLQorKi8KICAg ICAgICAgY2FzZSBTZXRUZXh0RGlyZWN0aW9uRGVmYXVsdDoKICAgICAgICAgICAgIGVkaXRvci0+ c2V0QmFzZVdyaXRpbmdEaXJlY3Rpb24oTmF0dXJhbFdyaXRpbmdEaXJlY3Rpb24pOwogICAgICAg ICAgICAgYnJlYWs7CkBAIC0xMzY5LDIyICsxMzk5LDE5IEBAIHZvaWQgUVdlYlBhZ2U6OnRyaWdn ZXJBY3Rpb24oV2ViQWN0aW9uIGEKICAgICAgICAgY2FzZSBTZXRUZXh0RGlyZWN0aW9uUmlnaHRU b0xlZnQ6CiAgICAgICAgICAgICBlZGl0b3ItPnNldEJhc2VXcml0aW5nRGlyZWN0aW9uKFJpZ2h0 VG9MZWZ0V3JpdGluZ0RpcmVjdGlvbik7CiAgICAgICAgICAgICBicmVhazsKLQorLyoKICAgICAg ICAgY2FzZSBUb2dnbGVCb2xkOgotICAgICAgICAgICAgY29tbWFuZCA9ICJUb2dnbGVCb2xkIjsK LSAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIFRvZ2dsZUl0YWxpYzoKLSAgICAgICAg ICAgIGNvbW1hbmQgPSAiVG9nZ2xlSXRhbGljIjsKLSAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICBjYXNlIFRvZ2dsZVVuZGVybGluZToKLSAgICAgICAgICAgIGVkaXRvci0+dG9nZ2xlVW5kZXJs aW5lKCk7CisgICAgICAgICAgICBjb21tYW5kID0gZWRpdG9yQ29tbWFuZEZvcldlYkFjdGlvbnMo YWN0aW9uKTsKICAgICAgICAgICAgIGJyZWFrOwotCisqLwogICAgICAgICBjYXNlIEluc3BlY3RF bGVtZW50OgogICAgICAgICAgICAgZC0+cGFnZS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5pbnNw ZWN0KGQtPmhpdFRlc3RSZXN1bHQuZC0+aW5uZXJOb25TaGFyZWROb2RlLmdldCgpKTsKICAgICAg ICAgICAgIGJyZWFrOwotCi0gICAgICAgIGRlZmF1bHQ6IGJyZWFrOworICAgICAgICBkZWZhdWx0 OgorICAgICAgICAgICAgY29tbWFuZCA9IGVkaXRvckNvbW1hbmRGb3JXZWJBY3Rpb25zKGFjdGlv bik7CisgICAgICAgICAgICBicmVhazsKICAgICB9CiAKICAgICBpZiAoY29tbWFuZCkKQEAgLTE3 NzQsNiArMTgwMSw4IEBAIHZvaWQgUVdlYlBhZ2U6OnNldEVkaXRhYmxlKGJvb2wgZWRpdGFibGUK ICAgICAgICAgICAgICAgICBmcmFtZS0+cmVtb3ZlRWRpdGluZ1N0eWxlRnJvbUJvZHlFbGVtZW50 KCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KKworICAgICAgICBkLT51cGRhdGVFZGl0b3JB Y3Rpb25zKCk7CiAgICAgfQogfQogCg== 22633 2008-08-04 08:22:25 -0700 2008-08-04 09:01:55 -0700 Adds support for updating more editing related actions. update_editing_actions2.txt text/plain 9490 elbunce SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gMzU1MzYpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDgtMDgtMDQgIEVyaWsgQnVuY2UgIDxlbGJ1bmNlQHRo ZWhpdmUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZCB1cGRhdGVBY3Rpb24oKSBzdXBwb3J0IHRvIFRvZ2dsZUJvbGQsIFRvZ2dsZUl0YWxp YywgYW5kIFRvZ2dsZVVuZGVybGluZS4KKyAgICAgICAgQWRkIGxvb2t1cCB0YWJsZSBmb3IgbWFw cGluZyB3ZWIgYWN0aW9ucyB0byBlZGl0b3IgY29tbWFuZHMuCisKKyAgICAgICAgKiBBcGkvcXdl YnBhZ2UuY3BwOgorICAgICAgICAoZWRpdG9yQ29tbWFuZEZvcldlYkFjdGlvbnMpOgorICAgICAg ICAoUVdlYlBhZ2VQcml2YXRlOjp1cGRhdGVBY3Rpb24pOgorICAgICAgICAoUVdlYlBhZ2VQcml2 YXRlOjp1cGRhdGVFZGl0b3JBY3Rpb25zKToKKyAgICAgICAgKFFXZWJQYWdlOjp0cmlnZ2VyQWN0 aW9uKToKKyAgICAgICAgKFFXZWJQYWdlOjpzZXRFZGl0YWJsZSk6CisKIDIwMDgtMDgtMDMgIEFy aXlhIEhpZGF5YXQgIDxhcml5YS5oaWRheWF0QHRyb2xsdGVjaC5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgU2ltb24uCkluZGV4OiBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkocmV2aXNpb24gMzU1MzYpCisrKyBX ZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTEsNiArOTEsODEg QEAKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKKy8vIExvb2t1cCB0YWJsZSBtYXBwaW5n IFFXZWJQYWdlOjpXZWJBY3Rpb25zIHRvIHRoZSBhc3NvY2lhdGVkIEVkaXRvciBjb21tYW5kcwor c3RhdGljIGNvbnN0IGNoYXIqIGVkaXRvckNvbW1hbmRXZWJBY3Rpb25zW10gPSAKK3sKKyAgICAw LCAvLyBPcGVuTGluaywKKworICAgIDAsIC8vIE9wZW5MaW5rSW5OZXdXaW5kb3csCisgICAgMCwg Ly8gT3BlbkZyYW1lSW5OZXdXaW5kb3csCisgICAgCisgICAgMCwgLy8gRG93bmxvYWRMaW5rVG9E aXNrLAorICAgIDAsIC8vIENvcHlMaW5rVG9DbGlwYm9hcmQsCisgICAgCisgICAgMCwgLy8gT3Bl bkltYWdlSW5OZXdXaW5kb3csCisgICAgMCwgLy8gRG93bmxvYWRJbWFnZVRvRGlzaywKKyAgICAw LCAvLyBDb3B5SW1hZ2VUb0NsaXBib2FyZCwKKyAgICAKKyAgICAwLCAvLyBCYWNrLAorICAgIDAs IC8vIEZvcndhcmQsCisgICAgMCwgLy8gU3RvcCwKKyAgICAwLCAvLyBSZWxvYWQsCisgICAgCisg ICAgIkN1dCIsIC8vIEN1dCwKKyAgICAiQ29weSIsIC8vIENvcHksCisgICAgIlBhc3RlIiwgLy8g UGFzdGUsCisgICAgCisgICAgIlVuZG8iLCAvLyBVbmRvLAorICAgICJSZWRvIiwgLy8gUmVkbywK KyAgICAiTW92ZUZvcndhcmQiLCAvLyBNb3ZlVG9OZXh0Q2hhciwKKyAgICAiTW92ZUJhY2t3YXJk IiwgLy8gTW92ZVRvUHJldmlvdXNDaGFyLAorICAgICJNb3ZlV29yZEZvcndhcmQiLCAvLyBNb3Zl VG9OZXh0V29yZCwKKyAgICAiTW92ZVdvcmRCYWNrd2FyZCIsIC8vIE1vdmVUb1ByZXZpb3VzV29y ZCwKKyAgICAiTW92ZURvd24iLCAvLyBNb3ZlVG9OZXh0TGluZSwKKyAgICAiTW92ZVVwIiwgLy8g TW92ZVRvUHJldmlvdXNMaW5lLAorICAgICJNb3ZlVG9CZWdpbm5pbmdPZkxpbmUiLCAvLyBNb3Zl VG9TdGFydE9mTGluZSwKKyAgICAiTW92ZVRvRW5kT2ZMaW5lIiwgLy8gTW92ZVRvRW5kT2ZMaW5l LAorICAgICJNb3ZlVG9CZWdpbm5pbmdPZlBhcmFncmFwaCIsIC8vIE1vdmVUb1N0YXJ0T2ZCbG9j aywKKyAgICAiTW92ZVRvRW5kT2ZQYXJhZ3JhcGgiLCAvLyBNb3ZlVG9FbmRPZkJsb2NrLAorICAg ICJNb3ZlVG9CZWdpbm5pbmdPZkRvY3VtZW50IiwgLy8gTW92ZVRvU3RhcnRPZkRvY3VtZW50LAor ICAgICJNb3ZlVG9FbmRPZkRvY3VtZW50IiwgLy8gTW92ZVRvRW5kT2ZEb2N1bWVudCwKKyAgICAi TW92ZUZvcndhcmRBbmRNb2RpZnlTZWxlY3Rpb24iLCAvLyBTZWxlY3ROZXh0Q2hhciwKKyAgICAi TW92ZUJhY2t3YXJkQW5kTW9kaWZ5U2VsZWN0aW9uIiwgLy8gU2VsZWN0UHJldmlvdXNDaGFyLAor ICAgICJNb3ZlV29yZEZvcndhcmRBbmRNb2RpZnlTZWxlY3Rpb24iLCAvLyBTZWxlY3ROZXh0V29y ZCwKKyAgICAiTW92ZVdvcmRCYWNrd2FyZEFuZE1vZGlmeVNlbGVjdGlvbiIsIC8vIFNlbGVjdFBy ZXZpb3VzV29yZCwKKyAgICAiTW92ZURvd25BbmRNb2RpZnlTZWxlY3Rpb24iLCAvLyBTZWxlY3RO ZXh0TGluZSwKKyAgICAiTW92ZVVwQW5kTW9kaWZ5U2VsZWN0aW9uIiwgLy8gU2VsZWN0UHJldmlv dXNMaW5lLAorICAgICJNb3ZlVG9CZWdpbm5pbmdPZkxpbmVBbmRNb2RpZnlTZWxlY3Rpb24iLCAv LyBTZWxlY3RTdGFydE9mTGluZSwKKyAgICAiTW92ZVRvRW5kT2ZMaW5lQW5kTW9kaWZ5U2VsZWN0 aW9uIiwgLy8gU2VsZWN0RW5kT2ZMaW5lLAorICAgICJNb3ZlVG9CZWdpbm5pbmdPZlBhcmFncmFw aEFuZE1vZGlmeVNlbGVjdGlvbiIsIC8vIFNlbGVjdFN0YXJ0T2ZCbG9jaywKKyAgICAiTW92ZVRv RW5kT2ZQYXJhZ3JhcGhBbmRNb2RpZnlTZWxlY3Rpb24iLCAvLyBTZWxlY3RFbmRPZkJsb2NrLAor ICAgICJNb3ZlVG9CZWdpbm5pbmdPZkRvY3VtZW50QW5kTW9kaWZ5U2VsZWN0aW9uIiwgLy9TZWxl Y3RTdGFydE9mRG9jdW1lbnQsCisgICAgIk1vdmVUb0VuZE9mRG9jdW1lbnRBbmRNb2RpZnlTZWxl Y3Rpb24iLCAvLyBTZWxlY3RFbmRPZkRvY3VtZW50LAorICAgICJEZWxldGVXb3JkQmFja3dhcmQi LCAvLyBEZWxldGVTdGFydE9mV29yZCwKKyAgICAiRGVsZXRlV29yZEZvcndhcmQiLCAvLyBEZWxl dGVFbmRPZldvcmQsCisgICAgCisgICAgMCwgLy8gU2V0VGV4dERpcmVjdGlvbkRlZmF1bHQsCisg ICAgMCwgLy8gU2V0VGV4dERpcmVjdGlvbkxlZnRUb1JpZ2h0LAorICAgIDAsIC8vIFNldFRleHRE aXJlY3Rpb25SaWdodFRvTGVmdCwKKyAgICAKKyAgICAiVG9nZ2xlQm9sZCIsIC8vIFRvZ2dsZUJv bGQsCisgICAgIlRvZ2dsZUl0YWxpYyIsIC8vIFRvZ2dsZUl0YWxpYywKKyAgICAiVG9nZ2xlVW5k ZXJsaW5lIiwgLy8gVG9nZ2xlVW5kZXJsaW5lLAorICAgIAorICAgIDAsIC8vIEluc3BlY3RFbGVt ZW50LAorCisgICAgMCAvLyBXZWJBY3Rpb25Db3VudAorfTsKKworLy8gTG9va3VwIHRoZSBhcHBy b3ByaWF0ZSBlZGl0b3IgY29tbWFuZCB0byB1c2UgZm9yIFdlYkFjdGlvbiBcYSBhY3Rpb24KK3N0 YXRpYyBjb25zdCBjaGFyKiBlZGl0b3JDb21tYW5kRm9yV2ViQWN0aW9ucyhRV2ViUGFnZTo6V2Vi QWN0aW9uIGFjdGlvbikKK3sKKyAgICBpZiAoKGFjdGlvbiA+IFFXZWJQYWdlOjpOb1dlYkFjdGlv bikgJiYgKGFjdGlvbiA8IGludChzaXplb2YoZWRpdG9yQ29tbWFuZFdlYkFjdGlvbnMpIC8gc2l6 ZW9mKGNvbnN0IGNoYXIqKSkpKQorICAgICAgICByZXR1cm4gZWRpdG9yQ29tbWFuZFdlYkFjdGlv bnNbYWN0aW9uXTsKKyAgICAKKyAgICByZXR1cm4gMDsKK30KKwogI2lmbmRlZiBRVF9OT19DVVJT T1IKIFNldEN1cnNvckV2ZW50OjpTZXRDdXJzb3JFdmVudChjb25zdCBRQ3Vyc29yJiBjdXJzb3Ip CiAgICAgOiBRRXZlbnQoc3RhdGljX2Nhc3Q8UUV2ZW50OjpUeXBlPihFdmVudFR5cGUpKQpAQCAt MzI1LDYgKzQwMCw3IEBAIHZvaWQgUVdlYlBhZ2VQcml2YXRlOjp1cGRhdGVBY3Rpb24oUVdlYlAK ICAgICBXZWJDb3JlOjpFZGl0b3IgKmVkaXRvciA9IHBhZ2UtPmZvY3VzQ29udHJvbGxlcigpLT5m b2N1c2VkT3JNYWluRnJhbWUoKS0+ZWRpdG9yKCk7CiAKICAgICBib29sIGVuYWJsZWQgPSBhLT5p c0VuYWJsZWQoKTsKKyAgICBib29sIGNoZWNrZWQgPSBhLT5pc0NoZWNrZWQoKTsKIAogICAgIHN3 aXRjaCAoYWN0aW9uKSB7CiAgICAgICAgIGNhc2UgUVdlYlBhZ2U6OkJhY2s6CkBAIC0zNTIsMTAg KzQyOCwyMiBAQCB2b2lkIFFXZWJQYWdlUHJpdmF0ZTo6dXBkYXRlQWN0aW9uKFFXZWJQCiAgICAg ICAgIGNhc2UgUVdlYlBhZ2U6OlJlZG86CiAgICAgICAgICAgICAvLyB0aG9zZSB0d28gYXJlIGhh bmRsZWQgYnkgUVVuZG9TdGFjawogICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgUVdl YlBhZ2U6OlRvZ2dsZUJvbGQ6CisgICAgICAgIGNhc2UgUVdlYlBhZ2U6OlRvZ2dsZUl0YWxpYzoK KyAgICAgICAgY2FzZSBRV2ViUGFnZTo6VG9nZ2xlVW5kZXJsaW5lOgorICAgICAgICAgICAgZW5h YmxlZCA9IGVkaXRvci0+Y2FuRWRpdFJpY2hseSgpOworICAgICAgICAgICAgaWYgKGVuYWJsZWQp CisgICAgICAgICAgICAgICAgY2hlY2tlZCA9IGVkaXRvci0+Y29tbWFuZChlZGl0b3JDb21tYW5k Rm9yV2ViQWN0aW9ucyhhY3Rpb24pKS5zdGF0ZSgpICE9IEZhbHNlVHJpU3RhdGU7CisgICAgICAg ICAgICBlbHNlCisgICAgICAgICAgICAgICAgY2hlY2tlZCA9IGZhbHNlOworICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgIGRlZmF1bHQ6IGJyZWFrOwogICAgIH0KIAogICAgIGEtPnNldEVuYWJs ZWQoZW5hYmxlZCk7CisKKyAgICBpZiAoYS0+aXNDaGVja2FibGUoKSkKKyAgICAgICAgYS0+c2V0 Q2hlY2tlZChjaGVja2VkKTsKIH0KIAogdm9pZCBRV2ViUGFnZVByaXZhdGU6OnVwZGF0ZU5hdmln YXRpb25BY3Rpb25zKCkKQEAgLTM3MSw2ICs0NTksOSBAQCB2b2lkIFFXZWJQYWdlUHJpdmF0ZTo6 dXBkYXRlRWRpdG9yQWN0aW9uCiAgICAgdXBkYXRlQWN0aW9uKFFXZWJQYWdlOjpDdXQpOwogICAg IHVwZGF0ZUFjdGlvbihRV2ViUGFnZTo6Q29weSk7CiAgICAgdXBkYXRlQWN0aW9uKFFXZWJQYWdl OjpQYXN0ZSk7CisgICAgdXBkYXRlQWN0aW9uKFFXZWJQYWdlOjpUb2dnbGVCb2xkKTsKKyAgICB1 cGRhdGVBY3Rpb24oUVdlYlBhZ2U6OlRvZ2dsZUl0YWxpYyk7CisgICAgdXBkYXRlQWN0aW9uKFFX ZWJQYWdlOjpUb2dnbGVVbmRlcmxpbmUpOwogfQogCiB2b2lkIFFXZWJQYWdlUHJpdmF0ZTo6dGlt ZXJFdmVudChRVGltZXJFdmVudCAqZXYpCkBAIC0xMjY5LDEwMiArMTM2MCw2IEBAIHZvaWQgUVdl YlBhZ2U6OnRyaWdnZXJBY3Rpb24oV2ViQWN0aW9uIGEKICAgICAgICAgY2FzZSBSZWxvYWQ6CiAg ICAgICAgICAgICBtYWluRnJhbWUoKS0+ZC0+ZnJhbWUtPmxvYWRlcigpLT5yZWxvYWQoKTsKICAg ICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIEN1dDoKLSAgICAgICAgICAgIGNvbW1hbmQg PSAiQ3V0IjsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIENvcHk6Ci0gICAgICAg ICAgICBjb21tYW5kID0gIkNvcHkiOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2Ug UGFzdGU6Ci0gICAgICAgICAgICBjb21tYW5kID0gIlBhc3RlIjsKLSAgICAgICAgICAgIGJyZWFr OwotCi0gICAgICAgIGNhc2UgVW5kbzoKLSAgICAgICAgICAgIGNvbW1hbmQgPSAiVW5kbyI7Ci0g ICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBSZWRvOgotICAgICAgICAgICAgY29tbWFu ZCA9ICJSZWRvIjsKLSAgICAgICAgICAgIGJyZWFrOwotCi0gICAgICAgIGNhc2UgTW92ZVRvTmV4 dENoYXI6Ci0gICAgICAgICAgICBjb21tYW5kID0gIk1vdmVGb3J3YXJkIjsKLSAgICAgICAgICAg IGJyZWFrOwotICAgICAgICBjYXNlIE1vdmVUb1ByZXZpb3VzQ2hhcjoKLSAgICAgICAgICAgIGNv bW1hbmQgPSAiTW92ZUJhY2t3YXJkIjsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNl IE1vdmVUb05leHRXb3JkOgotICAgICAgICAgICAgY29tbWFuZCA9ICJNb3ZlV29yZEZvcndhcmQi OwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgTW92ZVRvUHJldmlvdXNXb3JkOgot ICAgICAgICAgICAgY29tbWFuZCA9ICJNb3ZlV29yZEJhY2t3YXJkIjsKLSAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICBjYXNlIE1vdmVUb05leHRMaW5lOgotICAgICAgICAgICAgY29tbWFuZCA9 ICJNb3ZlRG93biI7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBNb3ZlVG9QcmV2 aW91c0xpbmU6Ci0gICAgICAgICAgICBjb21tYW5kID0gIk1vdmVVcCI7Ci0gICAgICAgICAgICBi cmVhazsKLSAgICAgICAgY2FzZSBNb3ZlVG9TdGFydE9mTGluZToKLSAgICAgICAgICAgIGNvbW1h bmQgPSAiTW92ZVRvQmVnaW5uaW5nT2ZMaW5lIjsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAg ICBjYXNlIE1vdmVUb0VuZE9mTGluZToKLSAgICAgICAgICAgIGNvbW1hbmQgPSAiTW92ZVRvRW5k T2ZMaW5lIjsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIE1vdmVUb1N0YXJ0T2ZC bG9jazoKLSAgICAgICAgICAgIGNvbW1hbmQgPSAiTW92ZVRvQmVnaW5uaW5nT2ZQYXJhZ3JhcGgi OwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgTW92ZVRvRW5kT2ZCbG9jazoKLSAg ICAgICAgICAgIGNvbW1hbmQgPSAiTW92ZVRvRW5kT2ZQYXJhZ3JhcGgiOwotICAgICAgICAgICAg YnJlYWs7Ci0gICAgICAgIGNhc2UgTW92ZVRvU3RhcnRPZkRvY3VtZW50OgotICAgICAgICAgICAg Y29tbWFuZCA9ICJNb3ZlVG9CZWdpbm5pbmdPZkRvY3VtZW50IjsKLSAgICAgICAgICAgIGJyZWFr OwotICAgICAgICBjYXNlIE1vdmVUb0VuZE9mRG9jdW1lbnQ6Ci0gICAgICAgICAgICBjb21tYW5k ID0gIk1vdmVUb0VuZE9mRG9jdW1lbnQiOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNh c2UgU2VsZWN0TmV4dENoYXI6Ci0gICAgICAgICAgICBjb21tYW5kID0gIk1vdmVGb3J3YXJkQW5k TW9kaWZ5U2VsZWN0aW9uIjsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIFNlbGVj dFByZXZpb3VzQ2hhcjoKLSAgICAgICAgICAgIGNvbW1hbmQgPSAiTW92ZUJhY2t3YXJkQW5kTW9k aWZ5U2VsZWN0aW9uIjsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIFNlbGVjdE5l eHRXb3JkOgotICAgICAgICAgICAgY29tbWFuZCA9ICJNb3ZlV29yZEZvcndhcmRBbmRNb2RpZnlT ZWxlY3Rpb24iOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgU2VsZWN0UHJldmlv dXNXb3JkOgotICAgICAgICAgICAgY29tbWFuZCA9ICJNb3ZlV29yZEJhY2t3YXJkQW5kTW9kaWZ5 U2VsZWN0aW9uIjsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIFNlbGVjdE5leHRM aW5lOgotICAgICAgICAgICAgY29tbWFuZCA9ICJNb3ZlRG93bkFuZE1vZGlmeVNlbGVjdGlvbiI7 Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBTZWxlY3RQcmV2aW91c0xpbmU6Ci0g ICAgICAgICAgICBjb21tYW5kID0gIk1vdmVVcEFuZE1vZGlmeVNlbGVjdGlvbiI7Ci0gICAgICAg ICAgICBicmVhazsKLSAgICAgICAgY2FzZSBTZWxlY3RTdGFydE9mTGluZToKLSAgICAgICAgICAg IGNvbW1hbmQgPSAiTW92ZVRvQmVnaW5uaW5nT2ZMaW5lQW5kTW9kaWZ5U2VsZWN0aW9uIjsKLSAg ICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIFNlbGVjdEVuZE9mTGluZToKLSAgICAgICAg ICAgIGNvbW1hbmQgPSAiTW92ZVRvRW5kT2ZMaW5lQW5kTW9kaWZ5U2VsZWN0aW9uIjsKLSAgICAg ICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIFNlbGVjdFN0YXJ0T2ZCbG9jazoKLSAgICAgICAg ICAgIGNvbW1hbmQgPSAiTW92ZVRvQmVnaW5uaW5nT2ZQYXJhZ3JhcGhBbmRNb2RpZnlTZWxlY3Rp b24iOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgU2VsZWN0RW5kT2ZCbG9jazoK LSAgICAgICAgICAgIGNvbW1hbmQgPSAiTW92ZVRvRW5kT2ZQYXJhZ3JhcGhBbmRNb2RpZnlTZWxl Y3Rpb24iOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgU2VsZWN0U3RhcnRPZkRv Y3VtZW50OgotICAgICAgICAgICAgY29tbWFuZCA9ICJNb3ZlVG9CZWdpbm5pbmdPZkRvY3VtZW50 QW5kTW9kaWZ5U2VsZWN0aW9uIjsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIFNl bGVjdEVuZE9mRG9jdW1lbnQ6Ci0gICAgICAgICAgICBjb21tYW5kID0gIk1vdmVUb0VuZE9mRG9j dW1lbnRBbmRNb2RpZnlTZWxlY3Rpb24iOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNh c2UgRGVsZXRlU3RhcnRPZldvcmQ6Ci0gICAgICAgICAgICBjb21tYW5kID0gIkRlbGV0ZVdvcmRC YWNrd2FyZCI7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBEZWxldGVFbmRPZldv cmQ6Ci0gICAgICAgICAgICBjb21tYW5kID0gIkRlbGV0ZVdvcmRGb3J3YXJkIjsKLSAgICAgICAg ICAgIGJyZWFrOwotCiAgICAgICAgIGNhc2UgU2V0VGV4dERpcmVjdGlvbkRlZmF1bHQ6CiAgICAg ICAgICAgICBlZGl0b3ItPnNldEJhc2VXcml0aW5nRGlyZWN0aW9uKE5hdHVyYWxXcml0aW5nRGly ZWN0aW9uKTsKICAgICAgICAgICAgIGJyZWFrOwpAQCAtMTM3NCwyMiArMTM2OSwxMiBAQCB2b2lk IFFXZWJQYWdlOjp0cmlnZ2VyQWN0aW9uKFdlYkFjdGlvbiBhCiAgICAgICAgIGNhc2UgU2V0VGV4 dERpcmVjdGlvblJpZ2h0VG9MZWZ0OgogICAgICAgICAgICAgZWRpdG9yLT5zZXRCYXNlV3JpdGlu Z0RpcmVjdGlvbihSaWdodFRvTGVmdFdyaXRpbmdEaXJlY3Rpb24pOwogICAgICAgICAgICAgYnJl YWs7Ci0KLSAgICAgICAgY2FzZSBUb2dnbGVCb2xkOgotICAgICAgICAgICAgY29tbWFuZCA9ICJU b2dnbGVCb2xkIjsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIFRvZ2dsZUl0YWxp YzoKLSAgICAgICAgICAgIGNvbW1hbmQgPSAiVG9nZ2xlSXRhbGljIjsKLSAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICBjYXNlIFRvZ2dsZVVuZGVybGluZToKLSAgICAgICAgICAgIGVkaXRvci0+ dG9nZ2xlVW5kZXJsaW5lKCk7Ci0gICAgICAgICAgICBicmVhazsKLQogICAgICAgICBjYXNlIElu c3BlY3RFbGVtZW50OgogICAgICAgICAgICAgZC0+cGFnZS0+aW5zcGVjdG9yQ29udHJvbGxlcigp LT5pbnNwZWN0KGQtPmhpdFRlc3RSZXN1bHQuZC0+aW5uZXJOb25TaGFyZWROb2RlLmdldCgpKTsK ICAgICAgICAgICAgIGJyZWFrOwotCi0gICAgICAgIGRlZmF1bHQ6IGJyZWFrOworICAgICAgICBk ZWZhdWx0OgorICAgICAgICAgICAgY29tbWFuZCA9IGVkaXRvckNvbW1hbmRGb3JXZWJBY3Rpb25z KGFjdGlvbik7CisgICAgICAgICAgICBicmVhazsKICAgICB9CiAKICAgICBpZiAoY29tbWFuZCkK QEAgLTE3NzksNiArMTc2NCw4IEBAIHZvaWQgUVdlYlBhZ2U6OnNldEVkaXRhYmxlKGJvb2wgZWRp dGFibGUKICAgICAgICAgICAgICAgICBmcmFtZS0+cmVtb3ZlRWRpdGluZ1N0eWxlRnJvbUJvZHlF bGVtZW50KCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KKworICAgICAgICBkLT51cGRhdGVF ZGl0b3JBY3Rpb25zKCk7CiAgICAgfQogfQogCg==