59837 2011-04-29 15:25:59 -0700 Get rid of versions of sendContextMenuEvent and eventMayStartDrag that takes NSEvent 2011-05-01 12:46:18 -0700 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 56410 1 rniwa rniwa ap commit-queue darin sam simon.fraser oldest_to_newest 395554 0 rniwa 2011-04-29 15:25:59 -0700 Mac WebKit port should be creating PlatformMouseEvent in WebKit code instead of pushing that code into EventHandler. 395556 1 91749 rniwa 2011-04-29 15:28:36 -0700 Created attachment 91749 cleanup 395594 2 91758 rniwa 2011-04-29 15:58:46 -0700 Created attachment 91758 Fixed test failures 395596 3 rniwa 2011-04-29 15:59:33 -0700 Apparently PlatformMouseEvent(event, self) and PlatformMouseEvent(event, page->chrome()->platformPageClient()) are different in WebHTMLView.mm 395932 4 91758 eric 2011-05-01 09:58:06 -0700 Comment on attachment 91758 Fixed test failures View in context: https://bugs.webkit.org/attachment.cgi?id=91758&action=review SGTM. > Source/WebKit/mac/WebView/WebHTMLView.mm:3456 > + if (Page* page = coreFrame->page()) > + result = coreFrame->eventHandler()->eventMayStartDrag(PlatformMouseEvent(event, page->chrome()->platformPageClient())); Will results still end up as false in the !page() case after this change? 395979 5 91758 rniwa 2011-05-01 11:55:04 -0700 Comment on attachment 91758 Fixed test failures View in context: https://bugs.webkit.org/attachment.cgi?id=91758&action=review Thanks for the review! >> Source/WebKit/mac/WebView/WebHTMLView.mm:3456 >> + result = coreFrame->eventHandler()->eventMayStartDrag(PlatformMouseEvent(event, page->chrome()->platformPageClient())); > > Will results still end up as false in the !page() case after this change? Yes, result is initialized to false. 396005 6 91758 commit-queue 2011-05-01 12:46:12 -0700 Comment on attachment 91758 Fixed test failures Clearing flags on attachment: 91758 Committed r85428: <http://trac.webkit.org/changeset/85428> 396006 7 commit-queue 2011-05-01 12:46:18 -0700 All reviewed patches have been landed. Closing bug. 91749 2011-04-29 15:28:36 -0700 2011-04-29 15:58:42 -0700 cleanup bug-59837-20110429152835.patch text/plain 6656 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1MzYyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDQtMjkgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgR2V0IHJpZCBvZiB2ZXJzaW9ucyBvZiBzZW5kQ29udGV4dE1lbnVF dmVudCBhbmQgZXZlbnRNYXlTdGFydERyYWcgdGhhdCB0YWtlcyBOU0V2ZW50CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTgzNworCisgICAgICAgIFJl bW92ZWQgRXZlbnRIYW5kbGVyOjpzZW5kQ29udGV4dE1lbnVFdmVudChOU0V2ZW50KikgYW5kIEV2 ZW50SGFuZGxlcjo6ZXZlbnRNYXlTdGFydERyYWcoTlNFdmVudCopCisKKyAgICAgICAgKiBXZWJD b3JlLmV4cC5pbjoKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxlci5oOgorICAgICAgICAqIHBh Z2UvbWFjL0V2ZW50SGFuZGxlck1hYy5tbToKKwogMjAxMS0wNC0yOSAgQ3NhYmEgT3N6dHJvZ29u w6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF0gVW5yZXZpZXdlZCBidWlsZGZp eCBhZnRlciByODUzNDMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkocmV2aXNpb24gODUzNTAp CisrKyBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkod29ya2luZyBjb3B5KQpAQCAtNDg3 LDYgKzQ4Nyw3IEBAIF9fWk43V2ViQ29yZTE3R2x5cGhQYWdlVHJlZU5vZGUxOHRyZWVHbHkKIF9f Wk43V2ViQ29yZTE3SGlzdG9yeUNvbnRyb2xsZXIyNnNhdmVEb2N1bWVudEFuZFNjcm9sbFN0YXRl RXYKIF9fWk43V2ViQ29yZTE3bmFtZUZvckN1cnNvclR5cGVFTlNfNkN1cnNvcjRUeXBlRQogX19a TjdXZWJDb3JlMTdvcGVuVGVtcG9yYXJ5RmlsZUVSS04zV1RGNlN0cmluZ0VSaQorX19aTjdXZWJD b3JlMThQbGF0Zm9ybU1vdXNlRXZlbnRDMUVQN05TRXZlbnRQNk5TVmlldwogX19aTjdXZWJDb3Jl MThQbGF0Zm9ybVN0cmF0ZWdpZXMyNmNyZWF0ZUxvY2FsaXphdGlvblN0cmF0ZWd5RXYKIF9fWk43 V2ViQ29yZTE4U2VhcmNoUG9wdXBNZW51TWFjQzFFUE5TXzE1UG9wdXBNZW51Q2xpZW50RQogX19a TjdXZWJDb3JlMThpc1N0YXJ0T2ZQYXJhZ3JhcGhFUktOU18xNVZpc2libGVQb3NpdGlvbkVOU18y N0VkaXRpbmdCb3VuZGFyeUNyb3NzaW5nUnVsZUUKQEAgLTE0NzYsNyArMTQ3Nyw2IEBAIF9fWk5L N1dlYkNvcmUxOFJlbmRlckxheWVyQmFja2luZzIwY29tcG8KIAogI2lmIEVOQUJMRShDT05URVhU X01FTlVTKQogX19aTjdXZWJDb3JlMTFDb250ZXh0TWVudTIyc2V0UGxhdGZvcm1EZXNjcmlwdGlv bkVQMTROU011dGFibGVBcnJheQotX19aTjdXZWJDb3JlMTJFdmVudEhhbmRsZXIyMHNlbmRDb250 ZXh0TWVudUV2ZW50RVA3TlNFdmVudAogX19aTjdXZWJDb3JlMTJFdmVudEhhbmRsZXIyMHNlbmRD b250ZXh0TWVudUV2ZW50RVJLTlNfMThQbGF0Zm9ybU1vdXNlRXZlbnRFCiBfX1pON1dlYkNvcmUx NUNvbnRleHRNZW51SXRlbTI2cmVsZWFzZVBsYXRmb3JtRGVzY3JpcHRpb25FdgogX19aTjdXZWJD b3JlMTVDb250ZXh0TWVudUl0ZW1DMUVOU18xN0NvbnRleHRNZW51QWN0aW9uRVJLTjNXVEY2U3Ry aW5nRWJiUk5TMl82VmVjdG9ySVMwX0xtMEVFRQpAQCAtMTUwNSw3ICsxNTA1LDYgQEAgX19aTjdX ZWJDb3JlOFNldHRpbmdzNDFzZXRVc2VzRGFzaGJvYXJkQgogCiAjaWYgRU5BQkxFKERSQUdfU1VQ UE9SVCkKIF9fWk43V2ViQ29yZTEyRXZlbnRIYW5kbGVyMTdkcmFnU291cmNlRW5kZWRBdEVSS05T XzE4UGxhdGZvcm1Nb3VzZUV2ZW50RU5TXzEzRHJhZ09wZXJhdGlvbkUKLV9fWk43V2ViQ29yZTEy RXZlbnRIYW5kbGVyMTdldmVudE1heVN0YXJ0RHJhZ0VQN05TRXZlbnQKIF9fWk5LN1dlYkNvcmUx MkV2ZW50SGFuZGxlcjE3ZXZlbnRNYXlTdGFydERyYWdFUktOU18xOFBsYXRmb3JtTW91c2VFdmVu dEUKIF9fWk43V2ViQ29yZTE0RHJhZ0NvbnRyb2xsZXIxMGRyYWdFeGl0ZWRFUE5TXzhEcmFnRGF0 YUUKIF9fWk43V2ViQ29yZTE0RHJhZ0NvbnRyb2xsZXIxMWRyYWdFbnRlcmVkRVBOU184RHJhZ0Rh dGFFCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmgJKHJldmlzaW9uIDg1MzUwKQor KysgU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuaAkod29ya2luZyBjb3B5KQpAQCAt MjE2LDExICsyMTYsNiBAQCBwdWJsaWM6CiAgICAgYm9vbCBrZXlFdmVudChOU0V2ZW50ICopOwog ICAgIGJvb2wgd2hlZWxFdmVudChOU0V2ZW50ICopOwogCi0jaWYgRU5BQkxFKENPTlRFWFRfTUVO VVMpCi0gICAgYm9vbCBzZW5kQ29udGV4dE1lbnVFdmVudChOU0V2ZW50ICopOwotI2VuZGlmCi0g ICAgYm9vbCBldmVudE1heVN0YXJ0RHJhZyhOU0V2ZW50ICopOwotCiAgICAgdm9pZCBzZW5kRmFr ZUV2ZW50c0FmdGVyV2lkZ2V0VHJhY2tpbmcoTlNFdmVudCAqaW5pdGlhdGluZ0V2ZW50KTsKIAog ICAgIHZvaWQgc2V0QWN0aXZhdGlvbkV2ZW50TnVtYmVyKGludCBudW0pIHsgbV9hY3RpdmF0aW9u RXZlbnROdW1iZXIgPSBudW07IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50 SGFuZGxlck1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9FdmVu dEhhbmRsZXJNYWMubW0JKHJldmlzaW9uIDg1MzUwKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9t YWMvRXZlbnRIYW5kbGVyTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC02NzgsMjYgKzY3OCw2IEBA IFBsYXRmb3JtTW91c2VFdmVudCBFdmVudEhhbmRsZXI6OmN1cnJlbnQKICAgICByZXR1cm4gUGxh dGZvcm1Nb3VzZUV2ZW50KGN1cnJlbnROU0V2ZW50KCksIHdpbmRvd1ZpZXcpOwogfQogCi0jaWYg RU5BQkxFKENPTlRFWFRfTUVOVVMpCi1ib29sIEV2ZW50SGFuZGxlcjo6c2VuZENvbnRleHRNZW51 RXZlbnQoTlNFdmVudCAqZXZlbnQpCi17Ci0gICAgUGFnZSogcGFnZSA9IG1fZnJhbWUtPnBhZ2Uo KTsKLSAgICBpZiAoIXBhZ2UpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICByZXR1cm4gc2Vu ZENvbnRleHRNZW51RXZlbnQoUGxhdGZvcm1Nb3VzZUV2ZW50KGV2ZW50LCBwYWdlLT5jaHJvbWUo KS0+cGxhdGZvcm1QYWdlQ2xpZW50KCkpKTsKLX0KLSNlbmRpZiAvLyBFTkFCTEUoQ09OVEVYVF9N RU5VUykKLQotI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCi1ib29sIEV2ZW50SGFuZGxlcjo6ZXZl bnRNYXlTdGFydERyYWcoTlNFdmVudCAqZXZlbnQpCi17Ci0gICAgUGFnZSogcGFnZSA9IG1fZnJh bWUtPnBhZ2UoKTsKLSAgICBpZiAoIXBhZ2UpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBy ZXR1cm4gZXZlbnRNYXlTdGFydERyYWcoUGxhdGZvcm1Nb3VzZUV2ZW50KGV2ZW50LCBwYWdlLT5j aHJvbWUoKS0+cGxhdGZvcm1QYWdlQ2xpZW50KCkpKTsKLX0KLSNlbmRpZiAvLyBFTkFCTEUoRFJB R19TVVBQT1JUKQotCiBib29sIEV2ZW50SGFuZGxlcjo6ZXZlbnRBY3RpdmF0ZWRWaWV3KGNvbnN0 IFBsYXRmb3JtTW91c2VFdmVudCYgZXZlbnQpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fYWN0aXZh dGlvbkV2ZW50TnVtYmVyID09IGV2ZW50LmV2ZW50TnVtYmVyKCk7CkluZGV4OiBTb3VyY2UvV2Vi S2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvQ2hhbmdl TG9nCShyZXZpc2lvbiA4NTM2MikKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDExLTA0LTI5ICBSeW9zdWtlIE5pd2EgIDxy bml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEdldCByaWQgb2YgdmVyc2lvbnMgb2Ygc2VuZENvbnRleHRNZW51RXZlbnQgYW5k IGV2ZW50TWF5U3RhcnREcmFnIHRoYXQgdGFrZXMgTlNFdmVudAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTk4MzcKKworICAgICAgICBDYWxsIHNlbmRD b250ZXh0TWVudUV2ZW50IGFuZCBldmVudE1heVN0YXJ0RHJhZyB3aXRoIFBsYXRmb3JtTW91c2VF dmVudCBpbnN0ZWFkIG9mIE5TRXZlbnQuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYkhUTUxWaWV3 Lm1tOgorICAgICAgICAoLVtXZWJIVE1MVmlldyBtZW51Rm9yRXZlbnQ6XSk6CisgICAgICAgICgt W1dlYkhUTUxWaWV3IGFjY2VwdHNGaXJzdE1vdXNlOl0pOgorICAgICAgICAoLVtXZWJIVE1MVmll dyBzaG91bGREZWxheVdpbmRvd09yZGVyaW5nRm9yRXZlbnQ6XSk6CisKIDIwMTEtMDQtMjkgIERl YW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9u IEZyYXNlci4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQko cmV2aXNpb24gODUzNTApCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3 Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMTA4LDcgKzMxMDgsNyBAQCAtIChOU01lbnUgKiltZW51 Rm9yRXZlbnQ6KE5TRXZlbnQgKilldmVuCiAgICAgX3ByaXZhdGUtPmhhbmRsaW5nTW91c2VEb3du RXZlbnQgPSBZRVM7CiAgICAgcGFnZS0+Y29udGV4dE1lbnVDb250cm9sbGVyKCktPmNsZWFyQ29u dGV4dE1lbnUoKTsKICAgICBjb3JlRnJhbWUtPmV2ZW50SGFuZGxlcigpLT5tb3VzZURvd24oZXZl bnQpOwotICAgIEJPT0wgaGFuZGxlZEV2ZW50ID0gY29yZUZyYW1lLT5ldmVudEhhbmRsZXIoKS0+ c2VuZENvbnRleHRNZW51RXZlbnQoZXZlbnQpOworICAgIEJPT0wgaGFuZGxlZEV2ZW50ID0gY29y ZUZyYW1lLT5ldmVudEhhbmRsZXIoKS0+c2VuZENvbnRleHRNZW51RXZlbnQoUGxhdGZvcm1Nb3Vz ZUV2ZW50KGV2ZW50LCBzZWxmKSk7CiAgICAgX3ByaXZhdGUtPmhhbmRsaW5nTW91c2VEb3duRXZl bnQgPSBOTzsKIAogICAgIGlmICghaGFuZGxlZEV2ZW50KQpAQCAtMzQyNiw3ICszNDI2LDcgQEAg LSAoQk9PTClhY2NlcHRzRmlyc3RNb3VzZTooTlNFdmVudCAqKWV2ZQogICAgICAgICAgICAgY29y ZUZyYW1lLT5ldmVudEhhbmRsZXIoKS0+c2V0QWN0aXZhdGlvbkV2ZW50TnVtYmVyKFtldmVudCBl dmVudE51bWJlcl0pOwogICAgICAgICAgICAgW2hpdEhUTUxWaWV3IF9zZXRNb3VzZURvd25FdmVu dDpldmVudF07CiAgICAgICAgICAgICBpZiAoW2hpdEhUTUxWaWV3IF9pc1NlbGVjdGlvbkV2ZW50 OmV2ZW50XSkKLSAgICAgICAgICAgICAgICByZXN1bHQgPSBjb3JlRnJhbWUtPmV2ZW50SGFuZGxl cigpLT5ldmVudE1heVN0YXJ0RHJhZyhldmVudCk7CisgICAgICAgICAgICAgICAgcmVzdWx0ID0g Y29yZUZyYW1lLT5ldmVudEhhbmRsZXIoKS0+ZXZlbnRNYXlTdGFydERyYWcoUGxhdGZvcm1Nb3Vz ZUV2ZW50KGV2ZW50LCBzZWxmKSk7CiAgICAgICAgICAgICBlbHNlIGlmIChbaGl0SFRNTFZpZXcg X2lzU2Nyb2xsQmFyRXZlbnQ6ZXZlbnRdKQogICAgICAgICAgICAgICAgIHJlc3VsdCA9IHRydWU7 CiAgICAgICAgICAgICBbaGl0SFRNTFZpZXcgX3NldE1vdXNlRG93bkV2ZW50Om5pbF07CkBAIC0z NDUwLDcgKzM0NTAsNyBAQCAtIChCT09MKXNob3VsZERlbGF5V2luZG93T3JkZXJpbmdGb3JFdmVu CiAgICAgICAgIGlmIChbaGl0SFRNTFZpZXcgX2lzU2VsZWN0aW9uRXZlbnQ6ZXZlbnRdKSB7CiAg ICAgICAgICAgICBpZiAoRnJhbWUqIGNvcmVGcmFtZSA9IGNvcmUoW2hpdEhUTUxWaWV3IF9mcmFt ZV0pKSB7CiAgICAgICAgICAgICAgICAgW2hpdEhUTUxWaWV3IF9zZXRNb3VzZURvd25FdmVudDpl dmVudF07Ci0gICAgICAgICAgICAgICAgcmVzdWx0ID0gY29yZUZyYW1lLT5ldmVudEhhbmRsZXIo KS0+ZXZlbnRNYXlTdGFydERyYWcoZXZlbnQpOworICAgICAgICAgICAgICAgIHJlc3VsdCA9IGNv cmVGcmFtZS0+ZXZlbnRIYW5kbGVyKCktPmV2ZW50TWF5U3RhcnREcmFnKFBsYXRmb3JtTW91c2VF dmVudChldmVudCwgc2VsZikpOwogICAgICAgICAgICAgICAgIFtoaXRIVE1MVmlldyBfc2V0TW91 c2VEb3duRXZlbnQ6bmlsXTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQo= 91758 2011-04-29 15:58:46 -0700 2011-05-01 12:46:12 -0700 Fixed test failures bug-59837-20110429155845.patch text/plain 7336 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1MzYyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDQtMjkgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgR2V0IHJpZCBvZiB2ZXJzaW9ucyBvZiBzZW5kQ29udGV4dE1lbnVF dmVudCBhbmQgZXZlbnRNYXlTdGFydERyYWcgdGhhdCB0YWtlcyBOU0V2ZW50CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTgzNworCisgICAgICAgIFJl bW92ZWQgRXZlbnRIYW5kbGVyOjpzZW5kQ29udGV4dE1lbnVFdmVudChOU0V2ZW50KikgYW5kIEV2 ZW50SGFuZGxlcjo6ZXZlbnRNYXlTdGFydERyYWcoTlNFdmVudCopCisKKyAgICAgICAgKiBXZWJD b3JlLmV4cC5pbjoKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxlci5oOgorICAgICAgICAqIHBh Z2UvbWFjL0V2ZW50SGFuZGxlck1hYy5tbToKKwogMjAxMS0wNC0yOSAgQ3NhYmEgT3N6dHJvZ29u w6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF0gVW5yZXZpZXdlZCBidWlsZGZp eCBhZnRlciByODUzNDMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkocmV2aXNpb24gODUzNTAp CisrKyBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkod29ya2luZyBjb3B5KQpAQCAtNDg3 LDYgKzQ4Nyw3IEBAIF9fWk43V2ViQ29yZTE3R2x5cGhQYWdlVHJlZU5vZGUxOHRyZWVHbHkKIF9f Wk43V2ViQ29yZTE3SGlzdG9yeUNvbnRyb2xsZXIyNnNhdmVEb2N1bWVudEFuZFNjcm9sbFN0YXRl RXYKIF9fWk43V2ViQ29yZTE3bmFtZUZvckN1cnNvclR5cGVFTlNfNkN1cnNvcjRUeXBlRQogX19a TjdXZWJDb3JlMTdvcGVuVGVtcG9yYXJ5RmlsZUVSS04zV1RGNlN0cmluZ0VSaQorX19aTjdXZWJD b3JlMThQbGF0Zm9ybU1vdXNlRXZlbnRDMUVQN05TRXZlbnRQNk5TVmlldwogX19aTjdXZWJDb3Jl MThQbGF0Zm9ybVN0cmF0ZWdpZXMyNmNyZWF0ZUxvY2FsaXphdGlvblN0cmF0ZWd5RXYKIF9fWk43 V2ViQ29yZTE4U2VhcmNoUG9wdXBNZW51TWFjQzFFUE5TXzE1UG9wdXBNZW51Q2xpZW50RQogX19a TjdXZWJDb3JlMThpc1N0YXJ0T2ZQYXJhZ3JhcGhFUktOU18xNVZpc2libGVQb3NpdGlvbkVOU18y N0VkaXRpbmdCb3VuZGFyeUNyb3NzaW5nUnVsZUUKQEAgLTE0NzYsNyArMTQ3Nyw2IEBAIF9fWk5L N1dlYkNvcmUxOFJlbmRlckxheWVyQmFja2luZzIwY29tcG8KIAogI2lmIEVOQUJMRShDT05URVhU X01FTlVTKQogX19aTjdXZWJDb3JlMTFDb250ZXh0TWVudTIyc2V0UGxhdGZvcm1EZXNjcmlwdGlv bkVQMTROU011dGFibGVBcnJheQotX19aTjdXZWJDb3JlMTJFdmVudEhhbmRsZXIyMHNlbmRDb250 ZXh0TWVudUV2ZW50RVA3TlNFdmVudAogX19aTjdXZWJDb3JlMTJFdmVudEhhbmRsZXIyMHNlbmRD b250ZXh0TWVudUV2ZW50RVJLTlNfMThQbGF0Zm9ybU1vdXNlRXZlbnRFCiBfX1pON1dlYkNvcmUx NUNvbnRleHRNZW51SXRlbTI2cmVsZWFzZVBsYXRmb3JtRGVzY3JpcHRpb25FdgogX19aTjdXZWJD b3JlMTVDb250ZXh0TWVudUl0ZW1DMUVOU18xN0NvbnRleHRNZW51QWN0aW9uRVJLTjNXVEY2U3Ry aW5nRWJiUk5TMl82VmVjdG9ySVMwX0xtMEVFRQpAQCAtMTUwNSw3ICsxNTA1LDYgQEAgX19aTjdX ZWJDb3JlOFNldHRpbmdzNDFzZXRVc2VzRGFzaGJvYXJkQgogCiAjaWYgRU5BQkxFKERSQUdfU1VQ UE9SVCkKIF9fWk43V2ViQ29yZTEyRXZlbnRIYW5kbGVyMTdkcmFnU291cmNlRW5kZWRBdEVSS05T XzE4UGxhdGZvcm1Nb3VzZUV2ZW50RU5TXzEzRHJhZ09wZXJhdGlvbkUKLV9fWk43V2ViQ29yZTEy RXZlbnRIYW5kbGVyMTdldmVudE1heVN0YXJ0RHJhZ0VQN05TRXZlbnQKIF9fWk5LN1dlYkNvcmUx MkV2ZW50SGFuZGxlcjE3ZXZlbnRNYXlTdGFydERyYWdFUktOU18xOFBsYXRmb3JtTW91c2VFdmVu dEUKIF9fWk43V2ViQ29yZTE0RHJhZ0NvbnRyb2xsZXIxMGRyYWdFeGl0ZWRFUE5TXzhEcmFnRGF0 YUUKIF9fWk43V2ViQ29yZTE0RHJhZ0NvbnRyb2xsZXIxMWRyYWdFbnRlcmVkRVBOU184RHJhZ0Rh dGFFCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmgJKHJldmlzaW9uIDg1MzUwKQor KysgU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuaAkod29ya2luZyBjb3B5KQpAQCAt MjE2LDExICsyMTYsNiBAQCBwdWJsaWM6CiAgICAgYm9vbCBrZXlFdmVudChOU0V2ZW50ICopOwog ICAgIGJvb2wgd2hlZWxFdmVudChOU0V2ZW50ICopOwogCi0jaWYgRU5BQkxFKENPTlRFWFRfTUVO VVMpCi0gICAgYm9vbCBzZW5kQ29udGV4dE1lbnVFdmVudChOU0V2ZW50ICopOwotI2VuZGlmCi0g ICAgYm9vbCBldmVudE1heVN0YXJ0RHJhZyhOU0V2ZW50ICopOwotCiAgICAgdm9pZCBzZW5kRmFr ZUV2ZW50c0FmdGVyV2lkZ2V0VHJhY2tpbmcoTlNFdmVudCAqaW5pdGlhdGluZ0V2ZW50KTsKIAog ICAgIHZvaWQgc2V0QWN0aXZhdGlvbkV2ZW50TnVtYmVyKGludCBudW0pIHsgbV9hY3RpdmF0aW9u RXZlbnROdW1iZXIgPSBudW07IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50 SGFuZGxlck1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9FdmVu dEhhbmRsZXJNYWMubW0JKHJldmlzaW9uIDg1MzUwKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9t YWMvRXZlbnRIYW5kbGVyTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC02NzgsMjYgKzY3OCw2IEBA IFBsYXRmb3JtTW91c2VFdmVudCBFdmVudEhhbmRsZXI6OmN1cnJlbnQKICAgICByZXR1cm4gUGxh dGZvcm1Nb3VzZUV2ZW50KGN1cnJlbnROU0V2ZW50KCksIHdpbmRvd1ZpZXcpOwogfQogCi0jaWYg RU5BQkxFKENPTlRFWFRfTUVOVVMpCi1ib29sIEV2ZW50SGFuZGxlcjo6c2VuZENvbnRleHRNZW51 RXZlbnQoTlNFdmVudCAqZXZlbnQpCi17Ci0gICAgUGFnZSogcGFnZSA9IG1fZnJhbWUtPnBhZ2Uo KTsKLSAgICBpZiAoIXBhZ2UpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICByZXR1cm4gc2Vu ZENvbnRleHRNZW51RXZlbnQoUGxhdGZvcm1Nb3VzZUV2ZW50KGV2ZW50LCBwYWdlLT5jaHJvbWUo KS0+cGxhdGZvcm1QYWdlQ2xpZW50KCkpKTsKLX0KLSNlbmRpZiAvLyBFTkFCTEUoQ09OVEVYVF9N RU5VUykKLQotI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCi1ib29sIEV2ZW50SGFuZGxlcjo6ZXZl bnRNYXlTdGFydERyYWcoTlNFdmVudCAqZXZlbnQpCi17Ci0gICAgUGFnZSogcGFnZSA9IG1fZnJh bWUtPnBhZ2UoKTsKLSAgICBpZiAoIXBhZ2UpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBy ZXR1cm4gZXZlbnRNYXlTdGFydERyYWcoUGxhdGZvcm1Nb3VzZUV2ZW50KGV2ZW50LCBwYWdlLT5j aHJvbWUoKS0+cGxhdGZvcm1QYWdlQ2xpZW50KCkpKTsKLX0KLSNlbmRpZiAvLyBFTkFCTEUoRFJB R19TVVBQT1JUKQotCiBib29sIEV2ZW50SGFuZGxlcjo6ZXZlbnRBY3RpdmF0ZWRWaWV3KGNvbnN0 IFBsYXRmb3JtTW91c2VFdmVudCYgZXZlbnQpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fYWN0aXZh dGlvbkV2ZW50TnVtYmVyID09IGV2ZW50LmV2ZW50TnVtYmVyKCk7CkluZGV4OiBTb3VyY2UvV2Vi S2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvQ2hhbmdl TG9nCShyZXZpc2lvbiA4NTM2MikKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDExLTA0LTI5ICBSeW9zdWtlIE5pd2EgIDxy bml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEdldCByaWQgb2YgdmVyc2lvbnMgb2Ygc2VuZENvbnRleHRNZW51RXZlbnQgYW5k IGV2ZW50TWF5U3RhcnREcmFnIHRoYXQgdGFrZXMgTlNFdmVudAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTk4MzcKKworICAgICAgICBDYWxsIHNlbmRD b250ZXh0TWVudUV2ZW50IGFuZCBldmVudE1heVN0YXJ0RHJhZyB3aXRoIFBsYXRmb3JtTW91c2VF dmVudCBpbnN0ZWFkIG9mIE5TRXZlbnQuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYkhUTUxWaWV3 Lm1tOgorICAgICAgICAoLVtXZWJIVE1MVmlldyBtZW51Rm9yRXZlbnQ6XSk6CisgICAgICAgICgt W1dlYkhUTUxWaWV3IGFjY2VwdHNGaXJzdE1vdXNlOl0pOgorICAgICAgICAoLVtXZWJIVE1MVmll dyBzaG91bGREZWxheVdpbmRvd09yZGVyaW5nRm9yRXZlbnQ6XSk6CisKIDIwMTEtMDQtMjkgIERl YW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9u IEZyYXNlci4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQko cmV2aXNpb24gODUzNTApCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3 Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC03Niw2ICs3Niw3IEBACiAjaW1wb3J0IDxXZWJDb3JlL0NT U011dGFibGVTdHlsZURlY2xhcmF0aW9uLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0NhY2hlZEltYWdl Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL0NhY2hlZFJlc291cmNlQ2xpZW50Lmg+CisjaW1wb3J0IDxX ZWJDb3JlL0Nocm9tZS5oPgogI2ltcG9ydCA8V2ViQ29yZS9Db2xvck1hYy5oPgogI2ltcG9ydCA8 V2ViQ29yZS9Db250ZXh0TWVudS5oPgogI2ltcG9ydCA8V2ViQ29yZS9Db250ZXh0TWVudUNvbnRy b2xsZXIuaD4KQEAgLTMxMDgsNyArMzEwOSw3IEBAIC0gKE5TTWVudSAqKW1lbnVGb3JFdmVudDoo TlNFdmVudCAqKWV2ZW4KICAgICBfcHJpdmF0ZS0+aGFuZGxpbmdNb3VzZURvd25FdmVudCA9IFlF UzsKICAgICBwYWdlLT5jb250ZXh0TWVudUNvbnRyb2xsZXIoKS0+Y2xlYXJDb250ZXh0TWVudSgp OwogICAgIGNvcmVGcmFtZS0+ZXZlbnRIYW5kbGVyKCktPm1vdXNlRG93bihldmVudCk7Ci0gICAg Qk9PTCBoYW5kbGVkRXZlbnQgPSBjb3JlRnJhbWUtPmV2ZW50SGFuZGxlcigpLT5zZW5kQ29udGV4 dE1lbnVFdmVudChldmVudCk7CisgICAgQk9PTCBoYW5kbGVkRXZlbnQgPSBjb3JlRnJhbWUtPmV2 ZW50SGFuZGxlcigpLT5zZW5kQ29udGV4dE1lbnVFdmVudChQbGF0Zm9ybU1vdXNlRXZlbnQoZXZl bnQsIHBhZ2UtPmNocm9tZSgpLT5wbGF0Zm9ybVBhZ2VDbGllbnQoKSkpOwogICAgIF9wcml2YXRl LT5oYW5kbGluZ01vdXNlRG93bkV2ZW50ID0gTk87CiAKICAgICBpZiAoIWhhbmRsZWRFdmVudCkK QEAgLTM0MjUsOSArMzQyNiwxMCBAQCAtIChCT09MKWFjY2VwdHNGaXJzdE1vdXNlOihOU0V2ZW50 ICopZXZlCiAgICAgICAgIGlmIChGcmFtZSogY29yZUZyYW1lID0gY29yZShbaGl0SFRNTFZpZXcg X2ZyYW1lXSkpIHsKICAgICAgICAgICAgIGNvcmVGcmFtZS0+ZXZlbnRIYW5kbGVyKCktPnNldEFj dGl2YXRpb25FdmVudE51bWJlcihbZXZlbnQgZXZlbnROdW1iZXJdKTsKICAgICAgICAgICAgIFto aXRIVE1MVmlldyBfc2V0TW91c2VEb3duRXZlbnQ6ZXZlbnRdOwotICAgICAgICAgICAgaWYgKFto aXRIVE1MVmlldyBfaXNTZWxlY3Rpb25FdmVudDpldmVudF0pCi0gICAgICAgICAgICAgICAgcmVz dWx0ID0gY29yZUZyYW1lLT5ldmVudEhhbmRsZXIoKS0+ZXZlbnRNYXlTdGFydERyYWcoZXZlbnQp OwotICAgICAgICAgICAgZWxzZSBpZiAoW2hpdEhUTUxWaWV3IF9pc1Njcm9sbEJhckV2ZW50OmV2 ZW50XSkKKyAgICAgICAgICAgIGlmIChbaGl0SFRNTFZpZXcgX2lzU2VsZWN0aW9uRXZlbnQ6ZXZl bnRdKSB7CisgICAgICAgICAgICAgICAgaWYgKFBhZ2UqIHBhZ2UgPSBjb3JlRnJhbWUtPnBhZ2Uo KSkKKyAgICAgICAgICAgICAgICAgICAgcmVzdWx0ID0gY29yZUZyYW1lLT5ldmVudEhhbmRsZXIo KS0+ZXZlbnRNYXlTdGFydERyYWcoUGxhdGZvcm1Nb3VzZUV2ZW50KGV2ZW50LCBwYWdlLT5jaHJv bWUoKS0+cGxhdGZvcm1QYWdlQ2xpZW50KCkpKTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAoW2hp dEhUTUxWaWV3IF9pc1Njcm9sbEJhckV2ZW50OmV2ZW50XSkKICAgICAgICAgICAgICAgICByZXN1 bHQgPSB0cnVlOwogICAgICAgICAgICAgW2hpdEhUTUxWaWV3IF9zZXRNb3VzZURvd25FdmVudDpu aWxdOwogICAgICAgICB9CkBAIC0zNDUwLDcgKzM0NTIsOCBAQCAtIChCT09MKXNob3VsZERlbGF5 V2luZG93T3JkZXJpbmdGb3JFdmVuCiAgICAgICAgIGlmIChbaGl0SFRNTFZpZXcgX2lzU2VsZWN0 aW9uRXZlbnQ6ZXZlbnRdKSB7CiAgICAgICAgICAgICBpZiAoRnJhbWUqIGNvcmVGcmFtZSA9IGNv cmUoW2hpdEhUTUxWaWV3IF9mcmFtZV0pKSB7CiAgICAgICAgICAgICAgICAgW2hpdEhUTUxWaWV3 IF9zZXRNb3VzZURvd25FdmVudDpldmVudF07Ci0gICAgICAgICAgICAgICAgcmVzdWx0ID0gY29y ZUZyYW1lLT5ldmVudEhhbmRsZXIoKS0+ZXZlbnRNYXlTdGFydERyYWcoZXZlbnQpOworICAgICAg ICAgICAgICAgIGlmIChQYWdlKiBwYWdlID0gY29yZUZyYW1lLT5wYWdlKCkpCisgICAgICAgICAg ICAgICAgICAgIHJlc3VsdCA9IGNvcmVGcmFtZS0+ZXZlbnRIYW5kbGVyKCktPmV2ZW50TWF5U3Rh cnREcmFnKFBsYXRmb3JtTW91c2VFdmVudChldmVudCwgcGFnZS0+Y2hyb21lKCktPnBsYXRmb3Jt UGFnZUNsaWVudCgpKSk7CiAgICAgICAgICAgICAgICAgW2hpdEhUTUxWaWV3IF9zZXRNb3VzZURv d25FdmVudDpuaWxdOwogICAgICAgICAgICAgfQogICAgICAgICB9Cg==