138458 2014-11-06 01:33:04 -0800 TextIndicatorWindow's bounce animation is lopsided when indicating two short lines of text 2014-11-06 11:39:06 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca bdakin mitz simon.fraser webkit-bug-importer oldest_to_newest 1046763 0 thorton 2014-11-06 01:33:04 -0800 TextIndicatorWindow's bounce animation is lopsided when indicating two short lines of text 1046764 1 241095 thorton 2014-11-06 01:33:29 -0800 Created attachment 241095 Patch 1046766 2 webkit-bug-importer 2014-11-06 01:35:27 -0800 <rdar://problem/18892496> 1046855 3 241095 simon.fraser 2014-11-06 11:04:38 -0800 Comment on attachment 241095 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241095&action=review > Source/WebKit2/Shared/TextIndicator.cpp:184 > + for (const FloatRect& textRectInWindowCoordinates : textRectsInWindowCoordinates) { auto? :\ I would be OK calling textRectInWindowCoordinates "rect". > Source/WebKit2/Shared/TextIndicator.cpp:185 > + FloatRect textRectInBoundingRectCoordinates = textRectInWindowCoordinates; Why didn't you just get it by value? > Source/WebKit2/Shared/TextIndicator.cpp:268 > + for (size_t i = 0; i < m_data.textRectsInBoundingRectCoordinates.size(); ++i) { Modern loop? > Source/WebKit2/Shared/TextIndicator.cpp:322 > + FloatRect imageRect = textRect; > + imageRect.move(m_data.textBoundingRectInWindowCoordinates.location() - m_data.selectionRectInWindowCoordinates.location()); > + m_data.contentImage->paint(graphicsContext, m_data.contentImageScaleFactor, enclosingIntRect(textRect).location(), enclosingIntRect(imageRect)); I see this twice. Maybe use a helper function? 1046860 4 thorton 2014-11-06 11:39:06 -0800 http://trac.webkit.org/changeset/175705 241095 2014-11-06 01:33:29 -0800 2014-11-06 11:04:38 -0800 Patch bug-138458-20141106013339.patch text/plain 13460 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1NjU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYmNhNjE4ZWM1N2EzMmIz NzIxOTJjODIyYjk2YjgyZDVmODRjM2VjNC4uMjBkOGMzMjQxY2U4ZGZjYjNlMjNkZWQ4YWY2Y2Ji MmY5OWI4OGNjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ4IEBACisyMDE0LTExLTA2ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFRleHRJbmRpY2F0 b3JXaW5kb3cncyBib3VuY2UgYW5pbWF0aW9uIGlzIGxvcHNpZGVkIHdoZW4gaW5kaWNhdGluZyB0 d28gc2hvcnQgbGluZXMgb2YgdGV4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTM4NDU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUHJldmlvdXNseSwgdGhlIFRleHRJbmRpY2F0b3IncyBmcmFtZSgpIGNv dmVyZWQgdGhlIGVudGlyZSBzZWxlY3Rpb24gaGlnaGxpZ2h0IGJvdW5kcy4KKyAgICAgICAgVGhp cyB3YXMgdW5kZXNpcmFibGUgaW4gY2FzZXMgd2hlcmUgdGhlIGhpZ2hsaWdodCBpbmNsdWRlZCBh cmVhcyBmYXIgb3V0c2lkZSB0aGUKKyAgICAgICAgYm91bmRzIG9mIHRoZSBzZWxlY3RlZCB0ZXh0 LCBhcyB0aGUgVGV4dEluZGljYXRvcldpbmRvdydzICdib3VuY2UnIGFuaW1hdGlvbgorICAgICAg ICB3b3VsZCBiZSBtaXNhbGlnbmVkIChjZW50ZXJlZCBvbiB0aGUgaGlnaGxpZ2h0IGluc3RlYWQg b2Ygb24gdGhlIHRleHQpLgorCisgICAgICAgICogU2hhcmVkL1RleHRJbmRpY2F0b3IuY3BwOgor ICAgICAgICBHZXQgcmlkIG9mIHRoZSBtYW55LWFyZ3VtZW50IFRleHRJbmRpY2F0b3I6OmNyZWF0 ZSwgYmVjYXVzZSBpdCB3YXMgb25seSB1c2VkCisgICAgICAgIGludGVybmFsbHksIGFuZCBoYXZl IGNyZWF0ZVdpdGhTZWxlY3Rpb25JbkZyYW1lIG1ha2UgYSA6OkRhdGEgaW5zdGVhZC4KKworICAg ICAgICAoV2ViS2l0OjpUZXh0SW5kaWNhdG9yOjpjcmVhdGVXaXRoU2VsZWN0aW9uSW5GcmFtZSk6 CisgICAgICAgIENvbXB1dGUgYW5kIHN0b3JlIHRoZSBib3VuZGluZyByZWN0IG9mIGFsbCBvZiB0 aGUgc2VsZWN0ZWQgdGV4dCByZWN0cywgYW5kIHN0b3JlCisgICAgICAgIGFsbCBvZiB0aGUgdGV4 dCByZWN0cyByZWxhdGl2ZSB0byB0aGF0IGJvdW5kaW5nIHJlY3QgaW5zdGVhZCBvZiByZWxhdGl2 ZSB0byB0aGUKKyAgICAgICAgc2VsZWN0aW9uIGhpZ2hsaWdodCBib3VuZHMuIFdlIGRvIHRoaXMg YmVjYXVzZSB0aGUgc2VsZWN0aW9uIGhpZ2hsaWdodCBib3VuZHMKKyAgICAgICAgb2Z0ZW4gaW5j bHVkZXMgYXJlYSB3aGljaCBpcyBmYXIgb3V0c2lkZSBvZiB0aGUgdGV4dCBib3VuZHMgKGluIHRo ZSBjYXNlIG9mIGEKKyAgICAgICAgc2VsZWN0aW9uIHRoYXQgc3BhbnMgbXVsdGlwbGUgbGluZXMp LCBhbmQgY2F1c2VzIHRoZSB0ZXh0IGluZGljYXRvciBib3VuY2UKKyAgICAgICAgYW5pbWF0aW9u IHRvIGJvdW5jZSBpbiBhIGxvcHNpZGVkIG1hbm5lci4KKworICAgICAgICAoV2ViS2l0OjpUZXh0 SW5kaWNhdG9yOjpUZXh0SW5kaWNhdG9yKToKKyAgICAgICAgQWRqdXN0IHRvIHRoZSByZW5hbWUg b2YgdGV4dFJlY3RzSW5TZWxlY3Rpb25SZWN0Q29vcmRpbmF0ZXMgLT4gdGV4dFJlY3RzSW5Cb3Vu ZGluZ1JlY3RDb29yZGluYXRlcy4KKworICAgICAgICAoV2ViS2l0OjpUZXh0SW5kaWNhdG9yOjpm cmFtZVJlY3QpOgorICAgICAgICBJbnN0ZWFkIG9mIHRoZSBUZXh0SW5kaWNhdG9yJ3MgZnJhbWUg YmVpbmcgdGhlIHNlbGVjdGlvbiBoaWdobGlnaHQgYm91bmRzLAorICAgICAgICBpdCBpcyBub3cg dGhlIGJvdW5kcyBvZiBhbGwgb2YgdGhlIHRleHQgcmVjdHMuCisKKyAgICAgICAgKFdlYktpdDo6 VGV4dEluZGljYXRvcjo6ZHJhdyk6CisgICAgICAgIFRyYW5zbGF0ZSBpbnRvIHRoZSBpbWFnZSBi eSB0aGUgZGlmZmVyZW5jZSBiZXR3ZWVuIHRoZSBzZWxlY3Rpb24gaGlnaGxpZ2h0IGJvdW5kcwor ICAgICAgICBhbmQgdGhlIHRleHQgYm91bmRpbmcgcmVjdC4gVGhpcyBpcyBuZWNlc3NhcnkgYmVj YXVzZSB0aGUgY29udGVudCBpbWFnZSBpcyBzdGlsbCBnZW5lcmF0ZWQKKyAgICAgICAgY292ZXJp bmcgdGhlIGVudGlyZSBzZWxlY3Rpb24gaGlnaGxpZ2h0IGJvdW5kcywgYnV0IHRoZSB0ZXh0IHJl Y3RzIGFyZSBpbiB0ZXh0LXJlY3QtYm91bmRzIGNvb3JkaW5hdGVzLgorCisgICAgICAgIChXZWJL aXQ6OlRleHRJbmRpY2F0b3I6OkRhdGE6OmVuY29kZSk6CisgICAgICAgIChXZWJLaXQ6OlRleHRJ bmRpY2F0b3I6OkRhdGE6OmRlY29kZSk6CisgICAgICAgIEFkanVzdCB0byB0aGUgcmVuYW1lIG9m IHRleHRSZWN0c0luU2VsZWN0aW9uUmVjdENvb3JkaW5hdGVzIC0+IHRleHRSZWN0c0luQm91bmRp bmdSZWN0Q29vcmRpbmF0ZXMuCisgICAgICAgIEVuY29kZS9kZWNvZGUgdGV4dEJvdW5kaW5nUmVj dEluV2luZG93Q29vcmRpbmF0ZXMuCisKKyAgICAgICAgKiBTaGFyZWQvVGV4dEluZGljYXRvci5o OgorICAgICAgICAoV2ViS2l0OjpUZXh0SW5kaWNhdG9yOjpjb250ZW50SW1hZ2UpOiBEZWxldGVk LgorICAgICAgICBHZXQgcmlkIG9mIGFuIHVubmVjZXNzYXJ5IGdldHRlciBhbmQgY29uc3RydWN0 b3IuCisKIDIwMTQtMTEtMDUgIFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUu Y29tPgogCiAgICAgICAgIEZpeCB0aGUgYnVpbGQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvVGV4dEluZGljYXRvci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvVGV4dElu ZGljYXRvci5jcHAKaW5kZXggMzdlOWJmMjdiMTBhYzg3MTY3NzkwMDkwZjc2OTM4MzE0YzQ1Y2U3 Yy4uNDM5ZWMwYWYyNzBjZTgwYTJhMTNlY2ZkYWEyZTA4NDA5ZmYxMWRkMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvU2hhcmVkL1RleHRJbmRpY2F0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9UZXh0SW5kaWNhdG9yLmNwcApAQCAtMTQ5LDE3ICsxNDksNiBAQCBzdGF0aWMg Ym9vbCB0ZXh0SW5kaWNhdG9yc0ZvclRleHRSZWN0c092ZXJsYXAoY29uc3QgVmVjdG9yPEZsb2F0 UmVjdD4mIHRleHRSZWN0cwogICAgIHJldHVybiBmYWxzZTsKIH0KIAotUGFzc1JlZlB0cjxUZXh0 SW5kaWNhdG9yPiBUZXh0SW5kaWNhdG9yOjpjcmVhdGUoY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0 JiBzZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRlcywgY29uc3QgVmVjdG9yPFdlYkNvcmU6 OkZsb2F0UmVjdD4mIHRleHRSZWN0c0luU2VsZWN0aW9uUmVjdENvb3JkaW5hdGVzLCBmbG9hdCBj b250ZW50SW1hZ2VTY2FsZUZhY3RvciwgUGFzc1JlZlB0cjxTaGFyZWFibGVCaXRtYXA+IGNvbnRl bnRJbWFnZSkKLXsKLSAgICBUZXh0SW5kaWNhdG9yOjpEYXRhIGRhdGE7Ci0gICAgZGF0YS5zZWxl Y3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRlcyA9IHNlbGVjdGlvblJlY3RJbldpbmRvd0Nvb3Jk aW5hdGVzOwotICAgIGRhdGEudGV4dFJlY3RzSW5TZWxlY3Rpb25SZWN0Q29vcmRpbmF0ZXMgPSB0 ZXh0UmVjdHNJblNlbGVjdGlvblJlY3RDb29yZGluYXRlczsKLSAgICBkYXRhLmNvbnRlbnRJbWFn ZVNjYWxlRmFjdG9yID0gY29udGVudEltYWdlU2NhbGVGYWN0b3I7Ci0gICAgZGF0YS5jb250ZW50 SW1hZ2UgPSBjb250ZW50SW1hZ2U7Ci0KLSAgICByZXR1cm4gVGV4dEluZGljYXRvcjo6Y3JlYXRl KGRhdGEpOwotfQotCiBQYXNzUmVmUHRyPFRleHRJbmRpY2F0b3I+IFRleHRJbmRpY2F0b3I6OmNy ZWF0ZShjb25zdCBUZXh0SW5kaWNhdG9yOjpEYXRhJiBkYXRhKQogewogICAgIHJldHVybiBhZG9w dFJlZihuZXcgVGV4dEluZGljYXRvcihkYXRhKSk7CkBAIC0xNzMsMjIgKzE2MiwzOSBAQCBQYXNz UmVmUHRyPFRleHRJbmRpY2F0b3I+IFRleHRJbmRpY2F0b3I6OmNyZWF0ZVdpdGhTZWxlY3Rpb25J bkZyYW1lKFdlYkZyYW1lJiBmcgogICAgIGlmICghaW5kaWNhdG9yQml0bWFwKQogICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKIAotICAgIC8vIFdlIHdhbnQgdGhlIHNlbGVjdGlvbiByZWN0IGluIHdp bmRvdyBjb29yZGluYXRlcy4KKyAgICAvLyBTdG9yZSB0aGUgc2VsZWN0aW9uIHJlY3QgaW4gd2lu ZG93IGNvb3JkaW5hdGVzLCB0byBiZSB1c2VkIHN1YnNlcXVlbnRseQorICAgIC8vIHRvIGRldGVy bWluZSBpZiB0aGUgaW5kaWNhdG9yIGFuZCBzZWxlY3Rpb24gc3RpbGwgcHJlY2lzZWx5IG92ZXJs YXAuCiAgICAgSW50UmVjdCBzZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRlcyA9IGNvcmVG cmFtZS52aWV3KCktPmNvbnRlbnRzVG9XaW5kb3coc2VsZWN0aW9uUmVjdCk7CiAKICAgICBWZWN0 b3I8RmxvYXRSZWN0PiB0ZXh0UmVjdHM7CiAgICAgY29yZUZyYW1lLnNlbGVjdGlvbigpLmdldENs aXBwZWRWaXNpYmxlVGV4dFJlY3RhbmdsZXModGV4dFJlY3RzKTsKIAotICAgIC8vIFdlIHdhbnQg dGhlIHRleHQgcmVjdHMgaW4gc2VsZWN0aW9uIHJlY3QgY29vcmRpbmF0ZXMuCi0gICAgVmVjdG9y PEZsb2F0UmVjdD4gdGV4dFJlY3RzSW5TZWxlY3Rpb25SZWN0Q29vcmRpbmF0ZXM7Ci0KKyAgICAv LyBUaGUgYm91bmRpbmcgcmVjdCBvZiBhbGwgdGhlIHRleHQgcmVjdHMgY2FuIGJlIGRpZmZlcmVu dCB0aGFuIHRoZSBzZWxlY3Rpb24KKyAgICAvLyByZWN0IHdoZW4gdGhlIHNlbGVjdGlvbiBzcGFu cyBtdWx0aXBsZSBsaW5lczsgdGhlIGluZGljYXRvciBkb2Vzbid0IGFjdHVhbGx5CisgICAgLy8g Y2FyZSB3aGVyZSB0aGUgc2VsZWN0aW9uIGhpZ2hsaWdodCBnb2VzLCBqdXN0IHdoZXJlIHRoZSB0 ZXh0IGFjdHVhbGx5IGlzLgorICAgIEZsb2F0UmVjdCB0ZXh0Qm91bmRpbmdSZWN0SW5XaW5kb3dD b29yZGluYXRlczsKKyAgICBWZWN0b3I8RmxvYXRSZWN0PiB0ZXh0UmVjdHNJbldpbmRvd0Nvb3Jk aW5hdGVzOwogICAgIGZvciAoY29uc3QgRmxvYXRSZWN0JiB0ZXh0UmVjdCA6IHRleHRSZWN0cykg ewotICAgICAgICBJbnRSZWN0IHRleHRSZWN0SW5TZWxlY3Rpb25SZWN0Q29vcmRpbmF0ZXMgPSBj b3JlRnJhbWUudmlldygpLT5jb250ZW50c1RvV2luZG93KGVuY2xvc2luZ0ludFJlY3QodGV4dFJl Y3QpKTsKLSAgICAgICAgdGV4dFJlY3RJblNlbGVjdGlvblJlY3RDb29yZGluYXRlcy5tb3ZlKC1z ZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRlcy54KCksIC1zZWxlY3Rpb25SZWN0SW5XaW5k b3dDb29yZGluYXRlcy55KCkpOwotICAgICAgICB0ZXh0UmVjdHNJblNlbGVjdGlvblJlY3RDb29y ZGluYXRlcy5hcHBlbmQodGV4dFJlY3RJblNlbGVjdGlvblJlY3RDb29yZGluYXRlcyk7CisgICAg ICAgIEZsb2F0UmVjdCB0ZXh0UmVjdEluV2luZG93Q29vcmRpbmF0ZXMgPSBjb3JlRnJhbWUudmll dygpLT5jb250ZW50c1RvV2luZG93KGVuY2xvc2luZ0ludFJlY3QodGV4dFJlY3QpKTsKKyAgICAg ICAgdGV4dFJlY3RzSW5XaW5kb3dDb29yZGluYXRlcy5hcHBlbmQodGV4dFJlY3RJbldpbmRvd0Nv b3JkaW5hdGVzKTsKKyAgICAgICAgdGV4dEJvdW5kaW5nUmVjdEluV2luZG93Q29vcmRpbmF0ZXMu dW5pdGUodGV4dFJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzKTsKICAgICB9CiAKLSAgICByZXR1cm4g VGV4dEluZGljYXRvcjo6Y3JlYXRlKHNlbGVjdGlvblJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzLCB0 ZXh0UmVjdHNJblNlbGVjdGlvblJlY3RDb29yZGluYXRlcywgZnJhbWUucGFnZSgpLT5kZXZpY2VT Y2FsZUZhY3RvcigpLCBpbmRpY2F0b3JCaXRtYXApOworICAgIFZlY3RvcjxGbG9hdFJlY3Q+IHRl eHRSZWN0c0luQm91bmRpbmdSZWN0Q29vcmRpbmF0ZXM7CisgICAgZm9yIChjb25zdCBGbG9hdFJl Y3QmIHRleHRSZWN0SW5XaW5kb3dDb29yZGluYXRlcyA6IHRleHRSZWN0c0luV2luZG93Q29vcmRp bmF0ZXMpIHsKKyAgICAgICAgRmxvYXRSZWN0IHRleHRSZWN0SW5Cb3VuZGluZ1JlY3RDb29yZGlu YXRlcyA9IHRleHRSZWN0SW5XaW5kb3dDb29yZGluYXRlczsKKyAgICAgICAgdGV4dFJlY3RJbkJv dW5kaW5nUmVjdENvb3JkaW5hdGVzLm1vdmVCeSgtdGV4dEJvdW5kaW5nUmVjdEluV2luZG93Q29v cmRpbmF0ZXMubG9jYXRpb24oKSk7CisgICAgICAgIHRleHRSZWN0c0luQm91bmRpbmdSZWN0Q29v cmRpbmF0ZXMuYXBwZW5kKHRleHRSZWN0SW5Cb3VuZGluZ1JlY3RDb29yZGluYXRlcyk7CisgICAg fQorCisgICAgVGV4dEluZGljYXRvcjo6RGF0YSBkYXRhOworICAgIGRhdGEuc2VsZWN0aW9uUmVj dEluV2luZG93Q29vcmRpbmF0ZXMgPSBzZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRlczsK KyAgICBkYXRhLnRleHRCb3VuZGluZ1JlY3RJbldpbmRvd0Nvb3JkaW5hdGVzID0gdGV4dEJvdW5k aW5nUmVjdEluV2luZG93Q29vcmRpbmF0ZXM7CisgICAgZGF0YS50ZXh0UmVjdHNJbkJvdW5kaW5n UmVjdENvb3JkaW5hdGVzID0gdGV4dFJlY3RzSW5Cb3VuZGluZ1JlY3RDb29yZGluYXRlczsKKyAg ICBkYXRhLmNvbnRlbnRJbWFnZVNjYWxlRmFjdG9yID0gZnJhbWUucGFnZSgpLT5kZXZpY2VTY2Fs ZUZhY3RvcigpOworICAgIGRhdGEuY29udGVudEltYWdlID0gaW5kaWNhdG9yQml0bWFwOworCisg ICAgcmV0dXJuIFRleHRJbmRpY2F0b3I6OmNyZWF0ZShkYXRhKTsKIH0KIAogVGV4dEluZGljYXRv cjo6VGV4dEluZGljYXRvcihjb25zdCBUZXh0SW5kaWNhdG9yOjpEYXRhJiBkYXRhKQpAQCAtMTk2 LDkgKzIwMiw5IEBAIFRleHRJbmRpY2F0b3I6OlRleHRJbmRpY2F0b3IoY29uc3QgVGV4dEluZGlj YXRvcjo6RGF0YSYgZGF0YSkKIHsKICAgICBBU1NFUlQobV9kYXRhLmNvbnRlbnRJbWFnZVNjYWxl RmFjdG9yICE9IDEgfHwgbV9kYXRhLmNvbnRlbnRJbWFnZS0+c2l6ZSgpID09IGVuY2xvc2luZ0lu dFJlY3QobV9kYXRhLnNlbGVjdGlvblJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzKS5zaXplKCkpOwog Ci0gICAgaWYgKHRleHRJbmRpY2F0b3JzRm9yVGV4dFJlY3RzT3ZlcmxhcChtX2RhdGEudGV4dFJl Y3RzSW5TZWxlY3Rpb25SZWN0Q29vcmRpbmF0ZXMpKSB7Ci0gICAgICAgIG1fZGF0YS50ZXh0UmVj dHNJblNlbGVjdGlvblJlY3RDb29yZGluYXRlc1swXSA9IHVuaW9uUmVjdChtX2RhdGEudGV4dFJl Y3RzSW5TZWxlY3Rpb25SZWN0Q29vcmRpbmF0ZXMpOwotICAgICAgICBtX2RhdGEudGV4dFJlY3Rz SW5TZWxlY3Rpb25SZWN0Q29vcmRpbmF0ZXMuc2hyaW5rKDEpOworICAgIGlmICh0ZXh0SW5kaWNh dG9yc0ZvclRleHRSZWN0c092ZXJsYXAobV9kYXRhLnRleHRSZWN0c0luQm91bmRpbmdSZWN0Q29v cmRpbmF0ZXMpKSB7CisgICAgICAgIG1fZGF0YS50ZXh0UmVjdHNJbkJvdW5kaW5nUmVjdENvb3Jk aW5hdGVzWzBdID0gdW5pb25SZWN0KG1fZGF0YS50ZXh0UmVjdHNJbkJvdW5kaW5nUmVjdENvb3Jk aW5hdGVzKTsKKyAgICAgICAgbV9kYXRhLnRleHRSZWN0c0luQm91bmRpbmdSZWN0Q29vcmRpbmF0 ZXMuc2hyaW5rKDEpOwogICAgIH0KIH0KIApAQCAtMjA4LDcgKzIxNCw3IEBAIFRleHRJbmRpY2F0 b3I6On5UZXh0SW5kaWNhdG9yKCkKIAogRmxvYXRSZWN0IFRleHRJbmRpY2F0b3I6OmZyYW1lUmVj dCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG91dHNldEluZGljYXRvclJlY3RJbmNsdWRpbmdTaGFk b3cobV9kYXRhLnNlbGVjdGlvblJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzKTsKKyAgICByZXR1cm4g b3V0c2V0SW5kaWNhdG9yUmVjdEluY2x1ZGluZ1NoYWRvdyhtX2RhdGEudGV4dEJvdW5kaW5nUmVj dEluV2luZG93Q29vcmRpbmF0ZXMpOwogfQogCiAjaWYgRU5BQkxFKExFR0FDWV9URVhUX0lORElD QVRPUl9TVFlMRSkKQEAgLTI1OSw4ICsyNjUsOCBAQCBzdGF0aWMgaW5saW5lIENvbG9yIGZsYXRE cm9wU2hhZG93Q29sb3IoKQogdm9pZCBUZXh0SW5kaWNhdG9yOjpkcmF3KEdyYXBoaWNzQ29udGV4 dCYgZ3JhcGhpY3NDb250ZXh0LCBjb25zdCBJbnRSZWN0JiAvKmRpcnR5UmVjdCovKQogewogI2lm IEVOQUJMRShMRUdBQ1lfVEVYVF9JTkRJQ0FUT1JfU1RZTEUpCi0gICAgZm9yIChzaXplX3QgaSA9 IDA7IGkgPCBtX2RhdGEudGV4dFJlY3RzSW5TZWxlY3Rpb25SZWN0Q29vcmRpbmF0ZXMuc2l6ZSgp OyArK2kpIHsKLSAgICAgICAgRmxvYXRSZWN0IHRleHRSZWN0ID0gbV9kYXRhLnRleHRSZWN0c0lu U2VsZWN0aW9uUmVjdENvb3JkaW5hdGVzW2ldOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwg bV9kYXRhLnRleHRSZWN0c0luQm91bmRpbmdSZWN0Q29vcmRpbmF0ZXMuc2l6ZSgpOyArK2kpIHsK KyAgICAgICAgRmxvYXRSZWN0IHRleHRSZWN0ID0gbV9kYXRhLnRleHRSZWN0c0luQm91bmRpbmdS ZWN0Q29vcmRpbmF0ZXNbaV07CiAgICAgICAgIHRleHRSZWN0Lm1vdmUobGVmdEJvcmRlclRoaWNr bmVzcywgdG9wQm9yZGVyVGhpY2tuZXNzKTsKIAogICAgICAgICBGbG9hdFJlY3Qgb3V0ZXJQYXRo UmVjdCA9IGluZmxhdGVSZWN0KHRleHRSZWN0LCBob3Jpem9udGFsT3V0c2V0VG9DZW50ZXJPZkxp Z2h0Qm9yZGVyLCB2ZXJ0aWNhbE91dHNldFRvQ2VudGVyT2ZMaWdodEJvcmRlcik7CkBAIC0yODcs MTIgKzI5MywxMyBAQCB2b2lkIFRleHRJbmRpY2F0b3I6OmRyYXcoR3JhcGhpY3NDb250ZXh0JiBn cmFwaGljc0NvbnRleHQsIGNvbnN0IEludFJlY3QmIC8qZGlydAogICAgICAgICAgICAgR3JhcGhp Y3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKGdyYXBoaWNzQ29udGV4dCk7CiAgICAgICAg ICAgICBncmFwaGljc0NvbnRleHQudHJhbnNsYXRlKEZsb2F0U2l6ZShyb3VuZGYobGVmdEJvcmRl clRoaWNrbmVzcyksIHJvdW5kZih0b3BCb3JkZXJUaGlja25lc3MpKSk7CiAKLSAgICAgICAgICAg IEludFJlY3QgY29udGVudEltYWdlUmVjdCA9IGVuY2xvc2luZ0ludFJlY3QobV9kYXRhLnRleHRS ZWN0c0luU2VsZWN0aW9uUmVjdENvb3JkaW5hdGVzW2ldKTsKLSAgICAgICAgICAgIG1fZGF0YS5j b250ZW50SW1hZ2UtPnBhaW50KGdyYXBoaWNzQ29udGV4dCwgbV9kYXRhLmNvbnRlbnRJbWFnZVNj YWxlRmFjdG9yLCBjb250ZW50SW1hZ2VSZWN0LmxvY2F0aW9uKCksIGNvbnRlbnRJbWFnZVJlY3Qp OworICAgICAgICAgICAgRmxvYXRSZWN0IGltYWdlUmVjdCA9IHRleHRSZWN0OworICAgICAgICAg ICAgaW1hZ2VSZWN0Lm1vdmUobV9kYXRhLnRleHRCb3VuZGluZ1JlY3RJbldpbmRvd0Nvb3JkaW5h dGVzLmxvY2F0aW9uKCkgLSBtX2RhdGEuc2VsZWN0aW9uUmVjdEluV2luZG93Q29vcmRpbmF0ZXMu bG9jYXRpb24oKSk7CisgICAgICAgICAgICBtX2RhdGEuY29udGVudEltYWdlLT5wYWludChncmFw aGljc0NvbnRleHQsIG1fZGF0YS5jb250ZW50SW1hZ2VTY2FsZUZhY3RvciwgZW5jbG9zaW5nSW50 UmVjdCh0ZXh0UmVjdCkubG9jYXRpb24oKSwgZW5jbG9zaW5nSW50UmVjdChpbWFnZVJlY3QpKTsK ICAgICAgICAgfQogICAgIH0KICNlbHNlCi0gICAgZm9yIChhdXRvJiB0ZXh0UmVjdCA6IG1fZGF0 YS50ZXh0UmVjdHNJblNlbGVjdGlvblJlY3RDb29yZGluYXRlcykgeworICAgIGZvciAoYXV0byYg dGV4dFJlY3QgOiBtX2RhdGEudGV4dFJlY3RzSW5Cb3VuZGluZ1JlY3RDb29yZGluYXRlcykgewog ICAgICAgICBGbG9hdFJlY3QgYmx1clJlY3QgPSB0ZXh0UmVjdDsKICAgICAgICAgYmx1clJlY3Qu bW92ZShmbGF0U2hhZG93Qmx1clJhZGl1cyArIGZsYXRTdHlsZUhvcml6b250YWxCb3JkZXIsIGZs YXRTaGFkb3dCbHVyUmFkaXVzICsgZmxhdFN0eWxlVmVydGljYWxCb3JkZXIpOwogICAgICAgICBG bG9hdFJlY3Qgb3V0ZXJQYXRoUmVjdCA9IGluZmxhdGVSZWN0KGJsdXJSZWN0LCBmbGF0U3R5bGVI b3Jpem9udGFsQm9yZGVyLCBmbGF0U3R5bGVWZXJ0aWNhbEJvcmRlcik7CkBAIC0zMTAsOCArMzE3 LDkgQEAgdm9pZCBUZXh0SW5kaWNhdG9yOjpkcmF3KEdyYXBoaWNzQ29udGV4dCYgZ3JhcGhpY3ND b250ZXh0LCBjb25zdCBJbnRSZWN0JiAvKmRpcnQKICAgICAgICAgICAgIEdyYXBoaWNzQ29udGV4 dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcihncmFwaGljc0NvbnRleHQpOwogICAgICAgICAgICAgZ3Jh cGhpY3NDb250ZXh0LnRyYW5zbGF0ZShGbG9hdFNpemUoZmxhdFNoYWRvd0JsdXJSYWRpdXMgKyBm bGF0U3R5bGVIb3Jpem9udGFsQm9yZGVyLCBmbGF0U2hhZG93Qmx1clJhZGl1cyArIGZsYXRTdHls ZVZlcnRpY2FsQm9yZGVyKSk7CiAKLSAgICAgICAgICAgIEludFJlY3QgY29udGVudEltYWdlUmVj dCA9IGVuY2xvc2luZ0ludFJlY3QodGV4dFJlY3QpOwotICAgICAgICAgICAgbV9kYXRhLmNvbnRl bnRJbWFnZS0+cGFpbnQoZ3JhcGhpY3NDb250ZXh0LCBtX2RhdGEuY29udGVudEltYWdlU2NhbGVG YWN0b3IsIGNvbnRlbnRJbWFnZVJlY3QubG9jYXRpb24oKSwgY29udGVudEltYWdlUmVjdCk7Cisg ICAgICAgICAgICBGbG9hdFJlY3QgaW1hZ2VSZWN0ID0gdGV4dFJlY3Q7CisgICAgICAgICAgICBp bWFnZVJlY3QubW92ZShtX2RhdGEudGV4dEJvdW5kaW5nUmVjdEluV2luZG93Q29vcmRpbmF0ZXMu bG9jYXRpb24oKSAtIG1fZGF0YS5zZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRlcy5sb2Nh dGlvbigpKTsKKyAgICAgICAgICAgIG1fZGF0YS5jb250ZW50SW1hZ2UtPnBhaW50KGdyYXBoaWNz Q29udGV4dCwgbV9kYXRhLmNvbnRlbnRJbWFnZVNjYWxlRmFjdG9yLCBlbmNsb3NpbmdJbnRSZWN0 KHRleHRSZWN0KS5sb2NhdGlvbigpLCBlbmNsb3NpbmdJbnRSZWN0KGltYWdlUmVjdCkpOwogICAg ICAgICB9CiAgICAgfQogI2VuZGlmCkBAIC0zMjAsNyArMzI4LDggQEAgdm9pZCBUZXh0SW5kaWNh dG9yOjpkcmF3KEdyYXBoaWNzQ29udGV4dCYgZ3JhcGhpY3NDb250ZXh0LCBjb25zdCBJbnRSZWN0 JiAvKmRpcnQKIHZvaWQgVGV4dEluZGljYXRvcjo6RGF0YTo6ZW5jb2RlKElQQzo6QXJndW1lbnRF bmNvZGVyJiBlbmNvZGVyKSBjb25zdAogewogICAgIGVuY29kZXIgPDwgc2VsZWN0aW9uUmVjdElu V2luZG93Q29vcmRpbmF0ZXM7Ci0gICAgZW5jb2RlciA8PCB0ZXh0UmVjdHNJblNlbGVjdGlvblJl Y3RDb29yZGluYXRlczsKKyAgICBlbmNvZGVyIDw8IHRleHRCb3VuZGluZ1JlY3RJbldpbmRvd0Nv b3JkaW5hdGVzOworICAgIGVuY29kZXIgPDwgdGV4dFJlY3RzSW5Cb3VuZGluZ1JlY3RDb29yZGlu YXRlczsKICAgICBlbmNvZGVyIDw8IGNvbnRlbnRJbWFnZVNjYWxlRmFjdG9yOwogCiAgICAgU2hh cmVhYmxlQml0bWFwOjpIYW5kbGUgY29udGVudEltYWdlSGFuZGxlOwpAQCAtMzM0LDcgKzM0Mywx MCBAQCBib29sIFRleHRJbmRpY2F0b3I6OkRhdGE6OmRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2Rl ciYgZGVjb2RlciwgVGV4dEluZGljYXRvcjo6RAogICAgIGlmICghZGVjb2Rlci5kZWNvZGUodGV4 dEluZGljYXRvckRhdGEuc2VsZWN0aW9uUmVjdEluV2luZG93Q29vcmRpbmF0ZXMpKQogICAgICAg ICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHRleHRJbmRpY2F0b3JE YXRhLnRleHRSZWN0c0luU2VsZWN0aW9uUmVjdENvb3JkaW5hdGVzKSkKKyAgICBpZiAoIWRlY29k ZXIuZGVjb2RlKHRleHRJbmRpY2F0b3JEYXRhLnRleHRCb3VuZGluZ1JlY3RJbldpbmRvd0Nvb3Jk aW5hdGVzKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgaWYgKCFkZWNvZGVyLmRlY29k ZSh0ZXh0SW5kaWNhdG9yRGF0YS50ZXh0UmVjdHNJbkJvdW5kaW5nUmVjdENvb3JkaW5hdGVzKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZSh0ZXh0SW5k aWNhdG9yRGF0YS5jb250ZW50SW1hZ2VTY2FsZUZhY3RvcikpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvVGV4dEluZGljYXRvci5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1Rl eHRJbmRpY2F0b3IuaAppbmRleCA4NDBmYWRkYmZjYmNkNTZkZTJlZTU1MWNmZGQzNjFiZmU0OWE0 ZGEwLi5jMjRhNmU4MGM3YzZlMzIwNzEyYWFjODg3ZmJkYmEwMjBlOWY0ZmUxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvVGV4dEluZGljYXRvci5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9UZXh0SW5kaWNhdG9yLmgKQEAgLTQ5LDcgKzQ5LDggQEAgY2xhc3MgVGV4dElu ZGljYXRvciA6IHB1YmxpYyBSZWZDb3VudGVkPFRleHRJbmRpY2F0b3I+IHsKIHB1YmxpYzoKICAg ICBzdHJ1Y3QgRGF0YSB7CiAgICAgICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBzZWxlY3Rpb25SZWN0 SW5XaW5kb3dDb29yZGluYXRlczsKLSAgICAgICAgVmVjdG9yPFdlYkNvcmU6OkZsb2F0UmVjdD4g dGV4dFJlY3RzSW5TZWxlY3Rpb25SZWN0Q29vcmRpbmF0ZXM7CisgICAgICAgIFdlYkNvcmU6OkZs b2F0UmVjdCB0ZXh0Qm91bmRpbmdSZWN0SW5XaW5kb3dDb29yZGluYXRlczsKKyAgICAgICAgVmVj dG9yPFdlYkNvcmU6OkZsb2F0UmVjdD4gdGV4dFJlY3RzSW5Cb3VuZGluZ1JlY3RDb29yZGluYXRl czsKICAgICAgICAgZmxvYXQgY29udGVudEltYWdlU2NhbGVGYWN0b3I7CiAgICAgICAgIFJlZlB0 cjxTaGFyZWFibGVCaXRtYXA+IGNvbnRlbnRJbWFnZTsKIApAQCAtNTcsNyArNTgsNiBAQCBwdWJs aWM6CiAgICAgICAgIHN0YXRpYyBib29sIGRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYsIERh dGEmKTsKICAgICB9OwogCi0gICAgc3RhdGljIFBhc3NSZWZQdHI8VGV4dEluZGljYXRvcj4gY3Jl YXRlKGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgc2VsZWN0aW9uUmVjdEluV2luZG93Q29vcmRp bmF0ZXMsIGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpGbG9hdFJlY3Q+JiB0ZXh0UmVjdHNJblNlbGVj dGlvbkNvb3JkaW5hdGVzLCBmbG9hdCBjb250ZW50SW1hZ2VTY2FsZUZhY3RvciwgUGFzc1JlZlB0 cjxTaGFyZWFibGVCaXRtYXA+IGNvbnRlbnRJbWFnZSk7CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8 VGV4dEluZGljYXRvcj4gY3JlYXRlKGNvbnN0IFRleHRJbmRpY2F0b3I6OkRhdGEmKTsKICAgICBz dGF0aWMgUGFzc1JlZlB0cjxUZXh0SW5kaWNhdG9yPiBjcmVhdGVXaXRoU2VsZWN0aW9uSW5GcmFt ZShXZWJGcmFtZSYpOwogCkBAIC02NSw3ICs2NSw2IEBAIHB1YmxpYzoKIAogICAgIFdlYkNvcmU6 OkZsb2F0UmVjdCBzZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRlcygpIGNvbnN0IHsgcmV0 dXJuIG1fZGF0YS5zZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRlczsgfQogICAgIFdlYkNv cmU6OkZsb2F0UmVjdCBmcmFtZVJlY3QoKSBjb25zdDsKLSAgICBTaGFyZWFibGVCaXRtYXAqIGNv bnRlbnRJbWFnZSgpIGNvbnN0IHsgcmV0dXJuIG1fZGF0YS5jb250ZW50SW1hZ2UuZ2V0KCk7IH0K ICAgICBEYXRhIGRhdGEoKSBjb25zdCB7IHJldHVybiBtX2RhdGE7IH0KIAogICAgIHZvaWQgZHJh dyhXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBkaXJ0 eVJlY3QpOwo=