122543 2013-10-09 01:24:52 -0700 [CSSRegions] Use RenderStyle::hasFlowFrom when needed 2013-10-22 01:26:33 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mihnea mihnea abucur allan.jensen commit-queue esprehn+autocc glenn gyuyoung.kim kangil.han kondapallykalyan macpherson menard WebkitBugTracker oldest_to_newest 937838 0 mihnea 2013-10-09 01:24:52 -0700 Instead of direct checks for !style()->regionThread().isNull(). 937839 1 213762 mihnea 2013-10-09 01:27:27 -0700 Created attachment 213762 Patch 937842 2 abucur 2013-10-09 01:33:13 -0700 I think "hasFlowFrom" is a better function name. It's also in line with existing accessors like "hasOpacity, hasPadding" etc. 937848 3 213764 mihnea 2013-10-09 02:11:39 -0700 Created attachment 213764 Patch 2 937856 4 mihnea 2013-10-09 02:48:21 -0700 (In reply to comment #2) > I think "hasFlowFrom" is a better function name. It's also in line with existing accessors like "hasOpacity, hasPadding" etc. Agree, maybe we should also change RenderStyle members m_regionThread to m_flowFrom. 941958 5 213764 hyatt 2013-10-21 12:17:28 -0700 Comment on attachment 213764 Patch 2 r=me 942180 6 214825 mihnea 2013-10-22 00:23:13 -0700 Created attachment 214825 Patch for landing 942187 7 214825 commit-queue 2013-10-22 01:26:31 -0700 Comment on attachment 214825 Patch for landing Clearing flags on attachment: 214825 Committed r157779: <http://trac.webkit.org/changeset/157779> 942188 8 commit-queue 2013-10-22 01:26:33 -0700 All reviewed patches have been landed. Closing bug. 213762 2013-10-09 01:27:27 -0700 2013-10-09 02:11:39 -0700 Patch 122453.patch text/plain 4362 mihnea ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4NzkzODU4Li4zMmZjN2NiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTMtMTAtMDkgIE1paG5lYSBPdmlkZW5pZSAgPG1paG5lYUBhZG9iZS5jb20+CisKKyAg ICAgICAgW0NTU1JlZ2lvbnNdIFVzZSBSZW5kZXJTdHlsZTo6aGFzU3R5bGVSZWdpb24gd2hlbiBu ZWVkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy MjU0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5v IGNoYW5nZSBvZiBmdW5jdGlvbmFsaXR5LCBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisg ICAgICAgICogY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpjb250ZW50VG9DU1NWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpDb21wdXRlZFN0 eWxlRXh0cmFjdG9yOjpwcm9wZXJ0eVZhbHVlKToKKyAgICAgICAgKiBkb20vUHNldWRvRWxlbWVu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQc2V1ZG9FbGVtZW50OjpkaWRBdHRhY2hSZW5kZXJl cnMpOgorICAgICAgICAqIGRvbS9Qc2V1ZG9FbGVtZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpw c2V1ZG9FbGVtZW50UmVuZGVyZXJJc05lZWRlZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRWxlbWVudDo6Y3JlYXRlRm9y KToKKwogMjAxMy0xMC0wOCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQu b3JnPgogCiAgICAgICAgIEltcHJvdmVkIFdpbkxhdW5jaGVyLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAppbmRleCA5ZjY1YWY2Li41 Y2E4ZmU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURl Y2xhcmF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURl Y2xhcmF0aW9uLmNwcApAQCAtMTQ5NCw3ICsxNDk0LDcgQEAgc3RhdGljIFBhc3NSZWZQdHI8Q1NT VmFsdWU+IGNvbnRlbnRUb0NTU1ZhbHVlKGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSkKICAgICAg ICAgfSBlbHNlIGlmIChjb250ZW50RGF0YS0+aXNUZXh0KCkpCiAgICAgICAgICAgICBsaXN0LT5h cHBlbmQoY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoc3RhdGljX2Nhc3Q8Y29uc3QgVGV4dENv bnRlbnREYXRhKj4oY29udGVudERhdGEpLT50ZXh0KCksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1Nf U1RSSU5HKSk7CiAgICAgfQotICAgIGlmICghc3R5bGUtPnJlZ2lvblRocmVhZCgpLmlzTnVsbCgp KQorICAgIGlmIChzdHlsZS0+aGFzU3R5bGVSZWdpb24oKSkKICAgICAgICAgbGlzdC0+YXBwZW5k KGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKHN0eWxlLT5yZWdpb25UaHJlYWQoKSwgQ1NTUHJp bWl0aXZlVmFsdWU6OkNTU19TVFJJTkcpKTsKICAgICByZXR1cm4gbGlzdC5yZWxlYXNlKCk7CiB9 CkBAIC0yODI5LDcgKzI4MjksNyBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiBDb21wdXRlZFN0eWxl RXh0cmFjdG9yOjpwcm9wZXJ0eVZhbHVlKENTU1Byb3BlcnR5SUQgcHJvcGVydAogICAgICAgICAg ICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFs dWVOb25lKTsKICAgICAgICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShz dHlsZS0+Zmxvd1RocmVhZCgpLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1NUUklORyk7CiAgICAg ICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGbG93RnJvbToKLSAgICAgICAgICAgIGlmIChzdHls ZS0+cmVnaW9uVGhyZWFkKCkuaXNOdWxsKCkpCisgICAgICAgICAgICBpZiAoIXN0eWxlLT5oYXNT dHlsZVJlZ2lvbigpKQogICAgICAgICAgICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVh dGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb25lKTsKICAgICAgICAgICAgIHJldHVybiBjc3NW YWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShzdHlsZS0+cmVnaW9uVGhyZWFkKCksIENTU1ByaW1pdGl2 ZVZhbHVlOjpDU1NfU1RSSU5HKTsKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFJlZ2lv bkZyYWdtZW50OgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1BzZXVkb0VsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1BzZXVkb0VsZW1lbnQuY3BwCmluZGV4IGNhYzNjM2Iu LjdhMzhhYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Qc2V1ZG9FbGVtZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vUHNldWRvRWxlbWVudC5jcHAKQEAgLTc5LDcgKzc5 LDcgQEAgUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gUHNldWRvRWxlbWVudDo6Y3VzdG9tU3R5bGVG b3JSZW5kZXJlcigpCiB2b2lkIFBzZXVkb0VsZW1lbnQ6OmRpZEF0dGFjaFJlbmRlcmVycygpCiB7 CiAgICAgUmVuZGVyRWxlbWVudCogcmVuZGVyZXIgPSB0aGlzLT5yZW5kZXJlcigpOwotICAgIGlm ICghcmVuZGVyZXIgfHwgIXJlbmRlcmVyLT5zdHlsZSgpLT5yZWdpb25UaHJlYWQoKS5pc0VtcHR5 KCkpCisgICAgaWYgKCFyZW5kZXJlciB8fCByZW5kZXJlci0+c3R5bGUoKS0+aGFzU3R5bGVSZWdp b24oKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgUmVuZGVyU3R5bGUqIHN0eWxlID0gcmVuZGVy ZXItPnN0eWxlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vUHNldWRvRWxlbWVu dC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL1BzZXVkb0VsZW1lbnQuaAppbmRleCBjMzZhZTcxLi44 YTZhODhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vUHNldWRvRWxlbWVudC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Qc2V1ZG9FbGVtZW50LmgKQEAgLTc0LDcgKzc0LDcgQEAg Y29uc3QgUXVhbGlmaWVkTmFtZSYgcHNldWRvRWxlbWVudFRhZ05hbWUoKTsKIAogaW5saW5lIGJv b2wgcHNldWRvRWxlbWVudFJlbmRlcmVySXNOZWVkZWQoY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxl KQogewotICAgIHJldHVybiBzdHlsZSAmJiBzdHlsZS0+ZGlzcGxheSgpICE9IE5PTkUgJiYgKHN0 eWxlLT5jb250ZW50RGF0YSgpIHx8ICFzdHlsZS0+cmVnaW9uVGhyZWFkKCkuaXNFbXB0eSgpKTsK KyAgICByZXR1cm4gc3R5bGUgJiYgc3R5bGUtPmRpc3BsYXkoKSAhPSBOT05FICYmIChzdHlsZS0+ Y29udGVudERhdGEoKSB8fCBzdHlsZS0+aGFzU3R5bGVSZWdpb24oKSk7CiB9CiAKIGlubGluZSBQ c2V1ZG9FbGVtZW50JiB0b1BzZXVkb0VsZW1lbnQoTm9kZSYgbm9kZSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAppbmRleCBiYWNkZjhhLi5jMTFmYzc2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCkBAIC0xMzUsNyArMTM1 LDcgQEAgUmVuZGVyRWxlbWVudCogUmVuZGVyRWxlbWVudDo6Y3JlYXRlRm9yKEVsZW1lbnQmIGVs ZW1lbnQsIFJlbmRlclN0eWxlJiBzdHlsZSkKICAgICAvLyB0cmVhdCA8cnQ+IGFzIHJ1YnkgdGV4 dCBPTkxZIGlmIGl0IHN0aWxsIGhhcyBpdHMgZGVmYXVsdCB0cmVhdG1lbnQgb2YgYmxvY2sKICAg ICBpZiAoZWxlbWVudC5oYXNUYWdOYW1lKEhUTUxOYW1lczo6cnRUYWcpICYmIHN0eWxlLmRpc3Bs YXkoKSA9PSBCTE9DSykKICAgICAgICAgcmV0dXJuIG5ldyAoYXJlbmEpIFJlbmRlclJ1YnlUZXh0 KGVsZW1lbnQpOwotICAgIGlmIChkb2N1bWVudC5jc3NSZWdpb25zRW5hYmxlZCgpICYmIHN0eWxl LmlzRGlzcGxheVJlZ2lvblR5cGUoKSAmJiAhc3R5bGUucmVnaW9uVGhyZWFkKCkuaXNFbXB0eSgp KQorICAgIGlmIChkb2N1bWVudC5jc3NSZWdpb25zRW5hYmxlZCgpICYmIHN0eWxlLmlzRGlzcGxh eVJlZ2lvblR5cGUoKSAmJiBzdHlsZS5oYXNTdHlsZVJlZ2lvbigpKQogICAgICAgICByZXR1cm4g bmV3IChhcmVuYSkgUmVuZGVyUmVnaW9uKCZlbGVtZW50LCAwKTsKICAgICBzd2l0Y2ggKHN0eWxl LmRpc3BsYXkoKSkgewogICAgIGNhc2UgTk9ORToK 213764 2013-10-09 02:11:39 -0700 2013-10-22 00:23:00 -0700 Patch 2 122453-2.patch text/plain 6025 mihnea ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4NzkzODU4Li5mZGYyOTZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTMtMTAtMDkgIE1paG5lYSBPdmlkZW5pZSAgPG1paG5lYUBhZG9iZS5jb20+CisKKyAg ICAgICAgW0NTU1JlZ2lvbnNdIFVzZSBSZW5kZXJTdHlsZTo6aGFzU3R5bGVSZWdpb24gd2hlbiBu ZWVkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy MjU0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl bmFtZSBSZW5kZXJTdHlsZTo6aGFzU3R5bGVSZWdpb24gLT4gUmVuZGVyU3R5bGU6Omhhc0Zsb3dG cm9tIGFuZCB1c2UgdGhyb3VnaG91dCB0aGUgY29kZS4KKyAgICAgICAgTm8gY2hhbmdlIG9mIGZ1 bmN0aW9uYWxpdHksIGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuICAgICAgICAKKworICAgICAg ICAqIGNzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Y29udGVudFRvQ1NTVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6Q29tcHV0ZWRTdHlsZUV4 dHJhY3Rvcjo6cHJvcGVydHlWYWx1ZSk6CisgICAgICAgICogY3NzL1N0eWxlUmVzb2x2ZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVSZXNvbHZlcjo6YWRqdXN0UmVuZGVyU3R5bGUpOgor ICAgICAgICAqIGRvbS9Qc2V1ZG9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBzZXVk b0VsZW1lbnQ6OmRpZEF0dGFjaFJlbmRlcmVycyk6CisgICAgICAgICogZG9tL1BzZXVkb0VsZW1l bnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OnBzZXVkb0VsZW1lbnRSZW5kZXJlcklzTmVlZGVkKToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJFbGVtZW50OjpjcmVhdGVGb3IpOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9S ZW5kZXJTdHlsZS5oOgorCiAyMDEzLTEwLTA4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVu c2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgSW1wcm92ZWQgV2luTGF1bmNoZXIuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCmluZGV4 IDlmNjVhZjYuLjE2MGY0YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21w dXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21w dXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCkBAIC0xNDk0LDcgKzE0OTQsNyBAQCBzdGF0aWMgUGFz c1JlZlB0cjxDU1NWYWx1ZT4gY29udGVudFRvQ1NTVmFsdWUoY29uc3QgUmVuZGVyU3R5bGUqIHN0 eWxlKQogICAgICAgICB9IGVsc2UgaWYgKGNvbnRlbnREYXRhLT5pc1RleHQoKSkKICAgICAgICAg ICAgIGxpc3QtPmFwcGVuZChjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShzdGF0aWNfY2FzdDxj b25zdCBUZXh0Q29udGVudERhdGEqPihjb250ZW50RGF0YSktPnRleHQoKSwgQ1NTUHJpbWl0aXZl VmFsdWU6OkNTU19TVFJJTkcpKTsKICAgICB9Ci0gICAgaWYgKCFzdHlsZS0+cmVnaW9uVGhyZWFk KCkuaXNOdWxsKCkpCisgICAgaWYgKHN0eWxlLT5oYXNGbG93RnJvbSgpKQogICAgICAgICBsaXN0 LT5hcHBlbmQoY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoc3R5bGUtPnJlZ2lvblRocmVhZCgp LCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1NUUklORykpOwogICAgIHJldHVybiBsaXN0LnJlbGVh c2UoKTsKIH0KQEAgLTI4MjksNyArMjgyOSw3IEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IENvbXB1 dGVkU3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0CiAg ICAgICAgICAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZUlkZW50aWZpZXJWYWx1 ZShDU1NWYWx1ZU5vbmUpOwogICAgICAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0 ZVZhbHVlKHN0eWxlLT5mbG93VGhyZWFkKCksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfU1RSSU5H KTsKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZsb3dGcm9tOgotICAgICAgICAgICAg aWYgKHN0eWxlLT5yZWdpb25UaHJlYWQoKS5pc051bGwoKSkKKyAgICAgICAgICAgIGlmICghc3R5 bGUtPmhhc0Zsb3dGcm9tKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgp LmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vbmUpOwogICAgICAgICAgICAgcmV0dXJu IGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKHN0eWxlLT5yZWdpb25UaHJlYWQoKSwgQ1NTUHJp bWl0aXZlVmFsdWU6OkNTU19TVFJJTkcpOwogICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0 UmVnaW9uRnJhZ21lbnQ6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNv bHZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKaW5kZXggYmUz ZDhkZS4uNDVkNDU0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2 ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcApAQCAtMTI2 OCw3ICsxMjY4LDcgQEAgdm9pZCBTdHlsZVJlc29sdmVyOjphZGp1c3RSZW5kZXJTdHlsZShSZW5k ZXJTdHlsZSogc3R5bGUsIFJlbmRlclN0eWxlKiBwYXJlbnRTdHkKICAgICAgICAgfHwgc3R5bGUt Pmhhc0JsZW5kTW9kZSgpCiAgICAgICAgIHx8IHN0eWxlLT5wb3NpdGlvbigpID09IFN0aWNreVBv c2l0aW9uCiAgICAgICAgIHx8IChzdHlsZS0+cG9zaXRpb24oKSA9PSBGaXhlZFBvc2l0aW9uICYm IGUgJiYgZS0+ZG9jdW1lbnQoKS5wYWdlKCkgJiYgZS0+ZG9jdW1lbnQoKS5wYWdlKCktPnNldHRp bmdzKCkuZml4ZWRQb3NpdGlvbkNyZWF0ZXNTdGFja2luZ0NvbnRleHQoKSkKLSAgICAgICAgfHwg c3R5bGUtPmhhc1N0eWxlUmVnaW9uKCkKKyAgICAgICAgfHwgc3R5bGUtPmhhc0Zsb3dGcm9tKCkK ICAgICAgICAgKSkKICAgICAgICAgc3R5bGUtPnNldFpJbmRleCgwKTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZG9tL1BzZXVkb0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L1BzZXVkb0VsZW1lbnQuY3BwCmluZGV4IGNhYzNjM2IuLmQyOWJiMTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9Qc2V1ZG9FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9k b20vUHNldWRvRWxlbWVudC5jcHAKQEAgLTc5LDcgKzc5LDcgQEAgUGFzc1JlZlB0cjxSZW5kZXJT dHlsZT4gUHNldWRvRWxlbWVudDo6Y3VzdG9tU3R5bGVGb3JSZW5kZXJlcigpCiB2b2lkIFBzZXVk b0VsZW1lbnQ6OmRpZEF0dGFjaFJlbmRlcmVycygpCiB7CiAgICAgUmVuZGVyRWxlbWVudCogcmVu ZGVyZXIgPSB0aGlzLT5yZW5kZXJlcigpOwotICAgIGlmICghcmVuZGVyZXIgfHwgIXJlbmRlcmVy LT5zdHlsZSgpLT5yZWdpb25UaHJlYWQoKS5pc0VtcHR5KCkpCisgICAgaWYgKCFyZW5kZXJlciB8 fCByZW5kZXJlci0+c3R5bGUoKS0+aGFzRmxvd0Zyb20oKSkKICAgICAgICAgcmV0dXJuOwogCiAg ICAgUmVuZGVyU3R5bGUqIHN0eWxlID0gcmVuZGVyZXItPnN0eWxlKCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9kb20vUHNldWRvRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL1Bz ZXVkb0VsZW1lbnQuaAppbmRleCBjMzZhZTcxLi5mODE1ZTdjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9kb20vUHNldWRvRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Qc2V1 ZG9FbGVtZW50LmgKQEAgLTc0LDcgKzc0LDcgQEAgY29uc3QgUXVhbGlmaWVkTmFtZSYgcHNldWRv RWxlbWVudFRhZ05hbWUoKTsKIAogaW5saW5lIGJvb2wgcHNldWRvRWxlbWVudFJlbmRlcmVySXNO ZWVkZWQoY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxlKQogewotICAgIHJldHVybiBzdHlsZSAmJiBz dHlsZS0+ZGlzcGxheSgpICE9IE5PTkUgJiYgKHN0eWxlLT5jb250ZW50RGF0YSgpIHx8ICFzdHls ZS0+cmVnaW9uVGhyZWFkKCkuaXNFbXB0eSgpKTsKKyAgICByZXR1cm4gc3R5bGUgJiYgc3R5bGUt PmRpc3BsYXkoKSAhPSBOT05FICYmIChzdHlsZS0+Y29udGVudERhdGEoKSB8fCBzdHlsZS0+aGFz Rmxvd0Zyb20oKSk7CiB9CiAKIGlubGluZSBQc2V1ZG9FbGVtZW50JiB0b1BzZXVkb0VsZW1lbnQo Tm9kZSYgbm9kZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJF bGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcApp bmRleCBiYWNkZjhhLi45YjQ2ODE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckVsZW1lbnQuY3BwCkBAIC0xMzUsNyArMTM1LDcgQEAgUmVuZGVyRWxlbWVudCogUmVuZGVyRWxl bWVudDo6Y3JlYXRlRm9yKEVsZW1lbnQmIGVsZW1lbnQsIFJlbmRlclN0eWxlJiBzdHlsZSkKICAg ICAvLyB0cmVhdCA8cnQ+IGFzIHJ1YnkgdGV4dCBPTkxZIGlmIGl0IHN0aWxsIGhhcyBpdHMgZGVm YXVsdCB0cmVhdG1lbnQgb2YgYmxvY2sKICAgICBpZiAoZWxlbWVudC5oYXNUYWdOYW1lKEhUTUxO YW1lczo6cnRUYWcpICYmIHN0eWxlLmRpc3BsYXkoKSA9PSBCTE9DSykKICAgICAgICAgcmV0dXJu IG5ldyAoYXJlbmEpIFJlbmRlclJ1YnlUZXh0KGVsZW1lbnQpOwotICAgIGlmIChkb2N1bWVudC5j c3NSZWdpb25zRW5hYmxlZCgpICYmIHN0eWxlLmlzRGlzcGxheVJlZ2lvblR5cGUoKSAmJiAhc3R5 bGUucmVnaW9uVGhyZWFkKCkuaXNFbXB0eSgpKQorICAgIGlmIChkb2N1bWVudC5jc3NSZWdpb25z RW5hYmxlZCgpICYmIHN0eWxlLmlzRGlzcGxheVJlZ2lvblR5cGUoKSAmJiBzdHlsZS5oYXNGbG93 RnJvbSgpKQogICAgICAgICByZXR1cm4gbmV3IChhcmVuYSkgUmVuZGVyUmVnaW9uKCZlbGVtZW50 LCAwKTsKICAgICBzd2l0Y2ggKHN0eWxlLmRpc3BsYXkoKSkgewogICAgIGNhc2UgTk9ORToKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKaW5kZXggMzBhNjkw Ni4uZjViYmUxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1Jl bmRlclN0eWxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0 eWxlLmgKQEAgLTg4OSw3ICs4ODksNyBAQCBwdWJsaWM6CiAgICAgLy8gRW5kIENTUzMgR2V0dGVy cwogCiAgICAgY29uc3QgQXRvbWljU3RyaW5nJiBmbG93VGhyZWFkKCkgY29uc3QgeyByZXR1cm4g cmFyZU5vbkluaGVyaXRlZERhdGEtPm1fZmxvd1RocmVhZDsgfQotICAgIGJvb2wgaGFzU3R5bGVS ZWdpb24oKSBjb25zdCB7IHJldHVybiAhcmFyZU5vbkluaGVyaXRlZERhdGEtPm1fcmVnaW9uVGhy ZWFkLmlzTnVsbCgpOyB9CisgICAgYm9vbCBoYXNGbG93RnJvbSgpIGNvbnN0IHsgcmV0dXJuICFy YXJlTm9uSW5oZXJpdGVkRGF0YS0+bV9yZWdpb25UaHJlYWQuaXNOdWxsKCk7IH0KICAgICBjb25z dCBBdG9taWNTdHJpbmcmIHJlZ2lvblRocmVhZCgpIGNvbnN0IHsgcmV0dXJuIHJhcmVOb25Jbmhl cml0ZWREYXRhLT5tX3JlZ2lvblRocmVhZDsgfQogICAgIFJlZ2lvbkZyYWdtZW50IHJlZ2lvbkZy YWdtZW50KCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8UmVnaW9uRnJhZ21lbnQ+KHJhcmVO b25Jbmhlcml0ZWREYXRhLT5tX3JlZ2lvbkZyYWdtZW50KTsgfQogCg== 214825 2013-10-22 00:23:13 -0700 2013-10-22 01:26:30 -0700 Patch for landing bug-122543-20131022102321.patch text/plain 7381 mihnea U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3Nzc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDMxN2NmZmJhZTUxYjNj NjZiNjFlYWZjYTIwMjM4YWE1OTRiZDVhZi4uMjZlMTNiZWMxNjhkNTMyMWJiNjdjZTM5ZDUzOGM0 YzY4NGZlMjg1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTEwLTIyICBNaWhu ZWEgT3ZpZGVuaWUgIDxtaWhuZWFAYWRvYmUuY29tPgorCisgICAgICAgIFtDU1NSZWdpb25zXSBV c2UgUmVuZGVyU3R5bGU6Omhhc0Zsb3dGcm9tIHdoZW4gbmVlZGVkCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI1NDMKKworICAgICAgICBSZXZpZXdl ZCBieSBEYXZpZCBIeWF0dC4KKworICAgICAgICBSZW5hbWUgUmVuZGVyU3R5bGU6Omhhc1N0eWxl UmVnaW9uIC0+IFJlbmRlclN0eWxlOjpoYXNGbG93RnJvbS4KKyAgICAgICAgVXNlIFJlbmRlclN0 eWxlOjpoYXNGbG93RnJvbSgpIGhlbHBlciBmdW5jdGlvbiBpbnN0ZWFkIG9mIGRpcmVjdGx5Cisg ICAgICAgIGNoZWNraW5nIHRoZSB2YWx1ZSBvZiBSZW5kZXJTdHlsZTo6cmVnaW9uVGhyZWFkKCku CisKKyAgICAgICAgTm8gY2hhbmdlIG9mIGZ1bmN0aW9uYWxpdHksIGNvdmVyZWQgYnkgZXhpc3Rp bmcgdGVzdHMuCisKKyAgICAgICAgKiBjc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OmNvbnRlbnRUb0NTU1ZhbHVlKToKKyAgICAgICAgKFdlYkNv cmU6OkNvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUpOgorICAgICAgICAqIGNz cy9TdHlsZVJlc29sdmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6OmFk anVzdFJlbmRlclN0eWxlKToKKyAgICAgICAgKiBkb20vUHNldWRvRWxlbWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpQc2V1ZG9FbGVtZW50OjpkaWRBdHRhY2hSZW5kZXJlcnMpOgorICAgICAg ICAqIGRvbS9Qc2V1ZG9FbGVtZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpwc2V1ZG9FbGVtZW50 UmVuZGVyZXJJc05lZWRlZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmNyZWF0ZVJlbmRlck5hbWVk Rmxvd0ZyYWdtZW50SWZOZWVkZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6c2hvdWxkQmVOb3JtYWxGbG93T25s eSk6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmg6CisKIDIwMTMtMTAt MjEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgW1dJTl0g UHJvcGVybHkgc3VwcG9ydCByZXZlcnNlIGFuaW1hdGlvbnMgd2l0aG91dCBuZWVkaW5nIHNvZnR3 YXJlIGZhbGxiYWNrLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVk U3R5bGVEZWNsYXJhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHls ZURlY2xhcmF0aW9uLmNwcAppbmRleCBlYTY2ZTdjNGY4NmZhYTE2MzdlOTBlNzIwMDYzMGRmMmU2 Yzc2YWI1Li44OGMwZDdjYWU3OTI0YTVlMmNjZmZmNGRhOGI0ZmVkODU3NGIwZDQ4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcApA QCAtMTQ5OSw3ICsxNDk5LDcgQEAgc3RhdGljIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IGNvbnRlbnRU b0NTU1ZhbHVlKGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSkKICAgICAgICAgfSBlbHNlIGlmIChj b250ZW50RGF0YS0+aXNUZXh0KCkpCiAgICAgICAgICAgICBsaXN0LT5hcHBlbmQoY3NzVmFsdWVQ b29sKCkuY3JlYXRlVmFsdWUoc3RhdGljX2Nhc3Q8Y29uc3QgVGV4dENvbnRlbnREYXRhKj4oY29u dGVudERhdGEpLT50ZXh0KCksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfU1RSSU5HKSk7CiAgICAg fQotICAgIGlmICghc3R5bGUtPnJlZ2lvblRocmVhZCgpLmlzTnVsbCgpKQorICAgIGlmIChzdHls ZS0+aGFzRmxvd0Zyb20oKSkKICAgICAgICAgbGlzdC0+YXBwZW5kKGNzc1ZhbHVlUG9vbCgpLmNy ZWF0ZVZhbHVlKHN0eWxlLT5yZWdpb25UaHJlYWQoKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19T VFJJTkcpKTsKICAgICByZXR1cm4gbGlzdC5yZWxlYXNlKCk7CiB9CkBAIC0yODQ0LDcgKzI4NDQs NyBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiBDb21wdXRlZFN0eWxlRXh0cmFjdG9yOjpwcm9wZXJ0 eVZhbHVlKENTU1Byb3BlcnR5SUQgcHJvcGVydAogICAgICAgICAgICAgICAgIHJldHVybiBjc3NW YWx1ZVBvb2woKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb25lKTsKICAgICAgICAg ICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShzdHlsZS0+Zmxvd1RocmVhZCgp LCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1NUUklORyk7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVy dHlXZWJraXRGbG93RnJvbToKLSAgICAgICAgICAgIGlmIChzdHlsZS0+cmVnaW9uVGhyZWFkKCku aXNOdWxsKCkpCisgICAgICAgICAgICBpZiAoIXN0eWxlLT5oYXNGbG93RnJvbSgpKQogICAgICAg ICAgICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NT VmFsdWVOb25lKTsKICAgICAgICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1 ZShzdHlsZS0+cmVnaW9uVGhyZWFkKCksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfU1RSSU5HKTsK ICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFJlZ2lvbkZyYWdtZW50OgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv Y3NzL1N0eWxlUmVzb2x2ZXIuY3BwCmluZGV4IGU1ODU4OTg1YzhlODAzMjJiMWUzY2FjODJkYzll Y2M1NGViMzIzZDAuLmNhZjU2MGJlMmM0NTg1OTIwMjM3NDc0YTdjYTdkMzJiM2YyYjk1NGUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKQEAgLTEyNjgsNyArMTI2OCw3IEBAIHZv aWQgU3R5bGVSZXNvbHZlcjo6YWRqdXN0UmVuZGVyU3R5bGUoUmVuZGVyU3R5bGUqIHN0eWxlLCBS ZW5kZXJTdHlsZSogcGFyZW50U3R5CiAgICAgICAgIHx8IHN0eWxlLT5oYXNCbGVuZE1vZGUoKQog ICAgICAgICB8fCBzdHlsZS0+cG9zaXRpb24oKSA9PSBTdGlja3lQb3NpdGlvbgogICAgICAgICB8 fCAoc3R5bGUtPnBvc2l0aW9uKCkgPT0gRml4ZWRQb3NpdGlvbiAmJiBlICYmIGUtPmRvY3VtZW50 KCkucGFnZSgpICYmIGUtPmRvY3VtZW50KCkucGFnZSgpLT5zZXR0aW5ncygpLmZpeGVkUG9zaXRp b25DcmVhdGVzU3RhY2tpbmdDb250ZXh0KCkpCi0gICAgICAgIHx8IHN0eWxlLT5oYXNTdHlsZVJl Z2lvbigpCisgICAgICAgIHx8IHN0eWxlLT5oYXNGbG93RnJvbSgpCiAgICAgICAgICkpCiAgICAg ICAgIHN0eWxlLT5zZXRaSW5kZXgoMCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Qc2V1ZG9FbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Qc2V1ZG9FbGVtZW50LmNw cAppbmRleCBlZDIzZWI3NWRiZGViNzFjZTA4NGRmNGEwNzIzNjdmYTM2NDIzZjZkLi5hNzU2MzJi ZGNhZWViNmU2MGVjNGFkMWY5ODkzOGVmZThiOTBjMjNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9kb20vUHNldWRvRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1BzZXVk b0VsZW1lbnQuY3BwCkBAIC04MCw3ICs4MCw3IEBAIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IFBz ZXVkb0VsZW1lbnQ6OmN1c3RvbVN0eWxlRm9yUmVuZGVyZXIoKQogdm9pZCBQc2V1ZG9FbGVtZW50 OjpkaWRBdHRhY2hSZW5kZXJlcnMoKQogewogICAgIFJlbmRlckVsZW1lbnQqIHJlbmRlcmVyID0g dGhpcy0+cmVuZGVyZXIoKTsKLSAgICBpZiAoIXJlbmRlcmVyIHx8ICFyZW5kZXJlci0+c3R5bGUo KS0+cmVnaW9uVGhyZWFkKCkuaXNFbXB0eSgpKQorICAgIGlmICghcmVuZGVyZXIgfHwgcmVuZGVy ZXItPnN0eWxlKCktPmhhc0Zsb3dGcm9tKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIFJlbmRl clN0eWxlKiBzdHlsZSA9IHJlbmRlcmVyLT5zdHlsZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvZG9tL1BzZXVkb0VsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Qc2V1ZG9FbGVt ZW50LmgKaW5kZXggZGQ5OTVhYTNiYjQ1Zjg5MjI2OGJkYTkwNmM1NTc3MmUyNjYxNDlkNy4uOTdj ZjhlZWU4MmEzMmYyNGY0MDcyNWQwZWZkYzg5MmRhNTRiYTVlMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvZG9tL1BzZXVkb0VsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vUHNl dWRvRWxlbWVudC5oCkBAIC03NCw3ICs3NCw3IEBAIGNvbnN0IFF1YWxpZmllZE5hbWUmIHBzZXVk b0VsZW1lbnRUYWdOYW1lKCk7CiAKIGlubGluZSBib29sIHBzZXVkb0VsZW1lbnRSZW5kZXJlcklz TmVlZGVkKGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSkKIHsKLSAgICByZXR1cm4gc3R5bGUgJiYg c3R5bGUtPmRpc3BsYXkoKSAhPSBOT05FICYmIChzdHlsZS0+Y29udGVudERhdGEoKSB8fCAhc3R5 bGUtPnJlZ2lvblRocmVhZCgpLmlzRW1wdHkoKSk7CisgICAgcmV0dXJuIHN0eWxlICYmIHN0eWxl LT5kaXNwbGF5KCkgIT0gTk9ORSAmJiAoc3R5bGUtPmNvbnRlbnREYXRhKCkgfHwgc3R5bGUtPmhh c0Zsb3dGcm9tKCkpOwogfQogCiB2b2lkIGlzUHNldWRvRWxlbWVudChjb25zdCBQc2V1ZG9FbGVt ZW50Jik7IC8vIENhdGNoIHVubmVjZXNzYXJ5IHJ1bnRpbWUgY2hlY2sgb2YgdHlwZSBrbm93biBh dCBjb21waWxlIHRpbWUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zs b3cuY3BwCmluZGV4IGZhOGVkZTg1MjA3YTgwOTRlZTkxODQzYmYwNTM3MmM1NmIzZTI4MjkuLmI3 M2VjMjVkNGI2ODZhZjFmMmQ5ZDg4OWMzNjZkYzQxNzM1MDIyZjkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCkBAIC0yNTg5LDcgKzI1ODksNyBAQCB2 b2lkIFJlbmRlckJsb2NrRmxvdzo6Y3JlYXRlUmVuZGVyTmFtZWRGbG93RnJhZ21lbnRJZk5lZWRl ZCgpCiAgICAgaWYgKHJlbmRlck5hbWVkRmxvd0ZyYWdtZW50KCkgfHwgaXNSZW5kZXJOYW1lZEZs b3dGcmFnbWVudCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoZG9jdW1lbnQoKS5jc3NS ZWdpb25zRW5hYmxlZCgpICYmIHN0eWxlKCktPmlzRGlzcGxheVJlZ2lvblR5cGUoKSAmJiAhc3R5 bGUoKS0+cmVnaW9uVGhyZWFkKCkuaXNFbXB0eSgpKSB7CisgICAgaWYgKGRvY3VtZW50KCkuY3Nz UmVnaW9uc0VuYWJsZWQoKSAmJiBzdHlsZSgpLT5pc0Rpc3BsYXlSZWdpb25UeXBlKCkgJiYgc3R5 bGUoKS0+aGFzRmxvd0Zyb20oKSkgewogICAgICAgICBSZW5kZXJOYW1lZEZsb3dGcmFnbWVudCog Zmxvd0ZyYWdtZW50ID0gbmV3IFJlbmRlck5hbWVkRmxvd0ZyYWdtZW50KGRvY3VtZW50KCkpOwog ICAgICAgICBmbG93RnJhZ21lbnQtPnNldFN0eWxlRm9yTmFtZWRGbG93RnJhZ21lbnQoc3R5bGUo KSk7CiAgICAgICAgIHNldFJlbmRlck5hbWVkRmxvd0ZyYWdtZW50KGZsb3dGcmFnbWVudCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCBjNGIyMTkxNjgzOGU0 ZThlYmFiNTU4MGYxZmZlNzVlMTJkMTRkMDY4Li5jZmMxYjhjZjg4NjZlNWRiYWNlYTI2MDU2NWU0 NDZjMGZhMzYwZGYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAK QEAgLTU5NjcsNyArNTk2Nyw3IEBAIGJvb2wgUmVuZGVyTGF5ZXI6OnNob3VsZEJlTm9ybWFsRmxv d09ubHkoKSBjb25zdAogI2VuZGlmCiAgICAgICAgICYmICFpc1RyYW5zcGFyZW50KCkKICAgICAg ICAgJiYgIW5lZWRzQ29tcG9zaXRlZFNjcm9sbGluZygpCi0gICAgICAgICYmICFyZW5kZXJlcigp LnN0eWxlKCktPmhhc1N0eWxlUmVnaW9uKCkKKyAgICAgICAgJiYgIXJlbmRlcmVyKCkuc3R5bGUo KS0+aGFzRmxvd0Zyb20oKQogICAgICAgICA7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKaW5kZXggNWY5NGNjNGFlZGVlYzM3YjRiMmY2OGUxOTgy YmEwMzIzMDkxMDEwNy4uZTlkN2JlNjgyYWQ1YmU3N2JlNDdjMWMwNGIwN2ZjY2M5NTVmODM0ZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKQEAgLTg5 Myw3ICs4OTMsNyBAQCBwdWJsaWM6CiAgICAgLy8gRW5kIENTUzMgR2V0dGVycwogCiAgICAgY29u c3QgQXRvbWljU3RyaW5nJiBmbG93VGhyZWFkKCkgY29uc3QgeyByZXR1cm4gcmFyZU5vbkluaGVy aXRlZERhdGEtPm1fZmxvd1RocmVhZDsgfQotICAgIGJvb2wgaGFzU3R5bGVSZWdpb24oKSBjb25z dCB7IHJldHVybiAhcmFyZU5vbkluaGVyaXRlZERhdGEtPm1fcmVnaW9uVGhyZWFkLmlzTnVsbCgp OyB9CisgICAgYm9vbCBoYXNGbG93RnJvbSgpIGNvbnN0IHsgcmV0dXJuICFyYXJlTm9uSW5oZXJp dGVkRGF0YS0+bV9yZWdpb25UaHJlYWQuaXNOdWxsKCk7IH0KICAgICBjb25zdCBBdG9taWNTdHJp bmcmIHJlZ2lvblRocmVhZCgpIGNvbnN0IHsgcmV0dXJuIHJhcmVOb25Jbmhlcml0ZWREYXRhLT5t X3JlZ2lvblRocmVhZDsgfQogICAgIFJlZ2lvbkZyYWdtZW50IHJlZ2lvbkZyYWdtZW50KCkgY29u c3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8UmVnaW9uRnJhZ21lbnQ+KHJhcmVOb25Jbmhlcml0ZWRE YXRhLT5tX3JlZ2lvbkZyYWdtZW50KTsgfQogCg==