169845 2017-03-17 22:03:53 -0700 TextIndicator should support a mode where selection rects are used to size the snapshot 2017-03-22 13:17:17 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin cdumez commit-queue dbates esprehn+autocc kangil.han megan_gardner thorton webkit-bug-importer oldest_to_newest 1289258 0 wenson_hsieh 2017-03-17 22:03:53 -0700 <rdar://problem/31127818> 1289259 1 304861 wenson_hsieh 2017-03-17 22:12:03 -0700 Created attachment 304861 Patch 1289261 2 304863 wenson_hsieh 2017-03-17 22:28:59 -0700 Created attachment 304863 Hook into new flag in WK2 1289483 3 304863 wenson_hsieh 2017-03-20 10:03:47 -0700 Comment on attachment 304863 Hook into new flag in WK2 Thanks Beth! 1289496 4 304863 commit-queue 2017-03-20 10:32:52 -0700 Comment on attachment 304863 Hook into new flag in WK2 Clearing flags on attachment: 304863 Committed r214174: <http://trac.webkit.org/changeset/214174> 1289497 5 commit-queue 2017-03-20 10:32:58 -0700 All reviewed patches have been landed. Closing bug. 1290179 6 304863 thorton 2017-03-22 13:14:34 -0700 Comment on attachment 304863 Hook into new flag in WK2 View in context: https://bugs.webkit.org/attachment.cgi?id=304863&action=review > Source/WebCore/page/TextIndicator.h:89 > + // Currently, this is only supported on iOS. This is a little weird, I think, because the text rects *are* the selection rects on Mac, right? 1290182 7 wenson_hsieh 2017-03-22 13:17:17 -0700 (In reply to Tim Horton from comment #6) > Comment on attachment 304863 [details] > Hook into new flag in WK2 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=304863&action=review > > > Source/WebCore/page/TextIndicator.h:89 > > + // Currently, this is only supported on iOS. > > This is a little weird, I think, because the text rects *are* the selection > rects on Mac, right? True. This is a bit confusing, since the rects used here specifically refer to those emitted by our selection rect collection heuristic on iOS. I'll make this distinction clear in a followup. 304861 2017-03-17 22:12:03 -0700 2017-03-17 22:28:54 -0700 Patch bug-169845-20170317221203.patch text/plain 6262 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0MTEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGRjY2FkODVlOWM4MWQw Y2Y4YjQyNjUxYjcxYjgxMDNhYzE5MmU0NS4uNzBjN2JhODIxMjI0NDYyNDIwM2UxZDIyM2I3YWE5 NDE4MDdkOTE5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE3LTAzLTE3ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFRleHRJbmRpY2F0 b3Igc2hvdWxkIHN1cHBvcnQgYSBtb2RlIHdoZXJlIHNlbGVjdGlvbiByZWN0cyBhcmUgdXNlZCB0 byBzaXplIHRoZSBzbmFwc2hvdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTY5ODQ1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMTEyNzgxOD4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRzIFRleHRJ bmRpY2F0b3Igc3VwcG9ydCBpbiBpT1MgZm9yIHVzaW5nIHRoZSB3b3VsZC1iZSBzZWxlY3Rpb24g cmVjdHMgb2YgYSBnaXZlbiByYW5nZSB0byBkZXRlcm1pbmUKKyAgICAgICAgc25hcHNob3R0aW5n IGJvdW5kcy4gU2VlIGJlbG93IGNoYW5nZXMgZm9yIG1vcmUgZGV0YWlscy4KKworICAgICAgICBU aGVyZSBpcyBubyBjaGFuZ2UgaW4gYmVoYXZpb3IgeWV0LgorCisgICAgICAgICogZG9tL1Jhbmdl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJhbmdlOjpjb2xsZWN0U2VsZWN0aW9uUmVjdHNXaXRo b3V0VW5pb25JbnRlcmlvckxpbmVzKToKKyAgICAgICAgKFdlYkNvcmU6OlJhbmdlOjpjb2xsZWN0 U2VsZWN0aW9uUmVjdHMpOgorCisgICAgICAgIE1hcmsgdGhlc2UgaGVscGVyIG1ldGhvZHMgYXMg Y29uc3QuCisKKyAgICAgICAgKiBkb20vUmFuZ2UuaDoKKyAgICAgICAgKiBwYWdlL1RleHRJbmRp Y2F0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Z2V0U2VsZWN0aW9uUmVjdHNGb3JSYW5nZSk6 CisgICAgICAgIChXZWJDb3JlOjppbml0aWFsaXplSW5kaWNhdG9yKToKKworICAgICAgICBJZiBU ZXh0SW5kaWNhdG9yT3B0aW9uVXNlU2VsZWN0aW9uUmVjdEZvclNpemluZyBpcyBlbmFibGVkLCB0 aGVuIGNvbXB1dGUgc2VsZWN0aW9uIHJlY3RzIGFuZCBzZXQgdGhlIHRleHQgcmVjdHMKKyAgICAg ICAgdG8gYmUgdGhlIHJlc3VsdGluZyBzZWxlY3Rpb24gcmVjdHMuIFRoZXNlIGFyZSBpbiBkb2N1 bWVudCBjb29yZGluYXRlcy4KKworICAgICAgICAqIHBhZ2UvVGV4dEluZGljYXRvci5oOgorCiAy MDE3LTAzLTE3ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBB ZGQgYSByZWxvYWQgcG9saWN5IHdoZXJlIG9ubHkgZXhwaXJlZCBzdWJyZXNvdXJjZXMgYXJlIHJl dmFsaWRhdGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuY3BwIGIvU291 cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmNwcAppbmRleCAzNWNhNmE5MDE1MDMzNWY4MzBlZjk5YThh ZDQxN2U5MDI4NWQwZGZiLi43NzM0YWJkMTIxYmFhOTA5MmM1NTA1NzQ4NzMwOWNmNTdmODlmNjky IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9SYW5nZS5jcHAKQEAgLTEyNjYsNyArMTI2Niw3IEBAIHN0YXRpYyBTZWxlY3Rp b25SZWN0IGNvYWxlc2NlU2VsZWN0aW9uUmVjdHMoY29uc3QgU2VsZWN0aW9uUmVjdCYgb3JpZ2lu YWwsIGNvbnN0CiAKIC8vIFRoaXMgZnVuY3Rpb24gaXMgc2ltaWxhciBpbiBzcGlyaXQgdG8gYWRk TGluZUJveFJlY3RzLCBidXQgYW5ub3RhdGVzIHRoZSByZXR1cm5lZCByZWN0YW5nbGVzCiAvLyB3 aXRoIGFkZGl0aW9uYWwgc3RhdGUgd2hpY2ggaGVscHMgaU9TIGRyYXcgc2VsZWN0aW9ucyBpbiBp dHMgdW5pcXVlIHdheS4KLWludCBSYW5nZTo6Y29sbGVjdFNlbGVjdGlvblJlY3RzV2l0aG91dFVu aW9uSW50ZXJpb3JMaW5lcyhWZWN0b3I8U2VsZWN0aW9uUmVjdD4mIHJlY3RzKQoraW50IFJhbmdl Ojpjb2xsZWN0U2VsZWN0aW9uUmVjdHNXaXRob3V0VW5pb25JbnRlcmlvckxpbmVzKFZlY3RvcjxT ZWxlY3Rpb25SZWN0PiYgcmVjdHMpIGNvbnN0CiB7CiAgICAgYXV0byYgc3RhcnRDb250YWluZXIg PSB0aGlzLT5zdGFydENvbnRhaW5lcigpOwogICAgIGF1dG8mIGVuZENvbnRhaW5lciA9IHRoaXMt PmVuZENvbnRhaW5lcigpOwpAQCAtMTQyNiw3ICsxNDI2LDcgQEAgaW50IFJhbmdlOjpjb2xsZWN0 U2VsZWN0aW9uUmVjdHNXaXRob3V0VW5pb25JbnRlcmlvckxpbmVzKFZlY3RvcjxTZWxlY3Rpb25S ZWN0PiYKICAgICByZXR1cm4gbWF4TGluZU51bWJlcjsKIH0KIAotdm9pZCBSYW5nZTo6Y29sbGVj dFNlbGVjdGlvblJlY3RzKFZlY3RvcjxTZWxlY3Rpb25SZWN0PiYgcmVjdHMpCit2b2lkIFJhbmdl Ojpjb2xsZWN0U2VsZWN0aW9uUmVjdHMoVmVjdG9yPFNlbGVjdGlvblJlY3Q+JiByZWN0cykgY29u c3QKIHsKICAgICBpbnQgbWF4TGluZU51bWJlciA9IGNvbGxlY3RTZWxlY3Rpb25SZWN0c1dpdGhv dXRVbmlvbkludGVyaW9yTGluZXMocmVjdHMpOwogICAgIGNvbnN0IHNpemVfdCBudW1iZXJPZlJl Y3RzID0gcmVjdHMuc2l6ZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1Jhbmdl LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuaAppbmRleCA1NTcwYjU1MjBiMmQ4YmJhNzQx MzMwYzhkNDk0ODQ1ZDE2ZDdiNmFjLi42NzRlMTM5MjE1MTkyOGZkMjg3MWM1MTY1NTA5ODBkNmUw NjkwNmQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vUmFuZ2UuaApAQCAtMTI0LDggKzEyNCw4IEBAIHB1YmxpYzoKICAgICBX RUJDT1JFX0VYUE9SVCB2b2lkIGFic29sdXRlVGV4dFF1YWRzKFZlY3RvcjxGbG9hdFF1YWQ+Jiwg Ym9vbCB1c2VTZWxlY3Rpb25IZWlnaHQgPSBmYWxzZSwgUmFuZ2VJbkZpeGVkUG9zaXRpb24qID0g bnVsbHB0cikgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgRmxvYXRSZWN0IGFic29sdXRlQm91 bmRpbmdSZWN0KCkgY29uc3Q7CiAjaWYgUExBVEZPUk0oSU9TKQotICAgIFdFQkNPUkVfRVhQT1JU IHZvaWQgY29sbGVjdFNlbGVjdGlvblJlY3RzKFZlY3RvcjxTZWxlY3Rpb25SZWN0PiYpOwotICAg IFdFQkNPUkVfRVhQT1JUIGludCBjb2xsZWN0U2VsZWN0aW9uUmVjdHNXaXRob3V0VW5pb25JbnRl cmlvckxpbmVzKFZlY3RvcjxTZWxlY3Rpb25SZWN0PiYpOworICAgIFdFQkNPUkVfRVhQT1JUIHZv aWQgY29sbGVjdFNlbGVjdGlvblJlY3RzKFZlY3RvcjxTZWxlY3Rpb25SZWN0PiYpIGNvbnN0Owor ICAgIFdFQkNPUkVfRVhQT1JUIGludCBjb2xsZWN0U2VsZWN0aW9uUmVjdHNXaXRob3V0VW5pb25J bnRlcmlvckxpbmVzKFZlY3RvcjxTZWxlY3Rpb25SZWN0PiYpIGNvbnN0OwogI2VuZGlmCiAKICAg ICB2b2lkIG5vZGVDaGlsZHJlbkNoYW5nZWQoQ29udGFpbmVyTm9kZSYpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9UZXh0SW5kaWNhdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvVGV4dEluZGljYXRvci5jcHAKaW5kZXggOTdkYmE0OTU4OGJjZmZjYzE1YTU1ZGM1MTgwZDU1 ZjFlYzY2NTE2Ny4uZDU3YjY4ZGVhMjJkYTcyZmU1OTA5MDI5ZTUxOTI5N2I3ZDc1MDlhNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9UZXh0SW5kaWNhdG9yLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1RleHRJbmRpY2F0b3IuY3BwCkBAIC00MSw2ICs0MSwxMCBAQAogI2lu Y2x1ZGUgIlJhbmdlLmgiCiAjaW5jbHVkZSAiUmVuZGVyT2JqZWN0LmgiCiAKKyNpZiBQTEFURk9S TShJT1MpCisjaW5jbHVkZSAiU2VsZWN0aW9uUmVjdC5oIgorI2VuZGlmCisKIHVzaW5nIG5hbWVz cGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC0xODMsNiArMTg3LDE5IEBA IHN0YXRpYyBib29sIHRha2VTbmFwc2hvdHMoVGV4dEluZGljYXRvckRhdGEmIGRhdGEsIEZyYW1l JiBmcmFtZSwgSW50UmVjdCBzbmFwc2hvCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKKyNpZiBQTEFU Rk9STShJT1MpCisKK3N0YXRpYyB2b2lkIGdldFNlbGVjdGlvblJlY3RzRm9yUmFuZ2UoVmVjdG9y PEZsb2F0UmVjdD4mIHJlc3VsdGluZ1JlY3RzLCBjb25zdCBSYW5nZSYgcmFuZ2UpCit7CisgICAg VmVjdG9yPFNlbGVjdGlvblJlY3Q+IHNlbGVjdGlvblJlY3RzRm9yUmFuZ2U7CisgICAgVmVjdG9y PEZsb2F0UmVjdD4gc2VsZWN0aW9uUmVjdHNGb3JSYW5nZUluQm91bmRpbmdSZWN0Q29vcmRpbmF0 ZXM7CisgICAgcmFuZ2UuY29sbGVjdFNlbGVjdGlvblJlY3RzKHNlbGVjdGlvblJlY3RzRm9yUmFu Z2UpOworICAgIGZvciAoYXV0byBzZWxlY3Rpb25SZWN0IDogc2VsZWN0aW9uUmVjdHNGb3JSYW5n ZSkKKyAgICAgICAgcmVzdWx0aW5nUmVjdHMuYXBwZW5kKHNlbGVjdGlvblJlY3QucmVjdCgpKTsK K30KKworI2VuZGlmCisKIHN0YXRpYyBib29sIGluaXRpYWxpemVJbmRpY2F0b3IoVGV4dEluZGlj YXRvckRhdGEmIGRhdGEsIEZyYW1lJiBmcmFtZSwgY29uc3QgUmFuZ2UmIHJhbmdlLCBGbG9hdFNp emUgbWFyZ2luLCBib29sIGluZGljYXRlc0N1cnJlbnRTZWxlY3Rpb24pCiB7CiAgICAgVmVjdG9y PEZsb2F0UmVjdD4gdGV4dFJlY3RzOwpAQCAtMTk3LDYgKzIxNCwxMCBAQCBzdGF0aWMgYm9vbCBp bml0aWFsaXplSW5kaWNhdG9yKFRleHRJbmRpY2F0b3JEYXRhJiBkYXRhLCBGcmFtZSYgZnJhbWUs IGNvbnN0IFJhbgogCiAgICAgaWYgKChkYXRhLm9wdGlvbnMgJiBUZXh0SW5kaWNhdG9yT3B0aW9u VXNlQm91bmRpbmdSZWN0QW5kUGFpbnRBbGxDb250ZW50Rm9yQ29tcGxleFJhbmdlcykgJiYgaGFz Tm9uSW5saW5lT3JSZXBsYWNlZEVsZW1lbnRzKHJhbmdlKSkKICAgICAgICAgZGF0YS5vcHRpb25z IHw9IFRleHRJbmRpY2F0b3JPcHRpb25QYWludEFsbENvbnRlbnQ7CisjaWYgUExBVEZPUk0oSU9T KQorICAgIGVsc2UgaWYgKGRhdGEub3B0aW9ucyAmIFRleHRJbmRpY2F0b3JPcHRpb25Vc2VTZWxl Y3Rpb25SZWN0Rm9yU2l6aW5nKQorICAgICAgICBnZXRTZWxlY3Rpb25SZWN0c0ZvclJhbmdlKHRl eHRSZWN0cywgcmFuZ2UpOworI2VuZGlmCiAgICAgZWxzZSB7CiAgICAgICAgIGlmIChkYXRhLm9w dGlvbnMgJiBUZXh0SW5kaWNhdG9yT3B0aW9uRG9Ob3RDbGlwVG9WaXNpYmxlUmVjdCkKICAgICAg ICAgICAgIGZyYW1lLnNlbGVjdGlvbigpLmdldFRleHRSZWN0YW5nbGVzKHRleHRSZWN0cywgdGV4 dFJlY3RIZWlnaHQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9UZXh0SW5kaWNh dG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RleHRJbmRpY2F0b3IuaAppbmRleCBhOGUyZDE5 NzZhZGMzOGY5NTJiYWUzYTUyMTNiODI1YzM1ZDI4YWIyLi4yNWJhNWMzNDJhYjQ5NzI1NzYyY2Y0 YzdlNGQ5ZjQ4M2U4NjE2MGYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RleHRJ bmRpY2F0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RleHRJbmRpY2F0b3IuaApAQCAt ODMsNiArODMsMTEgQEAgZW51bSBUZXh0SW5kaWNhdG9yT3B0aW9uIDogdWludDE2X3QgewogCiAg ICAgLy8gSW5jbHVkZSBhbiBhZGRpdGlvbmFsIHNuYXBzaG90IG9mIGV2ZXJ5dGhpbmcgaW4gdmll dywgd2l0aCB0aGUgZXhjZXB0aW9uIG9mIG5vZGVzIHdpdGhpbiB0aGUgY3VycmVudGx5IHNlbGVj dGVkIHJhbmdlLgogICAgIFRleHRJbmRpY2F0b3JPcHRpb25JbmNsdWRlU25hcHNob3RPZkFsbFZp c2libGVDb250ZW50V2l0aG91dFNlbGVjdGlvbiA9IDEgPDwgOCwKKworICAgIC8vIEJ5IGRlZmF1 bHQsIFRleHRJbmRpY2F0b3IgdXNlcyB0ZXh0IHJlY3RzIHRvIHNpemUgdGhlIHNuYXBzaG90LiBF bmFibGluZyB0aGlzIGZsYWcgY2F1c2VzIGl0IHRvIHVzZSB0aGUgYm91bmRzIG9mIHRoZQorICAg IC8vIHNlbGVjdGlvbiByZWN0cyB0aGF0IHdvdWxkIGVuY2xvc2UgdGhlIGdpdmVuIFJhbmdlIGlu c3RlYWQuCisgICAgLy8gQ3VycmVudGx5LCB0aGlzIGlzIG9ubHkgc3VwcG9ydGVkIG9uIGlPUy4K KyAgICBUZXh0SW5kaWNhdG9yT3B0aW9uVXNlU2VsZWN0aW9uUmVjdEZvclNpemluZyA9IDEgPDwg OSwKIH07CiB0eXBlZGVmIHVpbnQxNl90IFRleHRJbmRpY2F0b3JPcHRpb25zOwogCg== 304863 2017-03-17 22:28:59 -0700 2017-03-20 10:32:52 -0700 Hook into new flag in WK2 bug-169845-20170317222858.patch text/plain 8628 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0MTEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGRjY2FkODVlOWM4MWQw Y2Y4YjQyNjUxYjcxYjgxMDNhYzE5MmU0NS4uNmE3ZjgxYjZkMDdiZjVkNjE4MzZmZjA1MGZkNWRh YjU4YmYyN2M0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE3LTAzLTE3ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFRleHRJbmRpY2F0 b3Igc2hvdWxkIHN1cHBvcnQgYSBtb2RlIHdoZXJlIHNlbGVjdGlvbiByZWN0cyBhcmUgdXNlZCB0 byBzaXplIHRoZSBzbmFwc2hvdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTY5ODQ1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMTEyNzgxOD4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRzIFRleHRJ bmRpY2F0b3Igc3VwcG9ydCBpbiBpT1MgZm9yIHVzaW5nIHRoZSB3b3VsZC1iZSBzZWxlY3Rpb24g cmVjdHMgb2YgYSBnaXZlbiByYW5nZSB0byBkZXRlcm1pbmUKKyAgICAgICAgc25hcHNob3R0aW5n IGJvdW5kcy4gU2VlIGJlbG93IGNoYW5nZXMgZm9yIG1vcmUgZGV0YWlscy4KKworICAgICAgICAq IGRvbS9SYW5nZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSYW5nZTo6Y29sbGVjdFNlbGVjdGlv blJlY3RzV2l0aG91dFVuaW9uSW50ZXJpb3JMaW5lcyk6CisgICAgICAgIChXZWJDb3JlOjpSYW5n ZTo6Y29sbGVjdFNlbGVjdGlvblJlY3RzKToKKworICAgICAgICBNYXJrIHRoZXNlIGhlbHBlciBt ZXRob2RzIGFzIGNvbnN0LgorCisgICAgICAgICogZG9tL1JhbmdlLmg6CisgICAgICAgICogcGFn ZS9UZXh0SW5kaWNhdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmdldFNlbGVjdGlvblJlY3Rz Rm9yUmFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6aW5pdGlhbGl6ZUluZGljYXRvcik6CisKKyAg ICAgICAgSWYgVGV4dEluZGljYXRvck9wdGlvblVzZVNlbGVjdGlvblJlY3RGb3JTaXppbmcgaXMg ZW5hYmxlZCwgdGhlbiBjb21wdXRlIHNlbGVjdGlvbiByZWN0cyBhbmQgc2V0IHRoZSB0ZXh0IHJl Y3RzCisgICAgICAgIHRvIGJlIHRoZSByZXN1bHRpbmcgc2VsZWN0aW9uIHJlY3RzLiBUaGVzZSBh cmUgaW4gZG9jdW1lbnQgY29vcmRpbmF0ZXMuCisKKyAgICAgICAgKiBwYWdlL1RleHRJbmRpY2F0 b3IuaDoKKwogMjAxNy0wMy0xNyAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAK ICAgICAgICAgQWRkIGEgcmVsb2FkIHBvbGljeSB3aGVyZSBvbmx5IGV4cGlyZWQgc3VicmVzb3Vy Y2VzIGFyZSByZXZhbGlkYXRlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDAwM2M2ZDZmNmQzNGI0NTUxN2RiZWNh ZmNhNTg3ZDAxN2Q5MzZhN2MuLjA4NDIzMzlmMTA1NmM5YWMwMTJlMDUzMmQ1OTlmZjEyNmRiNjg4 NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxNy0wMy0xNyAgV2Vuc29uIEhzaWVo ICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KKworICAgICAgICBUZXh0SW5kaWNhdG9yIHNob3Vs ZCBzdXBwb3J0IGEgbW9kZSB3aGVyZSBzZWxlY3Rpb24gcmVjdHMgYXJlIHVzZWQgdG8gc2l6ZSB0 aGUgc25hcHNob3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE2OTg0NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzExMjc4MTg+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRvcHQgdGhlIG5ldyBUZXh0 SW5kaWNhdG9yT3B0aW9uVXNlU2VsZWN0aW9uUmVjdEZvclNpemluZyBmbGFnIHdoZW4gZ2VuZXJh dGluZyBhbiBlZGl0IGRhdGEgaW50ZXJhY3Rpb24gc25hcHNob3QuCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OmRpZENvbmNsdWRlRWRpdERhdGFJbnRlcmFjdGlvbik6CisKIDIwMTctMDMtMTcgIEFudHRp IEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBhIHJlbG9hZCBwb2xp Y3kgd2hlcmUgb25seSBleHBpcmVkIHN1YnJlc291cmNlcyBhcmUgcmV2YWxpZGF0ZWQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20v UmFuZ2UuY3BwCmluZGV4IDM1Y2E2YTkwMTUwMzM1ZjgzMGVmOTlhOGFkNDE3ZTkwMjg1ZDBkZmIu Ljc3MzRhYmQxMjFiYWE5MDkyYzU1MDU3NDg3MzA5Y2Y1N2Y4OWY2OTIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1Jhbmdl LmNwcApAQCAtMTI2Niw3ICsxMjY2LDcgQEAgc3RhdGljIFNlbGVjdGlvblJlY3QgY29hbGVzY2VT ZWxlY3Rpb25SZWN0cyhjb25zdCBTZWxlY3Rpb25SZWN0JiBvcmlnaW5hbCwgY29uc3QKIAogLy8g VGhpcyBmdW5jdGlvbiBpcyBzaW1pbGFyIGluIHNwaXJpdCB0byBhZGRMaW5lQm94UmVjdHMsIGJ1 dCBhbm5vdGF0ZXMgdGhlIHJldHVybmVkIHJlY3RhbmdsZXMKIC8vIHdpdGggYWRkaXRpb25hbCBz dGF0ZSB3aGljaCBoZWxwcyBpT1MgZHJhdyBzZWxlY3Rpb25zIGluIGl0cyB1bmlxdWUgd2F5Lgot aW50IFJhbmdlOjpjb2xsZWN0U2VsZWN0aW9uUmVjdHNXaXRob3V0VW5pb25JbnRlcmlvckxpbmVz KFZlY3RvcjxTZWxlY3Rpb25SZWN0PiYgcmVjdHMpCitpbnQgUmFuZ2U6OmNvbGxlY3RTZWxlY3Rp b25SZWN0c1dpdGhvdXRVbmlvbkludGVyaW9yTGluZXMoVmVjdG9yPFNlbGVjdGlvblJlY3Q+JiBy ZWN0cykgY29uc3QKIHsKICAgICBhdXRvJiBzdGFydENvbnRhaW5lciA9IHRoaXMtPnN0YXJ0Q29u dGFpbmVyKCk7CiAgICAgYXV0byYgZW5kQ29udGFpbmVyID0gdGhpcy0+ZW5kQ29udGFpbmVyKCk7 CkBAIC0xNDI2LDcgKzE0MjYsNyBAQCBpbnQgUmFuZ2U6OmNvbGxlY3RTZWxlY3Rpb25SZWN0c1dp dGhvdXRVbmlvbkludGVyaW9yTGluZXMoVmVjdG9yPFNlbGVjdGlvblJlY3Q+JgogICAgIHJldHVy biBtYXhMaW5lTnVtYmVyOwogfQogCi12b2lkIFJhbmdlOjpjb2xsZWN0U2VsZWN0aW9uUmVjdHMo VmVjdG9yPFNlbGVjdGlvblJlY3Q+JiByZWN0cykKK3ZvaWQgUmFuZ2U6OmNvbGxlY3RTZWxlY3Rp b25SZWN0cyhWZWN0b3I8U2VsZWN0aW9uUmVjdD4mIHJlY3RzKSBjb25zdAogewogICAgIGludCBt YXhMaW5lTnVtYmVyID0gY29sbGVjdFNlbGVjdGlvblJlY3RzV2l0aG91dFVuaW9uSW50ZXJpb3JM aW5lcyhyZWN0cyk7CiAgICAgY29uc3Qgc2l6ZV90IG51bWJlck9mUmVjdHMgPSByZWN0cy5zaXpl KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuaCBiL1NvdXJjZS9XZWJD b3JlL2RvbS9SYW5nZS5oCmluZGV4IDU1NzBiNTUyMGIyZDhiYmE3NDEzMzBjOGQ0OTQ4NDVkMTZk N2I2YWMuLjY3NGUxMzkyMTUxOTI4ZmQyODcxYzUxNjU1MDk4MGQ2ZTA2OTA2ZDMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9S YW5nZS5oCkBAIC0xMjQsOCArMTI0LDggQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIHZv aWQgYWJzb2x1dGVUZXh0UXVhZHMoVmVjdG9yPEZsb2F0UXVhZD4mLCBib29sIHVzZVNlbGVjdGlv bkhlaWdodCA9IGZhbHNlLCBSYW5nZUluRml4ZWRQb3NpdGlvbiogPSBudWxscHRyKSBjb25zdDsK ICAgICBXRUJDT1JFX0VYUE9SVCBGbG9hdFJlY3QgYWJzb2x1dGVCb3VuZGluZ1JlY3QoKSBjb25z dDsKICNpZiBQTEFURk9STShJT1MpCi0gICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBjb2xsZWN0U2Vs ZWN0aW9uUmVjdHMoVmVjdG9yPFNlbGVjdGlvblJlY3Q+Jik7Ci0gICAgV0VCQ09SRV9FWFBPUlQg aW50IGNvbGxlY3RTZWxlY3Rpb25SZWN0c1dpdGhvdXRVbmlvbkludGVyaW9yTGluZXMoVmVjdG9y PFNlbGVjdGlvblJlY3Q+Jik7CisgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBjb2xsZWN0U2VsZWN0 aW9uUmVjdHMoVmVjdG9yPFNlbGVjdGlvblJlY3Q+JikgY29uc3Q7CisgICAgV0VCQ09SRV9FWFBP UlQgaW50IGNvbGxlY3RTZWxlY3Rpb25SZWN0c1dpdGhvdXRVbmlvbkludGVyaW9yTGluZXMoVmVj dG9yPFNlbGVjdGlvblJlY3Q+JikgY29uc3Q7CiAjZW5kaWYKIAogICAgIHZvaWQgbm9kZUNoaWxk cmVuQ2hhbmdlZChDb250YWluZXJOb2RlJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL1RleHRJbmRpY2F0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9UZXh0SW5kaWNhdG9y LmNwcAppbmRleCA5N2RiYTQ5NTg4YmNmZmNjMTVhNTVkYzUxODBkNTVmMWVjNjY1MTY3Li5kNTdi NjhkZWEyMmRhNzJmZTU5MDkwMjllNTE5Mjk3YjdkNzUwOWE2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1RleHRJbmRpY2F0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv VGV4dEluZGljYXRvci5jcHAKQEAgLTQxLDYgKzQxLDEwIEBACiAjaW5jbHVkZSAiUmFuZ2UuaCIK ICNpbmNsdWRlICJSZW5kZXJPYmplY3QuaCIKIAorI2lmIFBMQVRGT1JNKElPUykKKyNpbmNsdWRl ICJTZWxlY3Rpb25SZWN0LmgiCisjZW5kaWYKKwogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTE4Myw2ICsxODcsMTkgQEAgc3RhdGljIGJvb2wgdGFr ZVNuYXBzaG90cyhUZXh0SW5kaWNhdG9yRGF0YSYgZGF0YSwgRnJhbWUmIGZyYW1lLCBJbnRSZWN0 IHNuYXBzaG8KICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorI2lmIFBMQVRGT1JNKElPUykKKworc3Rh dGljIHZvaWQgZ2V0U2VsZWN0aW9uUmVjdHNGb3JSYW5nZShWZWN0b3I8RmxvYXRSZWN0PiYgcmVz dWx0aW5nUmVjdHMsIGNvbnN0IFJhbmdlJiByYW5nZSkKK3sKKyAgICBWZWN0b3I8U2VsZWN0aW9u UmVjdD4gc2VsZWN0aW9uUmVjdHNGb3JSYW5nZTsKKyAgICBWZWN0b3I8RmxvYXRSZWN0PiBzZWxl Y3Rpb25SZWN0c0ZvclJhbmdlSW5Cb3VuZGluZ1JlY3RDb29yZGluYXRlczsKKyAgICByYW5nZS5j b2xsZWN0U2VsZWN0aW9uUmVjdHMoc2VsZWN0aW9uUmVjdHNGb3JSYW5nZSk7CisgICAgZm9yIChh dXRvIHNlbGVjdGlvblJlY3QgOiBzZWxlY3Rpb25SZWN0c0ZvclJhbmdlKQorICAgICAgICByZXN1 bHRpbmdSZWN0cy5hcHBlbmQoc2VsZWN0aW9uUmVjdC5yZWN0KCkpOworfQorCisjZW5kaWYKKwog c3RhdGljIGJvb2wgaW5pdGlhbGl6ZUluZGljYXRvcihUZXh0SW5kaWNhdG9yRGF0YSYgZGF0YSwg RnJhbWUmIGZyYW1lLCBjb25zdCBSYW5nZSYgcmFuZ2UsIEZsb2F0U2l6ZSBtYXJnaW4sIGJvb2wg aW5kaWNhdGVzQ3VycmVudFNlbGVjdGlvbikKIHsKICAgICBWZWN0b3I8RmxvYXRSZWN0PiB0ZXh0 UmVjdHM7CkBAIC0xOTcsNiArMjE0LDEwIEBAIHN0YXRpYyBib29sIGluaXRpYWxpemVJbmRpY2F0 b3IoVGV4dEluZGljYXRvckRhdGEmIGRhdGEsIEZyYW1lJiBmcmFtZSwgY29uc3QgUmFuCiAKICAg ICBpZiAoKGRhdGEub3B0aW9ucyAmIFRleHRJbmRpY2F0b3JPcHRpb25Vc2VCb3VuZGluZ1JlY3RB bmRQYWludEFsbENvbnRlbnRGb3JDb21wbGV4UmFuZ2VzKSAmJiBoYXNOb25JbmxpbmVPclJlcGxh Y2VkRWxlbWVudHMocmFuZ2UpKQogICAgICAgICBkYXRhLm9wdGlvbnMgfD0gVGV4dEluZGljYXRv ck9wdGlvblBhaW50QWxsQ29udGVudDsKKyNpZiBQTEFURk9STShJT1MpCisgICAgZWxzZSBpZiAo ZGF0YS5vcHRpb25zICYgVGV4dEluZGljYXRvck9wdGlvblVzZVNlbGVjdGlvblJlY3RGb3JTaXpp bmcpCisgICAgICAgIGdldFNlbGVjdGlvblJlY3RzRm9yUmFuZ2UodGV4dFJlY3RzLCByYW5nZSk7 CisjZW5kaWYKICAgICBlbHNlIHsKICAgICAgICAgaWYgKGRhdGEub3B0aW9ucyAmIFRleHRJbmRp Y2F0b3JPcHRpb25Eb05vdENsaXBUb1Zpc2libGVSZWN0KQogICAgICAgICAgICAgZnJhbWUuc2Vs ZWN0aW9uKCkuZ2V0VGV4dFJlY3RhbmdsZXModGV4dFJlY3RzLCB0ZXh0UmVjdEhlaWdodCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RleHRJbmRpY2F0b3IuaCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvVGV4dEluZGljYXRvci5oCmluZGV4IGE4ZTJkMTk3NmFkYzM4Zjk1MmJhZTNh NTIxM2I4MjVjMzVkMjhhYjIuLjI1YmE1YzM0MmFiNDk3MjU3NjJjZjRjN2U0ZDlmNDgzZTg2MTYw ZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVGV4dEluZGljYXRvci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvVGV4dEluZGljYXRvci5oCkBAIC04Myw2ICs4MywxMSBAQCBl bnVtIFRleHRJbmRpY2F0b3JPcHRpb24gOiB1aW50MTZfdCB7CiAKICAgICAvLyBJbmNsdWRlIGFu IGFkZGl0aW9uYWwgc25hcHNob3Qgb2YgZXZlcnl0aGluZyBpbiB2aWV3LCB3aXRoIHRoZSBleGNl cHRpb24gb2Ygbm9kZXMgd2l0aGluIHRoZSBjdXJyZW50bHkgc2VsZWN0ZWQgcmFuZ2UuCiAgICAg VGV4dEluZGljYXRvck9wdGlvbkluY2x1ZGVTbmFwc2hvdE9mQWxsVmlzaWJsZUNvbnRlbnRXaXRo b3V0U2VsZWN0aW9uID0gMSA8PCA4LAorCisgICAgLy8gQnkgZGVmYXVsdCwgVGV4dEluZGljYXRv ciB1c2VzIHRleHQgcmVjdHMgdG8gc2l6ZSB0aGUgc25hcHNob3QuIEVuYWJsaW5nIHRoaXMgZmxh ZyBjYXVzZXMgaXQgdG8gdXNlIHRoZSBib3VuZHMgb2YgdGhlCisgICAgLy8gc2VsZWN0aW9uIHJl Y3RzIHRoYXQgd291bGQgZW5jbG9zZSB0aGUgZ2l2ZW4gUmFuZ2UgaW5zdGVhZC4KKyAgICAvLyBD dXJyZW50bHksIHRoaXMgaXMgb25seSBzdXBwb3J0ZWQgb24gaU9TLgorICAgIFRleHRJbmRpY2F0 b3JPcHRpb25Vc2VTZWxlY3Rpb25SZWN0Rm9yU2l6aW5nID0gMSA8PCA5LAogfTsKIHR5cGVkZWYg dWludDE2X3QgVGV4dEluZGljYXRvck9wdGlvbnM7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRleCAyMmVjOTQyNGMwYTBk OTViNjdlZWEzNGJjNzU3MGIyZGRlMzIwMmY4Li5lMDg2MTJkNmM4MTBhODIyZjg4NzA5N2M2Y2Mx OTcyNjJiMmQyMmVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC02MzEsNyArNjMxLDcgQEAgdm9pZCBXZWJQYWdlOjpk aWRDb25jbHVkZUVkaXREYXRhSW50ZXJhY3Rpb24oKQogewogICAgIHN0ZDo6b3B0aW9uYWw8VGV4 dEluZGljYXRvckRhdGE+IHRleHRJbmRpY2F0b3JEYXRhOwogCi0gICAgc3RhdGljIGF1dG8gZGVm YXVsdEVkaXREcmFnVGV4dEluZGljYXRvck9wdGlvbnMgPSBUZXh0SW5kaWNhdG9yT3B0aW9uSW5j bHVkZVNuYXBzaG90T2ZBbGxWaXNpYmxlQ29udGVudFdpdGhvdXRTZWxlY3Rpb24gfCBUZXh0SW5k aWNhdG9yT3B0aW9uRG9Ob3RDbGlwVG9WaXNpYmxlUmVjdCB8IFRleHRJbmRpY2F0b3JPcHRpb25Q YWludEFsbENvbnRlbnQgfCBUZXh0SW5kaWNhdG9yT3B0aW9uSW5jbHVkZU1hcmdpbklmUmFuZ2VN YXRjaGVzU2VsZWN0aW9uIHwgVGV4dEluZGljYXRvck9wdGlvblBhaW50QmFja2dyb3VuZHMgfCBU ZXh0SW5kaWNhdG9yT3B0aW9uSW5jbHVkZVNuYXBzaG90V2l0aFNlbGVjdGlvbkhpZ2hsaWdodDsK KyAgICBzdGF0aWMgYXV0byBkZWZhdWx0RWRpdERyYWdUZXh0SW5kaWNhdG9yT3B0aW9ucyA9IFRl eHRJbmRpY2F0b3JPcHRpb25JbmNsdWRlU25hcHNob3RPZkFsbFZpc2libGVDb250ZW50V2l0aG91 dFNlbGVjdGlvbiB8IFRleHRJbmRpY2F0b3JPcHRpb25Eb05vdENsaXBUb1Zpc2libGVSZWN0IHwg VGV4dEluZGljYXRvck9wdGlvblBhaW50QWxsQ29udGVudCB8IFRleHRJbmRpY2F0b3JPcHRpb25J bmNsdWRlTWFyZ2luSWZSYW5nZU1hdGNoZXNTZWxlY3Rpb24gfCBUZXh0SW5kaWNhdG9yT3B0aW9u UGFpbnRCYWNrZ3JvdW5kcyB8IFRleHRJbmRpY2F0b3JPcHRpb25Vc2VTZWxlY3Rpb25SZWN0Rm9y U2l6aW5nIHwgVGV4dEluZGljYXRvck9wdGlvbkluY2x1ZGVTbmFwc2hvdFdpdGhTZWxlY3Rpb25I aWdobGlnaHQ7CiAgICAgYXV0byYgZnJhbWUgPSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZv Y3VzZWRPck1haW5GcmFtZSgpOwogICAgIGlmIChhdXRvIHJhbmdlID0gZnJhbWUuc2VsZWN0aW9u KCkuc2VsZWN0aW9uKCkudG9Ob3JtYWxpemVkUmFuZ2UoKSkgewogICAgICAgICBpZiAoYXV0byB0 ZXh0SW5kaWNhdG9yID0gVGV4dEluZGljYXRvcjo6Y3JlYXRlV2l0aFJhbmdlKCpyYW5nZSwgZGVm YXVsdEVkaXREcmFnVGV4dEluZGljYXRvck9wdGlvbnMsIFRleHRJbmRpY2F0b3JQcmVzZW50YXRp b25UcmFuc2l0aW9uOjpOb25lKSkK