111923 2013-03-09 11:14:33 -0800 Don't create multiple user gesture indicators when forwarding events to sub frames 2013-03-11 22:47:36 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 111959 1 jochen jochen abarth webkit.review.bot oldest_to_newest 851797 0 jochen 2013-03-09 11:14:33 -0800 Don't create multiple user gesture indicators when forwarding events to sub frames 851798 1 192347 jochen 2013-03-09 11:16:55 -0800 Created attachment 192347 Patch 851799 2 192347 abarth 2013-03-09 11:21:45 -0800 Comment on attachment 192347 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=192347&action=review > Source/WebCore/page/EventHandler.cpp:3169 > + OwnPtr<UserGestureIndicator> gestureIndicator; > + > + if (!UserGestureIndicator::processingUserGesture()) > + gestureIndicator = adoptPtr(new UserGestureIndicator(DefinitelyProcessingUserGesture)); Why doesn't UserGestureIndicator do this work for us? If we're already processing a user gesture, perhaps the UserGestureIndicator shouldn't bump the count in the token... Maybe that should be an option in the constructor? 851804 3 jochen 2013-03-09 11:35:41 -0800 (In reply to comment #2) > (From update of attachment 192347 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=192347&action=review > > > Source/WebCore/page/EventHandler.cpp:3169 > > + OwnPtr<UserGestureIndicator> gestureIndicator; > > + > > + if (!UserGestureIndicator::processingUserGesture()) > > + gestureIndicator = adoptPtr(new UserGestureIndicator(DefinitelyProcessingUserGesture)); > > Why doesn't UserGestureIndicator do this work for us? If we're already processing a user gesture, perhaps the UserGestureIndicator shouldn't bump the count in the token... Maybe that should be an option in the constructor? That's a good question. I guess that doing this by default won't work, e.g. when we run a nested message loop with a indicator on the stack during a showModalDialog() call. I need to think of a good name for an additional enum 852788 4 192575 jochen 2013-03-11 15:29:24 -0700 Created attachment 192575 Patch 852790 5 jochen 2013-03-11 15:30:32 -0700 As soon as bug 111959 is resolved, this patch will apply 852812 6 192575 abarth 2013-03-11 15:42:41 -0700 Comment on attachment 192575 Patch Thanks, this is much better. 853082 7 192575 webkit.review.bot 2013-03-11 22:47:33 -0700 Comment on attachment 192575 Patch Clearing flags on attachment: 192575 Committed r145481: <http://trac.webkit.org/changeset/145481> 853083 8 webkit.review.bot 2013-03-11 22:47:36 -0700 All reviewed patches have been landed. Closing bug. 192347 2013-03-09 11:16:55 -0800 2013-03-11 15:29:22 -0700 Patch bug-111923-20130309201257.patch text/plain 8024 jochen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MzA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODk1OTA3YmU2ZDEyNzMw ZTMzOGZlN2E5MGQ4MDI1ZDU4MDY3OTY1Ny4uN2Y1YThiY2RiMjU4OWZjYmJmNDQ4YjMzZGNkYjA3 YzkwZTEzN2IzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAzLTA5ICBKb2No ZW4gRWlzaW5nZXIgIDxqb2NoZW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIERvbid0IGNyZWF0 ZSBtdWx0aXBsZSB1c2VyIGdlc3R1cmUgaW5kaWNhdG9ycyB3aGVuIGZvcndhcmRpbmcgZXZlbnRz IHRvIHN1YiBmcmFtZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExMTkyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAg ICAgICAKKyAgICAgICAgUG9ydHMgdGhhdCBpbXBsZW1lbnQgY29uc3VtYWJsZSB1c2VyIGdlc3R1 cmVzIGRlcGVuZCBvbiBhIHNpbmdsZSB1c2VyCisgICAgICAgIGdlc3R1cmUgaW5kaWNhdG9yIGJl aW5nIGNyZWF0ZWQgaW4gcmVzcG9uc2UgdG8gYSBzaW5nbGUgdXNlciBnZXN0dXJlLgorCisgICAg ICAgIFRlc3Q6IHBsYXRmb3JtL2Nocm9taXVtL2Zhc3QvZXZlbnRzL3BvcHVwLWFsbG93ZWQtZnJv bS1nZXN0dXJlLW9ubHktb25jZS1pZnJhbWVzLmh0bWwKKworICAgICAgICAqIHBhZ2UvRXZlbnRI YW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VQ cmVzc0V2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VE b3VibGVDbGlja0V2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6aGFuZGxl TW91c2VSZWxlYXNlRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjprZXlF dmVudCk6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmhhbmRsZVRvdWNoRXZlbnQp OgorCiAyMDEzLTAzLTA3ICBSb2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KIAogICAg ICAgICBSRUdSRVNTSU9OKHIxNDA5MDcpOiBJbmNvcnJlY3QgYmFzZWxpbmUgZm9yIGNlbGxzIHdp dGggbWVkaWEgY29udGVudCBkdXJpbmcgbG9hZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9FdmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIu Y3BwCmluZGV4IDk0YTg0MDI0YzMyNGI3ZmJhNTEwM2YwMGRhNmRkZmZhMjQ2NGY3YWUuLjhmNTRh OWM0Y2UxMzQzYWRlZjM3NzEwZDhhMzQyNDFhNDk1ZmEwNmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2 ZW50SGFuZGxlci5jcHAKQEAgLTE0NTQsOCArMTQ1NCwxMiBAQCBib29sIEV2ZW50SGFuZGxlcjo6 aGFuZGxlTW91c2VQcmVzc0V2ZW50KGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYgbW91c2VFdmVu dCkKICAgICAgICAgcmV0dXJuIHRydWU7CiAjZW5kaWYKIAotICAgIFVzZXJHZXN0dXJlSW5kaWNh dG9yIGdlc3R1cmVJbmRpY2F0b3IoRGVmaW5pdGVseVByb2Nlc3NpbmdVc2VyR2VzdHVyZSk7Ci0g ICAgbV9sYXN0TW91c2VEb3duVXNlckdlc3R1cmVUb2tlbiA9IGdlc3R1cmVJbmRpY2F0b3IuY3Vy cmVudFRva2VuKCk7CisgICAgT3duUHRyPFVzZXJHZXN0dXJlSW5kaWNhdG9yPiBnZXN0dXJlSW5k aWNhdG9yOworCisgICAgaWYgKCFVc2VyR2VzdHVyZUluZGljYXRvcjo6cHJvY2Vzc2luZ1VzZXJH ZXN0dXJlKCkpIHsKKyAgICAgICAgZ2VzdHVyZUluZGljYXRvciA9IGFkb3B0UHRyKG5ldyBVc2Vy R2VzdHVyZUluZGljYXRvcihEZWZpbml0ZWx5UHJvY2Vzc2luZ1VzZXJHZXN0dXJlKSk7CisgICAg ICAgIG1fbGFzdE1vdXNlRG93blVzZXJHZXN0dXJlVG9rZW4gPSBnZXN0dXJlSW5kaWNhdG9yLT5j dXJyZW50VG9rZW4oKTsKKyAgICB9CiAKICAgICAvLyBGSVhNRSAoYnVnIDY4MTg1KTogdGhpcyBj YWxsIHNob3VsZCBiZSBtYWRlIGF0IGFub3RoZXIgYWJzdHJhY3Rpb24gbGF5ZXIKICAgICBtX2Zy YW1lLT5sb2FkZXIoKS0+cmVzZXRNdWx0aXBsZUZvcm1TdWJtaXNzaW9uUHJvdGVjdGlvbigpOwpA QCAtMTU4OCw3ICsxNTkyLDEwIEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5kbGVNb3VzZURvdWJs ZUNsaWNrRXZlbnQoY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBtb3VzZUV2CiAKICAgICBtX2Zy YW1lLT5zZWxlY3Rpb24oKS0+c2V0Q2FyZXRCbGlua2luZ1N1c3BlbmRlZChmYWxzZSk7CiAKLSAg ICBVc2VyR2VzdHVyZUluZGljYXRvciBnZXN0dXJlSW5kaWNhdG9yKERlZmluaXRlbHlQcm9jZXNz aW5nVXNlckdlc3R1cmUpOworICAgIE93blB0cjxVc2VyR2VzdHVyZUluZGljYXRvcj4gZ2VzdHVy ZUluZGljYXRvcjsKKworICAgIGlmICghVXNlckdlc3R1cmVJbmRpY2F0b3I6OnByb2Nlc3NpbmdV c2VyR2VzdHVyZSgpKQorICAgICAgICBnZXN0dXJlSW5kaWNhdG9yID0gYWRvcHRQdHIobmV3IFVz ZXJHZXN0dXJlSW5kaWNhdG9yKERlZmluaXRlbHlQcm9jZXNzaW5nVXNlckdlc3R1cmUpKTsKIAog ICAgIC8vIFdlIGdldCB0aGlzIGluc3RlYWQgb2YgYSBzZWNvbmQgbW91c2UtdXAgCiAgICAgbV9t b3VzZVByZXNzZWQgPSBmYWxzZTsKQEAgLTE4MzAsNyArMTgzNyw3IEBAIGJvb2wgRXZlbnRIYW5k bGVyOjpoYW5kbGVNb3VzZVJlbGVhc2VFdmVudChjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmIG1v dXNlRXZlbnQpCiAKICAgICBpZiAobV9sYXN0TW91c2VEb3duVXNlckdlc3R1cmVUb2tlbikKICAg ICAgICAgZ2VzdHVyZUluZGljYXRvciA9IGFkb3B0UHRyKG5ldyBVc2VyR2VzdHVyZUluZGljYXRv cihtX2xhc3RNb3VzZURvd25Vc2VyR2VzdHVyZVRva2VuLnJlbGVhc2UoKSkpOwotICAgIGVsc2UK KyAgICBlbHNlIGlmICghVXNlckdlc3R1cmVJbmRpY2F0b3I6OnByb2Nlc3NpbmdVc2VyR2VzdHVy ZSgpKQogICAgICAgICBnZXN0dXJlSW5kaWNhdG9yID0gYWRvcHRQdHIobmV3IFVzZXJHZXN0dXJl SW5kaWNhdG9yKERlZmluaXRlbHlQcm9jZXNzaW5nVXNlckdlc3R1cmUpKTsKIAogI2lmIEVOQUJM RShQQU5fU0NST0xMSU5HKQpAQCAtMzE1Niw3ICszMTYzLDEwIEBAIGJvb2wgRXZlbnRIYW5kbGVy OjprZXlFdmVudChjb25zdCBQbGF0Zm9ybUtleWJvYXJkRXZlbnQmIGluaXRpYWxLZXlFdmVudCkK ICAgICBpZiAoIW5vZGUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIFVzZXJHZXN0dXJl SW5kaWNhdG9yIGdlc3R1cmVJbmRpY2F0b3IoRGVmaW5pdGVseVByb2Nlc3NpbmdVc2VyR2VzdHVy ZSk7CisgICAgT3duUHRyPFVzZXJHZXN0dXJlSW5kaWNhdG9yPiBnZXN0dXJlSW5kaWNhdG9yOwor CisgICAgaWYgKCFVc2VyR2VzdHVyZUluZGljYXRvcjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCkp CisgICAgICAgIGdlc3R1cmVJbmRpY2F0b3IgPSBhZG9wdFB0cihuZXcgVXNlckdlc3R1cmVJbmRp Y2F0b3IoRGVmaW5pdGVseVByb2Nlc3NpbmdVc2VyR2VzdHVyZSkpOwogICAgIFVzZXJUeXBpbmdH ZXN0dXJlSW5kaWNhdG9yIHR5cGluZ0dlc3R1cmVJbmRpY2F0b3IobV9mcmFtZSk7CiAKICAgICBp ZiAoRnJhbWVWaWV3KiB2aWV3ID0gbV9mcmFtZS0+dmlldygpKQpAQCAtMzg1Myw3ICszODYzLDEw IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5kbGVUb3VjaEV2ZW50KGNvbnN0IFBsYXRmb3JtVG91 Y2hFdmVudCYgZXZlbnQpCiAKICAgICBjb25zdCBWZWN0b3I8UGxhdGZvcm1Ub3VjaFBvaW50PiYg cG9pbnRzID0gZXZlbnQudG91Y2hQb2ludHMoKTsKIAotICAgIFVzZXJHZXN0dXJlSW5kaWNhdG9y IGdlc3R1cmVJbmRpY2F0b3IoRGVmaW5pdGVseVByb2Nlc3NpbmdVc2VyR2VzdHVyZSk7CisgICAg T3duUHRyPFVzZXJHZXN0dXJlSW5kaWNhdG9yPiBnZXN0dXJlSW5kaWNhdG9yOworCisgICAgaWYg KCFVc2VyR2VzdHVyZUluZGljYXRvcjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCkpCisgICAgICAg IGdlc3R1cmVJbmRpY2F0b3IgPSBhZG9wdFB0cihuZXcgVXNlckdlc3R1cmVJbmRpY2F0b3IoRGVm aW5pdGVseVByb2Nlc3NpbmdVc2VyR2VzdHVyZSkpOwogCiAgICAgdW5zaWduZWQgaTsKICAgICBi b29sIGZyZXNoVG91Y2hFdmVudHMgPSB0cnVlOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGYyYWIyOWRiZGM0NDFiODIyNzU2 MzcxY2U2Yjg2OWZiZThlZTA5ODQuLmZjMTYxMmQ4ODY0ZTZmMjZmNWU1YzQxZjI3N2U4OWE2Mjg2 YmJhYmYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMy0wMy0wOSAgSm9jaGVuIEVpc2luZ2Vy ICA8am9jaGVuQGNocm9taXVtLm9yZz4KKworICAgICAgICBEb24ndCBjcmVhdGUgbXVsdGlwbGUg dXNlciBnZXN0dXJlIGluZGljYXRvcnMgd2hlbiBmb3J3YXJkaW5nIGV2ZW50cyB0byBzdWIgZnJh bWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE5 MjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBs YXRmb3JtL2Nocm9taXVtL2Zhc3QvZXZlbnRzL3BvcHVwLWFsbG93ZWQtZnJvbS1nZXN0dXJlLW9u bHktb25jZS1pZnJhbWVzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0v Y2hyb21pdW0vZmFzdC9ldmVudHMvcG9wdXAtYWxsb3dlZC1mcm9tLWdlc3R1cmUtb25seS1vbmNl LWlmcmFtZXMuaHRtbDogQWRkZWQuCisKIDIwMTMtMDMtMDcgIFJvYmVydCBIb2dhbiAgPHJvYmVy dEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjE0MDkwNyk6IEluY29ycmVjdCBi YXNlbGluZSBmb3IgY2VsbHMgd2l0aCBtZWRpYSBjb250ZW50IGR1cmluZyBsb2FkCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS9mYXN0L2V2ZW50cy9wb3B1cC1hbGxv d2VkLWZyb20tZ2VzdHVyZS1vbmx5LW9uY2UtaWZyYW1lcy1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS9mYXN0L2V2ZW50cy9wb3B1cC1hbGxvd2VkLWZyb20tZ2Vz dHVyZS1vbmx5LW9uY2UtaWZyYW1lcy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMzY4YzA1ZTcz ZGYzMTc2ZDJmMmQ3ZDg2ODM2MDFlZWZjZjc4YTE0MgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL2Zhc3QvZXZlbnRzL3BvcHVwLWFsbG93ZWQtZnJvbS1n ZXN0dXJlLW9ubHktb25jZS1pZnJhbWVzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDYgQEAKK1Rl c3QgdGhhdCB3ZSBkb24ndCBjcmVhdGUgYSBuZXcgdXNlciBnZXN0dXJlIGluZGljYXRvciBldmVy eSB0aW1lIGFuIGV2ZW50IGlzIHBhc3NlZCB0byBhbiBpZnJhbWUuCisKK1RvIHJ1biwgY2xpY2sg b24gdGhlIGlmcmFtZS4gVGhlIHRlc3QgcGFzc2VzLCBpZiBvbmx5IG9uZSB3aW5kb3cgaXMgb3Bl bmVkIGluIHJlc3BvbnNlIHRvIHRoZSBjbGljay4KKworCitQQVNTRUQKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL2Zhc3QvZXZlbnRzL3BvcHVwLWFsbG93ZWQtZnJv bS1nZXN0dXJlLW9ubHktb25jZS1pZnJhbWVzLmh0bWwgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9j aHJvbWl1bS9mYXN0L2V2ZW50cy9wb3B1cC1hbGxvd2VkLWZyb20tZ2VzdHVyZS1vbmx5LW9uY2Ut aWZyYW1lcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjM3NDcxMzg1MTcxZDE0M2IzNmY1NTY0ZjYxNTNiZmZj ZjJkZWUxMzYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1 bS9mYXN0L2V2ZW50cy9wb3B1cC1hbGxvd2VkLWZyb20tZ2VzdHVyZS1vbmx5LW9uY2UtaWZyYW1l cy5odG1sCkBAIC0wLDAgKzEsNDYgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+IAorICAgIDxi b2R5PgorICAgICAgICA8cD4KKyAgICAgICAgICAgIFRlc3QgdGhhdCB3ZSBkb24ndCBjcmVhdGUg YSBuZXcgdXNlciBnZXN0dXJlIGluZGljYXRvciBldmVyeSB0aW1lCisgICAgICAgICAgICBhbiBl dmVudCBpcyBwYXNzZWQgdG8gYW4gaWZyYW1lLgorICAgICAgICA8L3A+CisgICAgICAgIDxwPgor ICAgICAgICAgICAgVG8gcnVuLCBjbGljayBvbiB0aGUgaWZyYW1lLiBUaGUgdGVzdCBwYXNzZXMs IGlmIG9ubHkgb25lIHdpbmRvdworICAgICAgICAgICAgaXMgb3BlbmVkIGluIHJlc3BvbnNlIHRv IHRoZSBjbGljay4KKyAgICAgICAgPC9wPgorICAgICAgICA8aWZyYW1lIGlkPSJpZnJhbWUiIHNy Yz0iYWJvdXQ6YmxhbmsiPjwvaWZyYW1lPgorICAgICAgICA8ZGl2IGlkPSJjb25zb2xlIj48L2Rp dj4KKyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgICAgIHZhciBpZnJhbWUgPSBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgiaWZyYW1lIik7CisgICAgICAgICAgICBpZnJhbWUuY29udGVudERvY3Vt ZW50LmJvZHkub25jbGljayA9IGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAgIHdpbmRvdy5v cGVuKCJhYm91dDpibGFuayIsICJ3aW5kb3cxIik7CisgICAgICAgICAgICAgICAgd2luZG93Lm9w ZW4oImFib3V0OmJsYW5rIiwgIndpbmRvdzIiKTsKKyAgICAgICAgICAgICAgICBpZiAod2luZG93 LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHRlc3RSdW5uZXIud2luZG93 Q291bnQoKSA9PSB3aW5kb3dDb3VudCArIDEpCisgICAgICAgICAgICAgICAgICAgICAgICBkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgiY29uc29sZSIpLmlubmVyVGV4dCA9ICJQQVNTRUQiOworICAg ICAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgICAgICBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgiY29uc29sZSIpLmlubmVyVGV4dCA9ICJGQUlMRUQiOworICAgICAgICAg ICAgICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKKyAgICAgICAgICAgICAgICB9Cisg ICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikgeworICAg ICAgICAgICAgICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworICAgICAgICAgICAgICAgIHRl c3RSdW5uZXIuc2V0Q2FuT3BlbldpbmRvd3MoKTsKKyAgICAgICAgICAgICAgICB0ZXN0UnVubmVy LnNldFBvcHVwQmxvY2tpbmdFbmFibGVkKHRydWUpOworICAgICAgICAgICAgICAgIHRlc3RSdW5u ZXIuc2V0Q2xvc2VSZW1haW5pbmdXaW5kb3dzV2hlbkNvbXBsZXRlKHRydWUpOworICAgICAgICAg ICAgICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworICAgICAgICAgICAgICAgIHdpbmRv d0NvdW50ID0gdGVzdFJ1bm5lci53aW5kb3dDb3VudCgpOworCisgICAgICAgICAgICAgICAgdmFy IGZyYW1lID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImlmcmFtZSIpOworCisgICAgICAgICAg ICAgICAgaWYgKHdpbmRvdy5ldmVudFNlbmRlcikgeworICAgICAgICAgICAgICAgICAgICBldmVu dFNlbmRlci5tb3VzZU1vdmVUbyhmcmFtZS5vZmZzZXRMZWZ0ICsgZnJhbWUub2Zmc2V0V2lkdGgg LyAyLCBmcmFtZS5vZmZzZXRUb3AgKyBmcmFtZS5vZmZzZXRIZWlnaHQgLyAyKTsKKyAgICAgICAg ICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VEb3duKCk7CisgICAgICAgICAgICAgICAgICAg IGV2ZW50U2VuZGVyLm1vdXNlVXAoKTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9 CisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvYm9keT4KKyAgPC9odG1sPgo= 192575 2013-03-11 15:29:24 -0700 2013-03-11 22:47:33 -0700 Patch bug-111923-20130311232523.patch text/plain 10554 jochen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjBmYTBjYmNmMGZkMTMz YTU2ODcwMjMyMmQ3OWVkMmMzMThkOTY2NC4uMjk5NmIzY2MyYzc4NDIxOTcwOWE3NmE3YzEyYTZm MmE0ZWQ0YTQ0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDEzLTAzLTExICBKb2No ZW4gRWlzaW5nZXIgIDxqb2NoZW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIERvbid0IGNyZWF0 ZSBtdWx0aXBsZSB1c2VyIGdlc3R1cmUgaW5kaWNhdG9ycyB3aGVuIGZvcndhcmRpbmcgZXZlbnRz IHRvIHN1YiBmcmFtZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExMTkyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFBvcnRzIHRoYXQgaW1wbGVtZW50IGNvbnN1bWFibGUgdXNlciBnZXN0dXJlcyBkZXBl bmQgb24gYSBzaW5nbGUgdXNlcgorICAgICAgICBnZXN0dXJlIGluZGljYXRvciBiZWluZyBjcmVh dGVkIGluIHJlc3BvbnNlIHRvIGEgc2luZ2xlIHVzZXIgZ2VzdHVyZS4KKworICAgICAgICBUZXN0 OiBwbGF0Zm9ybS9jaHJvbWl1bS9mYXN0L2V2ZW50cy9wb3B1cC1hbGxvd2VkLWZyb20tZ2VzdHVy ZS1vbmx5LW9uY2UtaWZyYW1lcy5odG1sCisKKyAgICAgICAgKiBkb20vVXNlckdlc3R1cmVJbmRp Y2F0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aXNEZWZpbml0ZSk6CisgICAgICAgIChXZWJD b3JlOjpVc2VyR2VzdHVyZUluZGljYXRvcjo6VXNlckdlc3R1cmVJbmRpY2F0b3IpOgorICAgICAg ICAoV2ViQ29yZTo6VXNlckdlc3R1cmVJbmRpY2F0b3I6OnByb2Nlc3NpbmdVc2VyR2VzdHVyZSk6 CisgICAgICAgICogZG9tL1VzZXJHZXN0dXJlSW5kaWNhdG9yLmg6CisgICAgICAgICogcGFnZS9F dmVudEhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpoYW5kbGVN b3VzZVByZXNzRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpoYW5kbGVN b3VzZURvdWJsZUNsaWNrRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpo YW5kbGVNb3VzZVJlbGVhc2VFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6 OmtleUV2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6aGFuZGxlVG91Y2hF dmVudCk6CisKKzIwMTMtMDMtMTEgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1bS5v cmc+CisKICAgICAgICAgUmVuYW1lIERlZmluaXRlbHlQcm9jZXNzaW5nVXNlckdlc3R1cmUgdG8g RGVmaW5pdGVseVByb2Nlc3NpbmdOZXdVc2VyR2VzdHVyZQogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExOTU5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9Vc2VyR2VzdHVyZUluZGljYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20v VXNlckdlc3R1cmVJbmRpY2F0b3IuY3BwCmluZGV4IDgwODYwMzZjYmFjODIzMjdhMTYxZTA2OGM3 ODU3N2YxZjFkMWIwY2EuLjYxZDA0MGE2NzFiM2I2ZTdmYTM2MWU3NTViZDFiMWYzNmQzZGJiNDUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Vc2VyR2VzdHVyZUluZGljYXRvci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1VzZXJHZXN0dXJlSW5kaWNhdG9yLmNwcApAQCAtNTks NyArNTksNyBAQCBwcml2YXRlOgogCiBzdGF0aWMgYm9vbCBpc0RlZmluaXRlKFByb2Nlc3NpbmdV c2VyR2VzdHVyZVN0YXRlIHN0YXRlKQogewotICAgIHJldHVybiBzdGF0ZSA9PSBEZWZpbml0ZWx5 UHJvY2Vzc2luZ05ld1VzZXJHZXN0dXJlIHx8IHN0YXRlID09IERlZmluaXRlbHlOb3RQcm9jZXNz aW5nVXNlckdlc3R1cmU7CisgICAgcmV0dXJuIHN0YXRlID09IERlZmluaXRlbHlQcm9jZXNzaW5n TmV3VXNlckdlc3R1cmUgfHwgc3RhdGUgPT0gRGVmaW5pdGVseVByb2Nlc3NpbmdVc2VyR2VzdHVy ZSB8fCBzdGF0ZSA9PSBEZWZpbml0ZWx5Tm90UHJvY2Vzc2luZ1VzZXJHZXN0dXJlOwogfQogCiBQ cm9jZXNzaW5nVXNlckdlc3R1cmVTdGF0ZSBVc2VyR2VzdHVyZUluZGljYXRvcjo6c19zdGF0ZSA9 IERlZmluaXRlbHlOb3RQcm9jZXNzaW5nVXNlckdlc3R1cmU7CkBAIC04MCw2ICs4MCw4IEBAIFVz ZXJHZXN0dXJlSW5kaWNhdG9yOjpVc2VyR2VzdHVyZUluZGljYXRvcihQcm9jZXNzaW5nVXNlckdl c3R1cmVTdGF0ZSBzdGF0ZSkKIAogICAgIGlmIChzdGF0ZSA9PSBEZWZpbml0ZWx5UHJvY2Vzc2lu Z05ld1VzZXJHZXN0dXJlKQogICAgICAgICBzdGF0aWNfY2FzdDxHZXN0dXJlVG9rZW4qPihtX3Rv a2VuLmdldCgpKS0+YWRkR2VzdHVyZSgpOworICAgIGVsc2UgaWYgKHN0YXRlID09IERlZmluaXRl bHlQcm9jZXNzaW5nVXNlckdlc3R1cmUgJiYgc190b3Btb3N0SW5kaWNhdG9yID09IHRoaXMpCisg ICAgICAgIHN0YXRpY19jYXN0PEdlc3R1cmVUb2tlbio+KG1fdG9rZW4uZ2V0KCkpLT5hZGRHZXN0 dXJlKCk7CiAgICAgQVNTRVJUKGlzRGVmaW5pdGUoc19zdGF0ZSkpOwogfQogCkBAIC05NSw3ICs5 Nyw3IEBAIFVzZXJHZXN0dXJlSW5kaWNhdG9yOjpVc2VyR2VzdHVyZUluZGljYXRvcihQYXNzUmVm UHRyPFVzZXJHZXN0dXJlVG9rZW4+IHRva2VuKQogICAgICAgICAgICAgc3RhdGljX2Nhc3Q8R2Vz dHVyZVRva2VuKj4obV90b2tlbi5nZXQoKSktPmFkZEdlc3R1cmUoKTsKICAgICAgICAgICAgIHN0 YXRpY19jYXN0PEdlc3R1cmVUb2tlbio+KHRva2VuLmdldCgpKS0+Y29uc3VtZUdlc3R1cmUoKTsK ICAgICAgICAgfQotICAgICAgICBzX3N0YXRlID0gRGVmaW5pdGVseVByb2Nlc3NpbmdOZXdVc2Vy R2VzdHVyZTsKKyAgICAgICAgc19zdGF0ZSA9IERlZmluaXRlbHlQcm9jZXNzaW5nVXNlckdlc3R1 cmU7CiAgICAgfQogCiAgICAgQVNTRVJUKGlzRGVmaW5pdGUoc19zdGF0ZSkpOwpAQCAtMTExLDcg KzExMyw3IEBAIFVzZXJHZXN0dXJlSW5kaWNhdG9yOjp+VXNlckdlc3R1cmVJbmRpY2F0b3IoKQog CiBib29sIFVzZXJHZXN0dXJlSW5kaWNhdG9yOjpwcm9jZXNzaW5nVXNlckdlc3R1cmUoKQogewot ICAgIHJldHVybiBzX3RvcG1vc3RJbmRpY2F0b3IgJiYgc3RhdGljX2Nhc3Q8R2VzdHVyZVRva2Vu Kj4oc190b3Btb3N0SW5kaWNhdG9yLT5jdXJyZW50VG9rZW4oKSktPmhhc0dlc3R1cmVzKCkgJiYg c19zdGF0ZSA9PSBEZWZpbml0ZWx5UHJvY2Vzc2luZ05ld1VzZXJHZXN0dXJlOworICAgIHJldHVy biBzX3RvcG1vc3RJbmRpY2F0b3IgJiYgc3RhdGljX2Nhc3Q8R2VzdHVyZVRva2VuKj4oc190b3Bt b3N0SW5kaWNhdG9yLT5jdXJyZW50VG9rZW4oKSktPmhhc0dlc3R1cmVzKCkgJiYgKHNfc3RhdGUg PT0gRGVmaW5pdGVseVByb2Nlc3NpbmdOZXdVc2VyR2VzdHVyZSB8fCBzX3N0YXRlID09IERlZmlu aXRlbHlQcm9jZXNzaW5nVXNlckdlc3R1cmUpOwogfQogCiBib29sIFVzZXJHZXN0dXJlSW5kaWNh dG9yOjpjb25zdW1lVXNlckdlc3R1cmUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9t L1VzZXJHZXN0dXJlSW5kaWNhdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vVXNlckdlc3R1cmVJ bmRpY2F0b3IuaAppbmRleCA4ZDMyNTliZjI0ZTYwMWM3Nzk4MmVhMThiNjUwZTE4NTY5ZmM3M2Fi Li45MzMyOTIwYmI4OTQ4ZWNkNjI4ZTI4OWFiZTAzNGE3NDg5NmY4MThmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9kb20vVXNlckdlc3R1cmVJbmRpY2F0b3IuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vVXNlckdlc3R1cmVJbmRpY2F0b3IuaApAQCAtMzQsNiArMzQsNyBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIGVudW0gUHJvY2Vzc2luZ1VzZXJHZXN0dXJlU3RhdGUgewogICAgIERl ZmluaXRlbHlQcm9jZXNzaW5nTmV3VXNlckdlc3R1cmUsCisgICAgRGVmaW5pdGVseVByb2Nlc3Np bmdVc2VyR2VzdHVyZSwKICAgICBQb3NzaWJseVByb2Nlc3NpbmdVc2VyR2VzdHVyZSwKICAgICBE ZWZpbml0ZWx5Tm90UHJvY2Vzc2luZ1VzZXJHZXN0dXJlCiB9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVu dEhhbmRsZXIuY3BwCmluZGV4IGY3NDI5MjAzYjY3OGZiZjA5NDc1NTBjNzNkYjA0NzFlYTYzMTQ5 MGYuLjk0YTg0MDI0YzMyNGI3ZmJhNTEwM2YwMGRhNmRkZmZhMjQ2NGY3YWUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKQEAgLTE0NTQsNyArMTQ1NCw3IEBAIGJvb2wgRXZlbnRI YW5kbGVyOjpoYW5kbGVNb3VzZVByZXNzRXZlbnQoY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBt b3VzZUV2ZW50KQogICAgICAgICByZXR1cm4gdHJ1ZTsKICNlbmRpZgogCi0gICAgVXNlckdlc3R1 cmVJbmRpY2F0b3IgZ2VzdHVyZUluZGljYXRvcihEZWZpbml0ZWx5UHJvY2Vzc2luZ05ld1VzZXJH ZXN0dXJlKTsKKyAgICBVc2VyR2VzdHVyZUluZGljYXRvciBnZXN0dXJlSW5kaWNhdG9yKERlZmlu aXRlbHlQcm9jZXNzaW5nVXNlckdlc3R1cmUpOwogICAgIG1fbGFzdE1vdXNlRG93blVzZXJHZXN0 dXJlVG9rZW4gPSBnZXN0dXJlSW5kaWNhdG9yLmN1cnJlbnRUb2tlbigpOwogCiAgICAgLy8gRklY TUUgKGJ1ZyA2ODE4NSk6IHRoaXMgY2FsbCBzaG91bGQgYmUgbWFkZSBhdCBhbm90aGVyIGFic3Ry YWN0aW9uIGxheWVyCkBAIC0xNTg4LDcgKzE1ODgsNyBAQCBib29sIEV2ZW50SGFuZGxlcjo6aGFu ZGxlTW91c2VEb3VibGVDbGlja0V2ZW50KGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYgbW91c2VF dgogCiAgICAgbV9mcmFtZS0+c2VsZWN0aW9uKCktPnNldENhcmV0QmxpbmtpbmdTdXNwZW5kZWQo ZmFsc2UpOwogCi0gICAgVXNlckdlc3R1cmVJbmRpY2F0b3IgZ2VzdHVyZUluZGljYXRvcihEZWZp bml0ZWx5UHJvY2Vzc2luZ05ld1VzZXJHZXN0dXJlKTsKKyAgICBVc2VyR2VzdHVyZUluZGljYXRv ciBnZXN0dXJlSW5kaWNhdG9yKERlZmluaXRlbHlQcm9jZXNzaW5nVXNlckdlc3R1cmUpOwogCiAg ICAgLy8gV2UgZ2V0IHRoaXMgaW5zdGVhZCBvZiBhIHNlY29uZCBtb3VzZS11cCAKICAgICBtX21v dXNlUHJlc3NlZCA9IGZhbHNlOwpAQCAtMTgzMSw3ICsxODMxLDcgQEAgYm9vbCBFdmVudEhhbmRs ZXI6OmhhbmRsZU1vdXNlUmVsZWFzZUV2ZW50KGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYgbW91 c2VFdmVudCkKICAgICBpZiAobV9sYXN0TW91c2VEb3duVXNlckdlc3R1cmVUb2tlbikKICAgICAg ICAgZ2VzdHVyZUluZGljYXRvciA9IGFkb3B0UHRyKG5ldyBVc2VyR2VzdHVyZUluZGljYXRvciht X2xhc3RNb3VzZURvd25Vc2VyR2VzdHVyZVRva2VuLnJlbGVhc2UoKSkpOwogICAgIGVsc2UKLSAg ICAgICAgZ2VzdHVyZUluZGljYXRvciA9IGFkb3B0UHRyKG5ldyBVc2VyR2VzdHVyZUluZGljYXRv cihEZWZpbml0ZWx5UHJvY2Vzc2luZ05ld1VzZXJHZXN0dXJlKSk7CisgICAgICAgIGdlc3R1cmVJ bmRpY2F0b3IgPSBhZG9wdFB0cihuZXcgVXNlckdlc3R1cmVJbmRpY2F0b3IoRGVmaW5pdGVseVBy b2Nlc3NpbmdVc2VyR2VzdHVyZSkpOwogCiAjaWYgRU5BQkxFKFBBTl9TQ1JPTExJTkcpCiAgICAg bV9hdXRvc2Nyb2xsQ29udHJvbGxlci0+aGFuZGxlTW91c2VSZWxlYXNlRXZlbnQobW91c2VFdmVu dCk7CkBAIC0zMTU2LDcgKzMxNTYsNyBAQCBib29sIEV2ZW50SGFuZGxlcjo6a2V5RXZlbnQoY29u c3QgUGxhdGZvcm1LZXlib2FyZEV2ZW50JiBpbml0aWFsS2V5RXZlbnQpCiAgICAgaWYgKCFub2Rl KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBVc2VyR2VzdHVyZUluZGljYXRvciBnZXN0 dXJlSW5kaWNhdG9yKERlZmluaXRlbHlQcm9jZXNzaW5nTmV3VXNlckdlc3R1cmUpOworICAgIFVz ZXJHZXN0dXJlSW5kaWNhdG9yIGdlc3R1cmVJbmRpY2F0b3IoRGVmaW5pdGVseVByb2Nlc3NpbmdV c2VyR2VzdHVyZSk7CiAgICAgVXNlclR5cGluZ0dlc3R1cmVJbmRpY2F0b3IgdHlwaW5nR2VzdHVy ZUluZGljYXRvcihtX2ZyYW1lKTsKIAogICAgIGlmIChGcmFtZVZpZXcqIHZpZXcgPSBtX2ZyYW1l LT52aWV3KCkpCkBAIC0zODUzLDcgKzM4NTMsNyBAQCBib29sIEV2ZW50SGFuZGxlcjo6aGFuZGxl VG91Y2hFdmVudChjb25zdCBQbGF0Zm9ybVRvdWNoRXZlbnQmIGV2ZW50KQogCiAgICAgY29uc3Qg VmVjdG9yPFBsYXRmb3JtVG91Y2hQb2ludD4mIHBvaW50cyA9IGV2ZW50LnRvdWNoUG9pbnRzKCk7 CiAKLSAgICBVc2VyR2VzdHVyZUluZGljYXRvciBnZXN0dXJlSW5kaWNhdG9yKERlZmluaXRlbHlQ cm9jZXNzaW5nTmV3VXNlckdlc3R1cmUpOworICAgIFVzZXJHZXN0dXJlSW5kaWNhdG9yIGdlc3R1 cmVJbmRpY2F0b3IoRGVmaW5pdGVseVByb2Nlc3NpbmdVc2VyR2VzdHVyZSk7CiAKICAgICB1bnNp Z25lZCBpOwogICAgIGJvb2wgZnJlc2hUb3VjaEV2ZW50cyA9IHRydWU7CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZWJiMTE2 MjRhOGQ2YTZlMmVkMDcxZDc2ZjVkMDU1MDMyOTE2ZGYwMi4uYTUwZTE4NmQ1YjA3YmQwNDA1OTg2 YzhhMzJkNDk3YjZiYTk2ZjBhNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisr KyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEzLTAzLTExICBK b2NoZW4gRWlzaW5nZXIgIDxqb2NoZW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIERvbid0IGNy ZWF0ZSBtdWx0aXBsZSB1c2VyIGdlc3R1cmUgaW5kaWNhdG9ycyB3aGVuIGZvcndhcmRpbmcgZXZl bnRzIHRvIHN1YiBmcmFtZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExMTkyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFBvcnRzIHRoYXQgaW1wbGVtZW50IGNvbnN1bWFibGUgdXNlciBnZXN0dXJlcyBk ZXBlbmQgb24gYSBzaW5nbGUgdXNlcgorICAgICAgICBnZXN0dXJlIGluZGljYXRvciBiZWluZyBj cmVhdGVkIGluIHJlc3BvbnNlIHRvIGEgc2luZ2xlIHVzZXIgZ2VzdHVyZS4KKworICAgICAgICAq IHBsYXRmb3JtL2Nocm9taXVtL2Zhc3QvZXZlbnRzL3BvcHVwLWFsbG93ZWQtZnJvbS1nZXN0dXJl LW9ubHktb25jZS1pZnJhbWVzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogcGxhdGZv cm0vY2hyb21pdW0vZmFzdC9ldmVudHMvcG9wdXAtYWxsb3dlZC1mcm9tLWdlc3R1cmUtb25seS1v bmNlLWlmcmFtZXMuaHRtbDogQWRkZWQuCisKIDIwMTMtMDMtMDcgIEFsZXhhbmRlciBQYXZsb3Yg IDxhcGF2bG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBbRWxlbWVu dHNdIFhTTFQgdHJhbnNmb3JtYXRpb24gcmVzdWx0IGZyb20gdGhlIHhtbC1zdHlsZXNoZWV0IFBJ IG5vdCByZW5kZXJlZApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0v ZmFzdC9ldmVudHMvcG9wdXAtYWxsb3dlZC1mcm9tLWdlc3R1cmUtb25seS1vbmNlLWlmcmFtZXMt ZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vZmFzdC9ldmVudHMv cG9wdXAtYWxsb3dlZC1mcm9tLWdlc3R1cmUtb25seS1vbmNlLWlmcmFtZXMtZXhwZWN0ZWQudHh0 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjM2OGMwNWU3M2RmMzE3NmQyZjJkN2Q4NjgzNjAxZWVmY2Y3OGExNDIKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS9mYXN0L2V2ZW50 cy9wb3B1cC1hbGxvd2VkLWZyb20tZ2VzdHVyZS1vbmx5LW9uY2UtaWZyYW1lcy1leHBlY3RlZC50 eHQKQEAgLTAsMCArMSw2IEBACitUZXN0IHRoYXQgd2UgZG9uJ3QgY3JlYXRlIGEgbmV3IHVzZXIg Z2VzdHVyZSBpbmRpY2F0b3IgZXZlcnkgdGltZSBhbiBldmVudCBpcyBwYXNzZWQgdG8gYW4gaWZy YW1lLgorCitUbyBydW4sIGNsaWNrIG9uIHRoZSBpZnJhbWUuIFRoZSB0ZXN0IHBhc3NlcywgaWYg b25seSBvbmUgd2luZG93IGlzIG9wZW5lZCBpbiByZXNwb25zZSB0byB0aGUgY2xpY2suCisKKwor UEFTU0VECmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS9mYXN0L2V2 ZW50cy9wb3B1cC1hbGxvd2VkLWZyb20tZ2VzdHVyZS1vbmx5LW9uY2UtaWZyYW1lcy5odG1sIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vZmFzdC9ldmVudHMvcG9wdXAtYWxsb3dlZC1m cm9tLWdlc3R1cmUtb25seS1vbmNlLWlmcmFtZXMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zNzQ3MTM4NTE3 MWQxNDNiMzZmNTU2NGY2MTUzYmZmY2YyZGVlMTM2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vZmFzdC9ldmVudHMvcG9wdXAtYWxsb3dlZC1mcm9tLWdl c3R1cmUtb25seS1vbmNlLWlmcmFtZXMuaHRtbApAQCAtMCwwICsxLDQ2IEBACis8IURPQ1RZUEUg aHRtbD4KKzxodG1sPiAKKyAgICA8Ym9keT4KKyAgICAgICAgPHA+CisgICAgICAgICAgICBUZXN0 IHRoYXQgd2UgZG9uJ3QgY3JlYXRlIGEgbmV3IHVzZXIgZ2VzdHVyZSBpbmRpY2F0b3IgZXZlcnkg dGltZQorICAgICAgICAgICAgYW4gZXZlbnQgaXMgcGFzc2VkIHRvIGFuIGlmcmFtZS4KKyAgICAg ICAgPC9wPgorICAgICAgICA8cD4KKyAgICAgICAgICAgIFRvIHJ1biwgY2xpY2sgb24gdGhlIGlm cmFtZS4gVGhlIHRlc3QgcGFzc2VzLCBpZiBvbmx5IG9uZSB3aW5kb3cKKyAgICAgICAgICAgIGlz IG9wZW5lZCBpbiByZXNwb25zZSB0byB0aGUgY2xpY2suCisgICAgICAgIDwvcD4KKyAgICAgICAg PGlmcmFtZSBpZD0iaWZyYW1lIiBzcmM9ImFib3V0OmJsYW5rIj48L2lmcmFtZT4KKyAgICAgICAg PGRpdiBpZD0iY29uc29sZSI+PC9kaXY+CisgICAgICAgIDxzY3JpcHQ+CisgICAgICAgICAgICB2 YXIgaWZyYW1lID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImlmcmFtZSIpOworICAgICAgICAg ICAgaWZyYW1lLmNvbnRlbnREb2N1bWVudC5ib2R5Lm9uY2xpY2sgPSBmdW5jdGlvbigpIHsKKyAg ICAgICAgICAgICAgICB3aW5kb3cub3BlbigiYWJvdXQ6YmxhbmsiLCAid2luZG93MSIpOworICAg ICAgICAgICAgICAgIHdpbmRvdy5vcGVuKCJhYm91dDpibGFuayIsICJ3aW5kb3cyIik7CisgICAg ICAgICAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgICAgICAgICAgICAgICAg IGlmICh0ZXN0UnVubmVyLndpbmRvd0NvdW50KCkgPT0gd2luZG93Q291bnQgKyAxKQorICAgICAg ICAgICAgICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbnNvbGUiKS5pbm5l clRleHQgPSAiUEFTU0VEIjsKKyAgICAgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAg ICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbnNvbGUiKS5pbm5lclRleHQg PSAiRkFJTEVEIjsKKyAgICAgICAgICAgICAgICAgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7 CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorCisgICAgICAgICAgICBpZiAod2lu ZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgICAgICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQo KTsKKyAgICAgICAgICAgICAgICB0ZXN0UnVubmVyLnNldENhbk9wZW5XaW5kb3dzKCk7CisgICAg ICAgICAgICAgICAgdGVzdFJ1bm5lci5zZXRQb3B1cEJsb2NraW5nRW5hYmxlZCh0cnVlKTsKKyAg ICAgICAgICAgICAgICB0ZXN0UnVubmVyLnNldENsb3NlUmVtYWluaW5nV2luZG93c1doZW5Db21w bGV0ZSh0cnVlKTsKKyAgICAgICAgICAgICAgICB0ZXN0UnVubmVyLndhaXRVbnRpbERvbmUoKTsK KyAgICAgICAgICAgICAgICB3aW5kb3dDb3VudCA9IHRlc3RSdW5uZXIud2luZG93Q291bnQoKTsK KworICAgICAgICAgICAgICAgIHZhciBmcmFtZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJp ZnJhbWUiKTsKKworICAgICAgICAgICAgICAgIGlmICh3aW5kb3cuZXZlbnRTZW5kZXIpIHsKKyAg ICAgICAgICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oZnJhbWUub2Zmc2V0TGVm dCArIGZyYW1lLm9mZnNldFdpZHRoIC8gMiwgZnJhbWUub2Zmc2V0VG9wICsgZnJhbWUub2Zmc2V0 SGVpZ2h0IC8gMik7CisgICAgICAgICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlRG93bigp OworICAgICAgICAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVVwKCk7CisgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2JvZHk+Cisg IDwvaHRtbD4K