135631 2014-08-05 18:40:25 -0700 Cleanup InlineTextBox::paintSelection and ::localSelectionRect. 2017-11-15 13:11:13 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=137858 https://bugs.webkit.org/show_bug.cgi?id=178232 InRadar P2 Normal --- 135657 1 zalan zalan commit-queue dbates esprehn+autocc glenn kondapallykalyan mmaxfield simon.fraser webkit-bug-importer oldest_to_newest 1027036 0 zalan 2014-08-05 18:40:25 -0700 SSIA. 1027059 1 236074 zalan 2014-08-05 19:29:28 -0700 Created attachment 236074 Patch 1027077 2 236074 darin 2014-08-05 20:45:35 -0700 Comment on attachment 236074 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236074&action=review > Source/WebCore/ChangeLog:8 > + No change in functionality. But we removed the snapping from localSelectionRect. That seems like a bug fix, not a “no change” refactoring fix. > Source/WebCore/rendering/InlineTextBox.cpp:740 > + LayoutUnit selectionTop = root().selectionTopAdjustedForPrecedingBlock(); No need to put this into local variable any more if we are only using this once. 1027153 3 236101 zalan 2014-08-06 07:25:31 -0700 Created attachment 236101 Patch 1027162 4 236101 commit-queue 2014-08-06 08:04:30 -0700 Comment on attachment 236101 Patch Clearing flags on attachment: 236101 Committed r172145: <http://trac.webkit.org/changeset/172145> 1027163 5 commit-queue 2014-08-06 08:04:36 -0700 All reviewed patches have been landed. Closing bug. 1027198 6 commit-queue 2014-08-06 10:41:14 -0700 Re-opened since this is blocked by bug 135657 1362259 7 dbates 2017-10-19 12:36:35 -0700 Marked this bug resolved fix following the landing of <https://trac.webkit.org/changeset/223699> (bug #178232) that shared more code between InlineTextBox::paintSelection() and InlineTextBox::localSelectionRect(). The pointer to reference conversions that were made in the proposed patch for this bug (attachment #236101) were made in <https://trac.webkit.org/changeset/174876> (bug #137858). For completeness, we cannot remove the logic to compute the enclosing integral rectangle from localSelectionRect() as the patch on this bug (attachment #236101) attempted to do because localSelectionRect() is used to answer calls to the Web API Element.getClientRects() and other objects that override localSelectionRect() return the enclosing integral rectangle of the selection. For consistency we would need to update all overrides of localSelectionRect(), including the override in InlineTextBox. Bug #138913 is tracking this effort. 1372390 8 webkit-bug-importer 2017-11-15 13:11:13 -0800 <rdar://problem/35568938> 236074 2014-08-05 19:29:28 -0700 2014-08-06 07:25:28 -0700 Patch bug-135631-20140805192916.patch text/plain 7030 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMDM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODU1YmQwNmRkM2M5YWI5 MWM2MmRiMTY1ZmJhMTE4NDVkNzRhYThmYS4uYmFkNDI1NjM5NmQzNzcwMmMxZDdiZDM2YzY4OTA0 YTIzMTIxNTNjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE0LTA4LTA1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW51cCBJbmxpbmVUZXh0 Qm94OjpwYWludFNlbGVjdGlvbiBhbmQgOjpsb2NhbFNlbGVjdGlvblJlY3QuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU2MzEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBjaGFuZ2UgaW4gZnVuY3Rp b25hbGl0eS4KKworICAgICAgICAqIHJlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcDogSWRlYWxs eSB0aGVzZSAyIGZ1bmN0aW9ucyBzaG91bGQgc2hhcmUgc29tZSBtb3JlIGNvZGUuCisgICAgICAg IChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94Ojpsb2NhbFNlbGVjdGlvblJlY3QpOiBMb2NhbCBjb29y ZGluYXRlcyBzaG91bGQgbm90IGJlIHNuYXBwZWQvZW5jbG9zZWQuCisgICAgICAgIFRoaXMgY2hh bmdlIGNvdWxkIHBvdGVudGlhbGx5IGJyZWFrIHNvbWUgc2VsZWN0aW9ucy4gU2hvdWxkIHRoYXQg YmUgdGhlIGNhc2UsIHRoZXkgbmVlZCB0byBiZSBhZGRyZXNzZWQKKyAgICAgICAgc2VwYXJhdGVs eS4KKyAgICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OnBhaW50KToKKyAgICAgICAgKFdl YkNvcmU6OklubGluZVRleHRCb3g6OnBhaW50U2VsZWN0aW9uKTogTWlub3IgY2xlYW51cC4KKyAg ICAgICAgKiByZW5kZXJpbmcvSW5saW5lVGV4dEJveC5oOgorCiAyMDE0LTA4LTA1ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OOiBFeHRyZW1l bHkgZmxhc2h5IHNjcm9sbGluZyB3aGlsZSBhIHBhZ2UgaXMgc3RpbGwgbG9hZGluZyAoYmVjYXVz ZSBvZiBmbHVzaCB0aHJvdHRsaW5nKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL0lubGluZVRleHRCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRl eHRCb3guY3BwCmluZGV4IDI3ZjRmODliMWE2MWRlNDU0NGY0MDU0YjIzNTZjNDkyNDFlNjY3OWEu LjNmMjlkMWRhYTMzZGY0ZmMyODE4NjkzNjRiNmRiNTNhZTNhYzRjMjMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAKQEAgLTI4MSwxNiArMjgxLDkgQEAgTGF5 b3V0UmVjdCBJbmxpbmVUZXh0Qm94Ojpsb2NhbFNlbGVjdGlvblJlY3QoaW50IHN0YXJ0UG9zLCBp bnQgZW5kUG9zKSBjb25zdAogICAgIC8vIEF2b2lkIGNvbXB1dGluZyB0aGUgZm9udCB3aWR0aCB3 aGVuIHRoZSBlbnRpcmUgbGluZSBib3ggaXMgc2VsZWN0ZWQgYXMgYW4gb3B0aW1pemF0aW9uLgog ICAgIGlmIChzUG9zIHx8IGVQb3MgIT0gc3RhdGljX2Nhc3Q8aW50PihtX2xlbikpCiAgICAgICAg IGZvbnQuYWRqdXN0U2VsZWN0aW9uUmVjdEZvclRleHQodGV4dFJ1biwgc2VsZWN0aW9uUmVjdCwg c1BvcywgZVBvcyk7Ci0gICAgSW50UmVjdCBzbmFwcGVkU2VsZWN0aW9uUmVjdCA9IGVuY2xvc2lu Z0ludFJlY3Qoc2VsZWN0aW9uUmVjdCk7Ci0gICAgTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGggPSBz bmFwcGVkU2VsZWN0aW9uUmVjdC53aWR0aCgpOwotICAgIGlmIChzbmFwcGVkU2VsZWN0aW9uUmVj dC54KCkgPiBsb2dpY2FsUmlnaHQoKSkKLSAgICAgICAgbG9naWNhbFdpZHRoICA9IDA7Ci0gICAg ZWxzZSBpZiAoc25hcHBlZFNlbGVjdGlvblJlY3QubWF4WCgpID4gbG9naWNhbFJpZ2h0KCkpCi0g ICAgICAgIGxvZ2ljYWxXaWR0aCA9IGxvZ2ljYWxSaWdodCgpIC0gc25hcHBlZFNlbGVjdGlvblJl Y3QueCgpOwotCi0gICAgTGF5b3V0UG9pbnQgdG9wUG9pbnQgPSBpc0hvcml6b250YWwoKSA/IExh eW91dFBvaW50KHNuYXBwZWRTZWxlY3Rpb25SZWN0LngoKSwgc2VsZWN0aW9uVG9wKSA6IExheW91 dFBvaW50KHNlbGVjdGlvblRvcCwgc25hcHBlZFNlbGVjdGlvblJlY3QueCgpKTsKLSAgICBMYXlv dXRVbml0IHdpZHRoID0gaXNIb3Jpem9udGFsKCkgPyBsb2dpY2FsV2lkdGggOiBzZWxlY3Rpb25I ZWlnaHQ7Ci0gICAgTGF5b3V0VW5pdCBoZWlnaHQgPSBpc0hvcml6b250YWwoKSA/IHNlbGVjdGlv bkhlaWdodCA6IGxvZ2ljYWxXaWR0aDsKKyAgICBMYXlvdXRQb2ludCB0b3BQb2ludCA9IGlzSG9y aXpvbnRhbCgpID8gTGF5b3V0UG9pbnQoc2VsZWN0aW9uUmVjdC54KCksIHNlbGVjdGlvblRvcCkg OiBMYXlvdXRQb2ludChzZWxlY3Rpb25Ub3AsIHNlbGVjdGlvblJlY3QueCgpKTsKKyAgICBMYXlv dXRVbml0IHdpZHRoID0gaXNIb3Jpem9udGFsKCkgPyBzZWxlY3Rpb25SZWN0LndpZHRoKCkgOiBz ZWxlY3Rpb25IZWlnaHQ7CisgICAgTGF5b3V0VW5pdCBoZWlnaHQgPSBpc0hvcml6b250YWwoKSA/ IHNlbGVjdGlvbkhlaWdodCA6IHNlbGVjdGlvblJlY3Qud2lkdGgoKTsKIAogICAgIHJldHVybiBM YXlvdXRSZWN0KHRvcFBvaW50LCBMYXlvdXRTaXplKHdpZHRoLCBoZWlnaHQpKTsKIH0KQEAgLTU3 Nyw3ICs1NzAsNyBAQCB2b2lkIElubGluZVRleHRCb3g6OnBhaW50KFBhaW50SW5mbyYgcGFpbnRJ bmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQsCiAgICAgICAgIHBhaW50RG9jdW1l bnRNYXJrZXJzKGNvbnRleHQsIGJveE9yaWdpbiwgbGluZVN0eWxlLCBmb250LCB0cnVlKTsKIAog ICAgICAgICBpZiAoaGF2ZVNlbGVjdGlvbiAmJiAhdXNlQ3VzdG9tVW5kZXJsaW5lcykKLSAgICAg ICAgICAgIHBhaW50U2VsZWN0aW9uKGNvbnRleHQsIGJveE9yaWdpbiwgbGluZVN0eWxlLCBmb250 LCBzZWxlY3Rpb25QYWludFN0eWxlLmZpbGxDb2xvcik7CisgICAgICAgICAgICBwYWludFNlbGVj dGlvbigqY29udGV4dCwgYm94T3JpZ2luLCBsaW5lU3R5bGUsIGZvbnQsIHNlbGVjdGlvblBhaW50 U3R5bGUuZmlsbENvbG9yKTsKICAgICB9CiAKICAgICBpZiAoUGFnZSogcGFnZSA9IHJlbmRlcmVy KCkuZnJhbWUoKS5wYWdlKCkpIHsKQEAgLTcwNCwxMCArNjk3LDEwIEBAIHZvaWQgSW5saW5lVGV4 dEJveDo6c2VsZWN0aW9uU3RhcnRFbmQoaW50JiBzUG9zLCBpbnQmIGVQb3MpCiAgICAgZVBvcyA9 IHN0ZDo6bWluKGVuZFBvcyAtIG1fc3RhcnQsIChpbnQpbV9sZW4pOwogfQogCi12b2lkIElubGlu ZVRleHRCb3g6OnBhaW50U2VsZWN0aW9uKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3Qg RmxvYXRQb2ludCYgYm94T3JpZ2luLCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IEZv bnQmIGZvbnQsIENvbG9yIHRleHRDb2xvcikKK3ZvaWQgSW5saW5lVGV4dEJveDo6cGFpbnRTZWxl Y3Rpb24oR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBGbG9hdFBvaW50JiBib3hPcmln aW4sIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3QgRm9udCYgZm9udCwgQ29sb3IgdGV4 dENvbG9yKQogewogI2lmIEVOQUJMRShURVhUX1NFTEVDVElPTikKLSAgICBpZiAoY29udGV4dC0+ cGFpbnRpbmdEaXNhYmxlZCgpKQorICAgIGlmIChjb250ZXh0LnBhaW50aW5nRGlzYWJsZWQoKSkK ICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gU2VlIGlmIHdlIGhhdmUgYSBzZWxlY3Rpb24gdG8g cGFpbnQgYXQgYWxsLgpAQCAtNzI1LDggKzcxOCw4IEBAIHZvaWQgSW5saW5lVGV4dEJveDo6cGFp bnRTZWxlY3Rpb24oR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBGbG9hdFBvaW50JiBi CiAgICAgaWYgKHRleHRDb2xvciA9PSBjKQogICAgICAgICBjID0gQ29sb3IoMHhmZiAtIGMucmVk KCksIDB4ZmYgLSBjLmdyZWVuKCksIDB4ZmYgLSBjLmJsdWUoKSk7CiAKLSAgICBHcmFwaGljc0Nv bnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIoKmNvbnRleHQpOwotICAgIHVwZGF0ZUdyYXBoaWNz Q29udGV4dCgqY29udGV4dCwgVGV4dFBhaW50U3R5bGUoYywgc3R5bGUuY29sb3JTcGFjZSgpKSk7 IC8vIERvbid0IGRyYXcgdGV4dCBhdCBhbGwhCisgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZl ciBzdGF0ZVNhdmVyKGNvbnRleHQpOworICAgIHVwZGF0ZUdyYXBoaWNzQ29udGV4dChjb250ZXh0 LCBUZXh0UGFpbnRTdHlsZShjLCBzdHlsZS5jb2xvclNwYWNlKCkpKTsgLy8gRG9uJ3QgZHJhdyB0 ZXh0IGF0IGFsbCEKICAgICAKICAgICAvLyBJZiB0aGUgdGV4dCBpcyB0cnVuY2F0ZWQsIGxldCB0 aGUgdGhpbmcgYmVpbmcgcGFpbnRlZCBpbiB0aGUgdHJ1bmNhdGlvbgogICAgIC8vIGRyYXcgaXRz IG93biBoaWdobGlnaHQuCkBAIC03NDQsMTYgKzczNywxMiBAQCB2b2lkIElubGluZVRleHRCb3g6 OnBhaW50U2VsZWN0aW9uKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgRmxvYXRQb2lu dCYgYgogICAgIGlmIChyZXNwZWN0SHlwaGVuKQogICAgICAgICBlUG9zID0gdGV4dFJ1bi5sZW5n dGgoKTsKIAotICAgIGNvbnN0IFJvb3RJbmxpbmVCb3gmIHJvb3RCb3ggPSByb290KCk7Ci0gICAg TGF5b3V0VW5pdCBzZWxlY3Rpb25Cb3R0b20gPSByb290Qm94LnNlbGVjdGlvbkJvdHRvbSgpOwot ICAgIExheW91dFVuaXQgc2VsZWN0aW9uVG9wID0gcm9vdEJveC5zZWxlY3Rpb25Ub3BBZGp1c3Rl ZEZvclByZWNlZGluZ0Jsb2NrKCk7CisgICAgTGF5b3V0VW5pdCBzZWxlY3Rpb25Ub3AgPSByb290 KCkuc2VsZWN0aW9uVG9wQWRqdXN0ZWRGb3JQcmVjZWRpbmdCbG9jaygpOworICAgIExheW91dFVu aXQgZGVsdGFZID0gcmVuZGVyZXIoKS5zdHlsZSgpLmlzRmxpcHBlZExpbmVzV3JpdGluZ01vZGUo KSA/IHNlbGVjdGlvbkJvdHRvbSgpIC0gbG9naWNhbEJvdHRvbSgpIDogbG9naWNhbFRvcCgpIC0g c2VsZWN0aW9uVG9wOwogCi0gICAgTGF5b3V0VW5pdCBkZWx0YVkgPSByZW5kZXJlcigpLnN0eWxl KCkuaXNGbGlwcGVkTGluZXNXcml0aW5nTW9kZSgpID8gc2VsZWN0aW9uQm90dG9tIC0gbG9naWNh bEJvdHRvbSgpIDogbG9naWNhbFRvcCgpIC0gc2VsZWN0aW9uVG9wOwotICAgIExheW91dFVuaXQg c2VsZWN0aW9uSGVpZ2h0ID0gc3RkOjptYXg8TGF5b3V0VW5pdD4oMCwgc2VsZWN0aW9uQm90dG9t IC0gc2VsZWN0aW9uVG9wKTsKLQotICAgIExheW91dFJlY3Qgc2VsZWN0aW9uUmVjdCA9IExheW91 dFJlY3QoYm94T3JpZ2luLngoKSwgYm94T3JpZ2luLnkoKSAtIGRlbHRhWSwgbV9sb2dpY2FsV2lk dGgsIHNlbGVjdGlvbkhlaWdodCk7CisgICAgTGF5b3V0UmVjdCBzZWxlY3Rpb25SZWN0ID0gTGF5 b3V0UmVjdChib3hPcmlnaW4ueCgpLCBib3hPcmlnaW4ueSgpIC0gZGVsdGFZLCBtX2xvZ2ljYWxX aWR0aCwgcm9vdCgpLnNlbGVjdGlvbkhlaWdodEFkanVzdGVkRm9yUHJlY2VkaW5nQmxvY2soKSk7 CiAgICAgZm9udC5hZGp1c3RTZWxlY3Rpb25SZWN0Rm9yVGV4dCh0ZXh0UnVuLCBzZWxlY3Rpb25S ZWN0LCBzUG9zLCBlUG9zKTsKLSAgICBjb250ZXh0LT5maWxsUmVjdChkaXJlY3Rpb25hbFBpeGVs U25hcHBlZEZvclBhaW50aW5nKHNlbGVjdGlvblJlY3QsIHJlbmRlcmVyKCkuZG9jdW1lbnQoKS5k ZXZpY2VTY2FsZUZhY3RvcigpLCB0ZXh0UnVuLmx0cigpKSwgYywgc3R5bGUuY29sb3JTcGFjZSgp KTsKKyAgICBjb250ZXh0LmZpbGxSZWN0KGRpcmVjdGlvbmFsUGl4ZWxTbmFwcGVkRm9yUGFpbnRp bmcoc2VsZWN0aW9uUmVjdCwgcmVuZGVyZXIoKS5kb2N1bWVudCgpLmRldmljZVNjYWxlRmFjdG9y KCksIHRleHRSdW4ubHRyKCkpLCBjLCBzdHlsZS5jb2xvclNwYWNlKCkpOwogI2Vsc2UKICAgICBV TlVTRURfUEFSQU0oY29udGV4dCk7CiAgICAgVU5VU0VEX1BBUkFNKGJveE9yaWdpbik7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5oIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guaAppbmRleCBlMDc0NjYwZjVhZDFjZmYw YWViNzAwMWY3ZGY4NTY1OTQyOGFhYzEwLi5jOGEzMjljY2MzMmMxNzg2YjE5M2FlY2Y3ODkyYWY0 Njg1ODg2N2Y1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4 dEJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmgKQEAg LTE2NCw3ICsxNjQsNyBAQCBwcm90ZWN0ZWQ6CiAKIHByaXZhdGU6CiAgICAgdm9pZCBwYWludERl Y29yYXRpb24oR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgRmxvYXRQb2ludCYgYm94T3JpZ2luLCBU ZXh0RGVjb3JhdGlvbiwgVGV4dERlY29yYXRpb25TdHlsZSwgY29uc3QgU2hhZG93RGF0YSosIFRl eHRQYWludGVyJik7Ci0gICAgdm9pZCBwYWludFNlbGVjdGlvbihHcmFwaGljc0NvbnRleHQqLCBj b25zdCBGbG9hdFBvaW50JiBib3hPcmlnaW4sIGNvbnN0IFJlbmRlclN0eWxlJiwgY29uc3QgRm9u dCYsIENvbG9yIHRleHRDb2xvcik7CisgICAgdm9pZCBwYWludFNlbGVjdGlvbihHcmFwaGljc0Nv bnRleHQmLCBjb25zdCBGbG9hdFBvaW50JiBib3hPcmlnaW4sIGNvbnN0IFJlbmRlclN0eWxlJiwg Y29uc3QgRm9udCYsIENvbG9yIHRleHRDb2xvcik7CiAgICAgdm9pZCBwYWludERvY3VtZW50TWFy a2VyKEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEZsb2F0UG9pbnQmIGJveE9yaWdpbiwgRG9jdW1l bnRNYXJrZXIqLCBjb25zdCBSZW5kZXJTdHlsZSYsIGNvbnN0IEZvbnQmLCBib29sIGdyYW1tYXIp OwogICAgIHZvaWQgcGFpbnRUZXh0TWF0Y2hNYXJrZXIoR3JhcGhpY3NDb250ZXh0KiwgY29uc3Qg RmxvYXRQb2ludCYgYm94T3JpZ2luLCBEb2N1bWVudE1hcmtlciosIGNvbnN0IFJlbmRlclN0eWxl JiwgY29uc3QgRm9udCYpOwogCg== 236101 2014-08-06 07:25:31 -0700 2014-08-06 08:04:28 -0700 Patch bug-135631-20140806072519.patch text/plain 6952 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWE1NTVkMTJlMTdhZDI0 OTkwM2U0ZDYxNGQ4MmRlOWRmMDlmMGExNy4uOThhNGMwNjAwMTNjMzhlNTYxMDk2ZTBiOWRmNWZl ZDA3YWIyMDVjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE0LTA4LTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW51cCBJbmxpbmVUZXh0 Qm94OjpwYWludFNlbGVjdGlvbiBhbmQgOjpsb2NhbFNlbGVjdGlvblJlY3QuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU2MzEKKworICAgICAgICBS ZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRl c3RzLgorCisgICAgICAgICogcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwOiBJZGVhbGx5IHRo ZXNlIDIgZnVuY3Rpb25zIHNob3VsZCBzaGFyZSBzb21lIG1vcmUgY29kZS4KKyAgICAgICAgKFdl YkNvcmU6OklubGluZVRleHRCb3g6OmxvY2FsU2VsZWN0aW9uUmVjdCk6IExvY2FsIGNvb3JkaW5h dGVzIHNob3VsZCBub3QgYmUgc25hcHBlZC9lbmNsb3NlZC4KKyAgICAgICAgVGhpcyBjaGFuZ2Ug Y291bGQgcG90ZW50aWFsbHkgYnJlYWsgc29tZSBzZWxlY3Rpb25zLiBTaG91bGQgdGhhdCBiZSB0 aGUgY2FzZSwgdGhleSBuZWVkIHRvIGJlIGFkZHJlc3NlZAorICAgICAgICBzZXBhcmF0ZWx5Lgor ICAgICAgICAoV2ViQ29yZTo6SW5saW5lVGV4dEJveDo6cGFpbnQpOgorICAgICAgICAoV2ViQ29y ZTo6SW5saW5lVGV4dEJveDo6cGFpbnRTZWxlY3Rpb24pOiBNaW5vciBjbGVhbnVwLgorICAgICAg ICAqIHJlbmRlcmluZy9JbmxpbmVUZXh0Qm94Lmg6CisKIDIwMTQtMDgtMDYgIE1hcmsgTGFtICA8 bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIEdhcmRlbmluZzogZml4IGJpbmRpbmdzIHRl c3QgYnJlYWthZ2UgZm9yIGZvciByMTcwNTY0IG1lcmdlZCBpbiByMTcyMTI5LgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwCmluZGV4IDU4NjQ3ZTE5NDVlZmZhODZl NDViOWM5ZDNkNTA2YmZkMWViY2MxZmUuLjMxNWNhZWQ3MzNiNTRhNDU5ZDllYmY0Y2EyOGFkMmE1 OWI4YzFhN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0 Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAK QEAgLTI4MSwxNiArMjgxLDkgQEAgTGF5b3V0UmVjdCBJbmxpbmVUZXh0Qm94Ojpsb2NhbFNlbGVj dGlvblJlY3QoaW50IHN0YXJ0UG9zLCBpbnQgZW5kUG9zKSBjb25zdAogICAgIC8vIEF2b2lkIGNv bXB1dGluZyB0aGUgZm9udCB3aWR0aCB3aGVuIHRoZSBlbnRpcmUgbGluZSBib3ggaXMgc2VsZWN0 ZWQgYXMgYW4gb3B0aW1pemF0aW9uLgogICAgIGlmIChzUG9zIHx8IGVQb3MgIT0gc3RhdGljX2Nh c3Q8aW50PihtX2xlbikpCiAgICAgICAgIGZvbnQuYWRqdXN0U2VsZWN0aW9uUmVjdEZvclRleHQo dGV4dFJ1biwgc2VsZWN0aW9uUmVjdCwgc1BvcywgZVBvcyk7Ci0gICAgSW50UmVjdCBzbmFwcGVk U2VsZWN0aW9uUmVjdCA9IGVuY2xvc2luZ0ludFJlY3Qoc2VsZWN0aW9uUmVjdCk7Ci0gICAgTGF5 b3V0VW5pdCBsb2dpY2FsV2lkdGggPSBzbmFwcGVkU2VsZWN0aW9uUmVjdC53aWR0aCgpOwotICAg IGlmIChzbmFwcGVkU2VsZWN0aW9uUmVjdC54KCkgPiBsb2dpY2FsUmlnaHQoKSkKLSAgICAgICAg bG9naWNhbFdpZHRoICA9IDA7Ci0gICAgZWxzZSBpZiAoc25hcHBlZFNlbGVjdGlvblJlY3QubWF4 WCgpID4gbG9naWNhbFJpZ2h0KCkpCi0gICAgICAgIGxvZ2ljYWxXaWR0aCA9IGxvZ2ljYWxSaWdo dCgpIC0gc25hcHBlZFNlbGVjdGlvblJlY3QueCgpOwotCi0gICAgTGF5b3V0UG9pbnQgdG9wUG9p bnQgPSBpc0hvcml6b250YWwoKSA/IExheW91dFBvaW50KHNuYXBwZWRTZWxlY3Rpb25SZWN0Lngo KSwgc2VsZWN0aW9uVG9wKSA6IExheW91dFBvaW50KHNlbGVjdGlvblRvcCwgc25hcHBlZFNlbGVj dGlvblJlY3QueCgpKTsKLSAgICBMYXlvdXRVbml0IHdpZHRoID0gaXNIb3Jpem9udGFsKCkgPyBs b2dpY2FsV2lkdGggOiBzZWxlY3Rpb25IZWlnaHQ7Ci0gICAgTGF5b3V0VW5pdCBoZWlnaHQgPSBp c0hvcml6b250YWwoKSA/IHNlbGVjdGlvbkhlaWdodCA6IGxvZ2ljYWxXaWR0aDsKKyAgICBMYXlv dXRQb2ludCB0b3BQb2ludCA9IGlzSG9yaXpvbnRhbCgpID8gTGF5b3V0UG9pbnQoc2VsZWN0aW9u UmVjdC54KCksIHNlbGVjdGlvblRvcCkgOiBMYXlvdXRQb2ludChzZWxlY3Rpb25Ub3AsIHNlbGVj dGlvblJlY3QueCgpKTsKKyAgICBMYXlvdXRVbml0IHdpZHRoID0gaXNIb3Jpem9udGFsKCkgPyBz ZWxlY3Rpb25SZWN0LndpZHRoKCkgOiBzZWxlY3Rpb25IZWlnaHQ7CisgICAgTGF5b3V0VW5pdCBo ZWlnaHQgPSBpc0hvcml6b250YWwoKSA/IHNlbGVjdGlvbkhlaWdodCA6IHNlbGVjdGlvblJlY3Qu d2lkdGgoKTsKIAogICAgIHJldHVybiBMYXlvdXRSZWN0KHRvcFBvaW50LCBMYXlvdXRTaXplKHdp ZHRoLCBoZWlnaHQpKTsKIH0KQEAgLTU3Nyw3ICs1NzAsNyBAQCB2b2lkIElubGluZVRleHRCb3g6 OnBhaW50KFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZz ZXQsCiAgICAgICAgIHBhaW50RG9jdW1lbnRNYXJrZXJzKGNvbnRleHQsIGJveE9yaWdpbiwgbGlu ZVN0eWxlLCBmb250LCB0cnVlKTsKIAogICAgICAgICBpZiAoaGF2ZVNlbGVjdGlvbiAmJiAhdXNl Q3VzdG9tVW5kZXJsaW5lcykKLSAgICAgICAgICAgIHBhaW50U2VsZWN0aW9uKGNvbnRleHQsIGJv eE9yaWdpbiwgbGluZVN0eWxlLCBmb250LCBzZWxlY3Rpb25QYWludFN0eWxlLmZpbGxDb2xvcik7 CisgICAgICAgICAgICBwYWludFNlbGVjdGlvbigqY29udGV4dCwgYm94T3JpZ2luLCBsaW5lU3R5 bGUsIGZvbnQsIHNlbGVjdGlvblBhaW50U3R5bGUuZmlsbENvbG9yKTsKICAgICB9CiAKICAgICBp ZiAoUGFnZSogcGFnZSA9IHJlbmRlcmVyKCkuZnJhbWUoKS5wYWdlKCkpIHsKQEAgLTcwNCwxMCAr Njk3LDEwIEBAIHZvaWQgSW5saW5lVGV4dEJveDo6c2VsZWN0aW9uU3RhcnRFbmQoaW50JiBzUG9z LCBpbnQmIGVQb3MpCiAgICAgZVBvcyA9IHN0ZDo6bWluKGVuZFBvcyAtIG1fc3RhcnQsIChpbnQp bV9sZW4pOwogfQogCi12b2lkIElubGluZVRleHRCb3g6OnBhaW50U2VsZWN0aW9uKEdyYXBoaWNz Q29udGV4dCogY29udGV4dCwgY29uc3QgRmxvYXRQb2ludCYgYm94T3JpZ2luLCBjb25zdCBSZW5k ZXJTdHlsZSYgc3R5bGUsIGNvbnN0IEZvbnQmIGZvbnQsIENvbG9yIHRleHRDb2xvcikKK3ZvaWQg SW5saW5lVGV4dEJveDo6cGFpbnRTZWxlY3Rpb24oR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBj b25zdCBGbG9hdFBvaW50JiBib3hPcmlnaW4sIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgY29u c3QgRm9udCYgZm9udCwgQ29sb3IgdGV4dENvbG9yKQogewogI2lmIEVOQUJMRShURVhUX1NFTEVD VElPTikKLSAgICBpZiAoY29udGV4dC0+cGFpbnRpbmdEaXNhYmxlZCgpKQorICAgIGlmIChjb250 ZXh0LnBhaW50aW5nRGlzYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gU2VlIGlm IHdlIGhhdmUgYSBzZWxlY3Rpb24gdG8gcGFpbnQgYXQgYWxsLgpAQCAtNzI1LDggKzcxOCw4IEBA IHZvaWQgSW5saW5lVGV4dEJveDo6cGFpbnRTZWxlY3Rpb24oR3JhcGhpY3NDb250ZXh0KiBjb250 ZXh0LCBjb25zdCBGbG9hdFBvaW50JiBiCiAgICAgaWYgKHRleHRDb2xvciA9PSBjKQogICAgICAg ICBjID0gQ29sb3IoMHhmZiAtIGMucmVkKCksIDB4ZmYgLSBjLmdyZWVuKCksIDB4ZmYgLSBjLmJs dWUoKSk7CiAKLSAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIoKmNvbnRl eHQpOwotICAgIHVwZGF0ZUdyYXBoaWNzQ29udGV4dCgqY29udGV4dCwgVGV4dFBhaW50U3R5bGUo Yywgc3R5bGUuY29sb3JTcGFjZSgpKSk7IC8vIERvbid0IGRyYXcgdGV4dCBhdCBhbGwhCisgICAg R3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKGNvbnRleHQpOworICAgIHVwZGF0 ZUdyYXBoaWNzQ29udGV4dChjb250ZXh0LCBUZXh0UGFpbnRTdHlsZShjLCBzdHlsZS5jb2xvclNw YWNlKCkpKTsgLy8gRG9uJ3QgZHJhdyB0ZXh0IGF0IGFsbCEKICAgICAKICAgICAvLyBJZiB0aGUg dGV4dCBpcyB0cnVuY2F0ZWQsIGxldCB0aGUgdGhpbmcgYmVpbmcgcGFpbnRlZCBpbiB0aGUgdHJ1 bmNhdGlvbgogICAgIC8vIGRyYXcgaXRzIG93biBoaWdobGlnaHQuCkBAIC03NDQsMTYgKzczNywx MCBAQCB2b2lkIElubGluZVRleHRCb3g6OnBhaW50U2VsZWN0aW9uKEdyYXBoaWNzQ29udGV4dCog Y29udGV4dCwgY29uc3QgRmxvYXRQb2ludCYgYgogICAgIGlmIChyZXNwZWN0SHlwaGVuKQogICAg ICAgICBlUG9zID0gdGV4dFJ1bi5sZW5ndGgoKTsKIAotICAgIGNvbnN0IFJvb3RJbmxpbmVCb3gm IHJvb3RCb3ggPSByb290KCk7Ci0gICAgTGF5b3V0VW5pdCBzZWxlY3Rpb25Cb3R0b20gPSByb290 Qm94LnNlbGVjdGlvbkJvdHRvbSgpOwotICAgIExheW91dFVuaXQgc2VsZWN0aW9uVG9wID0gcm9v dEJveC5zZWxlY3Rpb25Ub3BBZGp1c3RlZEZvclByZWNlZGluZ0Jsb2NrKCk7Ci0KLSAgICBMYXlv dXRVbml0IGRlbHRhWSA9IHJlbmRlcmVyKCkuc3R5bGUoKS5pc0ZsaXBwZWRMaW5lc1dyaXRpbmdN b2RlKCkgPyBzZWxlY3Rpb25Cb3R0b20gLSBsb2dpY2FsQm90dG9tKCkgOiBsb2dpY2FsVG9wKCkg LSBzZWxlY3Rpb25Ub3A7Ci0gICAgTGF5b3V0VW5pdCBzZWxlY3Rpb25IZWlnaHQgPSBzdGQ6Om1h eDxMYXlvdXRVbml0PigwLCBzZWxlY3Rpb25Cb3R0b20gLSBzZWxlY3Rpb25Ub3ApOwotCi0gICAg TGF5b3V0UmVjdCBzZWxlY3Rpb25SZWN0ID0gTGF5b3V0UmVjdChib3hPcmlnaW4ueCgpLCBib3hP cmlnaW4ueSgpIC0gZGVsdGFZLCBtX2xvZ2ljYWxXaWR0aCwgc2VsZWN0aW9uSGVpZ2h0KTsKKyAg ICBMYXlvdXRVbml0IGRlbHRhWSA9IHJlbmRlcmVyKCkuc3R5bGUoKS5pc0ZsaXBwZWRMaW5lc1dy aXRpbmdNb2RlKCkgPyBzZWxlY3Rpb25Cb3R0b20oKSAtIGxvZ2ljYWxCb3R0b20oKSA6IGxvZ2lj YWxUb3AoKSAtIHJvb3QoKS5zZWxlY3Rpb25Ub3BBZGp1c3RlZEZvclByZWNlZGluZ0Jsb2NrKCk7 CisgICAgTGF5b3V0UmVjdCBzZWxlY3Rpb25SZWN0ID0gTGF5b3V0UmVjdChib3hPcmlnaW4ueCgp LCBib3hPcmlnaW4ueSgpIC0gZGVsdGFZLCBtX2xvZ2ljYWxXaWR0aCwgcm9vdCgpLnNlbGVjdGlv bkhlaWdodEFkanVzdGVkRm9yUHJlY2VkaW5nQmxvY2soKSk7CiAgICAgZm9udC5hZGp1c3RTZWxl Y3Rpb25SZWN0Rm9yVGV4dCh0ZXh0UnVuLCBzZWxlY3Rpb25SZWN0LCBzUG9zLCBlUG9zKTsKLSAg ICBjb250ZXh0LT5maWxsUmVjdChkaXJlY3Rpb25hbFBpeGVsU25hcHBlZEZvclBhaW50aW5nKHNl bGVjdGlvblJlY3QsIHJlbmRlcmVyKCkuZG9jdW1lbnQoKS5kZXZpY2VTY2FsZUZhY3RvcigpLCB0 ZXh0UnVuLmx0cigpKSwgYywgc3R5bGUuY29sb3JTcGFjZSgpKTsKKyAgICBjb250ZXh0LmZpbGxS ZWN0KGRpcmVjdGlvbmFsUGl4ZWxTbmFwcGVkRm9yUGFpbnRpbmcoc2VsZWN0aW9uUmVjdCwgcmVu ZGVyZXIoKS5kb2N1bWVudCgpLmRldmljZVNjYWxlRmFjdG9yKCksIHRleHRSdW4ubHRyKCkpLCBj LCBzdHlsZS5jb2xvclNwYWNlKCkpOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0oY29udGV4dCk7 CiAgICAgVU5VU0VEX1BBUkFNKGJveE9yaWdpbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lu bGluZVRleHRCb3guaAppbmRleCBlMDc0NjYwZjVhZDFjZmYwYWViNzAwMWY3ZGY4NTY1OTQyOGFh YzEwLi5jOGEzMjljY2MzMmMxNzg2YjE5M2FlY2Y3ODkyYWY0Njg1ODg2N2Y1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmgKQEAgLTE2NCw3ICsxNjQsNyBAQCBwcm90 ZWN0ZWQ6CiAKIHByaXZhdGU6CiAgICAgdm9pZCBwYWludERlY29yYXRpb24oR3JhcGhpY3NDb250 ZXh0JiwgY29uc3QgRmxvYXRQb2ludCYgYm94T3JpZ2luLCBUZXh0RGVjb3JhdGlvbiwgVGV4dERl Y29yYXRpb25TdHlsZSwgY29uc3QgU2hhZG93RGF0YSosIFRleHRQYWludGVyJik7Ci0gICAgdm9p ZCBwYWludFNlbGVjdGlvbihHcmFwaGljc0NvbnRleHQqLCBjb25zdCBGbG9hdFBvaW50JiBib3hP cmlnaW4sIGNvbnN0IFJlbmRlclN0eWxlJiwgY29uc3QgRm9udCYsIENvbG9yIHRleHRDb2xvcik7 CisgICAgdm9pZCBwYWludFNlbGVjdGlvbihHcmFwaGljc0NvbnRleHQmLCBjb25zdCBGbG9hdFBv aW50JiBib3hPcmlnaW4sIGNvbnN0IFJlbmRlclN0eWxlJiwgY29uc3QgRm9udCYsIENvbG9yIHRl eHRDb2xvcik7CiAgICAgdm9pZCBwYWludERvY3VtZW50TWFya2VyKEdyYXBoaWNzQ29udGV4dCos IGNvbnN0IEZsb2F0UG9pbnQmIGJveE9yaWdpbiwgRG9jdW1lbnRNYXJrZXIqLCBjb25zdCBSZW5k ZXJTdHlsZSYsIGNvbnN0IEZvbnQmLCBib29sIGdyYW1tYXIpOwogICAgIHZvaWQgcGFpbnRUZXh0 TWF0Y2hNYXJrZXIoR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgRmxvYXRQb2ludCYgYm94T3JpZ2lu LCBEb2N1bWVudE1hcmtlciosIGNvbnN0IFJlbmRlclN0eWxlJiwgY29uc3QgRm9udCYpOwogCg==