74337 2011-12-12 14:28:20 -0800 WebKit code shouldn't be calling applyCommand directly 2011-12-12 14:53:39 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 74249 1 rniwa rniwa darin dcheng enrica mrobinson xan.lopez oldest_to_newest 519473 0 rniwa 2011-12-12 14:28:20 -0800 CompositeEditCommands are implementation-details in WebCore and shouldn't be exposed to WebKit layer. 519486 1 118851 rniwa 2011-12-12 14:36:26 -0800 Created attachment 118851 cleanup 519490 2 118851 darin 2011-12-12 14:41:52 -0800 Comment on attachment 118851 cleanup View in context: https://bugs.webkit.org/attachment.cgi?id=118851&action=review > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:2246 > + bool selectReplacement = true; > + bool smartReplace = 0; > + return frame->editor()->replaceSelectionWithText(text, selectReplacement, smartReplace); We should change this to flags or enums, longer term. Also, we should use false instead of 0. 519504 3 118851 rniwa 2011-12-12 14:48:45 -0800 Comment on attachment 118851 cleanup View in context: https://bugs.webkit.org/attachment.cgi?id=118851&action=review Thanks for the review! >> Source/WebKit2/WebProcess/WebPage/WebPage.cpp:2246 >> + return frame->editor()->replaceSelectionWithText(text, selectReplacement, smartReplace); > > We should change this to flags or enums, longer term. Also, we should use false instead of 0. Oops, 0 was my mistake. Will fix. > Source/WebKit/chromium/src/WebFrameImpl.cpp:1125 > + bool selectReplacement = true; Oops, this should be false also. Will fix before landing it. 519519 4 rniwa 2011-12-12 14:53:39 -0800 Committed r102627: <http://trac.webkit.org/changeset/102627> 118851 2011-12-12 14:36:26 -0800 2011-12-12 14:48:45 -0800 cleanup bug-74337-20111212143625.patch text/plain 13172 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMjYyMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDExLTEyLTEyICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFdlYktpdCBjb2RlIHNob3VsZG4n dCBiZSBjYWxsaW5nIGFwcGx5Q29tbWFuZCBkaXJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQzMzcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIFdlYktpdC1sYXllciBjb2RlIGNhbGwgRWRp dG9yOjpyZXBsYWNlU2VsZWN0aW9uV2l0aEZyYWdtZW50IGFuZCBFZGl0b3I6OnJlcGxhY2VTZWxl Y3Rpb25XaXRoVGV4dAorICAgICAgICBpbnN0ZWFkIG9mIG1hbnVhbGx5IGNyZWF0aW5nIGFuZCBh cHBseWluZyBSZXBsYWNlU2VsZWN0aW9uQ29tbWFuZC4KKworICAgICAgICBUaGUgb25seSBiZWhh dmlvcmFsIGRpZmZlcmVuY2UgaXMgdGhhdCBuZXcgY29kZSB3aWxsIGVuZCB1cCBjaGVja2luZyBm b3Igc3BlbGwgY2hlY2tzLiBIb3dldmVyLCB0aGlzCisgICAgICAgIGRpZmZlcmVuY2UgYXBwZWFy cyB0byBiZSB1bmludGVudGlvbmFsIHNpbmNlIHRoZSBjb2RlIHByZWRhdGVzIGh0dHA6Ly90cmFj LndlYmtpdC5vcmcvY2hhbmdlc2V0LzczODg2LAorICAgICAgICB3aGljaCBpbnRyb2R1Y2VkIGFu IGludm9jYXRpb24gb2Ygc3BlbGxjaGVjayBjb2RlLgorCisgICAgICAgIFVuZm9ydHVuYXRlbHkg bm8gdGVzdHMgc2luY2UgdGhlcmUgZG9lc24ndCBzZWVtIHRvIGJlIGFueXdheSB0byB0ZXN0IHRo aXMgY2hhbmdlLgorCisgICAgICAgICogV2ViQ29yZS5leHAuaW46CisgICAgICAgICogZWRpdGlu Zy9FZGl0Q29tbWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjphcHBseUNvbW1hbmQpOgorICAg ICAgICAqIGVkaXRpbmcvRWRpdENvbW1hbmQuaDoKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5o OgorCiAyMDExLTExLTI2ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgUmVtb3ZlIHBsYXRmb3JtL2F1ZGlvL2ZmdHcKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL1dlYkNv cmUuZXhwLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCShy ZXZpc2lvbiAxMDI2MDgpCisrKyBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkod29ya2lu ZyBjb3B5KQpAQCAtMzAyLDcgKzMwMiw2IEBAIF9fWk43V2ViQ29yZTEyVGV4dEl0ZXJhdG9yOHN1 YnJhbmdlRVBOU18KIF9fWk43V2ViQ29yZTEyVGV4dEl0ZXJhdG9yQzFFUEtOU181UmFuZ2VFTlNf MjBUZXh0SXRlcmF0b3JCZWhhdmlvckUKIF9fWk43V2ViQ29yZTEyVGV4dEl0ZXJhdG9yRDFFdgog X19aTjdXZWJDb3JlMTJXb3JrZXJUaHJlYWQxN3dvcmtlclRocmVhZENvdW50RXYKLV9fWk43V2Vi Q29yZTEyYXBwbHlDb21tYW5kRU4zV1RGMTBQYXNzUmVmUHRySU5TXzExRWRpdENvbW1hbmRFRUUK IF9fWk43V2ViQ29yZTEyY2FjaGVTdG9yYWdlRXYKIF9fWk43V2ViQ29yZTEyY3JlYXRlTWFya3Vw RVBLTlNfNE5vZGVFTlNfMTNFQ2hpbGRyZW5Pbmx5RVBOM1dURjZWZWN0b3JJUFMwX0xtMEVFRU5T XzEzRUFic29sdXRlVVJMc0UKIF9fWk43V2ViQ29yZTEyY3JlYXRlTWFya3VwRVBLTlNfNVJhbmdl RVBOM1dURjZWZWN0b3JJUE5TXzROb2RlRUxtMEVFRU5TXzIzRUFubm90YXRlRm9ySW50ZXJjaGFu Z2VFYk5TXzEzRUFic29sdXRlVVJMc0UKQEAgLTYzOCw3ICs2MzcsNiBAQCBfX1pON1dlYkNvcmUy MmNyZWF0ZUZyYWdtZW50RnJvbVRleHRFUE5TCiBfX1pON1dlYkNvcmUyMmV4dGVybmFsUmVwcmVz ZW50YXRpb25FUE5TXzVGcmFtZUVqCiBfX1pON1dlYkNvcmUyMmV4dGVybmFsUmVwcmVzZW50YXRp b25FUE5TXzdFbGVtZW50RWoKIF9fWk43V2ViQ29yZTIzQXV0aGVudGljYXRpb25DaGFsbGVuZ2VD MUVSS05TXzE1UHJvdGVjdGlvblNwYWNlRVJLTlNfMTBDcmVkZW50aWFsRWpSS05TXzE2UmVzb3Vy Y2VSZXNwb25zZUVSS05TXzEzUmVzb3VyY2VFcnJvckUKLV9fWk43V2ViQ29yZTIzUmVwbGFjZVNl bGVjdGlvbkNvbW1hbmRDMUVQTlNfOERvY3VtZW50RU4zV1RGMTBQYXNzUmVmUHRySU5TXzE2RG9j dW1lbnRGcmFnbWVudEVFRWpOU18xMEVkaXRBY3Rpb25FCiBfX1pON1dlYkNvcmUyM2NyZWF0ZUZy YWdtZW50RnJvbU5vZGVzRVBOU184RG9jdW1lbnRFUktOM1dURjZWZWN0b3JJUE5TXzROb2RlRUxt MEVFRQogX19aTjdXZWJDb3JlMjNnZXRIb3N0bmFtZXNXaXRoQ29va2llc0VSTjNXVEY3SGFzaFNl dElOUzBfNlN0cmluZ0VOUzBfMTBTdHJpbmdIYXNoRU5TMF8xMEhhc2hUcmFpdHNJUzJfRUVFRQog X19aTjdXZWJDb3JlMjNvdmVycmlkZURlZmF1bHRMYW5ndWFnZUVSS04zV1RGNlN0cmluZ0UKQEAg LTg0MSw2ICs4MzksNyBAQCBfX1pON1dlYkNvcmU2RWRpdG9yMjFhcHBseVN0eWxlVG9TZWxlY3Rp CiBfX1pON1dlYkNvcmU2RWRpdG9yMjFpc1NlbGVjdGlvbk1pc3NwZWxsZWRFdgogX19aTjdXZWJD b3JlNkVkaXRvcjIzc2V0QmFzZVdyaXRpbmdEaXJlY3Rpb25FMTZXcml0aW5nRGlyZWN0aW9uCiBf X1pON1dlYkNvcmU2RWRpdG9yMjRhZHZhbmNlVG9OZXh0TWlzc3BlbGxpbmdFYgorX19aTjdXZWJD b3JlNkVkaXRvcjI0cmVwbGFjZVNlbGVjdGlvbldpdGhUZXh0RVJLTjNXVEY2U3RyaW5nRWJiCiBf X1pON1dlYkNvcmU2RWRpdG9yMjRjb21wdXRlQW5kU2V0VHlwaW5nU3R5bGVFUE5TXzE5Q1NTU3R5 bGVEZWNsYXJhdGlvbkVOU18xMEVkaXRBY3Rpb25FCiBfX1pON1dlYkNvcmU2RWRpdG9yMjRpc1Nl bGVjdGlvblVuZ3JhbW1hdGljYWxFdgogX19aTjdXZWJDb3JlNkVkaXRvcjI2ZGVjcmVhc2VTZWxl Y3Rpb25MaXN0TGV2ZWxFdgpAQCAtODQ4LDYgKzg0Nyw3IEBAIF9fWk43V2ViQ29yZTZFZGl0b3Iy NmluY3JlYXNlU2VsZWN0aW9uTGkKIF9fWk43V2ViQ29yZTZFZGl0b3IyNndyaXRlU2VsZWN0aW9u VG9QYXN0ZWJvYXJkRVJLTjNXVEY2U3RyaW5nRVJLTlMxXzZWZWN0b3JJUzJfTG0wRUVFCiBfX1pO N1dlYkNvcmU2RWRpdG9yMjdoYW5kbGVDb3JyZWN0aW9uUGFuZWxSZXN1bHRFUktOM1dURjZTdHJp bmdFCiBfX1pON1dlYkNvcmU2RWRpdG9yMjdyZWFkU2VsZWN0aW9uRnJvbVBhc3RlYm9hcmRFUktO M1dURjZTdHJpbmdFCitfX1pON1dlYkNvcmU2RWRpdG9yMjhyZXBsYWNlU2VsZWN0aW9uV2l0aEZy YWdtZW50RU4zV1RGMTBQYXNzUmVmUHRySU5TXzE2RG9jdW1lbnRGcmFnbWVudEVFRWJiYgogX19a TjdXZWJDb3JlNkVkaXRvcjI5Y2FuRGVjcmVhc2VTZWxlY3Rpb25MaXN0TGV2ZWxFdgogX19aTjdX ZWJDb3JlNkVkaXRvcjI5Y2FuSW5jcmVhc2VTZWxlY3Rpb25MaXN0TGV2ZWxFdgogX19aTjdXZWJD b3JlNkVkaXRvcjMwYXBwbHlQYXJhZ3JhcGhTdHlsZVRvU2VsZWN0aW9uRVBOU18xOUNTU1N0eWxl RGVjbGFyYXRpb25FTlNfMTBFZGl0QWN0aW9uRQpJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9FZGl0Q29tbWFuZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9F ZGl0Q29tbWFuZC5jcHAJKHJldmlzaW9uIDEwMjYwOCkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRp bmcvRWRpdENvbW1hbmQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNTksNyArMjU5LDcgQEAgdm9p ZCBTaW1wbGVFZGl0Q29tbWFuZDo6YWRkTm9kZUFuZERlc2NlbgogfQogI2VuZGlmCiAKLXZvaWQg YXBwbHlDb21tYW5kKFBhc3NSZWZQdHI8RWRpdENvbW1hbmQ+IGNvbW1hbmQpCit2b2lkIGFwcGx5 Q29tbWFuZChQYXNzUmVmUHRyPENvbXBvc2l0ZUVkaXRDb21tYW5kPiBjb21tYW5kKQogewogICAg IGNvbW1hbmQtPmFwcGx5KCk7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRD b21tYW5kLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0Q29tbWFu ZC5oCShyZXZpc2lvbiAxMDI2MDgpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRDb21t YW5kLmgJKHdvcmtpbmcgY29weSkKQEAgLTk1LDcgKzk1LDcgQEAgcHJpdmF0ZToKICAgICBSZWZQ dHI8RWxlbWVudD4gbV9lbmRpbmdSb290RWRpdGFibGVFbGVtZW50OwogICAgIENvbXBvc2l0ZUVk aXRDb21tYW5kKiBtX3BhcmVudDsKIAotICAgIGZyaWVuZCB2b2lkIGFwcGx5Q29tbWFuZChQYXNz UmVmUHRyPEVkaXRDb21tYW5kPik7CisgICAgZnJpZW5kIHZvaWQgYXBwbHlDb21tYW5kKFBhc3NS ZWZQdHI8Q29tcG9zaXRlRWRpdENvbW1hbmQ+KTsKIH07CiAKIGNsYXNzIFNpbXBsZUVkaXRDb21t YW5kIDogcHVibGljIEVkaXRDb21tYW5kIHsKQEAgLTEyMyw3ICsxMjMsNyBAQCBpbmxpbmUgU2lt cGxlRWRpdENvbW1hbmQqIHRvU2ltcGxlRWRpdENvCiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PFNp bXBsZUVkaXRDb21tYW5kKj4oY29tbWFuZCk7CiB9CiAKLXZvaWQgYXBwbHlDb21tYW5kKFBhc3NS ZWZQdHI8RWRpdENvbW1hbmQ+KTsKK3ZvaWQgYXBwbHlDb21tYW5kKFBhc3NSZWZQdHI8Q29tcG9z aXRlRWRpdENvbW1hbmQ+KTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvRWRpdG9yLmgJKHJldmlzaW9uIDEwMjYwOCkKKysrIFNvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvRWRpdG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTM3NCw2ICszNzQsOCBAQCBwdWJsaWM6 CiAgICAgdm9pZCByZWFkU2VsZWN0aW9uRnJvbVBhc3RlYm9hcmQoY29uc3QgU3RyaW5nJiBwYXN0 ZWJvYXJkTmFtZSk7CiAjZW5kaWYKIAorICAgIHZvaWQgcmVwbGFjZVNlbGVjdGlvbldpdGhGcmFn bWVudChQYXNzUmVmUHRyPERvY3VtZW50RnJhZ21lbnQ+LCBib29sIHNlbGVjdFJlcGxhY2VtZW50 LCBib29sIHNtYXJ0UmVwbGFjZSwgYm9vbCBtYXRjaFN0eWxlKTsKKyAgICB2b2lkIHJlcGxhY2VT ZWxlY3Rpb25XaXRoVGV4dChjb25zdCBTdHJpbmcmLCBib29sIHNlbGVjdFJlcGxhY2VtZW50LCBi b29sIHNtYXJ0UmVwbGFjZSk7CiAgICAgYm9vbCBzZWxlY3Rpb25TdGFydEhhc01hcmtlckZvcihE b2N1bWVudE1hcmtlcjo6TWFya2VyVHlwZSwgaW50IGZyb20sIGludCBsZW5ndGgpIGNvbnN0Owog ICAgIHZvaWQgdXBkYXRlTWFya2Vyc0ZvcldvcmRzQWZmZWN0ZWRCeUVkaXRpbmcoYm9vbCBvbmx5 SGFuZGxlV29yZHNDb250YWluaW5nU2VsZWN0aW9uKTsKICAgICB2b2lkIGRlbGV0ZWRBdXRvY29y cmVjdGlvbkF0UG9zaXRpb24oY29uc3QgUG9zaXRpb24mLCBjb25zdCBTdHJpbmcmIG9yaWdpbmFs U3RyaW5nKTsKQEAgLTQwMyw4ICs0MDUsNiBAQCBwcml2YXRlOgogICAgIFBhc3NSZWZQdHI8Q2xp cGJvYXJkPiBuZXdHZW5lcmFsQ2xpcGJvYXJkKENsaXBib2FyZEFjY2Vzc1BvbGljeSwgRnJhbWUq KTsKICAgICB2b2lkIHBhc3RlQXNQbGFpblRleHRXaXRoUGFzdGVib2FyZChQYXN0ZWJvYXJkKik7 CiAgICAgdm9pZCBwYXN0ZVdpdGhQYXN0ZWJvYXJkKFBhc3RlYm9hcmQqLCBib29sIGFsbG93UGxh aW5UZXh0KTsKLSAgICB2b2lkIHJlcGxhY2VTZWxlY3Rpb25XaXRoRnJhZ21lbnQoUGFzc1JlZlB0 cjxEb2N1bWVudEZyYWdtZW50PiwgYm9vbCBzZWxlY3RSZXBsYWNlbWVudCwgYm9vbCBzbWFydFJl cGxhY2UsIGJvb2wgbWF0Y2hTdHlsZSk7Ci0gICAgdm9pZCByZXBsYWNlU2VsZWN0aW9uV2l0aFRl eHQoY29uc3QgU3RyaW5nJiwgYm9vbCBzZWxlY3RSZXBsYWNlbWVudCwgYm9vbCBzbWFydFJlcGxh Y2UpOwogICAgIHZvaWQgd3JpdGVTZWxlY3Rpb25Ub1Bhc3RlYm9hcmQoUGFzdGVib2FyZCopOwog ICAgIHZvaWQgcmV2ZWFsU2VsZWN0aW9uQWZ0ZXJFZGl0aW5nT3BlcmF0aW9uKCk7CiAgICAgdm9p ZCBtYXJrTWlzc3BlbGxpbmdzT3JCYWRHcmFtbWFyKGNvbnN0IFZpc2libGVTZWxlY3Rpb24mLCBi b29sIGNoZWNrU3BlbGxpbmcsIFJlZlB0cjxSYW5nZT4mIGZpcnN0TWlzc3BlbGxpbmdSYW5nZSk7 CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCShyZXZpc2lvbiAxMDI2MjMpCisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMS0xMi0xMiAgUnlvc3Vr ZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KKworICAgICAgICBXZWJLaXQgY29kZSBzaG91bGRu J3QgYmUgY2FsbGluZyBhcHBseUNvbW1hbmQgZGlyZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0MzM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnJlcGxhY2VTZWxlY3Rpb25XaXRoVGV4dCk6 CisKIDIwMTEtMTItMTIgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAg ICAgIFBhZ2UgY2FjaGUgc2hvdWxkIHN1cHBvcnQgcGFnZXMgd2l0aCBwbHVnaW5zLgpJbmRleDog U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNp b24gMTAyNjA4KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMjQxLDEyICsyMjQxLDkgQEAgdm9pZCBXZWJQYWdlOjpk aWRTZWxlY3RJdGVtRnJvbUFjdGl2ZUNvbgogCiB2b2lkIFdlYlBhZ2U6OnJlcGxhY2VTZWxlY3Rp b25XaXRoVGV4dChGcmFtZSogZnJhbWUsIGNvbnN0IFN0cmluZyYgdGV4dCkKIHsKLSAgICBpZiAo ZnJhbWUtPnNlbGVjdGlvbigpLT5pc05vbmUoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgUmVm UHRyPERvY3VtZW50RnJhZ21lbnQ+IHRleHRGcmFnbWVudCA9IGNyZWF0ZUZyYWdtZW50RnJvbVRl eHQoZnJhbWUtPnNlbGVjdGlvbigpLT50b05vcm1hbGl6ZWRSYW5nZSgpLmdldCgpLCB0ZXh0KTsK LSAgICBhcHBseUNvbW1hbmQoUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQ6OmNyZWF0ZShmcmFtZS0+ ZG9jdW1lbnQoKSwgdGV4dEZyYWdtZW50LnJlbGVhc2UoKSwgUmVwbGFjZVNlbGVjdGlvbkNvbW1h bmQ6OlNlbGVjdFJlcGxhY2VtZW50IHwgUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQ6Ok1hdGNoU3R5 bGUgfCBSZXBsYWNlU2VsZWN0aW9uQ29tbWFuZDo6UHJldmVudE5lc3RpbmcpKTsKLSAgICBmcmFt ZS0+c2VsZWN0aW9uKCktPnJldmVhbFNlbGVjdGlvbihTY3JvbGxBbGlnbm1lbnQ6OmFsaWduVG9F ZGdlSWZOZWVkZWQpOworICAgIGJvb2wgc2VsZWN0UmVwbGFjZW1lbnQgPSB0cnVlOworICAgIGJv b2wgc21hcnRSZXBsYWNlID0gMDsKKyAgICByZXR1cm4gZnJhbWUtPmVkaXRvcigpLT5yZXBsYWNl U2VsZWN0aW9uV2l0aFRleHQodGV4dCwgc2VsZWN0UmVwbGFjZW1lbnQsIHNtYXJ0UmVwbGFjZSk7 CiB9CiAKIHZvaWQgV2ViUGFnZTo6Y2xlYXJTZWxlY3Rpb24oKQpJbmRleDogU291cmNlL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMjYyMykKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMTItMTIgIFJ5 b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV2ViS2l0IGNvZGUgc2hv dWxkbid0IGJlIGNhbGxpbmcgYXBwbHlDb21tYW5kIGRpcmVjdGx5CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDMzNworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3JjL1dlYkZyYW1lSW1wbC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYkZyYW1lSW1wbDo6cmVwbGFjZVNlbGVjdGlvbik6CisKIDIwMTEt MTItMTIgIERhdmlkIEdyb2dhbiAgPGRncm9nYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEZp eCBjb21waWxhdGlvbiBlcnJvciB3aGVuICFFTkFCTEUoV09SS0VSUykKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAkocmV2aXNpb24gMTAyNjA4KQor KysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTEyMiwxMCArMTEyMiw5IEBAIGJvb2wgV2ViRnJhbWVJbXBsOjp3aWxsU3VwcHJl c3NPcGVuZXJJbk4KIAogdm9pZCBXZWJGcmFtZUltcGw6OnJlcGxhY2VTZWxlY3Rpb24oY29uc3Qg V2ViU3RyaW5nJiB0ZXh0KQogewotICAgIFJlZlB0cjxEb2N1bWVudEZyYWdtZW50PiBmcmFnbWVu dCA9IGNyZWF0ZUZyYWdtZW50RnJvbVRleHQoCi0gICAgICAgIGZyYW1lKCktPnNlbGVjdGlvbigp LT50b05vcm1hbGl6ZWRSYW5nZSgpLmdldCgpLCB0ZXh0KTsKLSAgICBhcHBseUNvbW1hbmQoUmVw bGFjZVNlbGVjdGlvbkNvbW1hbmQ6OmNyZWF0ZSgKLSAgICAgICAgZnJhbWUoKS0+ZG9jdW1lbnQo KSwgZnJhZ21lbnQuZ2V0KCksIFJlcGxhY2VTZWxlY3Rpb25Db21tYW5kOjpTbWFydFJlcGxhY2Ug fCBSZXBsYWNlU2VsZWN0aW9uQ29tbWFuZDo6TWF0Y2hTdHlsZSB8IFJlcGxhY2VTZWxlY3Rpb25D b21tYW5kOjpQcmV2ZW50TmVzdGluZykpOworICAgIGJvb2wgc2VsZWN0UmVwbGFjZW1lbnQgPSB0 cnVlOworICAgIGJvb2wgc21hcnRSZXBsYWNlID0gdHJ1ZTsKKyAgICByZXR1cm4gZnJhbWUoKS0+ ZWRpdG9yKCktPnJlcGxhY2VTZWxlY3Rpb25XaXRoVGV4dCh0ZXh0LCBzZWxlY3RSZXBsYWNlbWVu dCwgc21hcnRSZXBsYWNlKTsKIH0KIAogdm9pZCBXZWJGcmFtZUltcGw6Omluc2VydFRleHQoY29u c3QgV2ViU3RyaW5nJiB0ZXh0KQpJbmRleDogU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwkocmV2aXNpb24gMTAyNjIz KQorKysgU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTMgQEAKKzIwMTEtMTItMTIgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgV2ViS2l0IGNvZGUgc2hvdWxkbid0IGJlIGNhbGxpbmcgYXBwbHlDb21tYW5kIGRp cmVjdGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03 NDMzNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog d2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJfZnJhbWVfcmVw bGFjZV9zZWxlY3Rpb24pOgorCiAyMDExLTEyLTEyICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5z b25AaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBndGtfd2lkZ2V0X3NpemVfYWxsb2NhdGUg Zm9yIHBsdWdpbiB3aWRnZXRzIHNob3VsZCBoYXBwZW4gaW4gdGhlIFdlYlZpZXcgc2l6ZS1hbGxv Y2F0ZSBtZXRob2QKSW5kZXg6IFNvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJmcmFt ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmZy YW1lLmNwcAkocmV2aXNpb24gMTAyNjA4KQorKysgU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dl YmtpdHdlYmZyYW1lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTk2LDEwICs5OTYsOSBAQCBXZWJL aXROZXR3b3JrUmVzcG9uc2UqIHdlYmtpdF93ZWJfZnJhbWVfCiB2b2lkIHdlYmtpdF93ZWJfZnJh bWVfcmVwbGFjZV9zZWxlY3Rpb24oV2ViS2l0V2ViRnJhbWUqIGZyYW1lLCBjb25zdCBjaGFyKiB0 ZXh0KQogewogICAgIEZyYW1lKiBjb3JlRnJhbWUgPSBjb3JlKGZyYW1lKTsKLSAgICBSZWZQdHI8 RG9jdW1lbnRGcmFnbWVudD4gZnJhZ21lbnQgPSBjcmVhdGVGcmFnbWVudEZyb21UZXh0KAotICAg ICAgICBjb3JlRnJhbWUtPnNlbGVjdGlvbigpLT50b05vcm1hbGl6ZWRSYW5nZSgpLmdldCgpLCB0 ZXh0KTsKLSAgICBhcHBseUNvbW1hbmQoUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQ6OmNyZWF0ZShj b3JlRnJhbWUtPmRvY3VtZW50KCksIGZyYWdtZW50LmdldCgpLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFJlcGxhY2VTZWxlY3Rpb25Db21tYW5kOjpT bWFydFJlcGxhY2UgfCBSZXBsYWNlU2VsZWN0aW9uQ29tbWFuZDo6TWF0Y2hTdHlsZSB8IFJlcGxh Y2VTZWxlY3Rpb25Db21tYW5kOjpQcmV2ZW50TmVzdGluZykpOworICAgIGJvb2wgc2VsZWN0UmVw bGFjZW1lbnQgPSBmYWxzZTsKKyAgICBib29sIHNtYXJ0UmVwbGFjZSA9IHRydWU7CisgICAgY29y ZUZyYW1lLT5lZGl0b3IoKS0+cmVwbGFjZVNlbGVjdGlvbldpdGhUZXh0KHRleHQsIHNlbGVjdFJl cGxhY2VtZW50LCBzbWFydFJlcGxhY2UpOwogfQogCiAvKioKSW5kZXg6IFNvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJ KHJldmlzaW9uIDEwMjYyMykKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDExLTEyLTEyICBSeW9zdWtlIE5pd2EgIDxybml3 YUB3ZWJraXQub3JnPgorCisgICAgICAgIFdlYktpdCBjb2RlIHNob3VsZG4ndCBiZSBjYWxsaW5n IGFwcGx5Q29tbWFuZCBkaXJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzQzMzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFdlYlZpZXcvV2ViRnJhbWUubW06CisgICAgICAgICgtW1dlYkZyYW1l IF9yZXBsYWNlU2VsZWN0aW9uV2l0aEZyYWdtZW50OnNlbGVjdFJlcGxhY2VtZW50OnNtYXJ0UmVw bGFjZTptYXRjaFN0eWxlOl0pOgorCiAyMDExLTEyLTEyICBCcmFkeSBFaWRzb24gIDxiZWlkc29u QGFwcGxlLmNvbT4KIAogICAgICAgICBQYWdlIGNhY2hlIHNob3VsZCBzdXBwb3J0IHBhZ2VzIHdp dGggcGx1Z2lucy4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWUubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbQkocmV2 aXNpb24gMTAyNjA4KQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbQko d29ya2luZyBjb3B5KQpAQCAtMTA0OCwxNSArMTA0OCw3IEBAIC0gKHZvaWQpX3JlcGxhY2VTZWxl Y3Rpb25XaXRoRnJhZ21lbnQ6KEQKIHsKICAgICBpZiAoX3ByaXZhdGUtPmNvcmVGcmFtZS0+c2Vs ZWN0aW9uKCktPmlzTm9uZSgpIHx8ICFmcmFnbWVudCkKICAgICAgICAgcmV0dXJuOwotICAgIFJl cGxhY2VTZWxlY3Rpb25Db21tYW5kOjpDb21tYW5kT3B0aW9ucyBvcHRpb25zID0gUmVwbGFjZVNl bGVjdGlvbkNvbW1hbmQ6OlByZXZlbnROZXN0aW5nOwotICAgIGlmIChzZWxlY3RSZXBsYWNlbWVu dCkKLSAgICAgICAgb3B0aW9ucyB8PSBSZXBsYWNlU2VsZWN0aW9uQ29tbWFuZDo6U2VsZWN0UmVw bGFjZW1lbnQ7Ci0gICAgaWYgKHNtYXJ0UmVwbGFjZSkKLSAgICAgICAgb3B0aW9ucyB8PSBSZXBs YWNlU2VsZWN0aW9uQ29tbWFuZDo6U21hcnRSZXBsYWNlOwotICAgIGlmIChtYXRjaFN0eWxlKQot ICAgICAgICBvcHRpb25zIHw9IFJlcGxhY2VTZWxlY3Rpb25Db21tYW5kOjpNYXRjaFN0eWxlOwot ICAgIGFwcGx5Q29tbWFuZChSZXBsYWNlU2VsZWN0aW9uQ29tbWFuZDo6Y3JlYXRlKF9wcml2YXRl LT5jb3JlRnJhbWUtPmRvY3VtZW50KCksIGNvcmUoZnJhZ21lbnQpLCBvcHRpb25zKSk7Ci0gICAg X3ByaXZhdGUtPmNvcmVGcmFtZS0+c2VsZWN0aW9uKCktPnJldmVhbFNlbGVjdGlvbihTY3JvbGxB bGlnbm1lbnQ6OmFsaWduVG9FZGdlSWZOZWVkZWQpOworICAgIF9wcml2YXRlLT5jb3JlRnJhbWUt PmVkaXRvcigpLT5yZXBsYWNlU2VsZWN0aW9uV2l0aEZyYWdtZW50KGNvcmUoZnJhZ21lbnQpLCBz ZWxlY3RSZXBsYWNlbWVudCwgc21hcnRSZXBsYWNlLCBtYXRjaFN0eWxlKTsKIH0KIAogLSAodm9p ZClfcmVwbGFjZVNlbGVjdGlvbldpdGhUZXh0OihOU1N0cmluZyAqKXRleHQgc2VsZWN0UmVwbGFj ZW1lbnQ6KEJPT0wpc2VsZWN0UmVwbGFjZW1lbnQgc21hcnRSZXBsYWNlOihCT09MKXNtYXJ0UmVw bGFjZQo=