143008 2015-03-24 10:02:34 -0700 Improve the offsetWidth/Height layout optimization 2015-03-26 12:10:15 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 143034 1 hyatt hyatt cmarcelo commit-queue esprehn+autocc kangil.han mark.lam oldest_to_newest 1079636 0 hyatt 2015-03-24 10:02:34 -0700 This patch covers some improvements to the offsetWidth/Height computation for avoiding layout. 1079637 1 249333 hyatt 2015-03-24 10:04:18 -0700 Created attachment 249333 Patch 1079638 2 commit-queue 2015-03-24 10:05:42 -0700 Attachment 249333 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:8: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1079651 3 hyatt 2015-03-24 12:14:07 -0700 Fixed in r181898. 1079682 4 ap 2015-03-24 13:26:38 -0700 This broke fast/regions/auto-size/autoheight-two-pass-layout-complex-002.html on WK1, not sure why EWS didn't notice. Maybe it fails when run with other tests, but succeeeds alone? https://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=fast%2Fregions%2Fauto-size%2Fautoheight-two-pass-layout-complex-002.html 1079825 5 mark.lam 2015-03-24 19:20:33 -0700 (In reply to comment #4) > This broke > fast/regions/auto-size/autoheight-two-pass-layout-complex-002.html on WK1, > not sure why EWS didn't notice. Maybe it fails when run with other tests, > but succeeeds alone? > > https://webkit-test-results.appspot.com/dashboards/flakiness_dashboard. > html#showAllRuns=true&tests=fast%2Fregions%2Fauto-size%2Fautoheight-two-pass- > layout-complex-002.html r181909: <http://trac.webkit.org/changeset/181909> made it better for WK2 on Yosemite, but the test is still failing on WK1 Yosemite, and on Mavericks bots. 1079844 6 ap 2015-03-24 20:47:29 -0700 As it still fails and Dave is not around, rolling out. 1079846 7 commit-queue 2015-03-24 20:49:07 -0700 Re-opened since this is blocked by bug 143034 1080008 8 249421 hyatt 2015-03-25 12:05:17 -0700 Created attachment 249421 Patch 1080373 9 hyatt 2015-03-26 12:10:15 -0700 Fixed in r182022. 249333 2015-03-24 10:04:18 -0700 2015-03-25 12:05:17 -0700 Patch patch.txt text/plain 8119 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MTg5NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE1LTAzLTI0ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBJbXByb3ZlIHRoZSBvZmZzZXRXaWR0 aC9IZWlnaHQgbGF5b3V0IG9wdGltaXphdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzMDA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAgICAgKiBk b20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnVwZGF0ZUxheW91 dElmRGltZW5zaW9uc091dE9mRGF0ZSk6CisgICAgICAgICogZG9tL0RvY3VtZW50Lmg6CisgICAg ICAgIENoYW5nZSBFbGVtZW50KiB0byBFbGVtZW50Ji4gQ2xlYW4gdXAgdGhlIGRpbWVuc2lvbiBi aXRzIHRvIHVzZSBzaGlmdGluZy4gUmVtb3ZlIGJvdGggdGhlIGlubGluZSBhbmQKKyAgICAgICAg dGhlIHBvc2l0aW9uaW5nIHJlc3RyaWN0aW9ucyBvbiB0aGUgb3B0aW1pemF0aW9uIGNoZWNrLgor CisgICAgICAgICogZG9tL0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6 b2Zmc2V0V2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6b2Zmc2V0SGVpZ2h0KToK KyAgICAgICAgQ2hhbmdlIHRvIHVzZSBFbGVtZW50JiBpbnN0ZWFkIG9mIEVsZW1lbnQqLgorCisg ICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpjbGllbnRXaWR0aCk6CisgICAgICAgIChXZWJDb3Jl OjpFbGVtZW50OjpjbGllbnRIZWlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6c2Ny b2xsV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6c2Nyb2xsSGVpZ2h0KToKKyAg ICAgICAgVHVybiBvbiB0aGUgb3B0aW1pemF0aW9uIGZvciBjbGllbnRXaWR0aC9IZWlnaHQgYW5k IHNjcm9sbFdpZHRoL0hlaWdodC4KKwogMjAxNS0wMy0xNyAgUGhpbGlwcGUgTm9ybWFuZCAgPHBu b3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW09wZW5XZWJSVENdIFJlYWx0aW1lTWVkaWFT b3VyY2VDZW50ZXIgaW1wbGVtZW50YXRpb24KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAko cmV2aXNpb24gMTgxODU0KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTg5Niw3ICsxODk2LDcgQEAgUmVmPFJlbmRlclN0eWxlPiBEb2N1bWVu dDo6c3R5bGVGb3JFbGVtZQogICAgIHJldHVybiBlbnN1cmVTdHlsZVJlc29sdmVyKCkuc3R5bGVG b3JFbGVtZW50KGVsZW1lbnQsIGVsZW1lbnQtPnBhcmVudE5vZGUoKSA/IGVsZW1lbnQtPnBhcmVu dE5vZGUoKS0+Y29tcHV0ZWRTdHlsZSgpIDogbnVsbHB0cik7CiB9CiAKLWJvb2wgRG9jdW1lbnQ6 OnVwZGF0ZUxheW91dElmRGltZW5zaW9uc091dE9mRGF0ZShFbGVtZW50KiBlbGVtZW50LCBEaW1l bnNpb25zQ2hlY2sgZGltZW5zaW9uc0NoZWNrKQorYm9vbCBEb2N1bWVudDo6dXBkYXRlTGF5b3V0 SWZEaW1lbnNpb25zT3V0T2ZEYXRlKEVsZW1lbnQmIGVsZW1lbnQsIERpbWVuc2lvbnNDaGVjayBk aW1lbnNpb25zQ2hlY2spCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICAKQEAg LTE5MjAsMTMgKzE5MjAsMTMgQEAgYm9vbCBEb2N1bWVudDo6dXBkYXRlTGF5b3V0SWZEaW1lbnNp b25zTwogICAgIC8vIGxheW91dC4KICAgICBib29sIHJlcXVpcmVGdWxsTGF5b3V0ID0gZmFsc2U7 CiAgICAgaWYgKEhUTUxGcmFtZU93bmVyRWxlbWVudCogb3duZXIgPSBvd25lckVsZW1lbnQoKSkg ewotICAgICAgICBpZiAob3duZXItPmRvY3VtZW50KCkudXBkYXRlTGF5b3V0SWZEaW1lbnNpb25z T3V0T2ZEYXRlKG93bmVyKSkKKyAgICAgICAgaWYgKG93bmVyLT5kb2N1bWVudCgpLnVwZGF0ZUxh eW91dElmRGltZW5zaW9uc091dE9mRGF0ZSgqb3duZXIpKQogICAgICAgICAgICAgcmVxdWlyZUZ1 bGxMYXlvdXQgPSB0cnVlOwogICAgIH0KICAgICAKICAgICB1cGRhdGVTdHlsZUlmTmVlZGVkKCk7 Ci0gICAgCi0gICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IGVsZW1lbnQtPnJlbmRlcmVyKCk7 CisKKyAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVyID0gZWxlbWVudC5yZW5kZXJlcigpOwogICAg IGlmICghcmVuZGVyZXIgfHwgcmVuZGVyZXItPm5lZWRzTGF5b3V0KCkpCiAgICAgICAgIHJlcXVp cmVGdWxsTGF5b3V0ID0gdHJ1ZTsKIApAQCAtMTk0MCw3ICsxOTQwLDcgQEAgYm9vbCBEb2N1bWVu dDo6dXBkYXRlTGF5b3V0SWZEaW1lbnNpb25zTwogICAgICAgICBSZW5kZXJCb3gqIGN1cnJlbnRC b3ggPSBudWxscHRyOwogICAgICAgICAKICAgICAgICAgLy8gQ2hlY2sgb3VyIGNvbnRhaW5pbmcg YmxvY2sgY2hhaW4uIElmIGFueXRoaW5nIGluIHRoZSBjaGFpbiBuZWVkcyBhIGxheW91dCwgdGhl biByZXF1aXJlIGEgZnVsbCBsYXlvdXQuCi0gICAgICAgIGZvciAoUmVuZGVyT2JqZWN0KiBjdXJy UmVuZGVyZXIgPSBlbGVtZW50LT5yZW5kZXJlcigpOyBjdXJyUmVuZGVyZXIgJiYgIWN1cnJSZW5k ZXJlci0+aXNSZW5kZXJWaWV3KCk7IGN1cnJSZW5kZXJlciA9IGN1cnJSZW5kZXJlci0+Y29udGFp bmVyKCkpIHsKKyAgICAgICAgZm9yIChSZW5kZXJPYmplY3QqIGN1cnJSZW5kZXJlciA9IGVsZW1l bnQucmVuZGVyZXIoKTsgY3VyclJlbmRlcmVyICYmICFjdXJyUmVuZGVyZXItPmlzUmVuZGVyVmll dygpOyBjdXJyUmVuZGVyZXIgPSBjdXJyUmVuZGVyZXItPmNvbnRhaW5lcigpKSB7CiAgICAgICAg ICAgICAKICAgICAgICAgICAgIC8vIFJlcXVpcmUgdGhlIGVudGlyZSBjb250YWluZXIgY2hhaW4g dG8gYmUgYm94ZXMuCiAgICAgICAgICAgICBpZiAoIWlzPFJlbmRlckJveD4oY3VyclJlbmRlcmVy KSkgewpAQCAtMTk2OSw5ICsxOTY5LDggQEAgYm9vbCBEb2N1bWVudDo6dXBkYXRlTGF5b3V0SWZE aW1lbnNpb25zTwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgICAg IAotICAgICAgICAgICAgaWYgKCFjdXJyZW50Qm94LT5pc1JlbmRlckJsb2NrRmxvdygpIHx8IGN1 cnJlbnRCb3gtPmlzSW5saW5lKCkgfHwgY3VycmVudEJveC0+aXNPdXRPZkZsb3dQb3NpdGlvbmVk KCkgfHwgY3VycmVudEJveC0+Zmxvd1RocmVhZENvbnRhaW5pbmdCbG9jaygpIHx8IGN1cnJlbnRC b3gtPmlzV3JpdGluZ01vZGVSb290KCkpIHsKLSAgICAgICAgICAgICAgICAvLyBGSVhNRTogRm9y IG5vdyByZXF1aXJlIG9ubHkgYmxvY2stbGV2ZWwgbm9uLXBvc2l0aW9uZWQKLSAgICAgICAgICAg ICAgICAvLyBibG9jayBmbG93cyBhbGwgdGhlIHdheSBiYWNrIHRvIHRoZSByb290LiBUaGlzIGxp bWl0cyB0aGUgb3B0aW1pemF0aW9uCisgICAgICAgICAgICBpZiAoIWN1cnJlbnRCb3gtPmlzUmVu ZGVyQmxvY2tGbG93KCkgfHwgY3VycmVudEJveC0+Zmxvd1RocmVhZENvbnRhaW5pbmdCbG9jaygp IHx8IGN1cnJlbnRCb3gtPmlzV3JpdGluZ01vZGVSb290KCkpIHsKKyAgICAgICAgICAgICAgICAv LyBGSVhNRTogRm9yIG5vdyByZXF1aXJlIG9ubHkgYmxvY2sgZmxvd3MgYWxsIHRoZSB3YXkgYmFj ayB0byB0aGUgcm9vdC4gVGhpcyBsaW1pdHMgdGhlIG9wdGltaXphdGlvbgogICAgICAgICAgICAg ICAgIC8vIGZvciBub3csIGFuZCB3ZSdsbCBleHBhbmQgaXQgaW4gZnV0dXJlIHBhdGNoZXMgdG8g YXBwbHkgdG8gbW9yZSBhbmQgbW9yZSBzY2VuYXJpb3MuCiAgICAgICAgICAgICAgICAgLy8gRGlz YWxsb3cgcmVnaW9ucy9jb2x1bW5zIGZyb20gaGF2aW5nIHRoZSBvcHRpbWl6YXRpb24uCiAgICAg ICAgICAgICAgICAgLy8gR2l2ZSB1cCBpZiB0aGUgd3JpdGluZyBtb2RlIGNoYW5nZXMgYXQgYWxs IGluIHRoZSBjb250YWluaW5nIGJsb2NrIGNoYWluLgpJbmRleDogU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgJ KHJldmlzaW9uIDE4MTg1NCkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0yNjAsNyArMjYwLDcgQEAgZW51bSBjbGFzcyBEb2N1bWVudENvbXBhdGli aWxpdHlNb2RlIDogdQogICAgIExpbWl0ZWRRdWlya3NNb2RlID0gMSA8PCAyCiB9OwogCi1lbnVt IERpbWVuc2lvbnNDaGVjayB7IFdpZHRoRGltZW5zaW9uc0NoZWNrID0gMHgxLCBIZWlnaHREaW1l bnNpb25zQ2hlY2sgPSAweDIsIEFsbERpbWVuc2lvbnNDaGVjayA9IDB4MyB9OworZW51bSBEaW1l bnNpb25zQ2hlY2sgeyBXaWR0aERpbWVuc2lvbnNDaGVjayA9IDEgPDwgMCwgSGVpZ2h0RGltZW5z aW9uc0NoZWNrID0gMSA8PCAxLCBBbGxEaW1lbnNpb25zQ2hlY2sgPSAxIDw8IDIgfTsKIAogY2xh c3MgRG9jdW1lbnQgOiBwdWJsaWMgQ29udGFpbmVyTm9kZSwgcHVibGljIFRyZWVTY29wZSwgcHVi bGljIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQsIHB1YmxpYyBGb250U2VsZWN0b3JDbGllbnQgewog cHVibGljOgpAQCAtNTY5LDcgKzU2OSw3IEBAIHB1YmxpYzoKICAgICBib29sIHJlbmRlclRyZWVC ZWluZ0Rlc3Ryb3llZCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVuZGVyVHJlZUJlaW5nRGVzdHJveWVk OyB9CiAgICAgYm9vbCBoYXNMaXZpbmdSZW5kZXJUcmVlKCkgY29uc3QgeyByZXR1cm4gcmVuZGVy VmlldygpICYmICFyZW5kZXJUcmVlQmVpbmdEZXN0cm95ZWQoKTsgfQogICAgIAotICAgIGJvb2wg dXBkYXRlTGF5b3V0SWZEaW1lbnNpb25zT3V0T2ZEYXRlKEVsZW1lbnQqLCBEaW1lbnNpb25zQ2hl Y2sgPSBBbGxEaW1lbnNpb25zQ2hlY2spOworICAgIGJvb2wgdXBkYXRlTGF5b3V0SWZEaW1lbnNp b25zT3V0T2ZEYXRlKEVsZW1lbnQmLCBEaW1lbnNpb25zQ2hlY2sgPSBBbGxEaW1lbnNpb25zQ2hl Y2spOwogICAgIAogICAgIEFYT2JqZWN0Q2FjaGUqIGV4aXN0aW5nQVhPYmplY3RDYWNoZSgpIGNv bnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIEFYT2JqZWN0Q2FjaGUqIGF4T2JqZWN0Q2FjaGUoKSBj b25zdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAJKHJldmlzaW9uIDE4MTg1NCkKKysrIFNv dXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzI4LDcgKzcy OCw3IEBAIGRvdWJsZSBFbGVtZW50OjpvZmZzZXRUb3AoKQogCiBkb3VibGUgRWxlbWVudDo6b2Zm c2V0V2lkdGgoKQogewotICAgIGRvY3VtZW50KCkudXBkYXRlTGF5b3V0SWZEaW1lbnNpb25zT3V0 T2ZEYXRlKHRoaXMsIFdpZHRoRGltZW5zaW9uc0NoZWNrKTsKKyAgICBkb2N1bWVudCgpLnVwZGF0 ZUxheW91dElmRGltZW5zaW9uc091dE9mRGF0ZSgqdGhpcywgV2lkdGhEaW1lbnNpb25zQ2hlY2sp OwogICAgIGlmIChSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVuZGVyZXIgPSByZW5kZXJCb3hNb2Rl bE9iamVjdCgpKSB7CiAgICAgICAgIExheW91dFVuaXQgb2Zmc2V0V2lkdGggPSBzdWJwaXhlbE1l dHJpY3NFbmFibGVkKHJlbmRlcmVyLT5kb2N1bWVudCgpKSA/IHJlbmRlcmVyLT5vZmZzZXRXaWR0 aCgpIDogTGF5b3V0VW5pdChyZW5kZXJlci0+cGl4ZWxTbmFwcGVkT2Zmc2V0V2lkdGgoKSk7CiAg ICAgICAgIHJldHVybiBjb252ZXJ0VG9Ob25TdWJwaXhlbFZhbHVlSWZOZWVkZWQoYWRqdXN0TGF5 b3V0VW5pdEZvckFic29sdXRlWm9vbShvZmZzZXRXaWR0aCwgKnJlbmRlcmVyKS50b0RvdWJsZSgp LCByZW5kZXJlci0+ZG9jdW1lbnQoKSk7CkBAIC03MzgsNyArNzM4LDcgQEAgZG91YmxlIEVsZW1l bnQ6Om9mZnNldFdpZHRoKCkKIAogZG91YmxlIEVsZW1lbnQ6Om9mZnNldEhlaWdodCgpCiB7Ci0g ICAgZG9jdW1lbnQoKS51cGRhdGVMYXlvdXRJZkRpbWVuc2lvbnNPdXRPZkRhdGUodGhpcywgSGVp Z2h0RGltZW5zaW9uc0NoZWNrKTsKKyAgICBkb2N1bWVudCgpLnVwZGF0ZUxheW91dElmRGltZW5z aW9uc091dE9mRGF0ZSgqdGhpcywgSGVpZ2h0RGltZW5zaW9uc0NoZWNrKTsKICAgICBpZiAoUmVu ZGVyQm94TW9kZWxPYmplY3QqIHJlbmRlcmVyID0gcmVuZGVyQm94TW9kZWxPYmplY3QoKSkgewog ICAgICAgICBMYXlvdXRVbml0IG9mZnNldEhlaWdodCA9IHN1YnBpeGVsTWV0cmljc0VuYWJsZWQo cmVuZGVyZXItPmRvY3VtZW50KCkpID8gcmVuZGVyZXItPm9mZnNldEhlaWdodCgpIDogTGF5b3V0 VW5pdChyZW5kZXJlci0+cGl4ZWxTbmFwcGVkT2Zmc2V0SGVpZ2h0KCkpOwogICAgICAgICByZXR1 cm4gY29udmVydFRvTm9uU3VicGl4ZWxWYWx1ZUlmTmVlZGVkKGFkanVzdExheW91dFVuaXRGb3JB YnNvbHV0ZVpvb20ob2Zmc2V0SGVpZ2h0LCAqcmVuZGVyZXIpLnRvRG91YmxlKCksIHJlbmRlcmVy LT5kb2N1bWVudCgpKTsKQEAgLTc5MCw3ICs3OTAsNyBAQCBkb3VibGUgRWxlbWVudDo6Y2xpZW50 VG9wKCkKIAogZG91YmxlIEVsZW1lbnQ6OmNsaWVudFdpZHRoKCkKIHsKLSAgICBkb2N1bWVudCgp LnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOworICAgIGRvY3VtZW50KCku dXBkYXRlTGF5b3V0SWZEaW1lbnNpb25zT3V0T2ZEYXRlKCp0aGlzLCBXaWR0aERpbWVuc2lvbnND aGVjayk7CiAKICAgICBpZiAoIWRvY3VtZW50KCkuaGFzTGl2aW5nUmVuZGVyVHJlZSgpKQogICAg ICAgICByZXR1cm4gMDsKQEAgLTgxMSw4ICs4MTEsNyBAQCBkb3VibGUgRWxlbWVudDo6Y2xpZW50 V2lkdGgoKQogCiBkb3VibGUgRWxlbWVudDo6Y2xpZW50SGVpZ2h0KCkKIHsKLSAgICBkb2N1bWVu dCgpLnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwotCisgICAgZG9jdW1l bnQoKS51cGRhdGVMYXlvdXRJZkRpbWVuc2lvbnNPdXRPZkRhdGUoKnRoaXMsIEhlaWdodERpbWVu c2lvbnNDaGVjayk7CiAgICAgaWYgKCFkb2N1bWVudCgpLmhhc0xpdmluZ1JlbmRlclRyZWUoKSkK ICAgICAgICAgcmV0dXJuIDA7CiAgICAgUmVuZGVyVmlldyYgcmVuZGVyVmlldyA9ICpkb2N1bWVu dCgpLnJlbmRlclZpZXcoKTsKQEAgLTg3Miw3ICs4NzEsNyBAQCB2b2lkIEVsZW1lbnQ6OnNldFNj cm9sbFRvcChpbnQgbmV3VG9wKQogCiBpbnQgRWxlbWVudDo6c2Nyb2xsV2lkdGgoKQogewotICAg IGRvY3VtZW50KCkudXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzKCk7CisgICAg ZG9jdW1lbnQoKS51cGRhdGVMYXlvdXRJZkRpbWVuc2lvbnNPdXRPZkRhdGUoKnRoaXMsIFdpZHRo RGltZW5zaW9uc0NoZWNrKTsKICAgICBpZiAoUmVuZGVyQm94KiByZW5kID0gcmVuZGVyQm94KCkp CiAgICAgICAgIHJldHVybiBhZGp1c3RGb3JBYnNvbHV0ZVpvb20ocmVuZC0+c2Nyb2xsV2lkdGgo KSwgKnJlbmQpOwogICAgIHJldHVybiAwOwpAQCAtODgwLDcgKzg3OSw3IEBAIGludCBFbGVtZW50 OjpzY3JvbGxXaWR0aCgpCiAKIGludCBFbGVtZW50OjpzY3JvbGxIZWlnaHQoKQogewotICAgIGRv Y3VtZW50KCkudXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzKCk7CisgICAgZG9j dW1lbnQoKS51cGRhdGVMYXlvdXRJZkRpbWVuc2lvbnNPdXRPZkRhdGUoKnRoaXMsIEhlaWdodERp bWVuc2lvbnNDaGVjayk7CiAgICAgaWYgKFJlbmRlckJveCogcmVuZCA9IHJlbmRlckJveCgpKQog ICAgICAgICByZXR1cm4gYWRqdXN0Rm9yQWJzb2x1dGVab29tKHJlbmQtPnNjcm9sbEhlaWdodCgp LCAqcmVuZCk7CiAgICAgcmV0dXJuIDA7Cg== 249421 2015-03-25 12:05:17 -0700 2015-03-25 13:41:55 -0700 Patch patch.txt text/plain 8690 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MTk2NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE1LTAzLTI1ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBJbXByb3ZlIHRoZSBvZmZzZXRXaWR0 aC9IZWlnaHQgbGF5b3V0IG9wdGltaXphdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzMDA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RG9jdW1lbnQ6OnVwZGF0ZUxheW91dElmRGltZW5zaW9uc091dE9mRGF0ZSk6CisgICAgICAg ICogZG9tL0RvY3VtZW50Lmg6CisgICAgICAgIENoYW5nZSBFbGVtZW50KiB0byBFbGVtZW50Ji4g Q2xlYW4gdXAgdGhlIGRpbWVuc2lvbiBiaXRzIHRvIHVzZSBzaGlmdGluZy4gUmVtb3ZlIGJvdGgg dGhlIGlubGluZSBhbmQKKyAgICAgICAgdGhlIHBvc2l0aW9uaW5nIHJlc3RyaWN0aW9ucyBvbiB0 aGUgb3B0aW1pemF0aW9uIGNoZWNrLgorCisgICAgICAgICogZG9tL0VsZW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RWxlbWVudDo6b2Zmc2V0V2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6 RWxlbWVudDo6b2Zmc2V0SGVpZ2h0KToKKyAgICAgICAgQ2hhbmdlIHRvIHVzZSBFbGVtZW50JiBp bnN0ZWFkIG9mIEVsZW1lbnQqLgorCisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpjbGllbnRX aWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpjbGllbnRIZWlnaHQpOgorICAgICAg ICAoV2ViQ29yZTo6RWxlbWVudDo6c2Nyb2xsV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6RWxl bWVudDo6c2Nyb2xsSGVpZ2h0KToKKyAgICAgICAgVHVybiBvbiB0aGUgb3B0aW1pemF0aW9uIGZv ciBjbGllbnRXaWR0aC9IZWlnaHQgYW5kIHNjcm9sbFdpZHRoL0hlaWdodC4KKwogMjAxNS0wMy0y NSAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgTWVkaWFDb250cm9s czogVXNlIGZvbnQgd2l0aCBmaXhlZCBudW1iZXIgd2lkdGgKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt ZW50LmNwcAkocmV2aXNpb24gMTgxOTY1KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTg5Niw3ICsxODk2LDcgQEAgUmVmPFJlbmRlclN0eWxl PiBEb2N1bWVudDo6c3R5bGVGb3JFbGVtZQogICAgIHJldHVybiBlbnN1cmVTdHlsZVJlc29sdmVy KCkuc3R5bGVGb3JFbGVtZW50KGVsZW1lbnQsIGVsZW1lbnQtPnBhcmVudE5vZGUoKSA/IGVsZW1l bnQtPnBhcmVudE5vZGUoKS0+Y29tcHV0ZWRTdHlsZSgpIDogbnVsbHB0cik7CiB9CiAKLWJvb2wg RG9jdW1lbnQ6OnVwZGF0ZUxheW91dElmRGltZW5zaW9uc091dE9mRGF0ZShFbGVtZW50KiBlbGVt ZW50LCBEaW1lbnNpb25zQ2hlY2sgZGltZW5zaW9uc0NoZWNrKQorYm9vbCBEb2N1bWVudDo6dXBk YXRlTGF5b3V0SWZEaW1lbnNpb25zT3V0T2ZEYXRlKEVsZW1lbnQmIGVsZW1lbnQsIERpbWVuc2lv bnNDaGVjayBkaW1lbnNpb25zQ2hlY2spCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsK ICAgICAKQEAgLTE5MjAsMTUgKzE5MjAsMTkgQEAgYm9vbCBEb2N1bWVudDo6dXBkYXRlTGF5b3V0 SWZEaW1lbnNpb25zTwogICAgIC8vIGxheW91dC4KICAgICBib29sIHJlcXVpcmVGdWxsTGF5b3V0 ID0gZmFsc2U7CiAgICAgaWYgKEhUTUxGcmFtZU93bmVyRWxlbWVudCogb3duZXIgPSBvd25lckVs ZW1lbnQoKSkgewotICAgICAgICBpZiAob3duZXItPmRvY3VtZW50KCkudXBkYXRlTGF5b3V0SWZE aW1lbnNpb25zT3V0T2ZEYXRlKG93bmVyKSkKKyAgICAgICAgaWYgKG93bmVyLT5kb2N1bWVudCgp LnVwZGF0ZUxheW91dElmRGltZW5zaW9uc091dE9mRGF0ZSgqb3duZXIpKQogICAgICAgICAgICAg cmVxdWlyZUZ1bGxMYXlvdXQgPSB0cnVlOwogICAgIH0KICAgICAKICAgICB1cGRhdGVTdHlsZUlm TmVlZGVkKCk7Ci0gICAgCi0gICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IGVsZW1lbnQtPnJl bmRlcmVyKCk7Ci0gICAgaWYgKCFyZW5kZXJlciB8fCByZW5kZXJlci0+bmVlZHNMYXlvdXQoKSkK KworICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSBlbGVtZW50LnJlbmRlcmVyKCk7CisgICAg aWYgKCFyZW5kZXJlciB8fCByZW5kZXJlci0+bmVlZHNMYXlvdXQoKSB8fCBlbGVtZW50LnJlbmRl ck5hbWVkRmxvd0ZyYWdtZW50KCkpIHsKKyAgICAgICAgLy8gSWYgd2UgZG9uJ3QgaGF2ZSBhIHJl bmRlcmVyIG9yIGlmIHRoZSByZW5kZXJlciBuZWVkcyBsYXlvdXQgZm9yIGFueSByZWFzb24sIGdp dmUgdXAuCisgICAgICAgIC8vIE5hbWVkIGZsb3dzIGNhbiBoYXZlIGF1dG8gaGVpZ2h0LCBzbyBk b24ndCB0cnkgdG8gZW5mb3JjZSB0aGUgb3B0aW1pemF0aW9uIGluIHRoaXMgY2FzZS4KKyAgICAg ICAgLy8gVGhlIDItcGFzcyBuYXR1cmUgb2YgYXV0byBoZWlnaHQgbmFtZWQgZmxvdyBsYXlvdXQg bWVhbnMgdGhlIHJlZ2lvbiBtYXkgbm90IGJlIGRpcnR5IHlldC4KICAgICAgICAgcmVxdWlyZUZ1 bGxMYXlvdXQgPSB0cnVlOworICAgIH0KIAogICAgIGJvb2wgaXNWZXJ0aWNhbCA9IHJlbmRlcmVy ICYmICFyZW5kZXJlci0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKTsKICAgICBib29sIGNoZWNr aW5nTG9naWNhbFdpZHRoID0gKChkaW1lbnNpb25zQ2hlY2sgJiBXaWR0aERpbWVuc2lvbnNDaGVj aykgJiYgIWlzVmVydGljYWwpIHx8ICgoZGltZW5zaW9uc0NoZWNrICYgSGVpZ2h0RGltZW5zaW9u c0NoZWNrKSAmJiBpc1ZlcnRpY2FsKTsKQEAgLTE5NDAsNyArMTk0NCw3IEBAIGJvb2wgRG9jdW1l bnQ6OnVwZGF0ZUxheW91dElmRGltZW5zaW9uc08KICAgICAgICAgUmVuZGVyQm94KiBjdXJyZW50 Qm94ID0gbnVsbHB0cjsKICAgICAgICAgCiAgICAgICAgIC8vIENoZWNrIG91ciBjb250YWluaW5n IGJsb2NrIGNoYWluLiBJZiBhbnl0aGluZyBpbiB0aGUgY2hhaW4gbmVlZHMgYSBsYXlvdXQsIHRo ZW4gcmVxdWlyZSBhIGZ1bGwgbGF5b3V0LgotICAgICAgICBmb3IgKFJlbmRlck9iamVjdCogY3Vy clJlbmRlcmVyID0gZWxlbWVudC0+cmVuZGVyZXIoKTsgY3VyclJlbmRlcmVyICYmICFjdXJyUmVu ZGVyZXItPmlzUmVuZGVyVmlldygpOyBjdXJyUmVuZGVyZXIgPSBjdXJyUmVuZGVyZXItPmNvbnRh aW5lcigpKSB7CisgICAgICAgIGZvciAoUmVuZGVyT2JqZWN0KiBjdXJyUmVuZGVyZXIgPSBlbGVt ZW50LnJlbmRlcmVyKCk7IGN1cnJSZW5kZXJlciAmJiAhY3VyclJlbmRlcmVyLT5pc1JlbmRlclZp ZXcoKTsgY3VyclJlbmRlcmVyID0gY3VyclJlbmRlcmVyLT5jb250YWluZXIoKSkgewogICAgICAg ICAgICAgCiAgICAgICAgICAgICAvLyBSZXF1aXJlIHRoZSBlbnRpcmUgY29udGFpbmVyIGNoYWlu IHRvIGJlIGJveGVzLgogICAgICAgICAgICAgaWYgKCFpczxSZW5kZXJCb3g+KGN1cnJSZW5kZXJl cikpIHsKQEAgLTE5NjksOSArMTk3Myw4IEBAIGJvb2wgRG9jdW1lbnQ6OnVwZGF0ZUxheW91dElm RGltZW5zaW9uc08KICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICAKLSAgICAgICAgICAgIGlmICghY3VycmVudEJveC0+aXNSZW5kZXJCbG9ja0Zsb3coKSB8fCBj dXJyZW50Qm94LT5pc0lubGluZSgpIHx8IGN1cnJlbnRCb3gtPmlzT3V0T2ZGbG93UG9zaXRpb25l ZCgpIHx8IGN1cnJlbnRCb3gtPmZsb3dUaHJlYWRDb250YWluaW5nQmxvY2soKSB8fCBjdXJyZW50 Qm94LT5pc1dyaXRpbmdNb2RlUm9vdCgpKSB7Ci0gICAgICAgICAgICAgICAgLy8gRklYTUU6IEZv ciBub3cgcmVxdWlyZSBvbmx5IGJsb2NrLWxldmVsIG5vbi1wb3NpdGlvbmVkCi0gICAgICAgICAg ICAgICAgLy8gYmxvY2sgZmxvd3MgYWxsIHRoZSB3YXkgYmFjayB0byB0aGUgcm9vdC4gVGhpcyBs aW1pdHMgdGhlIG9wdGltaXphdGlvbgorICAgICAgICAgICAgaWYgKCFjdXJyZW50Qm94LT5pc1Jl bmRlckJsb2NrRmxvdygpIHx8IGN1cnJlbnRCb3gtPmZsb3dUaHJlYWRDb250YWluaW5nQmxvY2so KSB8fCBjdXJyZW50Qm94LT5pc1dyaXRpbmdNb2RlUm9vdCgpKSB7CisgICAgICAgICAgICAgICAg Ly8gRklYTUU6IEZvciBub3cgcmVxdWlyZSBvbmx5IGJsb2NrIGZsb3dzIGFsbCB0aGUgd2F5IGJh Y2sgdG8gdGhlIHJvb3QuIFRoaXMgbGltaXRzIHRoZSBvcHRpbWl6YXRpb24KICAgICAgICAgICAg ICAgICAvLyBmb3Igbm93LCBhbmQgd2UnbGwgZXhwYW5kIGl0IGluIGZ1dHVyZSBwYXRjaGVzIHRv IGFwcGx5IHRvIG1vcmUgYW5kIG1vcmUgc2NlbmFyaW9zLgogICAgICAgICAgICAgICAgIC8vIERp c2FsbG93IHJlZ2lvbnMvY29sdW1ucyBmcm9tIGhhdmluZyB0aGUgb3B0aW1pemF0aW9uLgogICAg ICAgICAgICAgICAgIC8vIEdpdmUgdXAgaWYgdGhlIHdyaXRpbmcgbW9kZSBjaGFuZ2VzIGF0IGFs bCBpbiB0aGUgY29udGFpbmluZyBibG9jayBjaGFpbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5o CShyZXZpc2lvbiAxODE5NjUpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAkod29y a2luZyBjb3B5KQpAQCAtMjYwLDcgKzI2MCw3IEBAIGVudW0gY2xhc3MgRG9jdW1lbnRDb21wYXRp YmlsaXR5TW9kZSA6IHUKICAgICBMaW1pdGVkUXVpcmtzTW9kZSA9IDEgPDwgMgogfTsKIAotZW51 bSBEaW1lbnNpb25zQ2hlY2sgeyBXaWR0aERpbWVuc2lvbnNDaGVjayA9IDB4MSwgSGVpZ2h0RGlt ZW5zaW9uc0NoZWNrID0gMHgyLCBBbGxEaW1lbnNpb25zQ2hlY2sgPSAweDMgfTsKK2VudW0gRGlt ZW5zaW9uc0NoZWNrIHsgV2lkdGhEaW1lbnNpb25zQ2hlY2sgPSAxIDw8IDAsIEhlaWdodERpbWVu c2lvbnNDaGVjayA9IDEgPDwgMSwgQWxsRGltZW5zaW9uc0NoZWNrID0gMSA8PCAyIH07CiAKIGNs YXNzIERvY3VtZW50IDogcHVibGljIENvbnRhaW5lck5vZGUsIHB1YmxpYyBUcmVlU2NvcGUsIHB1 YmxpYyBTY3JpcHRFeGVjdXRpb25Db250ZXh0LCBwdWJsaWMgRm9udFNlbGVjdG9yQ2xpZW50IHsK IHB1YmxpYzoKQEAgLTU2OSw3ICs1NjksNyBAQCBwdWJsaWM6CiAgICAgYm9vbCByZW5kZXJUcmVl QmVpbmdEZXN0cm95ZWQoKSBjb25zdCB7IHJldHVybiBtX3JlbmRlclRyZWVCZWluZ0Rlc3Ryb3ll ZDsgfQogICAgIGJvb2wgaGFzTGl2aW5nUmVuZGVyVHJlZSgpIGNvbnN0IHsgcmV0dXJuIHJlbmRl clZpZXcoKSAmJiAhcmVuZGVyVHJlZUJlaW5nRGVzdHJveWVkKCk7IH0KICAgICAKLSAgICBib29s IHVwZGF0ZUxheW91dElmRGltZW5zaW9uc091dE9mRGF0ZShFbGVtZW50KiwgRGltZW5zaW9uc0No ZWNrID0gQWxsRGltZW5zaW9uc0NoZWNrKTsKKyAgICBib29sIHVwZGF0ZUxheW91dElmRGltZW5z aW9uc091dE9mRGF0ZShFbGVtZW50JiwgRGltZW5zaW9uc0NoZWNrID0gQWxsRGltZW5zaW9uc0No ZWNrKTsKICAgICAKICAgICBBWE9iamVjdENhY2hlKiBleGlzdGluZ0FYT2JqZWN0Q2FjaGUoKSBj b25zdDsKICAgICBXRUJDT1JFX0VYUE9SVCBBWE9iamVjdENhY2hlKiBheE9iamVjdENhY2hlKCkg Y29uc3Q7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCShyZXZpc2lvbiAxODE5NjUpCisrKyBT b3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcyOSw3ICs3 MjksNyBAQCBkb3VibGUgRWxlbWVudDo6b2Zmc2V0VG9wKCkKIAogZG91YmxlIEVsZW1lbnQ6Om9m ZnNldFdpZHRoKCkKIHsKLSAgICBkb2N1bWVudCgpLnVwZGF0ZUxheW91dElmRGltZW5zaW9uc091 dE9mRGF0ZSh0aGlzLCBXaWR0aERpbWVuc2lvbnNDaGVjayk7CisgICAgZG9jdW1lbnQoKS51cGRh dGVMYXlvdXRJZkRpbWVuc2lvbnNPdXRPZkRhdGUoKnRoaXMsIFdpZHRoRGltZW5zaW9uc0NoZWNr KTsKICAgICBpZiAoUmVuZGVyQm94TW9kZWxPYmplY3QqIHJlbmRlcmVyID0gcmVuZGVyQm94TW9k ZWxPYmplY3QoKSkgewogICAgICAgICBMYXlvdXRVbml0IG9mZnNldFdpZHRoID0gc3VicGl4ZWxN ZXRyaWNzRW5hYmxlZChyZW5kZXJlci0+ZG9jdW1lbnQoKSkgPyByZW5kZXJlci0+b2Zmc2V0V2lk dGgoKSA6IExheW91dFVuaXQocmVuZGVyZXItPnBpeGVsU25hcHBlZE9mZnNldFdpZHRoKCkpOwog ICAgICAgICByZXR1cm4gY29udmVydFRvTm9uU3VicGl4ZWxWYWx1ZUlmTmVlZGVkKGFkanVzdExh eW91dFVuaXRGb3JBYnNvbHV0ZVpvb20ob2Zmc2V0V2lkdGgsICpyZW5kZXJlcikudG9Eb3VibGUo KSwgcmVuZGVyZXItPmRvY3VtZW50KCkpOwpAQCAtNzM5LDcgKzczOSw3IEBAIGRvdWJsZSBFbGVt ZW50OjpvZmZzZXRXaWR0aCgpCiAKIGRvdWJsZSBFbGVtZW50OjpvZmZzZXRIZWlnaHQoKQogewot ICAgIGRvY3VtZW50KCkudXBkYXRlTGF5b3V0SWZEaW1lbnNpb25zT3V0T2ZEYXRlKHRoaXMsIEhl aWdodERpbWVuc2lvbnNDaGVjayk7CisgICAgZG9jdW1lbnQoKS51cGRhdGVMYXlvdXRJZkRpbWVu c2lvbnNPdXRPZkRhdGUoKnRoaXMsIEhlaWdodERpbWVuc2lvbnNDaGVjayk7CiAgICAgaWYgKFJl bmRlckJveE1vZGVsT2JqZWN0KiByZW5kZXJlciA9IHJlbmRlckJveE1vZGVsT2JqZWN0KCkpIHsK ICAgICAgICAgTGF5b3V0VW5pdCBvZmZzZXRIZWlnaHQgPSBzdWJwaXhlbE1ldHJpY3NFbmFibGVk KHJlbmRlcmVyLT5kb2N1bWVudCgpKSA/IHJlbmRlcmVyLT5vZmZzZXRIZWlnaHQoKSA6IExheW91 dFVuaXQocmVuZGVyZXItPnBpeGVsU25hcHBlZE9mZnNldEhlaWdodCgpKTsKICAgICAgICAgcmV0 dXJuIGNvbnZlcnRUb05vblN1YnBpeGVsVmFsdWVJZk5lZWRlZChhZGp1c3RMYXlvdXRVbml0Rm9y QWJzb2x1dGVab29tKG9mZnNldEhlaWdodCwgKnJlbmRlcmVyKS50b0RvdWJsZSgpLCByZW5kZXJl ci0+ZG9jdW1lbnQoKSk7CkBAIC03OTEsNyArNzkxLDcgQEAgZG91YmxlIEVsZW1lbnQ6OmNsaWVu dFRvcCgpCiAKIGRvdWJsZSBFbGVtZW50OjpjbGllbnRXaWR0aCgpCiB7Ci0gICAgZG9jdW1lbnQo KS51cGRhdGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsKKyAgICBkb2N1bWVudCgp LnVwZGF0ZUxheW91dElmRGltZW5zaW9uc091dE9mRGF0ZSgqdGhpcywgV2lkdGhEaW1lbnNpb25z Q2hlY2spOwogCiAgICAgaWYgKCFkb2N1bWVudCgpLmhhc0xpdmluZ1JlbmRlclRyZWUoKSkKICAg ICAgICAgcmV0dXJuIDA7CkBAIC04MTIsOCArODEyLDcgQEAgZG91YmxlIEVsZW1lbnQ6OmNsaWVu dFdpZHRoKCkKIAogZG91YmxlIEVsZW1lbnQ6OmNsaWVudEhlaWdodCgpCiB7Ci0gICAgZG9jdW1l bnQoKS51cGRhdGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsKLQorICAgIGRvY3Vt ZW50KCkudXBkYXRlTGF5b3V0SWZEaW1lbnNpb25zT3V0T2ZEYXRlKCp0aGlzLCBIZWlnaHREaW1l bnNpb25zQ2hlY2spOwogICAgIGlmICghZG9jdW1lbnQoKS5oYXNMaXZpbmdSZW5kZXJUcmVlKCkp CiAgICAgICAgIHJldHVybiAwOwogICAgIFJlbmRlclZpZXcmIHJlbmRlclZpZXcgPSAqZG9jdW1l bnQoKS5yZW5kZXJWaWV3KCk7CkBAIC04NzMsNyArODcyLDcgQEAgdm9pZCBFbGVtZW50OjpzZXRT Y3JvbGxUb3AoaW50IG5ld1RvcCkKIAogaW50IEVsZW1lbnQ6OnNjcm9sbFdpZHRoKCkKIHsKLSAg ICBkb2N1bWVudCgpLnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOworICAg IGRvY3VtZW50KCkudXBkYXRlTGF5b3V0SWZEaW1lbnNpb25zT3V0T2ZEYXRlKCp0aGlzLCBXaWR0 aERpbWVuc2lvbnNDaGVjayk7CiAgICAgaWYgKFJlbmRlckJveCogcmVuZCA9IHJlbmRlckJveCgp KQogICAgICAgICByZXR1cm4gYWRqdXN0Rm9yQWJzb2x1dGVab29tKHJlbmQtPnNjcm9sbFdpZHRo KCksICpyZW5kKTsKICAgICByZXR1cm4gMDsKQEAgLTg4MSw3ICs4ODAsNyBAQCBpbnQgRWxlbWVu dDo6c2Nyb2xsV2lkdGgoKQogCiBpbnQgRWxlbWVudDo6c2Nyb2xsSGVpZ2h0KCkKIHsKLSAgICBk b2N1bWVudCgpLnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOworICAgIGRv Y3VtZW50KCkudXBkYXRlTGF5b3V0SWZEaW1lbnNpb25zT3V0T2ZEYXRlKCp0aGlzLCBIZWlnaHRE aW1lbnNpb25zQ2hlY2spOwogICAgIGlmIChSZW5kZXJCb3gqIHJlbmQgPSByZW5kZXJCb3goKSkK ICAgICAgICAgcmV0dXJuIGFkanVzdEZvckFic29sdXRlWm9vbShyZW5kLT5zY3JvbGxIZWlnaHQo KSwgKnJlbmQpOwogICAgIHJldHVybiAwOwo=