84296 2012-04-18 16:05:44 -0700 Implement overlap avoidance for cues with snap-to-lines flag not set 2013-05-21 12:26:09 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 79347 1 vcarbune jer.noble annacc arun.patole commit-queue eric.carlson esprehn+autocc glenn jer.noble jonlee rniwa webkit-bug-importer oldest_to_newest 605186 0 vcarbune 2012-04-18 16:05:44 -0700 When snap-to-lines flag is false the boxes should not overlap, if possible: [...] 10.13.4 If there is a position to which the boxes in boxes can be moved while maintaining the relative positions of the boxes in boxes to each other such that none of the boxes in boxes would overlap any of the boxes in output, and all the boxes in output would be within the video's rendering area, then move the boxes in boxes to the closest such position to their current position, and then jump to the step labeled done positioning below. If there are multiple such positions that are equidistant from their current position, use the highest one amongst them; if there are several at that height, then use the leftmost one amongst them. [...] 605660 1 ap 2012-04-19 10:11:34 -0700 http://dev.w3.org/html5/webvtt/ 693264 2 vcarbune 2012-08-12 07:08:58 -0700 Updating the title and moving under advanced rendering main bug 886404 3 jonlee 2013-05-08 11:34:53 -0700 <rdar://problem/13760909> 891308 4 202308 jer.noble 2013-05-20 12:53:10 -0700 Created attachment 202308 Patch 891329 5 202308 eric.carlson 2013-05-20 13:36:29 -0700 Comment on attachment 202308 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=202308&action=review > Source/WebCore/rendering/RenderTextTrackCue.cpp:221 > +void RenderTextTrackCue::moveToWithinContainer() Nit: I am not wild about this name. "keepWithinContainer" or "moveIfNecessaryToKeepWithinContainer"? 891867 6 jer.noble 2013-05-21 10:14:28 -0700 Committed r150452: <http://trac.webkit.org/changeset/150452> 891941 7 rniwa 2013-05-21 12:26:09 -0700 The test added by this patch appears to be failing everywhere: http://build.webkit.org/results/Apple%20MountainLion%20Release%20WK1%20(Tests)/r150461%20(10183)/results.html --- /Volumes/Data/slave/mountainlion-release-tests-wk1/build/layout-test-results/media/track/track-cue-rendering-snap-to-lines-not-set-expected.txt +++ /Volumes/Data/slave/mountainlion-release-tests-wk1/build/layout-test-results/media/track/track-cue-rendering-snap-to-lines-not-set-actual.txt @@ -85,7 +85,7 @@ * Cue 2 * EXPECTED (cueDisplayElement.innerText == 'Top-right cue.') OK Cue left position (percentage): 100 -Cue top position (percentage): 0 +Cue top position (percentage): 7 * Cue 3 * EXPECTED (cueDisplayElement.innerText == 'Bottom cue.') OK @@ -105,6 +105,6 @@ * Cue 6 * EXPECTED (cueDisplayElement.innerText == 'Random cue 3.') OK Cue left position (percentage): 23 -Cue top position (percentage): 55 +Cue top position (percentage): 43 END OF TEST 202308 2013-05-20 12:53:10 -0700 2013-05-20 13:36:29 -0700 Patch bug-84296-20130520125159.patch text/plain 14640 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMjYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTM3NWFmMjUzZjhjYmNi OGY2MzJiYThmMTAzNTRhNTJlMGMxZGQ5My4uMmZiNjhjMmM3YjdjY2ExNzUzMDFmOTFmMzlhNmI3 MzQ3MWZmNGYxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUxIEBACisyMDEzLTA1LTIwICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEltcGxlbWVudCBvdmVybGFw IGF2b2lkYW5jZSBmb3IgY3VlcyB3aXRoIHNuYXAtdG8tbGluZXMgZmxhZyBub3Qgc2V0CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDI5NgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL3Ry YWNrL3RyYWNrLWN1ZS1vdmVybGFwLXNuYXAtdG8tbGluZXMtbm90LXNldC5odG1sCisKKyAgICAg ICAgU3VwcG9ydCBvdmVybGFwIGF2b2lkYW5jZSBmb3IgdGhlIG5vbi1zbmFwLXRvLWxpbmVzIHBh cnQgb2YgdGhlIFdlYlZUVCBzcGVjLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHRU cmFja0N1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0VHJhY2tDdWU6OmlzT3V0 c2lkZSk6IFNwbGl0IGltcGxlbWVudGF0aW9uIGludG8gcmVjdElzV2l0aGluQ29udGFpbmVyKCku CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0VHJhY2tDdWU6OnJlY3RJc1dpdGhpbkNvbnRh aW5lcik6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dFRyYWNrQ3VlOjppc092 ZXJsYXBwaW5nKTogU3BsaXQgaW50byBvdmVybGFwcGluZ09iamVjdCgpIGFuZCBvdmVybGFwcGlu Z09iamVjdEZvclJlY3QoKS4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRUcmFja0N1ZTo6 b3ZlcmxhcHBpbmdPYmplY3QpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRU cmFja0N1ZTo6b3ZlcmxhcHBpbmdPYmplY3RGb3JSZWN0KTogRGl0dG8uCisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUZXh0VHJhY2tDdWU6Om1vdmVUb1dpdGhpbkNvbnRhaW5lcik6IEFkZGVkLgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dFRyYWNrQ3VlOjpmaW5kTm9uT3ZlcmxhcHBpbmdQ b3NpdGlvbik6IFdoZW4gYW4gb3ZlcmxhcHBpbmcgb2JqZWN0IGlzIGZvdW5kLCBtb3ZlIHRoZQor ICAgICAgICAgICAgY3VlIHRvIGp1c3QgYWJvdmUgb3IgYmVsb3cgdGhhdCBvYmplY3QgYW5kIHRy eSBhZ2Fpbi4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRUcmFja0N1ZTo6cmVwb3NpdGlv bkN1ZVNuYXBUb0xpbmVzU2V0KTogTW92ZSBpbXBsZW1lbnRhdGlvbiBpbnRvIG1vdmVUb1dpdGhp bkNvbnRhaW5lcigpLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dFRyYWNrQ3VlOjpyZXBv c2l0aW9uQ3VlU25hcFRvTGluZXNOb3RTZXQpOiBBZGQgaW1wbGVtZW50YW50b24gYmFzZWQgb24g YWJvdmUuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHRUcmFja0N1ZS5oOgorICAgICAg ICAKKzIwMTMtMDUtMTcgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAg ICAgSW1wbGVtZW50IG92ZXJsYXAgYXZvaWRhbmNlIGZvciBjdWVzIHdpdGggc25hcC10by1saW5l cyBmbGFnIG5vdCBzZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTg0Mjk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy VGV4dFRyYWNrQ3VlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRUcmFja0N1ZTo6 aXNPdXRzaWRlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRUcmFja0N1ZTo6cmVjdElz V2l0aGluQ29udGFpbmVyKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyVGV4dFRyYWNrQ3VlOjppc092ZXJsYXBwaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRleHRUcmFja0N1ZTo6b3ZlcmxhcHBpbmdPYmplY3QpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyVGV4dFRyYWNrQ3VlOjpvdmVybGFwcGluZ09iamVjdEZvclJlY3QpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVGV4dFRyYWNrQ3VlOjptb3ZlVG9XaXRoaW5Db250YWluZXIpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dFRyYWNrQ3VlOjpmaW5kTm9uT3ZlcmxhcHBpbmdQb3Np dGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0VHJhY2tDdWU6OnJlcG9zaXRpb25D dWVTbmFwVG9MaW5lc1NldCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0VHJhY2tDdWU6 OnJlcG9zaXRpb25DdWVTbmFwVG9MaW5lc05vdFNldCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlclRleHRUcmFja0N1ZS5oOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChSZW5kZXJU ZXh0VHJhY2tDdWUpOgorCiAyMDEzLTA1LTEzICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUu Y29tPgogCiAgICAgICAgIExheWVyIGNvbnRhaW5pbmcgc2Nyb2xsYmFycyBkb2VzIG5vdCBkaXNh cHBlYXIgd2hlbiBzZXR0aW5nIG92ZXJmbG93OmhpZGRlbiBvbiBwYWdlIHJvb3QsIHVudGlsIHJl c2l6ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0VHJh Y2tDdWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRUcmFja0N1ZS5j cHAKaW5kZXggMGMwOGRmMTNiNjBmZWEwMmVjZDlkNmZkNTExZmIzMWE2YjMwOTc5Yi4uYmM2Y2Fj N2I5YTQ0N2M1MTgzMWY3NTQ0YmJhMDI0MGQwNWVjZjg3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRUcmFja0N1ZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRleHRUcmFja0N1ZS5jcHAKQEAgLTEyNCwxOSArMTI0LDM1IEBA IHZvaWQgUmVuZGVyVGV4dFRyYWNrQ3VlOjpwbGFjZUJveEluRGVmYXVsdFBvc2l0aW9uKExheW91 dFVuaXQgcG9zaXRpb24sIGJvb2wmIHN3CiAKIGJvb2wgUmVuZGVyVGV4dFRyYWNrQ3VlOjppc091 dHNpZGUoKSBjb25zdAogewotICAgIHJldHVybiAhY29udGFpbmluZ0Jsb2NrKCktPmFic29sdXRl Qm91bmRpbmdCb3hSZWN0KCkuY29udGFpbnMoYWJzb2x1dGVDb250ZW50Qm94KCkpOworICAgIHJl dHVybiAhcmVjdElzV2l0aGluQ29udGFpbmVyKGFic29sdXRlQ29udGVudEJveCgpKTsKIH0KIAor Ym9vbCBSZW5kZXJUZXh0VHJhY2tDdWU6OnJlY3RJc1dpdGhpbkNvbnRhaW5lcihjb25zdCBJbnRS ZWN0JiByZWN0KSBjb25zdAoreworICAgIHJldHVybiBjb250YWluaW5nQmxvY2soKS0+YWJzb2x1 dGVCb3VuZGluZ0JveFJlY3QoKS5jb250YWlucyhyZWN0KTsKK30KKworCiBib29sIFJlbmRlclRl eHRUcmFja0N1ZTo6aXNPdmVybGFwcGluZygpIGNvbnN0CiB7CisgICAgcmV0dXJuIG92ZXJsYXBw aW5nT2JqZWN0KCk7Cit9CisKK1JlbmRlck9iamVjdCogUmVuZGVyVGV4dFRyYWNrQ3VlOjpvdmVy bGFwcGluZ09iamVjdCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG92ZXJsYXBwaW5nT2JqZWN0Rm9y UmVjdChhYnNvbHV0ZUJvdW5kaW5nQm94UmVjdCgpKTsKK30KKworUmVuZGVyT2JqZWN0KiBSZW5k ZXJUZXh0VHJhY2tDdWU6Om92ZXJsYXBwaW5nT2JqZWN0Rm9yUmVjdChjb25zdCBJbnRSZWN0JiBy ZWN0KSBjb25zdAorewogICAgIGZvciAoUmVuZGVyT2JqZWN0KiBib3ggPSBwcmV2aW91c1NpYmxp bmcoKTsgYm94OyBib3ggPSBib3gtPnByZXZpb3VzU2libGluZygpKSB7CiAgICAgICAgIEludFJl Y3QgYm94UmVjdCA9IGJveC0+YWJzb2x1dGVCb3VuZGluZ0JveFJlY3QoKTsKIAotICAgICAgICBp ZiAoYWJzb2x1dGVCb3VuZGluZ0JveFJlY3QoKS5pbnRlcnNlY3RzKGJveFJlY3QpKQotICAgICAg ICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIGlmIChyZWN0LmludGVyc2VjdHMoYm94UmVjdCkp CisgICAgICAgICAgICByZXR1cm4gYm94OwogICAgIH0KIAotICAgIHJldHVybiBmYWxzZTsKKyAg ICByZXR1cm4gMDsKIH0KIAogYm9vbCBSZW5kZXJUZXh0VHJhY2tDdWU6OnNob3VsZFN3aXRjaERp cmVjdGlvbihJbmxpbmVGbG93Qm94KiBmaXJzdExpbmVCb3gsIExheW91dFVuaXQgc3RlcCkgY29u c3QKQEAgLTIwMiw2ICsyMTgsNzYgQEAgYm9vbCBSZW5kZXJUZXh0VHJhY2tDdWU6OnN3aXRjaERp cmVjdGlvbihib29sJiBzd2l0Y2hlZCwgTGF5b3V0VW5pdCYgc3RlcCkKICAgICByZXR1cm4gdHJ1 ZTsKIH0KIAordm9pZCBSZW5kZXJUZXh0VHJhY2tDdWU6Om1vdmVUb1dpdGhpbkNvbnRhaW5lcigp Cit7CisgICAgSW50UmVjdCBjb250YWluZXJSZWN0ID0gY29udGFpbmluZ0Jsb2NrKCktPmFic29s dXRlQm91bmRpbmdCb3hSZWN0KCk7CisgICAgSW50UmVjdCBjdWVSZWN0ID0gYWJzb2x1dGVCb3Vu ZGluZ0JveFJlY3QoKTsKKworICAgIGludCB0b3BPdmVyZmxvdyA9IGN1ZVJlY3QueSgpIC0gY29u dGFpbmVyUmVjdC55KCk7CisgICAgaW50IGJvdHRvbU92ZXJmbG93ID0gY29udGFpbmVyUmVjdC5t YXhZKCkgLSBjdWVSZWN0Lm1heFkoKTsKKworICAgIGludCB2ZXJ0aWNhbEFkanVzdG1lbnQgPSAw OworICAgIGlmICh0b3BPdmVyZmxvdyA8IDApCisgICAgICAgIHZlcnRpY2FsQWRqdXN0bWVudCA9 IC10b3BPdmVyZmxvdzsKKyAgICBlbHNlIGlmIChib3R0b21PdmVyZmxvdyA8IDApCisgICAgICAg IHZlcnRpY2FsQWRqdXN0bWVudCA9IGJvdHRvbU92ZXJmbG93OworCisgICAgaWYgKHZlcnRpY2Fs QWRqdXN0bWVudCkKKyAgICAgICAgc2V0WSh5KCkgKyB2ZXJ0aWNhbEFkanVzdG1lbnQpOworCisg ICAgaW50IGxlZnRPdmVyZmxvdyA9IGN1ZVJlY3QueCgpIC0gY29udGFpbmVyUmVjdC54KCk7Cisg ICAgaW50IHJpZ2h0T3ZlcmZsb3cgPSBjb250YWluZXJSZWN0Lm1heFgoKSAtIGN1ZVJlY3QubWF4 WCgpOworCisgICAgaW50IGhvcml6b250YWxBZGp1c3RtZW50ID0gMDsKKyAgICBpZiAobGVmdE92 ZXJmbG93IDwgMCkKKyAgICAgICAgaG9yaXpvbnRhbEFkanVzdG1lbnQgPSAtbGVmdE92ZXJmbG93 OworICAgIGVsc2UgaWYgKHJpZ2h0T3ZlcmZsb3cgPCAwKQorICAgICAgICBob3Jpem9udGFsQWRq dXN0bWVudCA9IHJpZ2h0T3ZlcmZsb3c7CisKKyAgICBpZiAoaG9yaXpvbnRhbEFkanVzdG1lbnQp CisgICAgICAgIHNldFgoeCgpICsgaG9yaXpvbnRhbEFkanVzdG1lbnQpOworfQorCitib29sIFJl bmRlclRleHRUcmFja0N1ZTo6ZmluZE5vbk92ZXJsYXBwaW5nUG9zaXRpb24oaW50JiBuZXdYLCBp bnQmIG5ld1kpIGNvbnN0Cit7CisgICAgbmV3WCA9IHgoKTsKKyAgICBuZXdZID0geSgpOworICAg IEludFJlY3Qgc3JjUmVjdCA9IGFic29sdXRlQm91bmRpbmdCb3hSZWN0KCk7CisgICAgSW50UmVj dCBkZXN0UmVjdCA9IHNyY1JlY3Q7CisKKyAgICAvLyBNb3ZlIHRoZSBib3ggdXAsIGxvb2tpbmcg Zm9yIGEgbm9uLW92ZXJsYXBwaW5nIHBvc2l0aW9uOgorICAgIHdoaWxlIChSZW5kZXJPYmplY3Qq IGJveCA9IG92ZXJsYXBwaW5nT2JqZWN0Rm9yUmVjdChkZXN0UmVjdCkpIHsKKyAgICAgICAgaWYg KG1fY3VlLT5nZXRXcml0aW5nRGlyZWN0aW9uKCkgPT0gVGV4dFRyYWNrQ3VlOjpIb3Jpem9udGFs KQorICAgICAgICAgICAgZGVzdFJlY3Quc2V0WShib3gtPmFic29sdXRlQm91bmRpbmdCb3hSZWN0 KCkueSgpIC0gZGVzdFJlY3QuaGVpZ2h0KCkpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBk ZXN0UmVjdC5zZXRYKGJveC0+YWJzb2x1dGVCb3VuZGluZ0JveFJlY3QoKS54KCkgLSBkZXN0UmVj dC53aWR0aCgpKTsKKyAgICB9CisKKyAgICBpZiAocmVjdElzV2l0aGluQ29udGFpbmVyKGRlc3RS ZWN0KSkgeworICAgICAgICBuZXdYICs9IGRlc3RSZWN0LngoKSAtIHNyY1JlY3QueCgpOworICAg ICAgICBuZXdZICs9IGRlc3RSZWN0LnkoKSAtIHNyY1JlY3QueSgpOworICAgICAgICByZXR1cm4g dHJ1ZTsKKyAgICB9CisKKyAgICBkZXN0UmVjdCA9IHNyY1JlY3Q7CisKKyAgICAvLyBNb3ZlIHRo ZSBib3ggZG93biwgbG9va2luZyBmb3IgYSBub24tb3ZlcmxhcHBpbmcgcG9zaXRpb246CisgICAg d2hpbGUgKFJlbmRlck9iamVjdCogYm94ID0gb3ZlcmxhcHBpbmdPYmplY3RGb3JSZWN0KGRlc3RS ZWN0KSkgeworICAgICAgICBpZiAobV9jdWUtPmdldFdyaXRpbmdEaXJlY3Rpb24oKSA9PSBUZXh0 VHJhY2tDdWU6Okhvcml6b250YWwpCisgICAgICAgICAgICBkZXN0UmVjdC5zZXRZKGJveC0+YWJz b2x1dGVCb3VuZGluZ0JveFJlY3QoKS5tYXhZKCkpOworICAgICAgICBlbHNlCisgICAgICAgICAg ICBkZXN0UmVjdC5zZXRYKGJveC0+YWJzb2x1dGVCb3VuZGluZ0JveFJlY3QoKS5tYXhYKCkpOwor ICAgIH0KKworICAgIGlmIChyZWN0SXNXaXRoaW5Db250YWluZXIoZGVzdFJlY3QpKSB7CisgICAg ICAgIG5ld1ggKz0gZGVzdFJlY3QueCgpIC0gc3JjUmVjdC54KCk7CisgICAgICAgIG5ld1kgKz0g ZGVzdFJlY3QueSgpIC0gc3JjUmVjdC55KCk7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0K KworICAgIHJldHVybiBmYWxzZTsKK30KKwogdm9pZCBSZW5kZXJUZXh0VHJhY2tDdWU6OnJlcG9z aXRpb25DdWVTbmFwVG9MaW5lc1NldCgpCiB7CiAgICAgSW5saW5lRmxvd0JveCogZmlyc3RMaW5l Qm94OwpAQCAtMjI5LDIyICszMTUsOCBAQCB2b2lkIFJlbmRlclRleHRUcmFja0N1ZTo6cmVwb3Np dGlvbkN1ZVNuYXBUb0xpbmVzU2V0KCkKIAogICAgIC8vIEFjb21tb2RhdGUgZXh0cmEgdG9wIGFu ZCBib3R0b20gcGFkZGluZywgYm9yZGVyIG9yIG1hcmdpbi4KICAgICAvLyBOb3RlOiB0aGlzIGlz IHN1cHBvcnRlZCBvbmx5IGZvciBpbnRlcm5hbCBVQSBzdHlsaW5nLCBub3QgdGhyb3VnaCB0aGUg Y3VlIHNlbGVjdG9yLgotICAgIGlmIChoYXNJbmxpbmVEaXJlY3Rpb25Cb3JkZXJzUGFkZGluZ09y TWFyZ2luKCkpIHsKLSAgICAgICAgSW50UmVjdCBjb250YWluZXJSZWN0ID0gY29udGFpbmluZ0Js b2NrKCktPmFic29sdXRlQm91bmRpbmdCb3hSZWN0KCk7Ci0gICAgICAgIEludFJlY3QgY3VlUmVj dCA9IGFic29sdXRlQm91bmRpbmdCb3hSZWN0KCk7Ci0KLSAgICAgICAgaW50IHRvcE92ZXJmbG93 ID0gY3VlUmVjdC55KCkgLSBjb250YWluZXJSZWN0LnkoKTsKLSAgICAgICAgaW50IGJvdHRvbU92 ZXJmbG93ID0gY29udGFpbmVyUmVjdC55KCkgKyBjb250YWluZXJSZWN0LmhlaWdodCgpIC0gY3Vl UmVjdC55KCkgLSBjdWVSZWN0LmhlaWdodCgpOwotCi0gICAgICAgIGludCBhZGp1c3RtZW50ID0g MDsKLSAgICAgICAgaWYgKHRvcE92ZXJmbG93IDwgMCkKLSAgICAgICAgICAgIGFkanVzdG1lbnQg PSAtdG9wT3ZlcmZsb3c7Ci0gICAgICAgIGVsc2UgaWYgKGJvdHRvbU92ZXJmbG93IDwgMCkKLSAg ICAgICAgICAgIGFkanVzdG1lbnQgPSBib3R0b21PdmVyZmxvdzsKLQotICAgICAgICBpZiAoYWRq dXN0bWVudCkKLSAgICAgICAgICAgIHNldFkoeSgpICsgYWRqdXN0bWVudCk7Ci0gICAgfQorICAg IGlmIChoYXNJbmxpbmVEaXJlY3Rpb25Cb3JkZXJzUGFkZGluZ09yTWFyZ2luKCkpCisgICAgICAg IG1vdmVUb1dpdGhpbkNvbnRhaW5lcigpOwogfQogCiB2b2lkIFJlbmRlclRleHRUcmFja0N1ZTo6 cmVwb3NpdGlvbkdlbmVyaWNDdWUoKQpAQCAtMjY3LDcgKzMzOSwyNiBAQCB2b2lkIFJlbmRlclRl eHRUcmFja0N1ZTo6cmVwb3NpdGlvbkdlbmVyaWNDdWUoKQogCiB2b2lkIFJlbmRlclRleHRUcmFj a0N1ZTo6cmVwb3NpdGlvbkN1ZVNuYXBUb0xpbmVzTm90U2V0KCkKIHsKLSAgICAvLyBGSVhNRTog SW1wbGVtZW50IG92ZXJsYXBwaW5nIGRldGVjdGlvbiB3aGVuIHNuYXAtdG8tbGluZXMgaXMgbm90 IHNldC4gaHR0cDovL3drYi51Zy84NDI5NgorICAgIC8vIDMuIElmIG5vbmUgb2YgdGhlIGJveGVz IGluIGJveGVzIHdvdWxkIG92ZXJsYXAgYW55IG9mIHRoZSBib3hlcyBpbiBvdXRwdXQsIGFuZCBh bGwgdGhlIGJveGVzIGluCisgICAgLy8gb3V0cHV0IGFyZSB3aXRoaW4gdGhlIHZpZGVvJ3MgcmVu ZGVyaW5nIGFyZWEsIHRoZW4ganVtcCB0byB0aGUgc3RlcCBsYWJlbGVkIGRvbmUgcG9zaXRpb25p bmcgYmVsb3cuCisgICAgaWYgKCFpc091dHNpZGUoKSAmJiAhaXNPdmVybGFwcGluZygpKQorICAg ICAgICByZXR1cm47CisKKyAgICAvLyA0LiBJZiB0aGVyZSBpcyBhIHBvc2l0aW9uIHRvIHdoaWNo IHRoZSBib3hlcyBpbiBib3hlcyBjYW4gYmUgbW92ZWQgd2hpbGUgbWFpbnRhaW5pbmcgdGhlIHJl bGF0aXZlCisgICAgLy8gcG9zaXRpb25zIG9mIHRoZSBib3hlcyBpbiBib3hlcyB0byBlYWNoIG90 aGVyIHN1Y2ggdGhhdCBub25lIG9mIHRoZSBib3hlcyBpbiBib3hlcyB3b3VsZCBvdmVybGFwCisg ICAgLy8gYW55IG9mIHRoZSBib3hlcyBpbiBvdXRwdXQsIGFuZCBhbGwgdGhlIGJveGVzIGluIG91 dHB1dCB3b3VsZCBiZSB3aXRoaW4gdGhlIHZpZGVvJ3MgcmVuZGVyaW5nIGFyZWEsCisgICAgLy8g dGhlbiBtb3ZlIHRoZSBib3hlcyBpbiBib3hlcyB0byB0aGUgY2xvc2VzdCBzdWNoIHBvc2l0aW9u IHRvIHRoZWlyIGN1cnJlbnQgcG9zaXRpb24sIGFuZCB0aGVuIGp1bXAKKyAgICAvLyB0byB0aGUg c3RlcCBsYWJlbGVkIGRvbmUgcG9zaXRpb25pbmcgYmVsb3cuIElmIHRoZXJlIGFyZSBtdWx0aXBs ZSBzdWNoIHBvc2l0aW9ucyB0aGF0IGFyZSBlcXVpZGlzdGFudAorICAgIC8vIGZyb20gdGhlaXIg Y3VycmVudCBwb3NpdGlvbiwgdXNlIHRoZSBoaWdoZXN0IG9uZSBhbW9uZ3N0IHRoZW07IGlmIHRo ZXJlIGFyZSBzZXZlcmFsIGF0IHRoYXQgaGVpZ2h0LAorICAgIC8vIHRoZW4gdXNlIHRoZSBsZWZ0 bW9zdCBvbmUgYW1vbmdzdCB0aGVtLgorICAgIG1vdmVUb1dpdGhpbkNvbnRhaW5lcigpOworICAg IGludCB4ID0gMDsKKyAgICBpbnQgeSA9IDA7CisgICAgaWYgKCFmaW5kTm9uT3ZlcmxhcHBpbmdQ b3NpdGlvbih4LCB5KSkKKyAgICAgICAgcmV0dXJuOworCisgICAgc2V0WCh4KTsKKyAgICBzZXRZ KHkpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dFRyYWNrQ3VlLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGV4dFRyYWNrQ3VlLmgKaW5kZXggOTgwODRhYjM4ZGQ1Mzk1ODVlNmE5MTM5 NzMwNzMxMWY2ODU2MDhmOS4uMTc0ZDgzYjQ1Njk2MTM5ZjRlMWYyOTAxMjFhYzI0MDVhNDNlNWU0 MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRUcmFja0N1 ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0VHJhY2tDdWUuaApA QCAtMzUsNiArMzUsNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIFJlbmRlckJv eDsKIGNsYXNzIFRleHRUcmFja0N1ZUJveDsKIAogY2xhc3MgUmVuZGVyVGV4dFRyYWNrQ3VlIDog cHVibGljIFJlbmRlckJsb2NrIHsKQEAgLTQ1LDExICs0NiwxNiBAQCBwcml2YXRlOgogICAgIHZp cnR1YWwgdm9pZCBsYXlvdXQoKSBPVkVSUklERTsKIAogICAgIGJvb2wgaXNPdXRzaWRlKCkgY29u c3Q7CisgICAgYm9vbCByZWN0SXNXaXRoaW5Db250YWluZXIoY29uc3QgSW50UmVjdCYpIGNvbnN0 OwogICAgIGJvb2wgaXNPdmVybGFwcGluZygpIGNvbnN0OworICAgIFJlbmRlck9iamVjdCogb3Zl cmxhcHBpbmdPYmplY3QoKSBjb25zdDsKKyAgICBSZW5kZXJPYmplY3QqIG92ZXJsYXBwaW5nT2Jq ZWN0Rm9yUmVjdChjb25zdCBJbnRSZWN0JikgY29uc3Q7CiAgICAgYm9vbCBzaG91bGRTd2l0Y2hE aXJlY3Rpb24oSW5saW5lRmxvd0JveCosIExheW91dFVuaXQpIGNvbnN0OwogCiAgICAgdm9pZCBt b3ZlQm94ZXNCeVN0ZXAoTGF5b3V0VW5pdCk7CiAgICAgYm9vbCBzd2l0Y2hEaXJlY3Rpb24oYm9v bCYsIExheW91dFVuaXQmKTsKKyAgICB2b2lkIG1vdmVUb1dpdGhpbkNvbnRhaW5lcigpOworICAg IGJvb2wgZmluZE5vbk92ZXJsYXBwaW5nUG9zaXRpb24oaW50JiB4LCBpbnQmIHkpIGNvbnN0Owog CiAgICAgYm9vbCBpbml0aWFsaXplTGF5b3V0UGFyYW1ldGVycyhJbmxpbmVGbG93Qm94KiYsIExh eW91dFVuaXQmLCBMYXlvdXRVbml0Jik7CiAgICAgdm9pZCBwbGFjZUJveEluRGVmYXVsdFBvc2l0 aW9uKExheW91dFVuaXQsIGJvb2wmKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAzOGI0ZTUzZDQ4ZDYxMzJiYjY5MzUxYWNh ZmY5Y2QyMTU5ZGJlNDBiLi4xZTRjYmVjMGRiZGQyN2RlZTgyNzc5NTdjM2ZhNWFlYWMxMzVmYmE5 IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTMtMDUtMjAgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CisKKyAgICAgICAgSW1wbGVtZW50IG92ZXJsYXAgYXZvaWRhbmNlIGZvciBj dWVzIHdpdGggc25hcC10by1saW5lcyBmbGFnIG5vdCBzZXQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0Mjk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBtZWRpYS90cmFjay90cmFjay1jdWUtb3Zlcmxh cC1zbmFwLXRvLWxpbmVzLW5vdC1zZXQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBt ZWRpYS90cmFjay90cmFjay1jdWUtb3ZlcmxhcC1zbmFwLXRvLWxpbmVzLW5vdC1zZXQuaHRtbDog QWRkZWQuCisKIDIwMTMtMDUtMTYgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAK ICAgICAgICAgU29tZSBtZWRpYS90cmFjayB0ZXN0cyBmYWlsIG9yIGFzc2VydCBvbiBNYWMKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWN1ZS1vdmVybGFwLXNuYXAt dG8tbGluZXMtbm90LXNldC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9tZWRpYS90cmFjay90 cmFjay1jdWUtb3ZlcmxhcC1zbmFwLXRvLWxpbmVzLW5vdC1zZXQtZXhwZWN0ZWQudHh0Cm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLjNkYzNlZDQ0OGIzNmZmMGNmYjAxZThhYmQ5NzJkZThjNDllMWUwNGMKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS90cmFjay90cmFjay1jdWUtb3ZlcmxhcC1zbmFw LXRvLWxpbmVzLW5vdC1zZXQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNyBAQAorVGVzdCB0aGF0 IFRleHRUcmFjaydzIGN1ZXMgYXJlIHJlbmRlcmVkIGNvcnJlY3RseSB3aGVuIHRoZSBzbmFwIHRv IGxpbmVzIGZsYWcgaXMgbm90IHNldC4KK0VWRU5UKGNhbnBsYXl0aHJvdWdoKQorRVZFTlQoc2Vl a2VkKQorQWN0aXZlIGN1ZXM6IDcKK05vIGN1ZSBlbGVtZW50cyBvdmVybGFwLiBPSworRU5EIE9G IFRFU1QKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svdHJhY2stY3VlLW92 ZXJsYXAtc25hcC10by1saW5lcy1ub3Qtc2V0Lmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS90cmFj ay90cmFjay1jdWUtb3ZlcmxhcC1zbmFwLXRvLWxpbmVzLW5vdC1zZXQuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li43YTZhZTYwMGVhMDk4ZGYwNjVmNjgwOTUwMjhmZWM0ODhmNmFhZDMzCi0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svdHJhY2stY3VlLW92ZXJsYXAtc25hcC10by1s aW5lcy1ub3Qtc2V0Lmh0bWwKQEAgLTAsMCArMSw3NSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRt bD4KKyAgICA8aGVhZD4KKyAgICAgICAgPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBj b250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9dXRmLTgiIC8+CisKKyAgICAgICAgPHNjcmlwdCBz cmM9Li4vbWVkaWEtZmlsZS5qcz48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmM9Li4vdmlk ZW8tdGVzdC5qcz48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmM9Li4vbWVkaWEtY29udHJv bHMuanM+PC9zY3JpcHQ+CisKKyAgICAgICAgPHNjcmlwdD4KKworICAgICAgICB2YXIgY3VlRGlz cGxheUVsZW1lbnQ7CisKKyAgICAgICAgQ2xpZW50UmVjdC5wcm90b3R5cGUuaW50ZXJzZWN0cyA9 IGZ1bmN0aW9uKHRoYXQpCisgICAgICAgIHsKKyAgICAgICAgICAgIC8vIFNlcGFyYXRpbmcgYXhp cyB0aGVvcmVtOgorICAgICAgICAgICAgcmV0dXJuIE1hdGguYWJzKHRoaXMudG9wIC0gdGhhdC50 b3ApIDwgTWF0aC5hYnModGhpcy5oZWlnaHQgKyB0aGF0LmhlaWdodCkgLyAyCisgICAgICAgICAg ICAgICAgJiYgTWF0aC5hYnModGhpcy5sZWZ0IC0gdGhhdC5sZWZ0KSA8IE1hdGguYWJzKHRoaXMu d2lkdGggKyB0aGF0LndpZHRoKSAvIDI7CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBm aW5kT3ZlcmxhcHBpbmdFbGVtZW50KGVsZW1lbnQpCisgICAgICAgIHsKKyAgICAgICAgICAgIHZh ciBlbGVtZW50UmVjdCA9IGVsZW1lbnQuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7CisgICAgICAg ICAgICB2YXIgc2libGluZ3MgPSBlbGVtZW50LnBhcmVudEVsZW1lbnQuY2hpbGRyZW47CisgICAg ICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHNpYmxpbmdzLmxlbmd0aDsgKytpKSB7CisgICAg ICAgICAgICAgICAgdmFyIHNpYmxpbmcgPSBzaWJsaW5nc1tpXTsKKyAgICAgICAgICAgICAgICBp ZiAoc2libGluZyA9PT0gZWxlbWVudCkKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisK KyAgICAgICAgICAgICAgICB2YXIgc2libGluZ1JlY3QgPSBzaWJsaW5nLmdldEJvdW5kaW5nQ2xp ZW50UmVjdCgpOworICAgICAgICAgICAgICAgIGlmIChlbGVtZW50UmVjdC5pbnRlcnNlY3RzKHNp YmxpbmdSZWN0KSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHNpYmxpbmc7CisgICAgICAg ICAgICB9CisgICAgICAgICAgICByZXR1cm4gbnVsbDsKKyAgICAgICAgfQorCisgICAgICAgIGZ1 bmN0aW9uIHNlZWtlZCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIHRlc3RUcmFjayA9IGRvY3Vt ZW50LnF1ZXJ5U2VsZWN0b3IoJ3RyYWNrJyk7CisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIkFj dGl2ZSBjdWVzOiAiICsgdGVzdFRyYWNrLnRyYWNrLmFjdGl2ZUN1ZXMubGVuZ3RoKTsKKworICAg ICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0ZXN0VHJhY2sudHJhY2suYWN0aXZlQ3Vlcy5s ZW5ndGg7ICsraSkgeworICAgICAgICAgICAgICAgIHZhciBjdWVEaXNwbGF5RWxlbWVudCA9IHRl eHRUcmFja0Rpc3BsYXlFbGVtZW50KHZpZGVvLCAnZGlzcGxheScsIGkpOworICAgICAgICAgICAg ICAgIHZhciBvdmVybGFwcGluZ0VsZW1lbnQgPSBmaW5kT3ZlcmxhcHBpbmdFbGVtZW50KGN1ZURp c3BsYXlFbGVtZW50KTsKKyAgICAgICAgICAgICAgICBpZiAob3ZlcmxhcHBpbmdFbGVtZW50KSB7 CisgICAgICAgICAgICAgICAgICAgIGZhaWxUZXN0KCJDdWUgZWxlbWVudCBudW1iZXIgIiArIGkg KyAiIG92ZXJsYXBzIHdpdGggZWxlbWVudCAiICsgb3ZlcmxhcHBpbmdFbGVtZW50ICsgIi4iKTsK KyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIH0KKworICAgICAgICAgICAgbG9nUmVzdWx0KHRydWUsICJObyBjdWUgZWxlbWVudHMgb3Zl cmxhcC4iKTsKKyAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAgICAgfTsKKworICAgICAgICBm dW5jdGlvbiBsb2FkZWQoKQorICAgICAgICB7CisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIlRl c3QgdGhhdCBUZXh0VHJhY2sncyBjdWVzIGFyZSByZW5kZXJlZCBjb3JyZWN0bHkgd2hlbiB0aGUg c25hcCB0byBsaW5lcyBmbGFnIGlzIG5vdCBzZXQuIik7CisKKyAgICAgICAgICAgIGZpbmRNZWRp YUVsZW1lbnQoKTsKKyAgICAgICAgICAgIHZpZGVvLnNyYyA9IGZpbmRNZWRpYUZpbGUoJ3ZpZGVv JywgJy4uL2NvbnRlbnQvdGVzdCcpOworCisgICAgICAgICAgICB3YWl0Rm9yRXZlbnQoJ2NhbnBs YXl0aHJvdWdoJywgZnVuY3Rpb24oKSB7CisgICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50KCdz ZWVrZWQnLCBzZWVrZWQsIGZhbHNlLCB0cnVlKTsKKyAgICAgICAgICAgICAgICB2aWRlby5jdXJy ZW50VGltZSA9IDQuMTA7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfQorCisgICAgICAgIDwv c2NyaXB0PgorICAgIDwvaGVhZD4KKyAgICA8Ym9keSBvbmxvYWQ9ImxvYWRlZCgpIj4KKyAgICAg ICAgPHZpZGVvIGNvbnRyb2xzPgorICAgICAgICAgICAgPHRyYWNrIHNyYz0iY2FwdGlvbnMtd2Vi dnR0L2NhcHRpb25zLXNuYXAtdG8tbGluZXMtbm90LXNldC52dHQiIGtpbmQ9ImNhcHRpb25zIiBk ZWZhdWx0PgorICAgICAgICA8L3ZpZGVvPgorICAgIDwvYm9keT4KKzwvaHRtbD4K