96674 2012-09-13 11:07:32 -0700 Flexitem margins should be based on content width, not width 2012-09-13 11:39:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tony tony eric ojan webkit.review.bot oldest_to_newest 719686 0 tony 2012-09-13 11:07:32 -0700 Flexitem margins should be based on content width, not width 719694 1 163917 tony 2012-09-13 11:13:05 -0700 Created attachment 163917 Patch 719696 2 tony 2012-09-13 11:13:29 -0700 Mostly just deleting code. 719724 3 163917 webkit.review.bot 2012-09-13 11:39:05 -0700 Comment on attachment 163917 Patch Clearing flags on attachment: 163917 Committed r128486: <http://trac.webkit.org/changeset/128486> 719725 4 webkit.review.bot 2012-09-13 11:39:08 -0700 All reviewed patches have been landed. Closing bug. 163917 2012-09-13 11:13:05 -0700 2012-09-13 11:39:05 -0700 Patch bug-96674-20120913111238.patch text/plain 13932 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQ5ZWM1NTE1MGJjZDE4 NGIxZTU1ZWM0NmE0YTdjZmNhZDU5NjQyYS4uYTMyODdhY2Q5MmRmZjUyMWVhMDg3MDc4YTYyN2Q0 OWIyYWNmODIyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA5LTEzICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgRmxleGl0ZW0gbWFyZ2lucyBz aG91bGQgYmUgYmFzZWQgb24gY29udGVudCB3aWR0aCwgbm90IHdpZHRoCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NjY3NAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1hcmdpbnMgc2hvdWxkIGJlIGJhc2Vk IG9uIGNvbnRlbnQgd2lkdGguIEFsc28gcmVtb3ZlIHNvbWUgY2FsbHMgdG8KKyAgICAgICAgbWFp bkF4aXNDb250ZW50RXh0ZW50KCkgd2hlbiB3ZSBjYW4gdXNlIGNvbnRlbnRMb2dpY2FsV2lkdGgg aW5zdGVhZC4KKworICAgICAgICBUZXN0czogY3NzMy9mbGV4Ym94L3BlcmNlbnQtbWFyZ2lucy5o dG1sIGhhcyBhIG5ldyB0ZXN0Y2FzZS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4 aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0 ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQpOiBVc2UgY29udGVudExvZ2ljYWxXaWR0aCBpbnN0ZWFk IG9mCisgICAgICAgIHBhc3NpbmcgaW4gdGhlIG1heGltdW0gdmFsdWUgKG9ubHkgdXNlZCBpbiB0 aGUgd2lkdGggY2FzZSkuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6cHJl ZmVycmVkTWFpbkF4aXNDb250ZW50RXh0ZW50Rm9yQ2hpbGQpOiBEb24ndCBwYXNzIGluIG1haW5B eGlzQ29udGVudEV4dGVudC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpj b21wdXRlQ2hpbGRNYXJnaW5WYWx1ZSk6IFVzZSBjb250ZW50TG9naWNhbFdpZHRoIGFuZCBzaW1w bGlmeSB0aGUgY29kZS4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb21w dXRlTWFpbkF4aXNQcmVmZXJyZWRTaXplcyk6IFJlbW92ZSB1bm5lY2Vzc2FyeSBtYWluQXhpc0Nv bnRlbnRFeHRlbnQoKSBjYWxsLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6 OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heCk6IFJlbW92ZSB1bm5lY2Vzc2FyeSBmbGV4Ym94 QXZhaWxhYmxlQ29udGVudEV4dGVudC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxl Qm94Ojpjb21wdXRlTmV4dEZsZXhMaW5lKTogUmVtb3ZlIHVubmVjZXNzYXJ5IG1haW5BeGlzQ29u dGVudEV4dGVudCgpIGNhbGwuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6 cmVzb2x2ZUZsZXhpYmxlTGVuZ3Rocyk6IFJlbW92ZSB1bm5lY2Vzc2FyeSBtYWluQXhpc0NvbnRl bnRFeHRlbnQoKSBjYWxsLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5o OiBSZW1vdmUgdW5uZWNlc3NhcnkgcGFyYW1zLgorCiAyMDEyLTA5LTEzICBTaW1vbiBIYXVzbWFu biAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KIAogICAgICAgICBBbm90aGVyIHByb3NwZWN0 aXZlIFF0L1dpbmRvd3MgYnVpbGQgZml4OiBBZGQgbWlzc2luZyBDU3RyaW5nLmggaW5jbHVkZS4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4 IDI4NmFiN2M3YjdlMTI3M2NjMWI5NDdjMjEwOTdiNWRjY2I4OTljMzguLjY5ODk1ZjI1NjVkYTUz NWU5M2Y4NzkyMjg0MTcwOWFmNzg4ZTEzYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNDAzLDEzICs0MDMsMTMgQEAgTGF5b3V0VW5p dCBSZW5kZXJGbGV4aWJsZUJveDo6bWFpbkF4aXNDb250ZW50RXh0ZW50KCkKICAgICByZXR1cm4g Y29udGVudExvZ2ljYWxXaWR0aCgpOwogfQogCi1MYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94 Ojpjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChSZW5kZXJCb3gqIGNoaWxkLCBTaXplVHlw ZSBzaXplVHlwZSwgY29uc3QgTGVuZ3RoJiBzaXplLCBMYXlvdXRVbml0IG1heGltdW1WYWx1ZSkK K0xheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNo aWxkKFJlbmRlckJveCogY2hpbGQsIFNpemVUeXBlIHNpemVUeXBlLCBjb25zdCBMZW5ndGgmIHNp emUpCiB7CiAgICAgLy8gRklYTUU6IFRoaXMgaXMgd3JvbmcgZm9yIG9ydGhvZ29uYWwgZmxvd3Mu IEl0IHNob3VsZCB1c2UgdGhlIGZsZXhib3gncyB3cml0aW5nLW1vZGUsIG5vdCB0aGUgY2hpbGQn cyBpbiBvcmRlcgogICAgIC8vIHRvIGZpZ3VyZSBvdXQgdGhlIGxvZ2ljYWwgaGVpZ2h0L3dpZHRo LgogICAgIGlmIChpc0NvbHVtbkZsb3coKSkKICAgICAgICAgcmV0dXJuIGNoaWxkLT5jb21wdXRl Q29udGVudExvZ2ljYWxIZWlnaHQoc2l6ZVR5cGUsIHNpemUpOwotICAgIHJldHVybiBjaGlsZC0+ YWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyh2YWx1ZUZvckxlbmd0aChz aXplLCBtYXhpbXVtVmFsdWUsIHZpZXcoKSkpOworICAgIHJldHVybiBjaGlsZC0+YWRqdXN0Q29u dGVudEJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyh2YWx1ZUZvckxlbmd0aChzaXplLCBjb250 ZW50TG9naWNhbFdpZHRoKCksIHZpZXcoKSkpOwogfQogCiBXcml0aW5nTW9kZSBSZW5kZXJGbGV4 aWJsZUJveDo6dHJhbnNmb3JtZWRXcml0aW5nTW9kZSgpIGNvbnN0CkBAIC02MDgsNyArNjA4LDcg QEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6cHJlZmVycmVkTWFpbkF4aXNDb250ZW50 RXh0ZW50Rm9yQ2hpbGQoUmVuZGVyQm94KgogICAgICAgICBMYXlvdXRVbml0IG1haW5BeGlzRXh0 ZW50ID0gaGFzT3J0aG9nb25hbEZsb3coY2hpbGQpID8gY2hpbGQtPmxvZ2ljYWxIZWlnaHQoKSA6 IGNoaWxkLT5tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgoKTsKICAgICAgICAgcmV0dXJuIG1haW5B eGlzRXh0ZW50IC0gbWFpbkF4aXNCb3JkZXJBbmRQYWRkaW5nRXh0ZW50Rm9yQ2hpbGQoY2hpbGQp OwogICAgIH0KLSAgICByZXR1cm4gc3RkOjptYXgoTGF5b3V0VW5pdCgwKSwgY29tcHV0ZU1haW5B eGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1haW5PclByZWZlcnJlZFNpemUsIGZsZXhCYXNpcywg bWFpbkF4aXNDb250ZW50RXh0ZW50KCkpKTsKKyAgICByZXR1cm4gc3RkOjptYXgoTGF5b3V0VW5p dCgwKSwgY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1haW5PclByZWZlcnJl ZFNpemUsIGZsZXhCYXNpcykpOwogfQogCiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpj b21wdXRlQXZhaWxhYmxlRnJlZVNwYWNlKExheW91dFVuaXQgcHJlZmVycmVkTWFpbkF4aXNFeHRl bnQpCkBAIC03NTIsMTcgKzc1MiwxNiBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpt YXJnaW5Cb3hBc2NlbnRGb3JDaGlsZChSZW5kZXJCb3gqIGNoaWxkKQogICAgIHJldHVybiBhc2Nl bnQgKyBmbG93QXdhcmVNYXJnaW5CZWZvcmVGb3JDaGlsZChjaGlsZCk7CiB9CiAKLUxheW91dFVu aXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYXJnaW5WYWx1ZShMZW5ndGggbWFyZ2luLCBM YXlvdXRVbml0IGF2YWlsYWJsZVNpemUsIFJlbmRlclZpZXcqIHZpZXcpCitMYXlvdXRVbml0IFJl bmRlckZsZXhpYmxlQm94Ojpjb21wdXRlQ2hpbGRNYXJnaW5WYWx1ZShMZW5ndGggbWFyZ2luLCBS ZW5kZXJWaWV3KiB2aWV3KQogewotICAgIC8vIENTUyBhbHdheXMgY29tcHV0ZXMgcGVyY2VudCBt YXJnaW5zIHdpdGggcmVzcGVjdCB0byB0aGUgY29udGFpbmluZyBibG9jaydzIHdpZHRoLCBldmVu IGZvciBtYXJnaW4tdG9wL21hcmdpbi1ib3R0b20uCi0gICAgaWYgKG1hcmdpbi5pc1BlcmNlbnQo KSkKLSAgICAgICAgYXZhaWxhYmxlU2l6ZSA9IGxvZ2ljYWxXaWR0aCgpOworICAgIC8vIFdoZW4g cmVzb2x2aW5nIHRoZSBtYXJnaW5zLCB3ZSB1c2UgdGhlIGNvbnRlbnQgc2l6ZSBmb3IgcmVzb2x2 aW5nIHBlcmNlbnQgYW5kIGNhbGMgKGZvciBwZXJjZW50cyBpbiBjYWxjIGV4cHJlc3Npb25zKSBt YXJnaW5zLgorICAgIC8vIEZvcnR1bmF0ZWx5LCBwZXJjZW50IG1hcmdpbnMgYXJlIGFsd2F5cyBj b21wdXRlZCB3aXRoIHJlc3BlY3QgdG8gdGhlIGJsb2NrJ3Mgd2lkdGgsIGV2ZW4gZm9yIG1hcmdp bi10b3AgYW5kIG1hcmdpbi1ib3R0b20uCisgICAgTGF5b3V0VW5pdCBhdmFpbGFibGVTaXplID0g Y29udGVudExvZ2ljYWxXaWR0aCgpOwogICAgIHJldHVybiBtaW5pbXVtVmFsdWVGb3JMZW5ndGgo bWFyZ2luLCBhdmFpbGFibGVTaXplLCB2aWV3KTsKIH0KIAogdm9pZCBSZW5kZXJGbGV4aWJsZUJv eDo6Y29tcHV0ZU1haW5BeGlzUHJlZmVycmVkU2l6ZXMoYm9vbCByZWxheW91dENoaWxkcmVuLCBP cmRlckhhc2hTZXQmIG9yZGVyVmFsdWVzKQogewotICAgIExheW91dFVuaXQgZmxleGJveEF2YWls YWJsZUNvbnRlbnRFeHRlbnQgPSBtYWluQXhpc0NvbnRlbnRFeHRlbnQoKTsKICAgICBSZW5kZXJW aWV3KiByZW5kZXJWaWV3ID0gdmlldygpOwogICAgIGZvciAoUmVuZGVyQm94KiBjaGlsZCA9IGZp cnN0Q2hpbGRCb3goKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nQm94KCkpIHsK ICAgICAgICAgb3JkZXJWYWx1ZXMuYWRkKGNoaWxkLT5zdHlsZSgpLT5vcmRlcigpKTsKQEAgLTc4 MiwxMSArNzgxLDExIEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc1By ZWZlcnJlZFNpemVzKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgT3JkCiAgICAgICAgIC8vIEJlZm9y ZSBydW5uaW5nIHRoZSBmbGV4IGFsZ29yaXRobSwgJ2F1dG8nIGhhcyBhIG1hcmdpbiBvZiAwLgog ICAgICAgICAvLyBBbHNvLCBpZiB3ZSdyZSBub3QgYXV0byBzaXppbmcsIHdlIGRvbid0IGRvIGEg bGF5b3V0IHRoYXQgY29tcHV0ZXMgdGhlIHN0YXJ0L2VuZCBtYXJnaW5zLgogICAgICAgICBpZiAo aXNIb3Jpem9udGFsRmxvdygpKSB7Ci0gICAgICAgICAgICBjaGlsZC0+c2V0TWFyZ2luTGVmdChj b21wdXRlTWFyZ2luVmFsdWUoY2hpbGQtPnN0eWxlKCktPm1hcmdpbkxlZnQoKSwgZmxleGJveEF2 YWlsYWJsZUNvbnRlbnRFeHRlbnQsIHJlbmRlclZpZXcpKTsKLSAgICAgICAgICAgIGNoaWxkLT5z ZXRNYXJnaW5SaWdodChjb21wdXRlTWFyZ2luVmFsdWUoY2hpbGQtPnN0eWxlKCktPm1hcmdpblJp Z2h0KCksIGZsZXhib3hBdmFpbGFibGVDb250ZW50RXh0ZW50LCByZW5kZXJWaWV3KSk7CisgICAg ICAgICAgICBjaGlsZC0+c2V0TWFyZ2luTGVmdChjb21wdXRlQ2hpbGRNYXJnaW5WYWx1ZShjaGls ZC0+c3R5bGUoKS0+bWFyZ2luTGVmdCgpLCByZW5kZXJWaWV3KSk7CisgICAgICAgICAgICBjaGls ZC0+c2V0TWFyZ2luUmlnaHQoY29tcHV0ZUNoaWxkTWFyZ2luVmFsdWUoY2hpbGQtPnN0eWxlKCkt Pm1hcmdpblJpZ2h0KCksIHJlbmRlclZpZXcpKTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAg ICAgIGNoaWxkLT5zZXRNYXJnaW5Ub3AoY29tcHV0ZU1hcmdpblZhbHVlKGNoaWxkLT5zdHlsZSgp LT5tYXJnaW5Ub3AoKSwgZmxleGJveEF2YWlsYWJsZUNvbnRlbnRFeHRlbnQsIHJlbmRlclZpZXcp KTsKLSAgICAgICAgICAgIGNoaWxkLT5zZXRNYXJnaW5Cb3R0b20oY29tcHV0ZU1hcmdpblZhbHVl KGNoaWxkLT5zdHlsZSgpLT5tYXJnaW5Cb3R0b20oKSwgZmxleGJveEF2YWlsYWJsZUNvbnRlbnRF eHRlbnQsIHJlbmRlclZpZXcpKTsKKyAgICAgICAgICAgIGNoaWxkLT5zZXRNYXJnaW5Ub3AoY29t cHV0ZUNoaWxkTWFyZ2luVmFsdWUoY2hpbGQtPnN0eWxlKCktPm1hcmdpblRvcCgpLCByZW5kZXJW aWV3KSk7CisgICAgICAgICAgICBjaGlsZC0+c2V0TWFyZ2luQm90dG9tKGNvbXB1dGVDaGlsZE1h cmdpblZhbHVlKGNoaWxkLT5zdHlsZSgpLT5tYXJnaW5Cb3R0b20oKSwgcmVuZGVyVmlldykpOwog ICAgICAgICB9CiAgICAgfQogfQpAQCAtODAyLDEyICs4MDEsMTIgQEAgTGF5b3V0VW5pdCBSZW5k ZXJGbGV4aWJsZUJveDo6bGluZUJyZWFrTGVuZ3RoKCkKICAgICByZXR1cm4gY29tcHV0ZWRWYWx1 ZXMubV9leHRlbnQgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpIC0gc2Nyb2xsYmFy TG9naWNhbEhlaWdodCgpOwogfQogCi1MYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjphZGp1 c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgoUmVuZGVyQm94KiBjaGlsZCwgTGF5b3V0VW5pdCBjaGls ZFNpemUsIExheW91dFVuaXQgZmxleGJveEF2YWlsYWJsZUNvbnRlbnRFeHRlbnQpCitMYXlvdXRV bml0IFJlbmRlckZsZXhpYmxlQm94OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgoUmVuZGVy Qm94KiBjaGlsZCwgTGF5b3V0VW5pdCBjaGlsZFNpemUpCiB7CiAgICAgLy8gRklYTUU6IFN1cHBv cnQgaW50cmluc2ljIG1pbi9tYXggbGVuZ3Rocy4KICAgICBMZW5ndGggbWF4ID0gaXNIb3Jpem9u dGFsRmxvdygpID8gY2hpbGQtPnN0eWxlKCktPm1heFdpZHRoKCkgOiBjaGlsZC0+c3R5bGUoKS0+ bWF4SGVpZ2h0KCk7CiAgICAgaWYgKG1heC5pc1NwZWNpZmllZCgpKSB7Ci0gICAgICAgIExheW91 dFVuaXQgbWF4RXh0ZW50ID0gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1h eFNpemUsIG1heCwgZmxleGJveEF2YWlsYWJsZUNvbnRlbnRFeHRlbnQpOworICAgICAgICBMYXlv dXRVbml0IG1heEV4dGVudCA9IGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNoaWxkLCBN YXhTaXplLCBtYXgpOwogICAgICAgICBpZiAobWF4RXh0ZW50ICE9IC0xICYmIGNoaWxkU2l6ZSA+ IG1heEV4dGVudCkKICAgICAgICAgICAgIGNoaWxkU2l6ZSA9IG1heEV4dGVudDsKICAgICB9CkBA IC04MTUsNyArODE0LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hp bGRTaXplRm9yTWluQW5kTWF4KFJlbmRlckJveCogY2hpbGQsIExheW8KICAgICBMZW5ndGggbWlu ID0gaXNIb3Jpem9udGFsRmxvdygpID8gY2hpbGQtPnN0eWxlKCktPm1pbldpZHRoKCkgOiBjaGls ZC0+c3R5bGUoKS0+bWluSGVpZ2h0KCk7CiAgICAgTGF5b3V0VW5pdCBtaW5FeHRlbnQgPSAwOwog ICAgIGlmIChtaW4uaXNTcGVjaWZpZWQoKSkKLSAgICAgICAgbWluRXh0ZW50ID0gY29tcHV0ZU1h aW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1pblNpemUsIG1pbiwgZmxleGJveEF2YWlsYWJs ZUNvbnRlbnRFeHRlbnQpOworICAgICAgICBtaW5FeHRlbnQgPSBjb21wdXRlTWFpbkF4aXNFeHRl bnRGb3JDaGlsZChjaGlsZCwgTWluU2l6ZSwgbWluKTsKICAgICBlbHNlIGlmIChtaW4uaXNBdXRv KCkpIHsKICAgICAgICAgbWluRXh0ZW50ID0gaGFzT3J0aG9nb25hbEZsb3coY2hpbGQpID8gY2hp bGQtPmxvZ2ljYWxIZWlnaHQoKSA6IGNoaWxkLT5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKTsK ICAgICAgICAgbWluRXh0ZW50IC09IG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZ0V4dGVudEZvckNo aWxkKGNoaWxkKTsKQEAgLTgzMyw3ICs4MzIsNiBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94Ojpj b21wdXRlTmV4dEZsZXhMaW5lKE9yZGVySXRlcmF0b3ImIGl0ZXJhdG9yLCBPcmRlcmVkRmxleAog ICAgIGlmICghaXRlcmF0b3IuY3VycmVudENoaWxkKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAotICAgIExheW91dFVuaXQgZmxleGJveEF2YWlsYWJsZUNvbnRlbnRFeHRlbnQgPSBtYWluQXhp c0NvbnRlbnRFeHRlbnQoKTsKICAgICBMYXlvdXRVbml0IGxpbmVCcmVhayA9IGxpbmVCcmVha0xl bmd0aCgpOwogCiAgICAgZm9yIChSZW5kZXJCb3gqIGNoaWxkID0gaXRlcmF0b3IuY3VycmVudENo aWxkKCk7IGNoaWxkOyBjaGlsZCA9IGl0ZXJhdG9yLm5leHQoKSkgewpAQCAtODUzLDcgKzg1MSw3 IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVOZXh0RmxleExpbmUoT3JkZXJJdGVy YXRvciYgaXRlcmF0b3IsIE9yZGVyZWRGbGV4CiAgICAgICAgIHRvdGFsRmxleEdyb3cgKz0gY2hp bGQtPnN0eWxlKCktPmZsZXhHcm93KCk7CiAgICAgICAgIHRvdGFsV2VpZ2h0ZWRGbGV4U2hyaW5r ICs9IGNoaWxkLT5zdHlsZSgpLT5mbGV4U2hyaW5rKCkgKiBjaGlsZE1haW5BeGlzRXh0ZW50Owog Ci0gICAgICAgIExheW91dFVuaXQgY2hpbGRNaW5NYXhBcHBsaWVkTWFpbkF4aXNFeHRlbnQgPSBh ZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgoY2hpbGQsIGNoaWxkTWFpbkF4aXNFeHRlbnQsIGZs ZXhib3hBdmFpbGFibGVDb250ZW50RXh0ZW50KTsKKyAgICAgICAgTGF5b3V0VW5pdCBjaGlsZE1p bk1heEFwcGxpZWRNYWluQXhpc0V4dGVudCA9IGFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heChj aGlsZCwgY2hpbGRNYWluQXhpc0V4dGVudCk7CiAgICAgICAgIG1pbk1heEFwcGxpZWRNYWluQXhp c0V4dGVudCArPSBjaGlsZE1pbk1heEFwcGxpZWRNYWluQXhpc0V4dGVudCAtIGNoaWxkTWFpbkF4 aXNFeHRlbnQgKyBjaGlsZE1haW5BeGlzTWFyZ2luQm94RXh0ZW50OwogICAgIH0KICAgICByZXR1 cm4gdHJ1ZTsKQEAgLTg3Niw3ICs4NzQsNiBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpmcmVl emVWaW9sYXRpb25zKGNvbnN0IFdURjo6VmVjdG9yPFZpb2xhdGlvbj4mIHZpb2xhdGlvbgogYm9v bCBSZW5kZXJGbGV4aWJsZUJveDo6cmVzb2x2ZUZsZXhpYmxlTGVuZ3RocyhGbGV4U2lnbiBmbGV4 U2lnbiwgY29uc3QgT3JkZXJlZEZsZXhJdGVtTGlzdCYgY2hpbGRyZW4sIExheW91dFVuaXQmIGF2 YWlsYWJsZUZyZWVTcGFjZSwgZmxvYXQmIHRvdGFsRmxleEdyb3csIGZsb2F0JiB0b3RhbFdlaWdo dGVkRmxleFNocmluaywgSW5mbGV4aWJsZUZsZXhJdGVtU2l6ZSYgaW5mbGV4aWJsZUl0ZW1zLCBX VEY6OlZlY3RvcjxMYXlvdXRVbml0PiYgY2hpbGRTaXplcykKIHsKICAgICBjaGlsZFNpemVzLmNs ZWFyKCk7Ci0gICAgTGF5b3V0VW5pdCBmbGV4Ym94QXZhaWxhYmxlQ29udGVudEV4dGVudCA9IG1h aW5BeGlzQ29udGVudEV4dGVudCgpOwogICAgIExheW91dFVuaXQgdG90YWxWaW9sYXRpb24gPSAw OwogICAgIExheW91dFVuaXQgdXNlZEZyZWVTcGFjZSA9IDA7CiAgICAgV1RGOjpWZWN0b3I8Vmlv bGF0aW9uPiBtaW5WaW9sYXRpb25zOwpAQCAtODk4LDcgKzg5NSw3IEBAIGJvb2wgUmVuZGVyRmxl eGlibGVCb3g6OnJlc29sdmVGbGV4aWJsZUxlbmd0aHMoRmxleFNpZ24gZmxleFNpZ24sIGNvbnN0 IE9yZGVyZWRGCiAgICAgICAgICAgICBlbHNlIGlmIChhdmFpbGFibGVGcmVlU3BhY2UgPCAwICYm IHRvdGFsV2VpZ2h0ZWRGbGV4U2hyaW5rID4gMCAmJiBmbGV4U2lnbiA9PSBOZWdhdGl2ZUZsZXhp YmlsaXR5ICYmIGlzZmluaXRlKHRvdGFsV2VpZ2h0ZWRGbGV4U2hyaW5rKSkKICAgICAgICAgICAg ICAgICBjaGlsZFNpemUgKz0gcm91bmRlZExheW91dFVuaXQoYXZhaWxhYmxlRnJlZVNwYWNlICog Y2hpbGQtPnN0eWxlKCktPmZsZXhTaHJpbmsoKSAqIHByZWZlcnJlZENoaWxkU2l6ZSAvIHRvdGFs V2VpZ2h0ZWRGbGV4U2hyaW5rKTsKIAotICAgICAgICAgICAgTGF5b3V0VW5pdCBhZGp1c3RlZENo aWxkU2l6ZSA9IGFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heChjaGlsZCwgY2hpbGRTaXplLCBm bGV4Ym94QXZhaWxhYmxlQ29udGVudEV4dGVudCk7CisgICAgICAgICAgICBMYXlvdXRVbml0IGFk anVzdGVkQ2hpbGRTaXplID0gYWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KGNoaWxkLCBjaGls ZFNpemUpOwogICAgICAgICAgICAgY2hpbGRTaXplcy5hcHBlbmQoYWRqdXN0ZWRDaGlsZFNpemUp OwogICAgICAgICAgICAgdXNlZEZyZWVTcGFjZSArPSBhZGp1c3RlZENoaWxkU2l6ZSAtIHByZWZl cnJlZENoaWxkU2l6ZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckZsZXhpYmxlQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGli bGVCb3guaAppbmRleCBkNDE4Y2U4NGM0ZWVjNTcyZjUzZTkzMGMzNjRjYWUyYzA5ODY4ZTU5Li5j OTUxMDVmNjNjZGRhNzJmMTY5Nzk5NThlNTE4YTIyZTgwNGFmMzY5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaApAQCAtODYsNyArODYsNyBAQCBwcml2 YXRlOgogICAgIExheW91dFVuaXQgbWFpbkF4aXNFeHRlbnQoKSBjb25zdDsKICAgICBMYXlvdXRV bml0IGNyb3NzQXhpc0NvbnRlbnRFeHRlbnQoKSBjb25zdDsKICAgICBMYXlvdXRVbml0IG1haW5B eGlzQ29udGVudEV4dGVudCgpOwotICAgIExheW91dFVuaXQgY29tcHV0ZU1haW5BeGlzRXh0ZW50 Rm9yQ2hpbGQoUmVuZGVyQm94KiBjaGlsZCwgU2l6ZVR5cGUsIGNvbnN0IExlbmd0aCYgc2l6ZSwg TGF5b3V0VW5pdCBtYXhpbXVtVmFsdWUpOworICAgIExheW91dFVuaXQgY29tcHV0ZU1haW5BeGlz RXh0ZW50Rm9yQ2hpbGQoUmVuZGVyQm94KiBjaGlsZCwgU2l6ZVR5cGUsIGNvbnN0IExlbmd0aCYg c2l6ZSk7CiAgICAgV3JpdGluZ01vZGUgdHJhbnNmb3JtZWRXcml0aW5nTW9kZSgpIGNvbnN0Owog ICAgIExheW91dFVuaXQgZmxvd0F3YXJlQm9yZGVyU3RhcnQoKSBjb25zdDsKICAgICBMYXlvdXRV bml0IGZsb3dBd2FyZUJvcmRlckVuZCgpIGNvbnN0OwpAQCAtMTIwLDEwICsxMjAsMTAgQEAgcHJp dmF0ZToKICAgICBMYXlvdXRVbml0IGF2YWlsYWJsZUFsaWdubWVudFNwYWNlRm9yQ2hpbGQoTGF5 b3V0VW5pdCBsaW5lQ3Jvc3NBeGlzRXh0ZW50LCBSZW5kZXJCb3gqKTsKICAgICBMYXlvdXRVbml0 IG1hcmdpbkJveEFzY2VudEZvckNoaWxkKFJlbmRlckJveCopOwogCi0gICAgTGF5b3V0VW5pdCBj b21wdXRlTWFyZ2luVmFsdWUoTGVuZ3RoIG1hcmdpbiwgTGF5b3V0VW5pdCBhdmFpbGFibGVTaXpl LCBSZW5kZXJWaWV3Kik7CisgICAgTGF5b3V0VW5pdCBjb21wdXRlQ2hpbGRNYXJnaW5WYWx1ZShM ZW5ndGggbWFyZ2luLCBSZW5kZXJWaWV3Kik7CiAgICAgdm9pZCBjb21wdXRlTWFpbkF4aXNQcmVm ZXJyZWRTaXplcyhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIE9yZGVySGFzaFNldCYpOwogICAgIExh eW91dFVuaXQgbGluZUJyZWFrTGVuZ3RoKCk7Ci0gICAgTGF5b3V0VW5pdCBhZGp1c3RDaGlsZFNp emVGb3JNaW5BbmRNYXgoUmVuZGVyQm94KiwgTGF5b3V0VW5pdCBjaGlsZFNpemUsIExheW91dFVu aXQgZmxleGJveEF2YWlsYWJsZUNvbnRlbnRFeHRlbnQpOworICAgIExheW91dFVuaXQgYWRqdXN0 Q2hpbGRTaXplRm9yTWluQW5kTWF4KFJlbmRlckJveCosIExheW91dFVuaXQgY2hpbGRTaXplKTsK ICAgICBib29sIGNvbXB1dGVOZXh0RmxleExpbmUoT3JkZXJJdGVyYXRvciYsIE9yZGVyZWRGbGV4 SXRlbUxpc3QmIG9yZGVyZWRDaGlsZHJlbiwgTGF5b3V0VW5pdCYgcHJlZmVycmVkTWFpbkF4aXNF eHRlbnQsIGZsb2F0JiB0b3RhbEZsZXhHcm93LCBmbG9hdCYgdG90YWxXZWlnaHRlZEZsZXhTaHJp bmssIExheW91dFVuaXQmIG1pbk1heEFwcGxpZWRNYWluQXhpc0V4dGVudCk7CiAgICAgTGF5b3V0 VW5pdCBjb21wdXRlQXZhaWxhYmxlRnJlZVNwYWNlKExheW91dFVuaXQgcHJlZmVycmVkTWFpbkF4 aXNFeHRlbnQpOwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKaW5kZXggNWE3ODkyZTEzOWU4NDYxYzNkMjM2MTNmZjcxMjZmMDgwYTM5 ZjhiMC4uYjkxODRkZWQwNzMxY2E2ZWFkNzdkYzk2ODk0NDU4ODJjNzc5MTgwMiAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE1IEBACisyMDEyLTA5LTEzICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgRmxleGl0ZW0gbWFyZ2lucyBzaG91bGQgYmUgYmFzZWQgb24gY29udGVudCB3 aWR0aCwgbm90IHdpZHRoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD05NjY3NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZCBhIHRlc3QgY2FzZSB3aGVyZSBjb250ZW50V2lkdGggIT0gd2lkdGguCisKKyAg ICAgICAgKiBjc3MzL2ZsZXhib3gvcGVyY2VudC1tYXJnaW5zLWV4cGVjdGVkLnR4dDoKKyAgICAg ICAgKiBjc3MzL2ZsZXhib3gvcGVyY2VudC1tYXJnaW5zLmh0bWw6CisKIDIwMTItMDktMTMgIExh dXJvIE5ldG8gIDxsYXVyby5uZXRvQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgW1F0XVtXSzJd IGZhc3QvZm9ybXMvYWNjZXNzLWtleS1mb3ItYWxsLWVsZW1lbnRzLmh0bWwgZmFpbHMKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9wZXJjZW50LW1hcmdpbnMtZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L3BlcmNlbnQtbWFyZ2lucy1leHBlY3RlZC50 eHQKaW5kZXggMzhlMDM1MjUxNTVjMWJkMmNkNjQ4NWRlMjM1ZWRiNDJkNTRhZmExZi4uMWY1MTRi NTg1NDU1YjYzMTU1YzNhYmZmMzNjZWNmMmU3NTQ3MjVhNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvY3NzMy9mbGV4Ym94L3BlcmNlbnQtbWFyZ2lucy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvY3NzMy9mbGV4Ym94L3BlcmNlbnQtbWFyZ2lucy1leHBlY3RlZC50eHQKQEAgLTEsMiAr MSwzIEBACiBQQVNTCiBQQVNTCitQQVNTCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2Zs ZXhib3gvcGVyY2VudC1tYXJnaW5zLmh0bWwgYi9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gvcGVy Y2VudC1tYXJnaW5zLmh0bWwKaW5kZXggYzQ1OGFhZGRjYzY4YzRiMTNhM2RmMGZkMjhiZTFiYjlh YWI2ZTUzMC4uYTU1MmEzMjUzNGY1Y2RhNGExOWU1YmIwMzkzODYzNDRjMWViODBiZiAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L3BlcmNlbnQtbWFyZ2lucy5odG1sCisrKyBi L0xheW91dFRlc3RzL2NzczMvZmxleGJveC9wZXJjZW50LW1hcmdpbnMuaHRtbApAQCAtMTYsNCAr MTYsOSBAQCBpZiAod2luZG93LnRlc3RSdW5uZXIpCiAgICAgPGRpdiBzdHlsZT0ibWFyZ2luOiAx MCU7IGJhY2tncm91bmQtY29sb3I6IG9yYW5nZTsgaGVpZ2h0OiA1cHg7IHdpZHRoOiA1cHgiIGRh dGEtZXhwZWN0ZWQtd2lkdGg9NSBkYXRhLWV4cGVjdGVkLWhlaWdodD01PjwvZGl2PgogPC9kaXY+ CiAKKzxkaXYgY2xhc3M9ImZsZXhib3giIHN0eWxlPSJkaXNwbGF5Oi13ZWJraXQtZmxleDsgYmFj a2dyb3VuZC1jb2xvcjogc2FsbW9uOyBoZWlnaHQ6IDMwMHB4OyB3aWR0aDogNDAwcHg7IHBhZGRp bmc6IDEwMHB4OyI+CisgICAgPGRpdiBzdHlsZT0ibWFyZ2luOiAxMCU7IGJhY2tncm91bmQtY29s b3I6IG9yYW5nZTsgaGVpZ2h0OiA1cHg7IC13ZWJraXQtZmxleDogMSA1cHgiIGRhdGEtZXhwZWN0 ZWQtd2lkdGg9MjM1IGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PTU+PC9kaXY+CisgICAgPGRpdiBzdHls ZT0ibWFyZ2luOiAxMCU7IGJhY2tncm91bmQtY29sb3I6IG9yYW5nZTsgaGVpZ2h0OiA1cHg7IHdp ZHRoOiA1cHgiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9NSBkYXRhLWV4cGVjdGVkLWhlaWdodD01Pjwv ZGl2PgorPC9kaXY+CisKIDwvYm9keT4K