81534 2012-03-19 12:07:48 -0700 [New Multicolumn] Make columns relayout properly when the containing block width changes. 2012-03-19 12:28:58 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt koivisto webkit.review.bot oldest_to_newest 582020 0 hyatt 2012-03-19 12:07:48 -0700 Make columns relayout properly when the containing block width changes. Cache the column count and width on the multi-column block. 582028 1 132623 hyatt 2012-03-19 12:12:43 -0700 Created attachment 132623 Patch 582034 2 132624 hyatt 2012-03-19 12:16:15 -0700 Created attachment 132624 Patch 582035 3 webkit.review.bot 2012-03-19 12:18:32 -0700 Attachment 132624 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/rendering/RenderMultiColumnBlock.h:45: One space before end of line comments [whitespace/comments] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 582042 4 koivisto 2012-03-19 12:21:41 -0700 r=me 582052 5 hyatt 2012-03-19 12:28:58 -0700 Fixed in r111217. 132623 2012-03-19 12:12:43 -0700 2012-03-19 12:16:15 -0700 Patch patch.txt text/plain 6841 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMTIxMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDEyLTAzLTE5ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODE1MzQKKworICAgICAgICBbTmV3IE11bHRpY29sdW1uXSBNYWtl IHRoZSBtdWx0aS1jb2x1bW4gYmxvY2sgcmUtbGF5b3V0IGl0cyBjaGlsZHJlbiB3aGVuIHRoZSBj b2x1bW4gd2lkdGgvY291bnQgY2hhbmdlLgorICAgICAgICBDYWNoZSB0aGUgY291bnQvd2lkdGgg b24gdGhlIG11bHRpLWNvbHVtbiBibG9jayBmb3IgZWFzeSBhY2Nlc3MuCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxv Y2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnJlY29tcHV0ZUxvZ2ljYWxX aWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6bGF5b3V0QmxvY2spOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5oOgorICAgICAgICBWaXJ0dWFsaXplIHRoZSBj b2RlIHRoYXQgcmVjb21wdXRlcyB0aGUgbG9naWNhbCB3aWR0aCBmb3IgYSBibG9jayBhbmQgc2V0 cyByZWxheW91dENoaWxkcmVuIHRvIHRydWUsCisgICAgICAgIHNvIHRoYXQgY29sdW1uIGNvZGUg Y2FuIHN1YmNsYXNzIHRoZSBtZXRob2QgdG8gYWxzbyBjaGVjayBmb3IgY2hhbmdlcyBpbiB0aGUg Y29sdW1uIHdpZHRoL2NvdW50LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck11bHRpQ29s dW1uQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5CbG9jazo6 Y29tcHV0ZUNvbHVtbkNvdW50QW5kV2lkdGgpOgorICAgICAgICBUaGUgY29sdW1uIGNvdW50L3dp ZHRoIGRldGVybWluYXRpb24gYWxnb3JpdGhtIGluIG9uZSBtZXRob2Qgb24gdGhlIFJlbmRlck11 bHRpQ29sdW1uQmxvY2suIEl0J3MgYSBjb3B5CisgICAgICAgIG9mIHRoZSBjb2RlIGZyb20gUmVu ZGVyQmxvY2sgKHdoaWNoIHdpbGwgYmUgZ29pbmcgYXdheSBldmVudHVhbGx5KS4KKworICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5CbG9jazo6cmVjb21wdXRlTG9naWNhbFdpZHRo KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5CbG9jay5oOgorICAgICAg ICAoUmVuZGVyTXVsdGlDb2x1bW5CbG9jayk6CisgICAgICAgIFN1YmNsYXNzZWQgbWV0aG9kIHRv IGFsc28gY2hlY2sgZm9yIGNoYW5nZXMgaW4gdGhlIGNvbHVtbiB3aWR0aCB0byBzZXQgcmVsYXlv dXRDaGlsZHJlbiB0byB0cnVlLgorCiAyMDEyLTAzLTE5ICBUb21teSBXaWRlbmZseWNodCAgPHRv bW15d0Bnb29nbGUuY29tPgogCiAgICAgICAgIE1lZGlhU3RyZWFtIEFQSSAoSlNFUCk6IEludHJv ZHVjaW5nIFBlZXJDb25uZWN0aW9uMDBIYW5kbGVyCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9jay5jcHAJKHJldmlzaW9uIDExMTA0OCkKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0MjMsNiArMTQy MywxNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpjb21wdXRlUmVnaW9uUmFuZ2VGb3JCCiAgICAgICAg IGVuY2xvc2luZ1JlbmRlckZsb3dUaHJlYWQoKS0+c2V0UmVnaW9uUmFuZ2VGb3JCb3godGhpcywg b2Zmc2V0RnJvbUxvZ2ljYWxUb3BPZkZpcnN0UGFnZSgpKTsKIH0KIAorYm9vbCBSZW5kZXJCbG9j azo6cmVjb21wdXRlTG9naWNhbFdpZHRoKCkKK3sKKyAgICBMYXlvdXRVbml0IG9sZFdpZHRoID0g bG9naWNhbFdpZHRoKCk7CisgICAgTGF5b3V0VW5pdCBvbGRDb2x1bW5XaWR0aCA9IGRlc2lyZWRD b2x1bW5XaWR0aCgpOworCisgICAgY29tcHV0ZUxvZ2ljYWxXaWR0aCgpOworICAgIGNhbGNDb2x1 bW5XaWR0aCgpOworCisgICAgcmV0dXJuIG9sZFdpZHRoICE9IGxvZ2ljYWxXaWR0aCgpIHx8IG9s ZENvbHVtbldpZHRoICE9IGRlc2lyZWRDb2x1bW5XaWR0aCgpOworfQorCiB2b2lkIFJlbmRlckJs b2NrOjpsYXlvdXRCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQgcGFnZUxv Z2ljYWxIZWlnaHQsIEJsb2NrTGF5b3V0UGFzcyBsYXlvdXRQYXNzKQogewogICAgIEFTU0VSVChu ZWVkc0xheW91dCgpKTsKQEAgLTE0MzUsMTcgKzE0NDYsMTEgQEAgdm9pZCBSZW5kZXJCbG9jazo6 bGF5b3V0QmxvY2soYm9vbCByZWxheQogCiAgICAgTGF5b3V0UmVwYWludGVyIHJlcGFpbnRlcigq dGhpcywgZXZlckhhZExheW91dCgpICYmIGNoZWNrRm9yUmVwYWludER1cmluZ0xheW91dCgpKTsK IAotICAgIExheW91dFVuaXQgb2xkV2lkdGggPSBsb2dpY2FsV2lkdGgoKTsKLSAgICBMYXlvdXRV bml0IG9sZENvbHVtbldpZHRoID0gZGVzaXJlZENvbHVtbldpZHRoKCk7Ci0KLSAgICBjb21wdXRl TG9naWNhbFdpZHRoKCk7Ci0gICAgY2FsY0NvbHVtbldpZHRoKCk7CisgICAgaWYgKHJlY29tcHV0 ZUxvZ2ljYWxXaWR0aCgpKQorICAgICAgICByZWxheW91dENoaWxkcmVuID0gdHJ1ZTsKIAogICAg IG1fb3ZlcmZsb3cuY2xlYXIoKTsKIAotICAgIGlmIChvbGRXaWR0aCAhPSBsb2dpY2FsV2lkdGgo KSB8fCBvbGRDb2x1bW5XaWR0aCAhPSBkZXNpcmVkQ29sdW1uV2lkdGgoKSkKLSAgICAgICAgcmVs YXlvdXRDaGlsZHJlbiA9IHRydWU7Ci0KICAgICAvLyBJZiBub3RoaW5nIGNoYW5nZWQgYWJvdXQg b3VyIGZsb2F0aW5nIHBvc2l0aW9uZWQgb2JqZWN0cywgbGV0J3MgZ28gYWhlYWQgYW5kIHRyeSB0 byBwbGFjZSB0aGVtIGFzCiAgICAgLy8gZmxvYXRzIHRvIGF2b2lkIGRvaW5nIHR3byBwYXNzZXMu CiAgICAgQmxvY2tMYXlvdXRQYXNzIGZsb2F0c0xheW91dFBhc3MgPSBsYXlvdXRQYXNzOwpJbmRl eDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgJKHJldmlzaW9uIDExMTA0NykK KysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCSh3b3JraW5nIGNvcHkp CkBAIC05ODUsNiArOTg1LDggQEAgcHJvdGVjdGVkOgogCiAgICAgdmlydHVhbCBib29sIHJlcXVp cmVzQ29sdW1ucyhpbnQgZGVzaXJlZENvbHVtbkNvdW50KSBjb25zdDsKIAorICAgIHZpcnR1YWwg Ym9vbCByZWNvbXB1dGVMb2dpY2FsV2lkdGgoKTsKKwogcHVibGljOgogICAgIExheW91dFVuaXQg b2Zmc2V0RnJvbUxvZ2ljYWxUb3BPZkZpcnN0UGFnZSgpIGNvbnN0OwogICAgIFJlbmRlclJlZ2lv biogcmVnaW9uQXRCbG9ja09mZnNldChMYXlvdXRVbml0KSBjb25zdDsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkJsb2NrLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5CbG9jay5jcHAJKHJl dmlzaW9uIDExMTA0OCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNv bHVtbkJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYsNiArMjYsOCBAQAogI2luY2x1ZGUg ImNvbmZpZy5oIgogI2luY2x1ZGUgIlJlbmRlck11bHRpQ29sdW1uQmxvY2suaCIKIAordXNpbmcg bmFtZXNwYWNlIHN0ZDsKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBSZW5kZXJNdWx0aUNvbHVt bkJsb2NrOjpSZW5kZXJNdWx0aUNvbHVtbkJsb2NrKE5vZGUqIG5vZGUpCkBAIC0zMyw2ICszNSw0 MiBAQCBSZW5kZXJNdWx0aUNvbHVtbkJsb2NrOjpSZW5kZXJNdWx0aUNvbHVtCiB7CiB9CiAKK3Zv aWQgUmVuZGVyTXVsdGlDb2x1bW5CbG9jazo6Y29tcHV0ZUNvbHVtbkNvdW50QW5kV2lkdGgoKQor eworICAgIC8vIENhbGN1bGF0ZSBvdXIgY29sdW1uIHdpZHRoIGFuZCBjb2x1bW4gY291bnQuCisg ICAgLy8gRklYTUU6IENhbiBvdmVyZmxvdyBvbiBmYXN0L2Jsb2NrL2Zsb2F0L2Zsb2F0LW5vdC1y ZW1vdmVkLWZyb20tbmV4dC1zaWJsaW5nNC5odG1sLCBzZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTY4NzQ0CisgICAgbV9jb2x1bW5Db3VudCA9IDE7CisgICAgbV9j b2x1bW5XaWR0aCA9IGNvbnRlbnRMb2dpY2FsV2lkdGgoKTsKKyAgICAKKyAgICBBU1NFUlQoIXN0 eWxlKCktPmhhc0F1dG9Db2x1bW5Db3VudCgpIHx8ICFzdHlsZSgpLT5oYXNBdXRvQ29sdW1uV2lk dGgoKSk7CisKKyAgICBMYXlvdXRVbml0IGF2YWlsV2lkdGggPSBtX2NvbHVtbldpZHRoOworICAg IExheW91dFVuaXQgY29sR2FwID0gY29sdW1uR2FwKCk7CisgICAgTGF5b3V0VW5pdCBjb2xXaWR0 aCA9IG1heDxMYXlvdXRVbml0PigxLCBMYXlvdXRVbml0KHN0eWxlKCktPmNvbHVtbldpZHRoKCkp KTsKKyAgICBpbnQgY29sQ291bnQgPSBtYXg8aW50PigxLCBzdHlsZSgpLT5jb2x1bW5Db3VudCgp KTsKKworICAgIGlmIChzdHlsZSgpLT5oYXNBdXRvQ29sdW1uV2lkdGgoKSAmJiAhc3R5bGUoKS0+ aGFzQXV0b0NvbHVtbkNvdW50KCkpIHsKKyAgICAgICAgbV9jb2x1bW5Db3VudCA9IGNvbENvdW50 OworICAgICAgICBtX2NvbHVtbldpZHRoID0gbWF4PExheW91dFVuaXQ+KDAsIChhdmFpbFdpZHRo IC0gKChtX2NvbHVtbkNvdW50IC0gMSkgKiBjb2xHYXApKSAvIG1fY29sdW1uQ291bnQpOworICAg IH0gZWxzZSBpZiAoIXN0eWxlKCktPmhhc0F1dG9Db2x1bW5XaWR0aCgpICYmIHN0eWxlKCktPmhh c0F1dG9Db2x1bW5Db3VudCgpKSB7CisgICAgICAgIG1fY29sdW1uQ291bnQgPSBtYXg8TGF5b3V0 VW5pdD4oMSwgKGF2YWlsV2lkdGggKyBjb2xHYXApIC8gKGNvbFdpZHRoICsgY29sR2FwKSk7Cisg ICAgICAgIG1fY29sdW1uV2lkdGggPSAoKGF2YWlsV2lkdGggKyBjb2xHYXApIC8gbV9jb2x1bW5D b3VudCkgLSBjb2xHYXA7CisgICAgfSBlbHNlIHsKKyAgICAgICAgbV9jb2x1bW5Db3VudCA9IG1h eDxMYXlvdXRVbml0PihtaW48TGF5b3V0VW5pdD4oY29sQ291bnQsIChhdmFpbFdpZHRoICsgY29s R2FwKSAvIChjb2xXaWR0aCArIGNvbEdhcCkpLCAxKTsKKyAgICAgICAgbV9jb2x1bW5XaWR0aCA9 ICgoYXZhaWxXaWR0aCArIGNvbEdhcCkgLyBtX2NvbHVtbkNvdW50KSAtIGNvbEdhcDsKKyAgICB9 Cit9CisKK2Jvb2wgUmVuZGVyTXVsdGlDb2x1bW5CbG9jazo6cmVjb21wdXRlTG9naWNhbFdpZHRo KCkKK3sKKyAgICBib29sIHJlbGF5b3V0Q2hpbGRyZW4gPSBSZW5kZXJCbG9jazo6cmVjb21wdXRl TG9naWNhbFdpZHRoKCk7CisgICAgTGF5b3V0VW5pdCBvbGRDb2x1bW5XaWR0aCA9IG1fY29sdW1u V2lkdGg7CisgICAgY29tcHV0ZUNvbHVtbkNvdW50QW5kV2lkdGgoKTsKKyAgICBpZiAobV9jb2x1 bW5XaWR0aCAhPSBvbGRDb2x1bW5XaWR0aCkKKyAgICAgICAgcmVsYXlvdXRDaGlsZHJlbiA9IHRy dWU7CisgICAgcmV0dXJuIHJlbGF5b3V0Q2hpbGRyZW47Cit9CisKIGNvbnN0IGNoYXIqIFJlbmRl ck11bHRpQ29sdW1uQmxvY2s6OnJlbmRlck5hbWUoKSBjb25zdAogeyAgICAKICAgICBpZiAoaXNG bG9hdGluZygpKQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29s dW1uQmxvY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TXVsdGlDb2x1bW5CbG9jay5oCShyZXZpc2lvbiAxMTEwNDgpCisrKyBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5CbG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw2 ICszNywxNCBAQCBwdWJsaWM6CiAgICAgCiBwcml2YXRlOgogICAgIHZpcnR1YWwgY29uc3QgY2hh ciogcmVuZGVyTmFtZSgpIGNvbnN0OworCisgICAgdmlydHVhbCBib29sIHJlY29tcHV0ZUxvZ2lj YWxXaWR0aCgpOworICAgIHZvaWQgY29tcHV0ZUNvbHVtbkNvdW50QW5kV2lkdGgoKTsKKworcHJp dmF0ZToKKyAgICB1bnNpZ25lZCBtX2NvbHVtbkNvdW50OyAgIC8vIFRoZSBkZWZhdWx0IGNvbHVt biBjb3VudC93aWR0aCB0aGF0IGFyZSBiYXNlZCBvZmYgb3VyIGNvbnRhaW5pbmcgYmxvY2sgd2lk dGguIFRoZXNlIHZhbHVlcyByZXByZXNlbnQgb25seSB0aGUgZGVmYXVsdCwKKyAgICBMYXlvdXRV bml0IG1fY29sdW1uV2lkdGg7IC8vIHNpbmNlIGEgbXVsdGktY29sdW1uIGJsb2NrIHRoYXQgaXMg c3BsaXQgYWNyb3NzIHZhcmlhYmxlIHdpZHRoIHBhZ2VzIG9yIHJlZ2lvbnMgd2lsbCBoYXZlIGRp ZmZlcmVudCBjb2x1bW4gY291bnRzIGFuZCB3aWR0aHMgaW4gZWFjaC4KKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIC8vIFRoZXNlIHZhbHVlcyB3aWxsIGJlIGNhY2hlZCAoZXZlbnR1YWxs eSkgZm9yIG11bHRpLWNvbHVtbiBibG9ja3MuCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl Cg== 132624 2012-03-19 12:16:15 -0700 2012-03-19 12:21:17 -0700 Patch patch.txt text/plain 6826 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMTIxMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDEyLTAzLTE5ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODE1MzQKKworICAgICAgICBbTmV3IE11bHRpY29sdW1uXSBNYWtl IHRoZSBtdWx0aS1jb2x1bW4gYmxvY2sgcmUtbGF5b3V0IGl0cyBjaGlsZHJlbiB3aGVuIHRoZSBj b2x1bW4gd2lkdGgvY291bnQgY2hhbmdlLgorICAgICAgICBDYWNoZSB0aGUgY291bnQvd2lkdGgg b24gdGhlIG11bHRpLWNvbHVtbiBibG9jayBmb3IgZWFzeSBhY2Nlc3MuCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxv Y2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnJlY29tcHV0ZUxvZ2ljYWxX aWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6bGF5b3V0QmxvY2spOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5oOgorICAgICAgICBWaXJ0dWFsaXplIHRoZSBj b2RlIHRoYXQgcmVjb21wdXRlcyB0aGUgbG9naWNhbCB3aWR0aCBmb3IgYSBibG9jayBhbmQgc2V0 cyByZWxheW91dENoaWxkcmVuIHRvIHRydWUsCisgICAgICAgIHNvIHRoYXQgY29sdW1uIGNvZGUg Y2FuIHN1YmNsYXNzIHRoZSBtZXRob2QgdG8gYWxzbyBjaGVjayBmb3IgY2hhbmdlcyBpbiB0aGUg Y29sdW1uIHdpZHRoL2NvdW50LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck11bHRpQ29s dW1uQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5CbG9jazo6 Y29tcHV0ZUNvbHVtbkNvdW50QW5kV2lkdGgpOgorICAgICAgICBUaGUgY29sdW1uIGNvdW50L3dp ZHRoIGRldGVybWluYXRpb24gYWxnb3JpdGhtIGluIG9uZSBtZXRob2Qgb24gdGhlIFJlbmRlck11 bHRpQ29sdW1uQmxvY2suIEl0J3MgYSBjb3B5CisgICAgICAgIG9mIHRoZSBjb2RlIGZyb20gUmVu ZGVyQmxvY2sgKHdoaWNoIHdpbGwgYmUgZ29pbmcgYXdheSBldmVudHVhbGx5KS4KKworICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5CbG9jazo6cmVjb21wdXRlTG9naWNhbFdpZHRo KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5CbG9jay5oOgorICAgICAg ICAoUmVuZGVyTXVsdGlDb2x1bW5CbG9jayk6CisgICAgICAgIFN1YmNsYXNzZWQgbWV0aG9kIHRv IGFsc28gY2hlY2sgZm9yIGNoYW5nZXMgaW4gdGhlIGNvbHVtbiB3aWR0aCB0byBzZXQgcmVsYXlv dXRDaGlsZHJlbiB0byB0cnVlLgorCiAyMDEyLTAzLTE5ICBUb21teSBXaWRlbmZseWNodCAgPHRv bW15d0Bnb29nbGUuY29tPgogCiAgICAgICAgIE1lZGlhU3RyZWFtIEFQSSAoSlNFUCk6IEludHJv ZHVjaW5nIFBlZXJDb25uZWN0aW9uMDBIYW5kbGVyCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9jay5jcHAJKHJldmlzaW9uIDExMTA0OCkKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0MjMsNiArMTQy MywxNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpjb21wdXRlUmVnaW9uUmFuZ2VGb3JCCiAgICAgICAg IGVuY2xvc2luZ1JlbmRlckZsb3dUaHJlYWQoKS0+c2V0UmVnaW9uUmFuZ2VGb3JCb3godGhpcywg b2Zmc2V0RnJvbUxvZ2ljYWxUb3BPZkZpcnN0UGFnZSgpKTsKIH0KIAorYm9vbCBSZW5kZXJCbG9j azo6cmVjb21wdXRlTG9naWNhbFdpZHRoKCkKK3sKKyAgICBMYXlvdXRVbml0IG9sZFdpZHRoID0g bG9naWNhbFdpZHRoKCk7CisgICAgTGF5b3V0VW5pdCBvbGRDb2x1bW5XaWR0aCA9IGRlc2lyZWRD b2x1bW5XaWR0aCgpOworCisgICAgY29tcHV0ZUxvZ2ljYWxXaWR0aCgpOworICAgIGNhbGNDb2x1 bW5XaWR0aCgpOworCisgICAgcmV0dXJuIG9sZFdpZHRoICE9IGxvZ2ljYWxXaWR0aCgpIHx8IG9s ZENvbHVtbldpZHRoICE9IGRlc2lyZWRDb2x1bW5XaWR0aCgpOworfQorCiB2b2lkIFJlbmRlckJs b2NrOjpsYXlvdXRCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQgcGFnZUxv Z2ljYWxIZWlnaHQsIEJsb2NrTGF5b3V0UGFzcyBsYXlvdXRQYXNzKQogewogICAgIEFTU0VSVChu ZWVkc0xheW91dCgpKTsKQEAgLTE0MzUsMTcgKzE0NDYsMTEgQEAgdm9pZCBSZW5kZXJCbG9jazo6 bGF5b3V0QmxvY2soYm9vbCByZWxheQogCiAgICAgTGF5b3V0UmVwYWludGVyIHJlcGFpbnRlcigq dGhpcywgZXZlckhhZExheW91dCgpICYmIGNoZWNrRm9yUmVwYWludER1cmluZ0xheW91dCgpKTsK IAotICAgIExheW91dFVuaXQgb2xkV2lkdGggPSBsb2dpY2FsV2lkdGgoKTsKLSAgICBMYXlvdXRV bml0IG9sZENvbHVtbldpZHRoID0gZGVzaXJlZENvbHVtbldpZHRoKCk7Ci0KLSAgICBjb21wdXRl TG9naWNhbFdpZHRoKCk7Ci0gICAgY2FsY0NvbHVtbldpZHRoKCk7CisgICAgaWYgKHJlY29tcHV0 ZUxvZ2ljYWxXaWR0aCgpKQorICAgICAgICByZWxheW91dENoaWxkcmVuID0gdHJ1ZTsKIAogICAg IG1fb3ZlcmZsb3cuY2xlYXIoKTsKIAotICAgIGlmIChvbGRXaWR0aCAhPSBsb2dpY2FsV2lkdGgo KSB8fCBvbGRDb2x1bW5XaWR0aCAhPSBkZXNpcmVkQ29sdW1uV2lkdGgoKSkKLSAgICAgICAgcmVs YXlvdXRDaGlsZHJlbiA9IHRydWU7Ci0KICAgICAvLyBJZiBub3RoaW5nIGNoYW5nZWQgYWJvdXQg b3VyIGZsb2F0aW5nIHBvc2l0aW9uZWQgb2JqZWN0cywgbGV0J3MgZ28gYWhlYWQgYW5kIHRyeSB0 byBwbGFjZSB0aGVtIGFzCiAgICAgLy8gZmxvYXRzIHRvIGF2b2lkIGRvaW5nIHR3byBwYXNzZXMu CiAgICAgQmxvY2tMYXlvdXRQYXNzIGZsb2F0c0xheW91dFBhc3MgPSBsYXlvdXRQYXNzOwpJbmRl eDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgJKHJldmlzaW9uIDExMTA0NykK KysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCSh3b3JraW5nIGNvcHkp CkBAIC05ODUsNiArOTg1LDggQEAgcHJvdGVjdGVkOgogCiAgICAgdmlydHVhbCBib29sIHJlcXVp cmVzQ29sdW1ucyhpbnQgZGVzaXJlZENvbHVtbkNvdW50KSBjb25zdDsKIAorICAgIHZpcnR1YWwg Ym9vbCByZWNvbXB1dGVMb2dpY2FsV2lkdGgoKTsKKwogcHVibGljOgogICAgIExheW91dFVuaXQg b2Zmc2V0RnJvbUxvZ2ljYWxUb3BPZkZpcnN0UGFnZSgpIGNvbnN0OwogICAgIFJlbmRlclJlZ2lv biogcmVnaW9uQXRCbG9ja09mZnNldChMYXlvdXRVbml0KSBjb25zdDsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkJsb2NrLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5CbG9jay5jcHAJKHJl dmlzaW9uIDExMTA0OCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNv bHVtbkJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYsMTEgKzI2LDUxIEBACiAjaW5jbHVk ZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiUmVuZGVyTXVsdGlDb2x1bW5CbG9jay5oIgogCit1c2lu ZyBuYW1lc3BhY2Ugc3RkOworCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFJlbmRlck11bHRpQ29s dW1uQmxvY2s6OlJlbmRlck11bHRpQ29sdW1uQmxvY2soTm9kZSogbm9kZSkKICAgICA6IFJlbmRl ckJsb2NrKG5vZGUpCisgICAgLCBtX2NvbHVtbkNvdW50KDEpCisgICAgLCBtX2NvbHVtbldpZHRo KDApCit7Cit9CisKK3ZvaWQgUmVuZGVyTXVsdGlDb2x1bW5CbG9jazo6Y29tcHV0ZUNvbHVtbkNv dW50QW5kV2lkdGgoKQoreworICAgIC8vIENhbGN1bGF0ZSBvdXIgY29sdW1uIHdpZHRoIGFuZCBj b2x1bW4gY291bnQuCisgICAgLy8gRklYTUU6IENhbiBvdmVyZmxvdyBvbiBmYXN0L2Jsb2NrL2Zs b2F0L2Zsb2F0LW5vdC1yZW1vdmVkLWZyb20tbmV4dC1zaWJsaW5nNC5odG1sLCBzZWUgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4NzQ0CisgICAgbV9jb2x1bW5Db3Vu dCA9IDE7CisgICAgbV9jb2x1bW5XaWR0aCA9IGNvbnRlbnRMb2dpY2FsV2lkdGgoKTsKKyAgICAK KyAgICBBU1NFUlQoIXN0eWxlKCktPmhhc0F1dG9Db2x1bW5Db3VudCgpIHx8ICFzdHlsZSgpLT5o YXNBdXRvQ29sdW1uV2lkdGgoKSk7CisKKyAgICBMYXlvdXRVbml0IGF2YWlsV2lkdGggPSBtX2Nv bHVtbldpZHRoOworICAgIExheW91dFVuaXQgY29sR2FwID0gY29sdW1uR2FwKCk7CisgICAgTGF5 b3V0VW5pdCBjb2xXaWR0aCA9IG1heDxMYXlvdXRVbml0PigxLCBMYXlvdXRVbml0KHN0eWxlKCkt PmNvbHVtbldpZHRoKCkpKTsKKyAgICBpbnQgY29sQ291bnQgPSBtYXg8aW50PigxLCBzdHlsZSgp LT5jb2x1bW5Db3VudCgpKTsKKworICAgIGlmIChzdHlsZSgpLT5oYXNBdXRvQ29sdW1uV2lkdGgo KSAmJiAhc3R5bGUoKS0+aGFzQXV0b0NvbHVtbkNvdW50KCkpIHsKKyAgICAgICAgbV9jb2x1bW5D b3VudCA9IGNvbENvdW50OworICAgICAgICBtX2NvbHVtbldpZHRoID0gbWF4PExheW91dFVuaXQ+ KDAsIChhdmFpbFdpZHRoIC0gKChtX2NvbHVtbkNvdW50IC0gMSkgKiBjb2xHYXApKSAvIG1fY29s dW1uQ291bnQpOworICAgIH0gZWxzZSBpZiAoIXN0eWxlKCktPmhhc0F1dG9Db2x1bW5XaWR0aCgp ICYmIHN0eWxlKCktPmhhc0F1dG9Db2x1bW5Db3VudCgpKSB7CisgICAgICAgIG1fY29sdW1uQ291 bnQgPSBtYXg8TGF5b3V0VW5pdD4oMSwgKGF2YWlsV2lkdGggKyBjb2xHYXApIC8gKGNvbFdpZHRo ICsgY29sR2FwKSk7CisgICAgICAgIG1fY29sdW1uV2lkdGggPSAoKGF2YWlsV2lkdGggKyBjb2xH YXApIC8gbV9jb2x1bW5Db3VudCkgLSBjb2xHYXA7CisgICAgfSBlbHNlIHsKKyAgICAgICAgbV9j b2x1bW5Db3VudCA9IG1heDxMYXlvdXRVbml0PihtaW48TGF5b3V0VW5pdD4oY29sQ291bnQsIChh dmFpbFdpZHRoICsgY29sR2FwKSAvIChjb2xXaWR0aCArIGNvbEdhcCkpLCAxKTsKKyAgICAgICAg bV9jb2x1bW5XaWR0aCA9ICgoYXZhaWxXaWR0aCArIGNvbEdhcCkgLyBtX2NvbHVtbkNvdW50KSAt IGNvbEdhcDsKKyAgICB9Cit9CisKK2Jvb2wgUmVuZGVyTXVsdGlDb2x1bW5CbG9jazo6cmVjb21w dXRlTG9naWNhbFdpZHRoKCkKIHsKKyAgICBib29sIHJlbGF5b3V0Q2hpbGRyZW4gPSBSZW5kZXJC bG9jazo6cmVjb21wdXRlTG9naWNhbFdpZHRoKCk7CisgICAgTGF5b3V0VW5pdCBvbGRDb2x1bW5X aWR0aCA9IG1fY29sdW1uV2lkdGg7CisgICAgY29tcHV0ZUNvbHVtbkNvdW50QW5kV2lkdGgoKTsK KyAgICBpZiAobV9jb2x1bW5XaWR0aCAhPSBvbGRDb2x1bW5XaWR0aCkKKyAgICAgICAgcmVsYXlv dXRDaGlsZHJlbiA9IHRydWU7CisgICAgcmV0dXJuIHJlbGF5b3V0Q2hpbGRyZW47CiB9CiAKIGNv bnN0IGNoYXIqIFJlbmRlck11bHRpQ29sdW1uQmxvY2s6OnJlbmRlck5hbWUoKSBjb25zdApJbmRl eDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uQmxvY2suaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5CbG9j ay5oCShyZXZpc2lvbiAxMTEwNDgpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TXVsdGlDb2x1bW5CbG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw2ICszNywxNCBAQCBwdWJs aWM6CiAgICAgCiBwcml2YXRlOgogICAgIHZpcnR1YWwgY29uc3QgY2hhciogcmVuZGVyTmFtZSgp IGNvbnN0OworCisgICAgdmlydHVhbCBib29sIHJlY29tcHV0ZUxvZ2ljYWxXaWR0aCgpOworICAg IHZvaWQgY29tcHV0ZUNvbHVtbkNvdW50QW5kV2lkdGgoKTsKKworcHJpdmF0ZToKKyAgICB1bnNp Z25lZCBtX2NvbHVtbkNvdW50OyAgIC8vIFRoZSBkZWZhdWx0IGNvbHVtbiBjb3VudC93aWR0aCB0 aGF0IGFyZSBiYXNlZCBvZmYgb3VyIGNvbnRhaW5pbmcgYmxvY2sgd2lkdGguIFRoZXNlIHZhbHVl cyByZXByZXNlbnQgb25seSB0aGUgZGVmYXVsdCwKKyAgICBMYXlvdXRVbml0IG1fY29sdW1uV2lk dGg7IC8vIHNpbmNlIGEgbXVsdGktY29sdW1uIGJsb2NrIHRoYXQgaXMgc3BsaXQgYWNyb3NzIHZh cmlhYmxlIHdpZHRoIHBhZ2VzIG9yIHJlZ2lvbnMgd2lsbCBoYXZlIGRpZmZlcmVudCBjb2x1bW4g Y291bnRzIGFuZCB3aWR0aHMgaW4gZWFjaC4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IC8vIFRoZXNlIHZhbHVlcyB3aWxsIGJlIGNhY2hlZCAoZXZlbnR1YWxseSkgZm9yIG11bHRpLWNv bHVtbiBibG9ja3MuCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg==