84175 2012-04-17 11:42:46 -0700 Change RenderThemeChromiumSkia paint methods to use pixel snapping 2012-04-17 17:31:55 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 eae eae abarth dglazkov eric jchaffraix leviw webkit.review.bot oldest_to_newest 604191 0 eae 2012-04-17 11:42:46 -0700 Change RenderThemeChromiumSkia paint methods to use pixel snapping in preparation for turning on subpixel layout. 604225 1 137578 eae 2012-04-17 12:09:18 -0700 Created attachment 137578 Patch 604358 2 137578 webkit.review.bot 2012-04-17 14:41:26 -0700 Comment on attachment 137578 Patch Attachment 137578 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/12425092 604460 3 137630 eae 2012-04-17 16:28:41 -0700 Created attachment 137630 Patch 604491 4 137630 eric 2012-04-17 16:59:48 -0700 Comment on attachment 137630 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=137630&action=review > Source/WebCore/rendering/RenderThemeChromiumSkia.cpp:286 > + LayoutUnit cancelButtonSize = std::min(inputContentBox.width(), std::min(inputContentBox.height(), r.height())); Don't we normally have "using namespace std;" at the top of cpp files which need min/max? 604494 5 137630 eae 2012-04-17 17:04:24 -0700 Comment on attachment 137630 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=137630&action=review >> Source/WebCore/rendering/RenderThemeChromiumSkia.cpp:286 >> + LayoutUnit cancelButtonSize = std::min(inputContentBox.width(), std::min(inputContentBox.height(), r.height())); > > Don't we normally have "using namespace std;" at the top of cpp files which need min/max? Normally we do, I wanted to be consistent with the rest of the file though. If you'd like I could change all of it. 604501 6 eric 2012-04-17 17:13:25 -0700 Yeah, I noticed that after I made the comment, so I just set cq+. It's fine. :) 604513 7 137630 webkit.review.bot 2012-04-17 17:31:51 -0700 Comment on attachment 137630 Patch Clearing flags on attachment: 137630 Committed r114471: <http://trac.webkit.org/changeset/114471> 604514 8 webkit.review.bot 2012-04-17 17:31:55 -0700 All reviewed patches have been landed. Closing bug. 137578 2012-04-17 12:09:18 -0700 2012-04-17 16:28:37 -0700 Patch bug-84175-20120417120917.patch text/plain 8254 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNDQwNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA0LTE3ICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBDaGFuZ2UgUmVuZGVyVGhlbWVD aHJvbWl1bVNraWEgcGFpbnQgbWV0aG9kcyB0byB1c2UgcGl4ZWwgc25hcHBpbmcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0MTc1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBj aGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICBDaGFuZ2UgUmVuZGVyVGhlbWVDaHJv bWl1bVNraWEgdG8gdXNlIHN1YnBpeGVsIHR5cGVzIGFuZCBwaXhlbCBzbmFwCisgICAgICAgIHZh bHVlcyBqdXN0IGJlZm9yZSBwYWludGluZy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJU aGVtZUNocm9taXVtU2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUNocm9t aXVtU2tpYTo6Y29udmVydFRvUGFpbnRpbmdSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRoZW1lQ2hyb21pdW1Ta2lhOjpwYWludFNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lQ2hyb21pdW1Ta2lhOjpwYWludFNlYXJjaEZpZWxkUmVz dWx0c0RlY29yYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVDaHJvbWl1bVNr aWE6OnBhaW50U2VhcmNoRmllbGRSZXN1bHRzQnV0dG9uKToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyVGhlbWVDaHJvbWl1bVNraWEuaDoKKwogMjAxMi0wNC0xNyAgVG9tIFNlcGV6ICA8dHNl cGV6QGNocm9taXVtLm9yZz4KIAogICAgICAgICBGcmFtZXNuaWZmaW5nIGRlZmVuc2UgaXMgdG9v IGFnZ3Jlc3NpdmUuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVD aHJvbWl1bVNraWEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUaGVtZUNocm9taXVtU2tpYS5jcHAJKHJldmlzaW9uIDExNDM5NCkKKysrIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtU2tpYS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTI2MSwxNiArMjYxLDE2IEBAIHZvaWQgUmVuZGVyVGhlbWVDaHJvbWl1bVNraWE6OmFk anVzdFNlYXIKICAgICBzdHlsZS0+c2V0SGVpZ2h0KExlbmd0aChjYW5jZWxCdXR0b25TaXplLCBG aXhlZCkpOwogfQogCi1JbnRSZWN0IFJlbmRlclRoZW1lQ2hyb21pdW1Ta2lhOjpjb252ZXJ0VG9Q YWludGluZ1JlY3QoUmVuZGVyT2JqZWN0KiBpbnB1dFJlbmRlcmVyLCBjb25zdCBSZW5kZXJPYmpl Y3QqIHBhcnRSZW5kZXJlciwgSW50UmVjdCBwYXJ0UmVjdCwgY29uc3QgSW50UmVjdCYgbG9jYWxP ZmZzZXQpIGNvbnN0CitJbnRSZWN0IFJlbmRlclRoZW1lQ2hyb21pdW1Ta2lhOjpjb252ZXJ0VG9Q YWludGluZ1JlY3QoUmVuZGVyT2JqZWN0KiBpbnB1dFJlbmRlcmVyLCBjb25zdCBSZW5kZXJPYmpl Y3QqIHBhcnRSZW5kZXJlciwgTGF5b3V0UmVjdCBwYXJ0UmVjdCwgY29uc3QgSW50UmVjdCYgbG9j YWxPZmZzZXQpIGNvbnN0CiB7CiAgICAgLy8gQ29tcHV0ZSBhbiBvZmZzZXQgYmV0d2VlbiB0aGUg cGFydCByZW5kZXJlciBhbmQgdGhlIGlucHV0IHJlbmRlcmVyLgotICAgIEludFNpemUgb2Zmc2V0 RnJvbUlucHV0UmVuZGVyZXIgPSAtKHBhcnRSZW5kZXJlci0+b2Zmc2V0RnJvbUFuY2VzdG9yQ29u dGFpbmVyKGlucHV0UmVuZGVyZXIpKTsKKyAgICBMYXlvdXRTaXplIG9mZnNldEZyb21JbnB1dFJl bmRlcmVyID0gLXBhcnRSZW5kZXJlci0+b2Zmc2V0RnJvbUFuY2VzdG9yQ29udGFpbmVyKGlucHV0 UmVuZGVyZXIpOwogICAgIC8vIE1vdmUgdGhlIHJlY3QgaW50byBwYXJ0UmVuZGVyZXIncyBjb29y ZHMuCiAgICAgcGFydFJlY3QubW92ZShvZmZzZXRGcm9tSW5wdXRSZW5kZXJlcik7CiAgICAgLy8g QWNjb3VudCBmb3IgdGhlIGxvY2FsIGRyYXdpbmcgb2Zmc2V0LgogICAgIHBhcnRSZWN0Lm1vdmUo bG9jYWxPZmZzZXQueCgpLCBsb2NhbE9mZnNldC55KCkpOwogCi0gICAgcmV0dXJuIHBhcnRSZWN0 OworICAgIHJldHVybiBwaXhlbFNuYXBwZWRJbnRSZWN0KHBhcnRSZWN0KTsKIH0KIAogYm9vbCBS ZW5kZXJUaGVtZUNocm9taXVtU2tpYTo6cGFpbnRTZWFyY2hGaWVsZENhbmNlbEJ1dHRvbihSZW5k ZXJPYmplY3QqIGNhbmNlbEJ1dHRvbk9iamVjdCwgY29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8s IGNvbnN0IEludFJlY3QmIHIpCkBAIC0yODAsMTYgKzI4MCwxNiBAQCBib29sIFJlbmRlclRoZW1l Q2hyb21pdW1Ta2lhOjpwYWludFNlYXJjCiAgICAgaWYgKCFpbnB1dC0+cmVuZGVyZXIoKS0+aXNC b3goKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIFJlbmRlckJveCogaW5wdXRSZW5kZXJC b3ggPSB0b1JlbmRlckJveChpbnB1dC0+cmVuZGVyZXIoKSk7Ci0gICAgSW50UmVjdCBpbnB1dENv bnRlbnRCb3ggPSBpbnB1dFJlbmRlckJveC0+Y29udGVudEJveFJlY3QoKTsKKyAgICBMYXlvdXRS ZWN0IGlucHV0Q29udGVudEJveCA9IGlucHV0UmVuZGVyQm94LT5jb250ZW50Qm94UmVjdCgpOwog CiAgICAgLy8gTWFrZSBzdXJlIHRoZSBzY2FsZWQgYnV0dG9uIHN0YXlzIHNxdWFyZSBhbmQgd2ls bCBmaXQgaW4gaXRzIHBhcmVudCdzIGJveC4KLSAgICBpbnQgY2FuY2VsQnV0dG9uU2l6ZSA9IHN0 ZDo6bWluKGlucHV0Q29udGVudEJveC53aWR0aCgpLCBzdGQ6Om1pbjxpbnQ+KGlucHV0Q29udGVu dEJveC5oZWlnaHQoKSwgci5oZWlnaHQoKSkpOworICAgIExheW91dFVuaXQgY2FuY2VsQnV0dG9u U2l6ZSA9IHN0ZDo6bWluKGlucHV0Q29udGVudEJveC53aWR0aCgpLCBzdGQ6Om1pbihpbnB1dENv bnRlbnRCb3guaGVpZ2h0KCksIHIuaGVpZ2h0KCkpKTsKICAgICAvLyBDYWxjdWxhdGUgY2FuY2Vs IGJ1dHRvbidzIGNvb3JkaW5hdGVzIHJlbGF0aXZlIHRvIHRoZSBpbnB1dCBlbGVtZW50LgogICAg IC8vIENlbnRlciB0aGUgYnV0dG9uIHZlcnRpY2FsbHkuICBSb3VuZCB1cCB0aG91Z2gsIHNvIGlm IGl0IGhhcyB0byBiZSBvbmUgcGl4ZWwgb2ZmLWNlbnRlciwgaXQgd2lsbAogICAgIC8vIGJlIG9u ZSBwaXhlbCBjbG9zZXIgdG8gdGhlIGJvdHRvbSBvZiB0aGUgZmllbGQuICBUaGlzIHRlbmRzIHRv IGxvb2sgYmV0dGVyIHdpdGggdGhlIHRleHQuCi0gICAgSW50UmVjdCBjYW5jZWxCdXR0b25SZWN0 KGNhbmNlbEJ1dHRvbk9iamVjdC0+b2Zmc2V0RnJvbUFuY2VzdG9yQ29udGFpbmVyKGlucHV0UmVu ZGVyQm94KS53aWR0aCgpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnB1dENvbnRl bnRCb3gueSgpICsgKGlucHV0Q29udGVudEJveC5oZWlnaHQoKSAtIGNhbmNlbEJ1dHRvblNpemUg KyAxKSAvIDIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNhbmNlbEJ1dHRvblNpemUs IGNhbmNlbEJ1dHRvblNpemUpOworICAgIExheW91dFJlY3QgY2FuY2VsQnV0dG9uUmVjdChjYW5j ZWxCdXR0b25PYmplY3QtPm9mZnNldEZyb21BbmNlc3RvckNvbnRhaW5lcihpbnB1dFJlbmRlckJv eCkud2lkdGgoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5wdXRDb250ZW50 Qm94LnkoKSArIChpbnB1dENvbnRlbnRCb3guaGVpZ2h0KCkgLSBjYW5jZWxCdXR0b25TaXplICsg MSkgLyAyLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjYW5jZWxCdXR0b25TaXpl LCBjYW5jZWxCdXR0b25TaXplKTsKICAgICBJbnRSZWN0IHBhaW50aW5nUmVjdCA9IGNvbnZlcnRU b1BhaW50aW5nUmVjdChpbnB1dFJlbmRlckJveCwgY2FuY2VsQnV0dG9uT2JqZWN0LCBjYW5jZWxC dXR0b25SZWN0LCByKTsKIAogICAgIHN0YXRpYyBJbWFnZSogY2FuY2VsSW1hZ2UgPSBJbWFnZTo6 bG9hZFBsYXRmb3JtUmVzb3VyY2UoInNlYXJjaENhbmNlbCIpLmxlYWtSZWYoKTsKQEAgLTMyMywx NiArMzIzLDE2IEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bVNraWE6OnBhaW50U2VhcmMKICAg ICBpZiAoIWlucHV0LT5yZW5kZXJlcigpLT5pc0JveCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgUmVuZGVyQm94KiBpbnB1dFJlbmRlckJveCA9IHRvUmVuZGVyQm94KGlucHV0LT5yZW5k ZXJlcigpKTsKLSAgICBJbnRSZWN0IGlucHV0Q29udGVudEJveCA9IGlucHV0UmVuZGVyQm94LT5j b250ZW50Qm94UmVjdCgpOworICAgIExheW91dFJlY3QgaW5wdXRDb250ZW50Qm94ID0gaW5wdXRS ZW5kZXJCb3gtPmNvbnRlbnRCb3hSZWN0KCk7CiAKICAgICAvLyBNYWtlIHN1cmUgdGhlIHNjYWxl ZCBkZWNvcmF0aW9uIHN0YXlzIHNxdWFyZSBhbmQgd2lsbCBmaXQgaW4gaXRzIHBhcmVudCdzIGJv eC4KLSAgICBpbnQgbWFnbmlmaWVyU2l6ZSA9IHN0ZDo6bWluKGlucHV0Q29udGVudEJveC53aWR0 aCgpLCBzdGQ6Om1pbjxpbnQ+KGlucHV0Q29udGVudEJveC5oZWlnaHQoKSwgci5oZWlnaHQoKSkp OworICAgIExheW91dFVuaXQgbWFnbmlmaWVyU2l6ZSA9IHN0ZDo6bWluKGlucHV0Q29udGVudEJv eC53aWR0aCgpLCBzdGQ6Om1pbihpbnB1dENvbnRlbnRCb3guaGVpZ2h0KCksIHIuaGVpZ2h0KCkp KTsKICAgICAvLyBDYWxjdWxhdGUgZGVjb3JhdGlvbidzIGNvb3JkaW5hdGVzIHJlbGF0aXZlIHRv IHRoZSBpbnB1dCBlbGVtZW50LgogICAgIC8vIENlbnRlciB0aGUgZGVjb3JhdGlvbiB2ZXJ0aWNh bGx5LiAgUm91bmQgdXAgdGhvdWdoLCBzbyBpZiBpdCBoYXMgdG8gYmUgb25lIHBpeGVsIG9mZi1j ZW50ZXIsIGl0IHdpbGwKICAgICAvLyBiZSBvbmUgcGl4ZWwgY2xvc2VyIHRvIHRoZSBib3R0b20g b2YgdGhlIGZpZWxkLiAgVGhpcyB0ZW5kcyB0byBsb29rIGJldHRlciB3aXRoIHRoZSB0ZXh0Lgot ICAgIEludFJlY3QgbWFnbmlmaWVyUmVjdChtYWduaWZpZXJPYmplY3QtPm9mZnNldEZyb21BbmNl c3RvckNvbnRhaW5lcihpbnB1dFJlbmRlckJveCkud2lkdGgoKSwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgaW5wdXRDb250ZW50Qm94LnkoKSArIChpbnB1dENvbnRlbnRCb3guaGVpZ2h0KCkg LSBtYWduaWZpZXJTaXplICsgMSkgLyAyLAotICAgICAgICAgICAgICAgICAgICAgICAgICBtYWdu aWZpZXJTaXplLCBtYWduaWZpZXJTaXplKTsKKyAgICBMYXlvdXRSZWN0IG1hZ25pZmllclJlY3Qo bWFnbmlmaWVyT2JqZWN0LT5vZmZzZXRGcm9tQW5jZXN0b3JDb250YWluZXIoaW5wdXRSZW5kZXJC b3gpLndpZHRoKCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlucHV0Q29udGVudEJv eC55KCkgKyAoaW5wdXRDb250ZW50Qm94LmhlaWdodCgpIC0gbWFnbmlmaWVyU2l6ZSArIDEpIC8g MiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWFnbmlmaWVyU2l6ZSwgbWFnbmlmaWVy U2l6ZSk7CiAgICAgSW50UmVjdCBwYWludGluZ1JlY3QgPSBjb252ZXJ0VG9QYWludGluZ1JlY3Qo aW5wdXRSZW5kZXJCb3gsIG1hZ25pZmllck9iamVjdCwgbWFnbmlmaWVyUmVjdCwgcik7CiAKICAg ICBzdGF0aWMgSW1hZ2UqIG1hZ25pZmllckltYWdlID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291 cmNlKCJzZWFyY2hNYWduaWZpZXIiKS5sZWFrUmVmKCk7CkBAIC0zNTgsMTQgKzM1OCwxNCBAQCBi b29sIFJlbmRlclRoZW1lQ2hyb21pdW1Ta2lhOjpwYWludFNlYXJjCiAgICAgaWYgKCFpbnB1dC0+ cmVuZGVyZXIoKS0+aXNCb3goKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIFJlbmRlckJv eCogaW5wdXRSZW5kZXJCb3ggPSB0b1JlbmRlckJveChpbnB1dC0+cmVuZGVyZXIoKSk7Ci0gICAg SW50UmVjdCBpbnB1dENvbnRlbnRCb3ggPSBpbnB1dFJlbmRlckJveC0+Y29udGVudEJveFJlY3Qo KTsKKyAgICBMYXlvdXRSZWN0IGlucHV0Q29udGVudEJveCA9IGlucHV0UmVuZGVyQm94LT5jb250 ZW50Qm94UmVjdCgpOwogCiAgICAgLy8gTWFrZSBzdXJlIHRoZSBzY2FsZWQgZGVjb3JhdGlvbiB3 aWxsIGZpdCBpbiBpdHMgcGFyZW50J3MgYm94LgotICAgIGludCBtYWduaWZpZXJIZWlnaHQgPSBz dGQ6Om1pbjxpbnQ+KGlucHV0Q29udGVudEJveC5oZWlnaHQoKSwgci5oZWlnaHQoKSk7Ci0gICAg aW50IG1hZ25pZmllcldpZHRoID0gc3RkOjptaW48aW50PihpbnB1dENvbnRlbnRCb3gud2lkdGgo KSwgbWFnbmlmaWVySGVpZ2h0ICogZGVmYXVsdFNlYXJjaEZpZWxkUmVzdWx0c0J1dHRvbldpZHRo IC8gZGVmYXVsdFNlYXJjaEZpZWxkUmVzdWx0c0RlY29yYXRpb25TaXplKTsKLSAgICBJbnRSZWN0 IG1hZ25pZmllclJlY3QobWFnbmlmaWVyT2JqZWN0LT5vZmZzZXRGcm9tQW5jZXN0b3JDb250YWlu ZXIoaW5wdXRSZW5kZXJCb3gpLndpZHRoKCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgIGlu cHV0Q29udGVudEJveC55KCkgKyAoaW5wdXRDb250ZW50Qm94LmhlaWdodCgpIC0gbWFnbmlmaWVy SGVpZ2h0ICsgMSkgLyAyLAotICAgICAgICAgICAgICAgICAgICAgICAgICBtYWduaWZpZXJXaWR0 aCwgbWFnbmlmaWVySGVpZ2h0KTsKKyAgICBMYXlvdXRVbml0IG1hZ25pZmllckhlaWdodCA9IHN0 ZDo6bWluKGlucHV0Q29udGVudEJveC5oZWlnaHQoKSwgci5oZWlnaHQoKSk7CisgICAgTGF5b3V0 VW5pdCBtYWduaWZpZXJXaWR0aCA9IHN0ZDo6bWluKGlucHV0Q29udGVudEJveC53aWR0aCgpLCBt YWduaWZpZXJIZWlnaHQgKiBkZWZhdWx0U2VhcmNoRmllbGRSZXN1bHRzQnV0dG9uV2lkdGggLyBk ZWZhdWx0U2VhcmNoRmllbGRSZXN1bHRzRGVjb3JhdGlvblNpemUpOworICAgIExheW91dFJlY3Qg bWFnbmlmaWVyUmVjdChtYWduaWZpZXJPYmplY3QtPm9mZnNldEZyb21BbmNlc3RvckNvbnRhaW5l cihpbnB1dFJlbmRlckJveCkud2lkdGgoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg aW5wdXRDb250ZW50Qm94LnkoKSArIChpbnB1dENvbnRlbnRCb3guaGVpZ2h0KCkgLSBtYWduaWZp ZXJIZWlnaHQgKyAxKSAvIDIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1hZ25pZmll cldpZHRoLCBtYWduaWZpZXJIZWlnaHQpOwogICAgIEludFJlY3QgcGFpbnRpbmdSZWN0ID0gY29u dmVydFRvUGFpbnRpbmdSZWN0KGlucHV0UmVuZGVyQm94LCBtYWduaWZpZXJPYmplY3QsIG1hZ25p ZmllclJlY3QsIHIpOwogCiAgICAgc3RhdGljIEltYWdlKiBtYWduaWZpZXJJbWFnZSA9IEltYWdl Ojpsb2FkUGxhdGZvcm1SZXNvdXJjZSgic2VhcmNoTWFnbmlmaWVyUmVzdWx0cyIpLmxlYWtSZWYo KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtU2tp YS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNo cm9taXVtU2tpYS5oCShyZXZpc2lvbiAxMTQzOTQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGhlbWVDaHJvbWl1bVNraWEuaAkod29ya2luZyBjb3B5KQpAQCAtMTU3LDcgKzE1 Nyw3IEBAIHByaXZhdGU6CiAKICAgICBpbnQgbWVudUxpc3RJbnRlcm5hbFBhZGRpbmcoUmVuZGVy U3R5bGUqLCBpbnQgcGFkZGluZ1R5cGUpIGNvbnN0OwogICAgIGJvb2wgcGFpbnRNZWRpYUJ1dHRv bkludGVybmFsKEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmLCBJbWFnZSopOwotICAg IEludFJlY3QgY29udmVydFRvUGFpbnRpbmdSZWN0KFJlbmRlck9iamVjdCogaW5wdXRSZW5kZXJl ciwgY29uc3QgUmVuZGVyT2JqZWN0KiBwYXJ0UmVuZGVyZXIsIEludFJlY3QgcGFydFJlY3QsIGNv bnN0IEludFJlY3QmIGxvY2FsT2Zmc2V0KSBjb25zdDsKKyAgICBJbnRSZWN0IGNvbnZlcnRUb1Bh aW50aW5nUmVjdChSZW5kZXJPYmplY3QqIGlucHV0UmVuZGVyZXIsIGNvbnN0IFJlbmRlck9iamVj dCogcGFydFJlbmRlcmVyLCBMYXlvdXRSZWN0IHBhcnRSZWN0LCBjb25zdCBJbnRSZWN0JiBsb2Nh bE9mZnNldCkgY29uc3Q7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 137630 2012-04-17 16:28:41 -0700 2012-04-17 17:31:51 -0700 Patch bug-84175-20120417162840.patch text/plain 8283 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNDQzMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA0LTE3ICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBDaGFuZ2UgUmVuZGVyVGhlbWVD aHJvbWl1bVNraWEgcGFpbnQgbWV0aG9kcyB0byB1c2UgcGl4ZWwgc25hcHBpbmcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0MTc1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBj aGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICBDaGFuZ2UgUmVuZGVyVGhlbWVDaHJv bWl1bVNraWEgdG8gdXNlIHN1YnBpeGVsIHR5cGVzIGFuZCBwaXhlbCBzbmFwCisgICAgICAgIHZh bHVlcyBqdXN0IGJlZm9yZSBwYWludGluZy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJU aGVtZUNocm9taXVtU2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUNocm9t aXVtU2tpYTo6Y29udmVydFRvUGFpbnRpbmdSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRoZW1lQ2hyb21pdW1Ta2lhOjpwYWludFNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lQ2hyb21pdW1Ta2lhOjpwYWludFNlYXJjaEZpZWxkUmVz dWx0c0RlY29yYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVDaHJvbWl1bVNr aWE6OnBhaW50U2VhcmNoRmllbGRSZXN1bHRzQnV0dG9uKToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyVGhlbWVDaHJvbWl1bVNraWEuaDoKKwogMjAxMi0wNC0xNyAgRW1pbCBBIEVrbHVuZCAg PGVhZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUm9sbG91dCByMTE0NDA0IGFzIGl0IGJyb2tl IGEgY291cGxlIG9mIGNocm9taXVtIGJ1aWxkcy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZUNocm9taXVtU2tpYS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1Ta2lhLmNwcAkocmV2aXNpb24gMTE0 NDI3KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1Ta2lh LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYxLDE2ICsyNjEsMTYgQEAgdm9pZCBSZW5kZXJUaGVt ZUNocm9taXVtU2tpYTo6YWRqdXN0U2VhcgogICAgIHN0eWxlLT5zZXRIZWlnaHQoTGVuZ3RoKGNh bmNlbEJ1dHRvblNpemUsIEZpeGVkKSk7CiB9CiAKLUludFJlY3QgUmVuZGVyVGhlbWVDaHJvbWl1 bVNraWE6OmNvbnZlcnRUb1BhaW50aW5nUmVjdChSZW5kZXJPYmplY3QqIGlucHV0UmVuZGVyZXIs IGNvbnN0IFJlbmRlck9iamVjdCogcGFydFJlbmRlcmVyLCBJbnRSZWN0IHBhcnRSZWN0LCBjb25z dCBJbnRSZWN0JiBsb2NhbE9mZnNldCkgY29uc3QKK0ludFJlY3QgUmVuZGVyVGhlbWVDaHJvbWl1 bVNraWE6OmNvbnZlcnRUb1BhaW50aW5nUmVjdChSZW5kZXJPYmplY3QqIGlucHV0UmVuZGVyZXIs IGNvbnN0IFJlbmRlck9iamVjdCogcGFydFJlbmRlcmVyLCBMYXlvdXRSZWN0IHBhcnRSZWN0LCBj b25zdCBJbnRSZWN0JiBsb2NhbE9mZnNldCkgY29uc3QKIHsKICAgICAvLyBDb21wdXRlIGFuIG9m ZnNldCBiZXR3ZWVuIHRoZSBwYXJ0IHJlbmRlcmVyIGFuZCB0aGUgaW5wdXQgcmVuZGVyZXIuCi0g ICAgSW50U2l6ZSBvZmZzZXRGcm9tSW5wdXRSZW5kZXJlciA9IC0ocGFydFJlbmRlcmVyLT5vZmZz ZXRGcm9tQW5jZXN0b3JDb250YWluZXIoaW5wdXRSZW5kZXJlcikpOworICAgIExheW91dFNpemUg b2Zmc2V0RnJvbUlucHV0UmVuZGVyZXIgPSAtcGFydFJlbmRlcmVyLT5vZmZzZXRGcm9tQW5jZXN0 b3JDb250YWluZXIoaW5wdXRSZW5kZXJlcik7CiAgICAgLy8gTW92ZSB0aGUgcmVjdCBpbnRvIHBh cnRSZW5kZXJlcidzIGNvb3Jkcy4KICAgICBwYXJ0UmVjdC5tb3ZlKG9mZnNldEZyb21JbnB1dFJl bmRlcmVyKTsKICAgICAvLyBBY2NvdW50IGZvciB0aGUgbG9jYWwgZHJhd2luZyBvZmZzZXQuCiAg ICAgcGFydFJlY3QubW92ZShsb2NhbE9mZnNldC54KCksIGxvY2FsT2Zmc2V0LnkoKSk7CiAKLSAg ICByZXR1cm4gcGFydFJlY3Q7CisgICAgcmV0dXJuIHBpeGVsU25hcHBlZEludFJlY3QocGFydFJl Y3QpOwogfQogCiBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1Ta2lhOjpwYWludFNlYXJjaEZpZWxk Q2FuY2VsQnV0dG9uKFJlbmRlck9iamVjdCogY2FuY2VsQnV0dG9uT2JqZWN0LCBjb25zdCBQYWlu dEluZm8mIHBhaW50SW5mbywgY29uc3QgSW50UmVjdCYgcikKQEAgLTI4MCwxNiArMjgwLDE2IEBA IGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bVNraWE6OnBhaW50U2VhcmMKICAgICBpZiAoIWlucHV0 LT5yZW5kZXJlcigpLT5pc0JveCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgUmVuZGVy Qm94KiBpbnB1dFJlbmRlckJveCA9IHRvUmVuZGVyQm94KGlucHV0LT5yZW5kZXJlcigpKTsKLSAg ICBJbnRSZWN0IGlucHV0Q29udGVudEJveCA9IGlucHV0UmVuZGVyQm94LT5jb250ZW50Qm94UmVj dCgpOworICAgIExheW91dFJlY3QgaW5wdXRDb250ZW50Qm94ID0gaW5wdXRSZW5kZXJCb3gtPmNv bnRlbnRCb3hSZWN0KCk7CiAKICAgICAvLyBNYWtlIHN1cmUgdGhlIHNjYWxlZCBidXR0b24gc3Rh eXMgc3F1YXJlIGFuZCB3aWxsIGZpdCBpbiBpdHMgcGFyZW50J3MgYm94LgotICAgIGludCBjYW5j ZWxCdXR0b25TaXplID0gc3RkOjptaW4oaW5wdXRDb250ZW50Qm94LndpZHRoKCksIHN0ZDo6bWlu PGludD4oaW5wdXRDb250ZW50Qm94LmhlaWdodCgpLCByLmhlaWdodCgpKSk7CisgICAgTGF5b3V0 VW5pdCBjYW5jZWxCdXR0b25TaXplID0gc3RkOjptaW4oaW5wdXRDb250ZW50Qm94LndpZHRoKCks IHN0ZDo6bWluKGlucHV0Q29udGVudEJveC5oZWlnaHQoKSwgci5oZWlnaHQoKSkpOwogICAgIC8v IENhbGN1bGF0ZSBjYW5jZWwgYnV0dG9uJ3MgY29vcmRpbmF0ZXMgcmVsYXRpdmUgdG8gdGhlIGlu cHV0IGVsZW1lbnQuCiAgICAgLy8gQ2VudGVyIHRoZSBidXR0b24gdmVydGljYWxseS4gIFJvdW5k IHVwIHRob3VnaCwgc28gaWYgaXQgaGFzIHRvIGJlIG9uZSBwaXhlbCBvZmYtY2VudGVyLCBpdCB3 aWxsCiAgICAgLy8gYmUgb25lIHBpeGVsIGNsb3NlciB0byB0aGUgYm90dG9tIG9mIHRoZSBmaWVs ZC4gIFRoaXMgdGVuZHMgdG8gbG9vayBiZXR0ZXIgd2l0aCB0aGUgdGV4dC4KLSAgICBJbnRSZWN0 IGNhbmNlbEJ1dHRvblJlY3QoY2FuY2VsQnV0dG9uT2JqZWN0LT5vZmZzZXRGcm9tQW5jZXN0b3JD b250YWluZXIoaW5wdXRSZW5kZXJCb3gpLndpZHRoKCksCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGlucHV0Q29udGVudEJveC55KCkgKyAoaW5wdXRDb250ZW50Qm94LmhlaWdodCgpIC0g Y2FuY2VsQnV0dG9uU2l6ZSArIDEpIC8gMiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y2FuY2VsQnV0dG9uU2l6ZSwgY2FuY2VsQnV0dG9uU2l6ZSk7CisgICAgTGF5b3V0UmVjdCBjYW5j ZWxCdXR0b25SZWN0KGNhbmNlbEJ1dHRvbk9iamVjdC0+b2Zmc2V0RnJvbUFuY2VzdG9yQ29udGFp bmVyKGlucHV0UmVuZGVyQm94KS53aWR0aCgpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBpbnB1dENvbnRlbnRCb3gueSgpICsgKGlucHV0Q29udGVudEJveC5oZWlnaHQoKSAtIGNh bmNlbEJ1dHRvblNpemUgKyAxKSAvIDIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNhbmNlbEJ1dHRvblNpemUsIGNhbmNlbEJ1dHRvblNpemUpOwogICAgIEludFJlY3QgcGFpbnRp bmdSZWN0ID0gY29udmVydFRvUGFpbnRpbmdSZWN0KGlucHV0UmVuZGVyQm94LCBjYW5jZWxCdXR0 b25PYmplY3QsIGNhbmNlbEJ1dHRvblJlY3QsIHIpOwogCiAgICAgc3RhdGljIEltYWdlKiBjYW5j ZWxJbWFnZSA9IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZSgic2VhcmNoQ2FuY2VsIikubGVh a1JlZigpOwpAQCAtMzIzLDE2ICszMjMsMTYgQEAgYm9vbCBSZW5kZXJUaGVtZUNocm9taXVtU2tp YTo6cGFpbnRTZWFyYwogICAgIGlmICghaW5wdXQtPnJlbmRlcmVyKCktPmlzQm94KCkpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKICAgICBSZW5kZXJCb3gqIGlucHV0UmVuZGVyQm94ID0gdG9SZW5k ZXJCb3goaW5wdXQtPnJlbmRlcmVyKCkpOwotICAgIEludFJlY3QgaW5wdXRDb250ZW50Qm94ID0g aW5wdXRSZW5kZXJCb3gtPmNvbnRlbnRCb3hSZWN0KCk7CisgICAgTGF5b3V0UmVjdCBpbnB1dENv bnRlbnRCb3ggPSBpbnB1dFJlbmRlckJveC0+Y29udGVudEJveFJlY3QoKTsKIAogICAgIC8vIE1h a2Ugc3VyZSB0aGUgc2NhbGVkIGRlY29yYXRpb24gc3RheXMgc3F1YXJlIGFuZCB3aWxsIGZpdCBp biBpdHMgcGFyZW50J3MgYm94LgotICAgIGludCBtYWduaWZpZXJTaXplID0gc3RkOjptaW4oaW5w dXRDb250ZW50Qm94LndpZHRoKCksIHN0ZDo6bWluPGludD4oaW5wdXRDb250ZW50Qm94LmhlaWdo dCgpLCByLmhlaWdodCgpKSk7CisgICAgTGF5b3V0VW5pdCBtYWduaWZpZXJTaXplID0gc3RkOjpt aW4oaW5wdXRDb250ZW50Qm94LndpZHRoKCksIHN0ZDo6bWluKGlucHV0Q29udGVudEJveC5oZWln aHQoKSwgci5oZWlnaHQoKSkpOwogICAgIC8vIENhbGN1bGF0ZSBkZWNvcmF0aW9uJ3MgY29vcmRp bmF0ZXMgcmVsYXRpdmUgdG8gdGhlIGlucHV0IGVsZW1lbnQuCiAgICAgLy8gQ2VudGVyIHRoZSBk ZWNvcmF0aW9uIHZlcnRpY2FsbHkuICBSb3VuZCB1cCB0aG91Z2gsIHNvIGlmIGl0IGhhcyB0byBi ZSBvbmUgcGl4ZWwgb2ZmLWNlbnRlciwgaXQgd2lsbAogICAgIC8vIGJlIG9uZSBwaXhlbCBjbG9z ZXIgdG8gdGhlIGJvdHRvbSBvZiB0aGUgZmllbGQuICBUaGlzIHRlbmRzIHRvIGxvb2sgYmV0dGVy IHdpdGggdGhlIHRleHQuCi0gICAgSW50UmVjdCBtYWduaWZpZXJSZWN0KG1hZ25pZmllck9iamVj dC0+b2Zmc2V0RnJvbUFuY2VzdG9yQ29udGFpbmVyKGlucHV0UmVuZGVyQm94KS53aWR0aCgpLAot ICAgICAgICAgICAgICAgICAgICAgICAgICBpbnB1dENvbnRlbnRCb3gueSgpICsgKGlucHV0Q29u dGVudEJveC5oZWlnaHQoKSAtIG1hZ25pZmllclNpemUgKyAxKSAvIDIsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgIG1hZ25pZmllclNpemUsIG1hZ25pZmllclNpemUpOworICAgIExheW91dFJl Y3QgbWFnbmlmaWVyUmVjdChtYWduaWZpZXJPYmplY3QtPm9mZnNldEZyb21BbmNlc3RvckNvbnRh aW5lcihpbnB1dFJlbmRlckJveCkud2lkdGgoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaW5wdXRDb250ZW50Qm94LnkoKSArIChpbnB1dENvbnRlbnRCb3guaGVpZ2h0KCkgLSBtYWdu aWZpZXJTaXplICsgMSkgLyAyLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtYWduaWZp ZXJTaXplLCBtYWduaWZpZXJTaXplKTsKICAgICBJbnRSZWN0IHBhaW50aW5nUmVjdCA9IGNvbnZl cnRUb1BhaW50aW5nUmVjdChpbnB1dFJlbmRlckJveCwgbWFnbmlmaWVyT2JqZWN0LCBtYWduaWZp ZXJSZWN0LCByKTsKIAogICAgIHN0YXRpYyBJbWFnZSogbWFnbmlmaWVySW1hZ2UgPSBJbWFnZTo6 bG9hZFBsYXRmb3JtUmVzb3VyY2UoInNlYXJjaE1hZ25pZmllciIpLmxlYWtSZWYoKTsKQEAgLTM1 OCwxNCArMzU4LDE0IEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bVNraWE6OnBhaW50U2VhcmMK ICAgICBpZiAoIWlucHV0LT5yZW5kZXJlcigpLT5pc0JveCgpKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgUmVuZGVyQm94KiBpbnB1dFJlbmRlckJveCA9IHRvUmVuZGVyQm94KGlucHV0LT5y ZW5kZXJlcigpKTsKLSAgICBJbnRSZWN0IGlucHV0Q29udGVudEJveCA9IGlucHV0UmVuZGVyQm94 LT5jb250ZW50Qm94UmVjdCgpOworICAgIExheW91dFJlY3QgaW5wdXRDb250ZW50Qm94ID0gaW5w dXRSZW5kZXJCb3gtPmNvbnRlbnRCb3hSZWN0KCk7CiAKICAgICAvLyBNYWtlIHN1cmUgdGhlIHNj YWxlZCBkZWNvcmF0aW9uIHdpbGwgZml0IGluIGl0cyBwYXJlbnQncyBib3guCi0gICAgaW50IG1h Z25pZmllckhlaWdodCA9IHN0ZDo6bWluPGludD4oaW5wdXRDb250ZW50Qm94LmhlaWdodCgpLCBy LmhlaWdodCgpKTsKLSAgICBpbnQgbWFnbmlmaWVyV2lkdGggPSBzdGQ6Om1pbjxpbnQ+KGlucHV0 Q29udGVudEJveC53aWR0aCgpLCBtYWduaWZpZXJIZWlnaHQgKiBkZWZhdWx0U2VhcmNoRmllbGRS ZXN1bHRzQnV0dG9uV2lkdGggLyBkZWZhdWx0U2VhcmNoRmllbGRSZXN1bHRzRGVjb3JhdGlvblNp emUpOwotICAgIEludFJlY3QgbWFnbmlmaWVyUmVjdChtYWduaWZpZXJPYmplY3QtPm9mZnNldEZy b21BbmNlc3RvckNvbnRhaW5lcihpbnB1dFJlbmRlckJveCkud2lkdGgoKSwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgaW5wdXRDb250ZW50Qm94LnkoKSArIChpbnB1dENvbnRlbnRCb3guaGVp Z2h0KCkgLSBtYWduaWZpZXJIZWlnaHQgKyAxKSAvIDIsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgIG1hZ25pZmllcldpZHRoLCBtYWduaWZpZXJIZWlnaHQpOworICAgIExheW91dFVuaXQgbWFn bmlmaWVySGVpZ2h0ID0gc3RkOjptaW4oaW5wdXRDb250ZW50Qm94LmhlaWdodCgpLCByLmhlaWdo dCgpKTsKKyAgICBMYXlvdXRVbml0IG1hZ25pZmllcldpZHRoID0gc3RkOjptaW48TGF5b3V0VW5p dD4oaW5wdXRDb250ZW50Qm94LndpZHRoKCksIG1hZ25pZmllckhlaWdodCAqIGRlZmF1bHRTZWFy Y2hGaWVsZFJlc3VsdHNCdXR0b25XaWR0aCAvIGRlZmF1bHRTZWFyY2hGaWVsZFJlc3VsdHNEZWNv cmF0aW9uU2l6ZSk7CisgICAgTGF5b3V0UmVjdCBtYWduaWZpZXJSZWN0KG1hZ25pZmllck9iamVj dC0+b2Zmc2V0RnJvbUFuY2VzdG9yQ29udGFpbmVyKGlucHV0UmVuZGVyQm94KS53aWR0aCgpLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnB1dENvbnRlbnRCb3gueSgpICsgKGlucHV0 Q29udGVudEJveC5oZWlnaHQoKSAtIG1hZ25pZmllckhlaWdodCArIDEpIC8gMiwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbWFnbmlmaWVyV2lkdGgsIG1hZ25pZmllckhlaWdodCk7CiAg ICAgSW50UmVjdCBwYWludGluZ1JlY3QgPSBjb252ZXJ0VG9QYWludGluZ1JlY3QoaW5wdXRSZW5k ZXJCb3gsIG1hZ25pZmllck9iamVjdCwgbWFnbmlmaWVyUmVjdCwgcik7CiAKICAgICBzdGF0aWMg SW1hZ2UqIG1hZ25pZmllckltYWdlID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKCJzZWFy Y2hNYWduaWZpZXJSZXN1bHRzIikubGVha1JlZigpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1Ta2lhLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1Ta2lhLmgJKHJldmlzaW9uIDExNDQy NykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtU2tpYS5o CSh3b3JraW5nIGNvcHkpCkBAIC0xNTcsNyArMTU3LDcgQEAgcHJpdmF0ZToKIAogICAgIGludCBt ZW51TGlzdEludGVybmFsUGFkZGluZyhSZW5kZXJTdHlsZSosIGludCBwYWRkaW5nVHlwZSkgY29u c3Q7CiAgICAgYm9vbCBwYWludE1lZGlhQnV0dG9uSW50ZXJuYWwoR3JhcGhpY3NDb250ZXh0Kiwg Y29uc3QgSW50UmVjdCYsIEltYWdlKik7Ci0gICAgSW50UmVjdCBjb252ZXJ0VG9QYWludGluZ1Jl Y3QoUmVuZGVyT2JqZWN0KiBpbnB1dFJlbmRlcmVyLCBjb25zdCBSZW5kZXJPYmplY3QqIHBhcnRS ZW5kZXJlciwgSW50UmVjdCBwYXJ0UmVjdCwgY29uc3QgSW50UmVjdCYgbG9jYWxPZmZzZXQpIGNv bnN0OworICAgIEludFJlY3QgY29udmVydFRvUGFpbnRpbmdSZWN0KFJlbmRlck9iamVjdCogaW5w dXRSZW5kZXJlciwgY29uc3QgUmVuZGVyT2JqZWN0KiBwYXJ0UmVuZGVyZXIsIExheW91dFJlY3Qg cGFydFJlY3QsIGNvbnN0IEludFJlY3QmIGxvY2FsT2Zmc2V0KSBjb25zdDsKIH07CiAKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUK