148505 2015-08-26 17:48:26 -0700 Update Grid Layout to use fewer magic -1s 2015-08-27 11:04:01 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield commit-queue esprehn+autocc glenn jfernandez kondapallykalyan rego svillar oldest_to_newest 1121131 0 mmaxfield 2015-08-26 17:48:26 -0700 Update Grid Layout to use fewer magic -1s 1121132 1 260010 mmaxfield 2015-08-26 17:50:10 -0700 Created attachment 260010 Patch 1121215 2 260035 mmaxfield 2015-08-26 23:00:52 -0700 Created attachment 260035 Patch 1121252 3 260010 jfernandez 2015-08-27 01:10:44 -0700 Comment on attachment 260010 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=260010&action=review > Source/WebCore/rendering/RenderGrid.cpp:1301 > + ASSERT(child.overrideContainingBlockContentLogicalWidth()); Shouldn't we assert child.overrideContainingBlockContentLogicalHeight() as well ? 1121362 4 mmaxfield 2015-08-27 11:04:01 -0700 Committed r189037: <http://trac.webkit.org/changeset/189037> 260010 2015-08-26 17:50:10 -0700 2015-08-26 23:00:47 -0700 Patch bug-148505-20150826174959.patch text/plain 7064 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5MDA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzUzOTJiY2E5N2E5MzQ5 MzRlYjAyZjQyZTJlZTQ0MmQ1YWEwMDM4Ni4uYjc1NzhlZmIyZTNjODNmMzI2NTU3OTA4YTRjYWU4 ZjE1ZGEyOGY2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE1LTA4LTI2ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKKyAgICAgICAgVXBkYXRlIEdy aWQgTGF5b3V0IHRvIHVzZSBmZXdlciBtYWdpYyAtMXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODUwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFmdGVyIHIxODg4NzMsIHRoZXJlIHdlcmUgc3RpbGwg c29tZSAtMXMgbGVmdCBpbiBHcmlkIExheW91dCBjb2RlLiBUaGlzIHBhdGNoIGNsZWFucyB0aGVt CisgICAgICAgIHVwIGFmdGVyIGNvbnN1bHRpbmcgd2l0aCBKYXZpZXIgRmVybmFuZGV6LgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5nZS4K KworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyQm94Ojpjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JDb250ZW50KToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29udGFpbmluZ0Jsb2NrTG9naWNhbEhlaWdodEZvckNv bnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpwZXJwZW5kaWN1bGFyQ29udGFp bmluZ0Jsb2NrTG9naWNhbEhlaWdodCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6YXBwbHlTdHJldGNoQWxpZ25tZW50 VG9DaGlsZElmTmVlZGVkKToKKworMjAxNS0wOC0yNiAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4 ZmllbGRAYXBwbGUuY29tPgorCiAgICAgICAgIFtDb2NvYV0gUGVyZm9ybWFuY2VUZXN0IExheW91 dC9SZWdpb25zU2hhcGVzLmh0bWwgaXMgZmFpbGluZwogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4NDY0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveC5jcHAKaW5kZXggMzQ2NDVlZTMwZTA3NDkwMDllMWYzM2Y4ODcwYjJiODZhYjJhNjAw Yy4uMWYyZGZkMTU4MDAwMDRkMDA4ZGFjMjhjZWQ1Nzk4MzJjNjBmZDcyNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTE4NzksOCArMTg3OSwxMCBAQCBMYXlvdXRV bml0IFJlbmRlckJveDo6c2hyaW5rTG9naWNhbFdpZHRoVG9Bdm9pZEZsb2F0cyhMYXlvdXRVbml0 IGNoaWxkTWFyZ2luU3RhcgogTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnRhaW5pbmdCbG9ja0xv Z2ljYWxXaWR0aEZvckNvbnRlbnQoKSBjb25zdAogewogI2lmIEVOQUJMRShDU1NfR1JJRF9MQVlP VVQpCi0gICAgaWYgKGhhc092ZXJyaWRlQ29udGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoKCkpCi0g ICAgICAgIHJldHVybiBvdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsV2lkdGgo KS52YWx1ZU9yKC0xKTsKKyAgICBpZiAoaGFzT3ZlcnJpZGVDb250YWluaW5nQmxvY2tMb2dpY2Fs V2lkdGgoKSkgeworICAgICAgICBpZiAoYXV0byBvdmVycmlkZUxvZ2ljYWxXaWR0aCA9IG92ZXJy aWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxXaWR0aCgpKQorICAgICAgICAgICAgcmV0 dXJuIG92ZXJyaWRlTG9naWNhbFdpZHRoLnZhbHVlKCk7CisgICAgfQogI2VuZGlmCiAKICAgICBp ZiAoUmVuZGVyQmxvY2sqIGNiID0gY29udGFpbmluZ0Jsb2NrKCkpCkBAIC0xODkxLDggKzE4OTMs MTAgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0aEZv ckNvbnRlbnQoKSBjb25zdAogTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnRhaW5pbmdCbG9ja0xv Z2ljYWxIZWlnaHRGb3JDb250ZW50KEF2YWlsYWJsZUxvZ2ljYWxIZWlnaHRUeXBlIGhlaWdodFR5 cGUpIGNvbnN0CiB7CiAjaWYgRU5BQkxFKENTU19HUklEX0xBWU9VVCkKLSAgICBpZiAoaGFzT3Zl cnJpZGVDb250YWluaW5nQmxvY2tMb2dpY2FsSGVpZ2h0KCkpCi0gICAgICAgIHJldHVybiBvdmVy cmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsSGVpZ2h0KCkudmFsdWVPcigtMSk7Cisg ICAgaWYgKGhhc092ZXJyaWRlQ29udGFpbmluZ0Jsb2NrTG9naWNhbEhlaWdodCgpKSB7CisgICAg ICAgIGlmIChhdXRvIG92ZXJyaWRlTG9naWNhbEhlaWdodCA9IG92ZXJyaWRlQ29udGFpbmluZ0Js b2NrQ29udGVudExvZ2ljYWxIZWlnaHQoKSkKKyAgICAgICAgICAgIHJldHVybiBvdmVycmlkZUxv Z2ljYWxIZWlnaHQudmFsdWUoKTsKKyAgICB9CiAjZW5kaWYKIAogICAgIGlmIChSZW5kZXJCbG9j ayogY2IgPSBjb250YWluaW5nQmxvY2soKSkKQEAgLTE5MzIsOCArMTkzNiwxMCBAQCBMYXlvdXRV bml0IFJlbmRlckJveDo6Y29udGFpbmluZ0Jsb2NrQXZhaWxhYmxlTGluZVdpZHRoSW5SZWdpb24o UmVuZGVyUmVnaW9uKiByZQogTGF5b3V0VW5pdCBSZW5kZXJCb3g6OnBlcnBlbmRpY3VsYXJDb250 YWluaW5nQmxvY2tMb2dpY2FsSGVpZ2h0KCkgY29uc3QKIHsKICNpZiBFTkFCTEUoQ1NTX0dSSURf TEFZT1VUKQotICAgIGlmIChoYXNPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxIZWlnaHQo KSkKLSAgICAgICAgcmV0dXJuIG92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxI ZWlnaHQoKS52YWx1ZU9yKC0xKTsKKyAgICBpZiAoaGFzT3ZlcnJpZGVDb250YWluaW5nQmxvY2tM b2dpY2FsSGVpZ2h0KCkpIHsKKyAgICAgICAgaWYgKGF1dG8gb3ZlcnJpZGVMb2dpY2FsSGVpZ2h0 ID0gb3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbEhlaWdodCgpKQorICAgICAg ICAgICAgcmV0dXJuIG92ZXJyaWRlTG9naWNhbEhlaWdodC5nZXQoKTsKKyAgICB9CiAjZW5kaWYK IAogICAgIFJlbmRlckJsb2NrKiBjYiA9IGNvbnRhaW5pbmdCbG9jaygpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCmluZGV4IDBmNjg4NGQ1MDJlMzZkYmViZTFmZjE3ZjIy NTg5NzhhNmFkYWE3NjguLmUzODM2NTZmOWE2YzZjZDczMGFiMmNlN2I1N2Q2NjEzZjBkNTFjYzUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTEyOTgsNiArMTI5 OCw4IEBAIExheW91dFVuaXQgUmVuZGVyR3JpZDo6YXZhaWxhYmxlQWxpZ25tZW50U3BhY2VGb3JD aGlsZEJlZm9yZVN0cmV0Y2hpbmcoTGF5b3V0VW5pCiAvLyBGSVhNRTogVGhpcyBsb2dpYyBpcyBz aGFyZWQgYnkgUmVuZGVyRmxleGlibGVCb3gsIHNvIGl0IHNob3VsZCBiZSBtb3ZlZCB0byBSZW5k ZXJCb3guCiB2b2lkIFJlbmRlckdyaWQ6OmFwcGx5U3RyZXRjaEFsaWdubWVudFRvQ2hpbGRJZk5l ZWRlZChSZW5kZXJCb3gmIGNoaWxkKQogeworICAgIEFTU0VSVChjaGlsZC5vdmVycmlkZUNvbnRh aW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsV2lkdGgoKSk7CisKICAgICAvLyBXZSBjbGVhciBib3Ro IHdpZHRoIGFuZCBoZWlnaHQgb3ZlcnJpZGUgdmFsdWVzIGJlY2F1c2Ugd2Ugd2lsbCBkZWNpZGUg bm93IHdoZXRoZXIgdGhleQogICAgIC8vIGFyZSBhbGxvd2VkIG9yIG5vdCwgZXZhbHVhdGluZyB0 aGUgY29uZGl0aW9ucyB3aGljaCBtaWdodCBoYXZlIGNoYW5nZWQgc2luY2UgdGhlIG9sZAogICAg IC8vIHZhbHVlcyB3ZXJlIHNldC4KQEAgLTEzMTAsMTEgKzEzMTIsMTEgQEAgdm9pZCBSZW5kZXJH cmlkOjphcHBseVN0cmV0Y2hBbGlnbm1lbnRUb0NoaWxkSWZOZWVkZWQoUmVuZGVyQm94JiBjaGls ZCkKICAgICBib29sIGFsbG93ZWRUb1N0cmV0Y2hDaGlsZEFsb25nUm93QXhpcyA9IGhhc0F1dG9T aXplSW5Sb3dBeGlzICYmICFjaGlsZFN0eWxlLm1hcmdpblN0YXJ0VXNpbmcoJmdyaWRTdHlsZSku aXNBdXRvKCkgJiYgIWNoaWxkU3R5bGUubWFyZ2luRW5kVXNpbmcoJmdyaWRTdHlsZSkuaXNBdXRv KCk7CiAgICAgaWYgKCFhbGxvd2VkVG9TdHJldGNoQ2hpbGRBbG9uZ1Jvd0F4aXMgfHwgUmVuZGVy U3R5bGU6OnJlc29sdmVKdXN0aWZpY2F0aW9uKGdyaWRTdHlsZSwgY2hpbGRTdHlsZSwgSXRlbVBv c2l0aW9uU3RyZXRjaCkgIT0gSXRlbVBvc2l0aW9uU3RyZXRjaCkgewogICAgICAgICBib29sIGhh c0F1dG9NaW5TaXplSW5Sb3dBeGlzID0gaXNIb3Jpem9udGFsTW9kZSA/IGNoaWxkU3R5bGUubWlu V2lkdGgoKS5pc0F1dG8oKSA6IGNoaWxkU3R5bGUubWluSGVpZ2h0KCkuaXNBdXRvKCk7Ci0gICAg ICAgIGJvb2wgY2FuU2hyaW5rVG9GaXRJblJvd0F4aXNGb3JDaGlsZCA9ICFoYXNBdXRvTWluU2l6 ZUluUm93QXhpcyB8fCAoY2hpbGQub3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNh bFdpZHRoKCkgJiYgY2hpbGQubWluUHJlZmVycmVkTG9naWNhbFdpZHRoKCkgPD0gY2hpbGQub3Zl cnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbFdpZHRoKCkudmFsdWUoKSk7CisgICAg ICAgIGJvb2wgY2FuU2hyaW5rVG9GaXRJblJvd0F4aXNGb3JDaGlsZCA9ICFoYXNBdXRvTWluU2l6 ZUluUm93QXhpcyB8fCBjaGlsZC5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSA8PSBjaGlsZC5v dmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsV2lkdGgoKS52YWx1ZSgpOwogICAg ICAgICAvLyBUT0RPKGxhamF2YSk6IGhvdyB0byBoYW5kbGUgb3J0aG9nb25hbGl0eSBpbiB0aGlz IGNhc2UgPy4KICAgICAgICAgLy8gVE9ETyhsYWphdmEpOiBncmlkIHRyYWNrIHNpemluZyBhbmQg cG9zaXRpb25pbmcgZG8gbm90IHN1cHBvcnQgb3J0aG9nb25hbCBtb2RlcyB5ZXQuCiAgICAgICAg IGlmIChoYXNBdXRvU2l6ZUluUm93QXhpcyAmJiBjYW5TaHJpbmtUb0ZpdEluUm93QXhpc0ZvckNo aWxkKSB7Ci0gICAgICAgICAgICBMYXlvdXRVbml0IGNoaWxkV2lkdGhUb0ZpdENvbnRlbnQgPSBz dGQ6Om1heChzdGQ6Om1pbihjaGlsZC5tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSwgY2hpbGQu b3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbFdpZHRoKCkudmFsdWVPcigtMSkg LSBjaGlsZC5tYXJnaW5Mb2dpY2FsV2lkdGgoKSksIGNoaWxkLm1pblByZWZlcnJlZExvZ2ljYWxX aWR0aCgpKTsKKyAgICAgICAgICAgIExheW91dFVuaXQgY2hpbGRXaWR0aFRvRml0Q29udGVudCA9 IHN0ZDo6bWF4KHN0ZDo6bWluKGNoaWxkLm1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCgpLCBjaGls ZC5vdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsV2lkdGgoKS52YWx1ZSgpIC0g Y2hpbGQubWFyZ2luTG9naWNhbFdpZHRoKCkpLCBjaGlsZC5taW5QcmVmZXJyZWRMb2dpY2FsV2lk dGgoKSk7CiAgICAgICAgICAgICBMYXlvdXRVbml0IGRlc2lyZWRMb2dpY2FsV2lkdGggPSBjaGls ZC5jb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlNaW5NYXgoY2hpbGRXaWR0aFRvRml0Q29udGVudCwg TnVsbG9wdCk7CiAgICAgICAgICAgICBjaGlsZC5zZXRPdmVycmlkZUxvZ2ljYWxDb250ZW50V2lk dGgoZGVzaXJlZExvZ2ljYWxXaWR0aCAtIGNoaWxkLmJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lk dGgoKSk7CiAgICAgICAgICAgICBpZiAoZGVzaXJlZExvZ2ljYWxXaWR0aCAhPSBjaGlsZC5sb2dp Y2FsV2lkdGgoKSkKQEAgLTEzMjgsNyArMTMzMCw3IEBAIHZvaWQgUmVuZGVyR3JpZDo6YXBwbHlT dHJldGNoQWxpZ25tZW50VG9DaGlsZElmTmVlZGVkKFJlbmRlckJveCYgY2hpbGQpCiAgICAgICAg IC8vIFRPRE8gKGxhamF2YSk6IElmIHRoZSBjaGlsZCBoYXMgb3J0aG9nb25hbCBmbG93LCB0aGVu IGl0IGFscmVhZHkgaGFzIGFuIG92ZXJyaWRlIGhlaWdodCBzZXQsIHNvIHVzZSBpdC4KICAgICAg ICAgLy8gVE9ETyAobGFqYXZhKTogZ3JpZCB0cmFjayBzaXppbmcgYW5kIHBvc2l0aW9uaW5nIGRv IG5vdCBzdXBwb3J0IG9ydGhvZ29uYWwgbW9kZXMgeWV0LgogICAgICAgICBpZiAoY2hpbGQuaXNI b3Jpem9udGFsV3JpdGluZ01vZGUoKSA9PSBpc0hvcml6b250YWxNb2RlKSB7Ci0gICAgICAgICAg ICBMYXlvdXRVbml0IHN0cmV0Y2hlZExvZ2ljYWxIZWlnaHQgPSBhdmFpbGFibGVBbGlnbm1lbnRT cGFjZUZvckNoaWxkQmVmb3JlU3RyZXRjaGluZyhjaGlsZC5vdmVycmlkZUNvbnRhaW5pbmdCbG9j a0NvbnRlbnRMb2dpY2FsSGVpZ2h0KCkudmFsdWVPcigtMSksIGNoaWxkKTsKKyAgICAgICAgICAg IExheW91dFVuaXQgc3RyZXRjaGVkTG9naWNhbEhlaWdodCA9IGF2YWlsYWJsZUFsaWdubWVudFNw YWNlRm9yQ2hpbGRCZWZvcmVTdHJldGNoaW5nKGNoaWxkLm92ZXJyaWRlQ29udGFpbmluZ0Jsb2Nr Q29udGVudExvZ2ljYWxIZWlnaHQoKS52YWx1ZSgpLCBjaGlsZCk7CiAgICAgICAgICAgICBMYXlv dXRVbml0IGRlc2lyZWRMb2dpY2FsSGVpZ2h0ID0gY2hpbGQuY29uc3RyYWluTG9naWNhbEhlaWdo dEJ5TWluTWF4KHN0cmV0Y2hlZExvZ2ljYWxIZWlnaHQsIE51bGxvcHQpOwogICAgICAgICAgICAg Y2hpbGQuc2V0T3ZlcnJpZGVMb2dpY2FsQ29udGVudEhlaWdodChkZXNpcmVkTG9naWNhbEhlaWdo dCAtIGNoaWxkLmJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KCkpOwogICAgICAgICAgICAg aWYgKGRlc2lyZWRMb2dpY2FsSGVpZ2h0ICE9IGNoaWxkLmxvZ2ljYWxIZWlnaHQoKSkgewo= 260035 2015-08-26 23:00:52 -0700 2015-08-27 01:11:11 -0700 Patch bug-148505-20150826230041.patch text/plain 6984 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5MDEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzFjY2U5OTM2ZmYzNjIx OTUzMTg2NGNkMDhlNWE0NTk5M2Y1ZDhlZi4uOWE1MDQzMzE0MDBhZWMzYTA5NWIwMzdmZjE5NDM4 OTkzMmRlZjBlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE1LTA4LTI2ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgVXBkYXRlIEdy aWQgTGF5b3V0IHRvIHVzZSBmZXdlciBtYWdpYyAtMXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODUwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFmdGVyIHIxODg4NzMsIHRoZXJlIHdlcmUgc3RpbGwg c29tZSAtMXMgbGVmdCBpbiBHcmlkIExheW91dCBjb2RlLiBUaGlzIHBhdGNoIGNsZWFucyB0aGVt CisgICAgICAgIHVwIGFmdGVyIGNvbnN1bHRpbmcgd2l0aCBKYXZpZXIgRmVybmFuZGV6LgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5nZS4K KworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyQm94Ojpjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JDb250ZW50KToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29udGFpbmluZ0Jsb2NrTG9naWNhbEhlaWdodEZvckNv bnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpwZXJwZW5kaWN1bGFyQ29udGFp bmluZ0Jsb2NrTG9naWNhbEhlaWdodCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6YXBwbHlTdHJldGNoQWxpZ25tZW50 VG9DaGlsZElmTmVlZGVkKToKKwogMjAxNS0wOC0yNiAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBs ZS5jb20+CiAKICAgICAgICAgd2F0Y2hkb2cgbV9kaWRGaXJlIHN0YXRlIGVycm9uZW91c2x5IHJl dGFpbmVkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCAzNDY0NWVl MzBlMDc0OTAwOWUxZjMzZjg4NzBiMmI4NmFiMmE2MDBjLi4wZGQ3MjE3ZjVhZGEwMjNiMjRkYTg0 MjY4MzAyNDFlYzA2NTgwOGFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNw cApAQCAtMTg3OSw4ICsxODc5LDEwIEBAIExheW91dFVuaXQgUmVuZGVyQm94OjpzaHJpbmtMb2dp Y2FsV2lkdGhUb0F2b2lkRmxvYXRzKExheW91dFVuaXQgY2hpbGRNYXJnaW5TdGFyCiBMYXlvdXRV bml0IFJlbmRlckJveDo6Y29udGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoRm9yQ29udGVudCgpIGNv bnN0CiB7CiAjaWYgRU5BQkxFKENTU19HUklEX0xBWU9VVCkKLSAgICBpZiAoaGFzT3ZlcnJpZGVD b250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGgoKSkKLSAgICAgICAgcmV0dXJuIG92ZXJyaWRlQ29u dGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxXaWR0aCgpLnZhbHVlT3IoLTEpOworICAgIGlmICho YXNPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0aCgpKSB7CisgICAgICAgIGlmIChh dXRvIG92ZXJyaWRlTG9naWNhbFdpZHRoID0gb3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50 TG9naWNhbFdpZHRoKCkpCisgICAgICAgICAgICByZXR1cm4gb3ZlcnJpZGVMb2dpY2FsV2lkdGgu dmFsdWUoKTsKKyAgICB9CiAjZW5kaWYKIAogICAgIGlmIChSZW5kZXJCbG9jayogY2IgPSBjb250 YWluaW5nQmxvY2soKSkKQEAgLTE4OTEsOCArMTg5MywxMCBAQCBMYXlvdXRVbml0IFJlbmRlckJv eDo6Y29udGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoRm9yQ29udGVudCgpIGNvbnN0CiBMYXlvdXRV bml0IFJlbmRlckJveDo6Y29udGFpbmluZ0Jsb2NrTG9naWNhbEhlaWdodEZvckNvbnRlbnQoQXZh aWxhYmxlTG9naWNhbEhlaWdodFR5cGUgaGVpZ2h0VHlwZSkgY29uc3QKIHsKICNpZiBFTkFCTEUo Q1NTX0dSSURfTEFZT1VUKQotICAgIGlmIChoYXNPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0xvZ2lj YWxIZWlnaHQoKSkKLSAgICAgICAgcmV0dXJuIG92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVu dExvZ2ljYWxIZWlnaHQoKS52YWx1ZU9yKC0xKTsKKyAgICBpZiAoaGFzT3ZlcnJpZGVDb250YWlu aW5nQmxvY2tMb2dpY2FsSGVpZ2h0KCkpIHsKKyAgICAgICAgaWYgKGF1dG8gb3ZlcnJpZGVMb2dp Y2FsSGVpZ2h0ID0gb3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbEhlaWdodCgp KQorICAgICAgICAgICAgcmV0dXJuIG92ZXJyaWRlTG9naWNhbEhlaWdodC52YWx1ZSgpOworICAg IH0KICNlbmRpZgogCiAgICAgaWYgKFJlbmRlckJsb2NrKiBjYiA9IGNvbnRhaW5pbmdCbG9jaygp KQpAQCAtMTkzMiw4ICsxOTM2LDEwIEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb250YWluaW5n QmxvY2tBdmFpbGFibGVMaW5lV2lkdGhJblJlZ2lvbihSZW5kZXJSZWdpb24qIHJlCiBMYXlvdXRV bml0IFJlbmRlckJveDo6cGVycGVuZGljdWxhckNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxIZWlnaHQo KSBjb25zdAogewogI2lmIEVOQUJMRShDU1NfR1JJRF9MQVlPVVQpCi0gICAgaWYgKGhhc092ZXJy aWRlQ29udGFpbmluZ0Jsb2NrTG9naWNhbEhlaWdodCgpKQotICAgICAgICByZXR1cm4gb3ZlcnJp ZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbEhlaWdodCgpLnZhbHVlT3IoLTEpOworICAg IGlmIChoYXNPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxIZWlnaHQoKSkgeworICAgICAg ICBpZiAoYXV0byBvdmVycmlkZUxvZ2ljYWxIZWlnaHQgPSBvdmVycmlkZUNvbnRhaW5pbmdCbG9j a0NvbnRlbnRMb2dpY2FsSGVpZ2h0KCkpCisgICAgICAgICAgICByZXR1cm4gb3ZlcnJpZGVMb2dp Y2FsSGVpZ2h0LnZhbHVlKCk7CisgICAgfQogI2VuZGlmCiAKICAgICBSZW5kZXJCbG9jayogY2Ig PSBjb250YWluaW5nQmxvY2soKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJHcmlkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNw cAppbmRleCAwZjY4ODRkNTAyZTM2ZGJlYmUxZmYxN2YyMjU4OTc4YTZhZGFhNzY4Li5lMzgzNjU2 ZjlhNmM2Y2Q3MzBhYjJjZTdiNTdkNjYxM2YwZDUxY2M1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckdyaWQuY3BwCkBAIC0xMjk4LDYgKzEyOTgsOCBAQCBMYXlvdXRVbml0IFJlbmRl ckdyaWQ6OmF2YWlsYWJsZUFsaWdubWVudFNwYWNlRm9yQ2hpbGRCZWZvcmVTdHJldGNoaW5nKExh eW91dFVuaQogLy8gRklYTUU6IFRoaXMgbG9naWMgaXMgc2hhcmVkIGJ5IFJlbmRlckZsZXhpYmxl Qm94LCBzbyBpdCBzaG91bGQgYmUgbW92ZWQgdG8gUmVuZGVyQm94Lgogdm9pZCBSZW5kZXJHcmlk OjphcHBseVN0cmV0Y2hBbGlnbm1lbnRUb0NoaWxkSWZOZWVkZWQoUmVuZGVyQm94JiBjaGlsZCkK IHsKKyAgICBBU1NFUlQoY2hpbGQub3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNh bFdpZHRoKCkpOworCiAgICAgLy8gV2UgY2xlYXIgYm90aCB3aWR0aCBhbmQgaGVpZ2h0IG92ZXJy aWRlIHZhbHVlcyBiZWNhdXNlIHdlIHdpbGwgZGVjaWRlIG5vdyB3aGV0aGVyIHRoZXkKICAgICAv LyBhcmUgYWxsb3dlZCBvciBub3QsIGV2YWx1YXRpbmcgdGhlIGNvbmRpdGlvbnMgd2hpY2ggbWln aHQgaGF2ZSBjaGFuZ2VkIHNpbmNlIHRoZSBvbGQKICAgICAvLyB2YWx1ZXMgd2VyZSBzZXQuCkBA IC0xMzEwLDExICsxMzEyLDExIEBAIHZvaWQgUmVuZGVyR3JpZDo6YXBwbHlTdHJldGNoQWxpZ25t ZW50VG9DaGlsZElmTmVlZGVkKFJlbmRlckJveCYgY2hpbGQpCiAgICAgYm9vbCBhbGxvd2VkVG9T dHJldGNoQ2hpbGRBbG9uZ1Jvd0F4aXMgPSBoYXNBdXRvU2l6ZUluUm93QXhpcyAmJiAhY2hpbGRT dHlsZS5tYXJnaW5TdGFydFVzaW5nKCZncmlkU3R5bGUpLmlzQXV0bygpICYmICFjaGlsZFN0eWxl Lm1hcmdpbkVuZFVzaW5nKCZncmlkU3R5bGUpLmlzQXV0bygpOwogICAgIGlmICghYWxsb3dlZFRv U3RyZXRjaENoaWxkQWxvbmdSb3dBeGlzIHx8IFJlbmRlclN0eWxlOjpyZXNvbHZlSnVzdGlmaWNh dGlvbihncmlkU3R5bGUsIGNoaWxkU3R5bGUsIEl0ZW1Qb3NpdGlvblN0cmV0Y2gpICE9IEl0ZW1Q b3NpdGlvblN0cmV0Y2gpIHsKICAgICAgICAgYm9vbCBoYXNBdXRvTWluU2l6ZUluUm93QXhpcyA9 IGlzSG9yaXpvbnRhbE1vZGUgPyBjaGlsZFN0eWxlLm1pbldpZHRoKCkuaXNBdXRvKCkgOiBjaGls ZFN0eWxlLm1pbkhlaWdodCgpLmlzQXV0bygpOwotICAgICAgICBib29sIGNhblNocmlua1RvRml0 SW5Sb3dBeGlzRm9yQ2hpbGQgPSAhaGFzQXV0b01pblNpemVJblJvd0F4aXMgfHwgKGNoaWxkLm92 ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxXaWR0aCgpICYmIGNoaWxkLm1pblBy ZWZlcnJlZExvZ2ljYWxXaWR0aCgpIDw9IGNoaWxkLm92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29u dGVudExvZ2ljYWxXaWR0aCgpLnZhbHVlKCkpOworICAgICAgICBib29sIGNhblNocmlua1RvRml0 SW5Sb3dBeGlzRm9yQ2hpbGQgPSAhaGFzQXV0b01pblNpemVJblJvd0F4aXMgfHwgY2hpbGQubWlu UHJlZmVycmVkTG9naWNhbFdpZHRoKCkgPD0gY2hpbGQub3ZlcnJpZGVDb250YWluaW5nQmxvY2tD b250ZW50TG9naWNhbFdpZHRoKCkudmFsdWUoKTsKICAgICAgICAgLy8gVE9ETyhsYWphdmEpOiBo b3cgdG8gaGFuZGxlIG9ydGhvZ29uYWxpdHkgaW4gdGhpcyBjYXNlID8uCiAgICAgICAgIC8vIFRP RE8obGFqYXZhKTogZ3JpZCB0cmFjayBzaXppbmcgYW5kIHBvc2l0aW9uaW5nIGRvIG5vdCBzdXBw b3J0IG9ydGhvZ29uYWwgbW9kZXMgeWV0LgogICAgICAgICBpZiAoaGFzQXV0b1NpemVJblJvd0F4 aXMgJiYgY2FuU2hyaW5rVG9GaXRJblJvd0F4aXNGb3JDaGlsZCkgewotICAgICAgICAgICAgTGF5 b3V0VW5pdCBjaGlsZFdpZHRoVG9GaXRDb250ZW50ID0gc3RkOjptYXgoc3RkOjptaW4oY2hpbGQu bWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKCksIGNoaWxkLm92ZXJyaWRlQ29udGFpbmluZ0Jsb2Nr Q29udGVudExvZ2ljYWxXaWR0aCgpLnZhbHVlT3IoLTEpIC0gY2hpbGQubWFyZ2luTG9naWNhbFdp ZHRoKCkpLCBjaGlsZC5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSk7CisgICAgICAgICAgICBM YXlvdXRVbml0IGNoaWxkV2lkdGhUb0ZpdENvbnRlbnQgPSBzdGQ6Om1heChzdGQ6Om1pbihjaGls ZC5tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSwgY2hpbGQub3ZlcnJpZGVDb250YWluaW5nQmxv Y2tDb250ZW50TG9naWNhbFdpZHRoKCkudmFsdWUoKSAtIGNoaWxkLm1hcmdpbkxvZ2ljYWxXaWR0 aCgpKSwgY2hpbGQubWluUHJlZmVycmVkTG9naWNhbFdpZHRoKCkpOwogICAgICAgICAgICAgTGF5 b3V0VW5pdCBkZXNpcmVkTG9naWNhbFdpZHRoID0gY2hpbGQuY29uc3RyYWluTG9naWNhbEhlaWdo dEJ5TWluTWF4KGNoaWxkV2lkdGhUb0ZpdENvbnRlbnQsIE51bGxvcHQpOwogICAgICAgICAgICAg Y2hpbGQuc2V0T3ZlcnJpZGVMb2dpY2FsQ29udGVudFdpZHRoKGRlc2lyZWRMb2dpY2FsV2lkdGgg LSBjaGlsZC5ib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCkpOwogICAgICAgICAgICAgaWYg KGRlc2lyZWRMb2dpY2FsV2lkdGggIT0gY2hpbGQubG9naWNhbFdpZHRoKCkpCkBAIC0xMzI4LDcg KzEzMzAsNyBAQCB2b2lkIFJlbmRlckdyaWQ6OmFwcGx5U3RyZXRjaEFsaWdubWVudFRvQ2hpbGRJ Zk5lZWRlZChSZW5kZXJCb3gmIGNoaWxkKQogICAgICAgICAvLyBUT0RPIChsYWphdmEpOiBJZiB0 aGUgY2hpbGQgaGFzIG9ydGhvZ29uYWwgZmxvdywgdGhlbiBpdCBhbHJlYWR5IGhhcyBhbiBvdmVy cmlkZSBoZWlnaHQgc2V0LCBzbyB1c2UgaXQuCiAgICAgICAgIC8vIFRPRE8gKGxhamF2YSk6IGdy aWQgdHJhY2sgc2l6aW5nIGFuZCBwb3NpdGlvbmluZyBkbyBub3Qgc3VwcG9ydCBvcnRob2dvbmFs IG1vZGVzIHlldC4KICAgICAgICAgaWYgKGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkg PT0gaXNIb3Jpem9udGFsTW9kZSkgewotICAgICAgICAgICAgTGF5b3V0VW5pdCBzdHJldGNoZWRM b2dpY2FsSGVpZ2h0ID0gYXZhaWxhYmxlQWxpZ25tZW50U3BhY2VGb3JDaGlsZEJlZm9yZVN0cmV0 Y2hpbmcoY2hpbGQub3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbEhlaWdodCgp LnZhbHVlT3IoLTEpLCBjaGlsZCk7CisgICAgICAgICAgICBMYXlvdXRVbml0IHN0cmV0Y2hlZExv Z2ljYWxIZWlnaHQgPSBhdmFpbGFibGVBbGlnbm1lbnRTcGFjZUZvckNoaWxkQmVmb3JlU3RyZXRj aGluZyhjaGlsZC5vdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsSGVpZ2h0KCku dmFsdWUoKSwgY2hpbGQpOwogICAgICAgICAgICAgTGF5b3V0VW5pdCBkZXNpcmVkTG9naWNhbEhl aWdodCA9IGNoaWxkLmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heChzdHJldGNoZWRMb2dp Y2FsSGVpZ2h0LCBOdWxsb3B0KTsKICAgICAgICAgICAgIGNoaWxkLnNldE92ZXJyaWRlTG9naWNh bENvbnRlbnRIZWlnaHQoZGVzaXJlZExvZ2ljYWxIZWlnaHQgLSBjaGlsZC5ib3JkZXJBbmRQYWRk aW5nTG9naWNhbEhlaWdodCgpKTsKICAgICAgICAgICAgIGlmIChkZXNpcmVkTG9naWNhbEhlaWdo dCAhPSBjaGlsZC5sb2dpY2FsSGVpZ2h0KCkpIHsK