98454 2012-10-04 15:13:44 -0700 Split the intrinsic padding update code out of RenderTableSection::layoutRows 2012-10-04 21:10:19 -0700 1 1 1 Unclassified WebKit Tables 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jchaffraix jchaffraix bdakin eric hyatt webkit.review.bot oldest_to_newest 735054 0 jchaffraix 2012-10-04 15:13:44 -0700 RenderTableSection::layoutRows is very long and it's difficult to see what's going on. The idea of this bug is to split the part about setting the cell's intrinsic padding and move it to RenderTableCell as there is little dependency on RenderTableSection. Patch forthcoming. 735059 1 eric 2012-10-04 15:15:51 -0700 And how! 735076 2 167189 jchaffraix 2012-10-04 15:36:58 -0700 Created attachment 167189 Proposed split. Cleaned up a little layoutRows while touching it. 735259 3 167189 eric 2012-10-04 19:41:13 -0700 Comment on attachment 167189 Proposed split. Cleaned up a little layoutRows while touching it. Fantastic. :) 735289 4 167189 webkit.review.bot 2012-10-04 21:10:15 -0700 Comment on attachment 167189 Proposed split. Cleaned up a little layoutRows while touching it. Clearing flags on attachment: 167189 Committed r130454: <http://trac.webkit.org/changeset/130454> 735290 5 webkit.review.bot 2012-10-04 21:10:19 -0700 All reviewed patches have been landed. Closing bug. 167189 2012-10-04 15:36:58 -0700 2012-10-04 21:10:15 -0700 Proposed split. Cleaned up a little layoutRows while touching it. bug-98454-20121004153607.patch text/plain 9697 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwMzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjZiYzg3OGRiOTZmMjZj OTAxMzFjOTA3ZTVhN2ZhOTM0OTAzNDQyOC4uNjgxMWM2NjRiZjA1OTM4MzE1YjUzYmM1ZDJiNDZi MDFkNGE3ZTBmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEyLTEwLTA0ICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFNwbGl0IHRo ZSBpbnRyaW5zaWMgcGFkZGluZyB1cGRhdGUgY29kZSBvdXQgb2YgUmVuZGVyVGFibGVTZWN0aW9u OjpsYXlvdXRSb3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05ODQ1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFJlbmRlclRhYmxlU2VjdGlvbjo6bGF5b3V0Um93cyBpcyB2ZXJ5IGxvbmcgYW5kIGl0J3Mg ZGlmZmljdWx0IHRvIHNlZSB3aGF0J3MKKyAgICAgICAgZ29pbmcgb24uIFRoaXMgY2hhbmdlIG1v dmVzIHRoZSBpbnRyaW5zaWMgcGFkZGluZyB1cGRhdGUgY29kZSBpbnRvIFJlbmRlclRhYmxlQ2Vs bAorICAgICAgICBmb3IgY2xhcml0eS4gV2hpbGUgYXQgaXQsIGNsZWFuZWQgdXAgYSBiaXQgdGhl IGNvZGUgKHJlbmFtaW5nIHZhcmlhYmxlcywgZnVuY3Rpb25zKS4KKworICAgICAgICBDaGFuZ2Ug Y292ZXJlZCBieSBleGlzdGluZyB0YWJsZSB0ZXN0cy4KKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJUYWJsZUNlbGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGVDZWxsOjpj b21wdXRlSW50cmluc2ljUGFkZGluZyk6CisgICAgICAgIEFkZGVkIHRoaXMgbmV3IGZ1bmN0aW9u IHRoYXQgZG9lcyB0aGUgdXBkYXRlLiBSZW1vdmVkIHRoZSAnZGVmYXVsdCcgY2FzZSwgcmVwbGFj ZWQgYnkKKyAgICAgICAgdGhlIGV4cGxpY2l0IGxhYmVsIEJBU0VMSU5FX01JRERMRS4KKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRhYmxlQ2VsbDo6c2V0SW50cmluc2ljUGFkZGluZ0JlZm9yZSk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUYWJsZUNlbGw6OnNldEludHJpbnNpY1BhZGRpbmdBZnRlcik6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJUYWJsZUNlbGw6OnNldEludHJpbnNpY1BhZGRpbmcpOgorICAgICAg ICBNb3ZlZCB0aG9zZSBzZXR0ZXJzIHRvIHRoZSBwcml2YXRlIHNlY3Rpb24gYXMgd2Ugd2FudCBv dGhlciBjbGFzc2VzCisgICAgICAgIHRvIHVzZSBjb21wdXRlSW50cmluc2ljUGFkZGluZy4KKwor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyVGFibGVTZWN0aW9uOjpsYXlvdXRSb3dzKToKKyAgICAgICAgUmVwbGFjZWQg dGhlIGNvZGUgd2l0aCBhIGNhbGwgdG8gUmVuZGVyVGFibGVDZWxsOjpjb21wdXRlSW50cmluc2lj UGFkZGluZy4KKyAgICAgICAgQWxzbyBtb3ZlZCAyIHZhcmlhYmxlcyBpbiB0aGUgbG9vcCBwZXIg b3VyIGNvZGluZyBzdHlsZS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rp b24uaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlU2VjdGlvbjo6cm93QmFzZWxpbmUp OgorICAgICAgICBSZW5hbWVkIHRvIG1hdGNoIG91ciBjb2Rpbmcgc3R5bGUuCisKIDIwMTItMTAt MDMgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgogCiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODMxMwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlQ2VsbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcAppbmRleCA5NDRhOTBjNzBmMTA0ODBkNmI2MTk5ODBi NjdlODZjMGFmMThkYzU0Li4wYjdhODBkYjEwYWY4Y2Q1ZDE4MTRkZjRiN2JiNDNjZmIwZGQ5OTZk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcApAQCAt MTk4LDYgKzE5OCw0NyBAQCB2b2lkIFJlbmRlclRhYmxlQ2VsbDo6Y29tcHV0ZVByZWZlcnJlZExv Z2ljYWxXaWR0aHMoKQogICAgIH0KIH0KIAordm9pZCBSZW5kZXJUYWJsZUNlbGw6OmNvbXB1dGVJ bnRyaW5zaWNQYWRkaW5nKGludCByb3dIZWlnaHQpCit7CisgICAgaW50IG9sZEludHJpbnNpY1Bh ZGRpbmdCZWZvcmUgPSBpbnRyaW5zaWNQYWRkaW5nQmVmb3JlKCk7CisgICAgaW50IG9sZEludHJp bnNpY1BhZGRpbmdBZnRlciA9IGludHJpbnNpY1BhZGRpbmdBZnRlcigpOworICAgIGludCBsb2dp Y2FsSGVpZ2h0V2l0aG91dEludHJpbnNpY1BhZGRpbmcgPSBwaXhlbFNuYXBwZWRMb2dpY2FsSGVp Z2h0KCkgLSBvbGRJbnRyaW5zaWNQYWRkaW5nQmVmb3JlIC0gb2xkSW50cmluc2ljUGFkZGluZ0Fm dGVyOworCisgICAgaW50IGludHJpbnNpY1BhZGRpbmdCZWZvcmUgPSAwOworICAgIHN3aXRjaCAo c3R5bGUoKS0+dmVydGljYWxBbGlnbigpKSB7CisgICAgY2FzZSBTVUI6CisgICAgY2FzZSBTVVBF UjoKKyAgICBjYXNlIFRFWFRfVE9QOgorICAgIGNhc2UgVEVYVF9CT1RUT006CisgICAgY2FzZSBM RU5HVEg6CisgICAgY2FzZSBCQVNFTElORTogeworICAgICAgICBMYXlvdXRVbml0IGJhc2VsaW5l ID0gY2VsbEJhc2VsaW5lUG9zaXRpb24oKTsKKyAgICAgICAgaWYgKGJhc2VsaW5lID4gYm9yZGVy QmVmb3JlKCkgKyBwYWRkaW5nQmVmb3JlKCkpCisgICAgICAgICAgICBpbnRyaW5zaWNQYWRkaW5n QmVmb3JlID0gc2VjdGlvbigpLT5yb3dCYXNlbGluZShyb3dJbmRleCgpKSAtIChiYXNlbGluZSAt IG9sZEludHJpbnNpY1BhZGRpbmdCZWZvcmUpOworICAgICAgICBicmVhazsKKyAgICB9CisgICAg Y2FzZSBUT1A6CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgTUlERExFOgorICAgICAgICBpbnRy aW5zaWNQYWRkaW5nQmVmb3JlID0gKHJvd0hlaWdodCAtIGxvZ2ljYWxIZWlnaHRXaXRob3V0SW50 cmluc2ljUGFkZGluZykgLyAyOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEJPVFRPTToKKyAg ICAgICAgaW50cmluc2ljUGFkZGluZ0JlZm9yZSA9IHJvd0hlaWdodCAtIGxvZ2ljYWxIZWlnaHRX aXRob3V0SW50cmluc2ljUGFkZGluZzsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBCQVNFTElO RV9NSURETEU6CisgICAgICAgIGJyZWFrOworICAgIH0KKworICAgIGludCBpbnRyaW5zaWNQYWRk aW5nQWZ0ZXIgPSByb3dIZWlnaHQgLSBsb2dpY2FsSGVpZ2h0V2l0aG91dEludHJpbnNpY1BhZGRp bmcgLSBpbnRyaW5zaWNQYWRkaW5nQmVmb3JlOworICAgIHNldEludHJpbnNpY1BhZGRpbmdCZWZv cmUoaW50cmluc2ljUGFkZGluZ0JlZm9yZSk7CisgICAgc2V0SW50cmluc2ljUGFkZGluZ0FmdGVy KGludHJpbnNpY1BhZGRpbmdBZnRlcik7CisKKyAgICAvLyBGSVhNRTogQ2hhbmdpbmcgYW4gaW50 cmluc2ljIHBhZGRpbmcgc2hvdWxkbid0IHRyaWdnZXIgYSByZWxheW91dCBhcyBpdCBvbmx5IHNo aWZ0cyB0aGUgY2VsbCBpbnNpZGUgdGhlIHJvdyBidXQKKyAgICAvLyBkb2Vzbid0IGNoYW5nZSB0 aGUgbG9naWNhbCBoZWlnaHQuCisgICAgaWYgKGludHJpbnNpY1BhZGRpbmdCZWZvcmUgIT0gb2xk SW50cmluc2ljUGFkZGluZ0JlZm9yZSB8fCBpbnRyaW5zaWNQYWRkaW5nQWZ0ZXIgIT0gb2xkSW50 cmluc2ljUGFkZGluZ0FmdGVyKQorICAgICAgICBzZXROZWVkc0xheW91dCh0cnVlLCBNYXJrT25s eVRoaXMpOworfQorCiB2b2lkIFJlbmRlclRhYmxlQ2VsbDo6dXBkYXRlTG9naWNhbFdpZHRoKCkK IHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNl bGwuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuaAppbmRleCA0 NWRiN2FhMTljNzk3ZDcxMjEzOGE4MTI5MmI4YjhhNGY2MTVjMjU3Li5lODc2NDE5ZDRiYWExM2Rk NmFkMjg4ZWRmZmQ4OGUwOGRiOWJiZDgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGFibGVDZWxsLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRhYmxlQ2VsbC5oCkBAIC05OSw5ICs5OSw3IEBAIHB1YmxpYzoKIAogICAgIExheW91dFVu aXQgY2VsbEJhc2VsaW5lUG9zaXRpb24oKSBjb25zdDsKIAotICAgIHZvaWQgc2V0SW50cmluc2lj UGFkZGluZ0JlZm9yZShpbnQgcCkgeyBtX2ludHJpbnNpY1BhZGRpbmdCZWZvcmUgPSBwOyB9Ci0g ICAgdm9pZCBzZXRJbnRyaW5zaWNQYWRkaW5nQWZ0ZXIoaW50IHApIHsgbV9pbnRyaW5zaWNQYWRk aW5nQWZ0ZXIgPSBwOyB9Ci0gICAgdm9pZCBzZXRJbnRyaW5zaWNQYWRkaW5nKGludCBiZWZvcmUs IGludCBhZnRlcikgeyBzZXRJbnRyaW5zaWNQYWRkaW5nQmVmb3JlKGJlZm9yZSk7IHNldEludHJp bnNpY1BhZGRpbmdBZnRlcihhZnRlcik7IH0KKyAgICB2b2lkIGNvbXB1dGVJbnRyaW5zaWNQYWRk aW5nKGludCByb3dIZWlnaHQpOwogICAgIHZvaWQgY2xlYXJJbnRyaW5zaWNQYWRkaW5nKCkgeyBz ZXRJbnRyaW5zaWNQYWRkaW5nKDAsIDApOyB9CiAKICAgICBpbnQgaW50cmluc2ljUGFkZGluZ0Jl Zm9yZSgpIGNvbnN0IHsgcmV0dXJuIG1faW50cmluc2ljUGFkZGluZ0JlZm9yZTsgfQpAQCAtMjEw LDYgKzIwOCwxMCBAQCBwcml2YXRlOgogICAgIGludCBib3JkZXJIYWxmQmVmb3JlKGJvb2wgb3V0 ZXIpIGNvbnN0OwogICAgIGludCBib3JkZXJIYWxmQWZ0ZXIoYm9vbCBvdXRlcikgY29uc3Q7CiAK KyAgICB2b2lkIHNldEludHJpbnNpY1BhZGRpbmdCZWZvcmUoaW50IHApIHsgbV9pbnRyaW5zaWNQ YWRkaW5nQmVmb3JlID0gcDsgfQorICAgIHZvaWQgc2V0SW50cmluc2ljUGFkZGluZ0FmdGVyKGlu dCBwKSB7IG1faW50cmluc2ljUGFkZGluZ0FmdGVyID0gcDsgfQorICAgIHZvaWQgc2V0SW50cmlu c2ljUGFkZGluZyhpbnQgYmVmb3JlLCBpbnQgYWZ0ZXIpIHsgc2V0SW50cmluc2ljUGFkZGluZ0Jl Zm9yZShiZWZvcmUpOyBzZXRJbnRyaW5zaWNQYWRkaW5nQWZ0ZXIoYWZ0ZXIpOyB9CisKICAgICBD b2xsYXBzZWRCb3JkZXJWYWx1ZSBjb2xsYXBzZWRTdGFydEJvcmRlcihJbmNsdWRlQm9yZGVyQ29s b3JPck5vdCA9IEluY2x1ZGVCb3JkZXJDb2xvcikgY29uc3Q7CiAgICAgQ29sbGFwc2VkQm9yZGVy VmFsdWUgY29sbGFwc2VkRW5kQm9yZGVyKEluY2x1ZGVCb3JkZXJDb2xvck9yTm90ID0gSW5jbHVk ZUJvcmRlckNvbG9yKSBjb25zdDsKICAgICBDb2xsYXBzZWRCb3JkZXJWYWx1ZSBjb2xsYXBzZWRC ZWZvcmVCb3JkZXIoSW5jbHVkZUJvcmRlckNvbG9yT3JOb3QgPSBJbmNsdWRlQm9yZGVyQ29sb3Ip IGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxl U2VjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9u LmNwcAppbmRleCBlYjY5NDg5MjE2OTMyZjg4MTJkMzcxNWY5ZWM1MWNmMTU1MTU0YmE4Li42Yzll MzM1NGJiMDczNmFiMjAwMTIzNmJlZGUzNjg1YWM1OTNhZDM4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9uLmNwcApAQCAtNTE2LDggKzUxNiw2IEBA IHZvaWQgUmVuZGVyVGFibGVTZWN0aW9uOjpsYXlvdXRSb3dzKCkKIAogICAgIEFTU0VSVCghbmVl ZHNMYXlvdXQoKSk7CiAKLSAgICBpbnQgckhlaWdodDsKLSAgICB1bnNpZ25lZCByaW5keDsKICAg ICB1bnNpZ25lZCB0b3RhbFJvd3MgPSBtX2dyaWQuc2l6ZSgpOwogCiAgICAgLy8gU2V0IHRoZSB3 aWR0aCBvZiBvdXIgc2VjdGlvbiBub3cuICBUaGUgcm93cyB3aWxsIGFsc28gYmUgdGhpcyB3aWR0 aC4KQEAgLTU0OSw5ICs1NDcsOSBAQCB2b2lkIFJlbmRlclRhYmxlU2VjdGlvbjo6bGF5b3V0Um93 cygpCiAgICAgICAgICAgICBpZiAoIWNlbGwgfHwgY3MuaW5Db2xTcGFuKQogICAgICAgICAgICAg ICAgIGNvbnRpbnVlOwogCi0gICAgICAgICAgICByaW5keCA9IGNlbGwtPnJvd0luZGV4KCk7Ci0g ICAgICAgICAgICBySGVpZ2h0ID0gbV9yb3dQb3NbcmluZHggKyBjZWxsLT5yb3dTcGFuKCldIC0g bV9yb3dQb3NbcmluZHhdIC0gdnNwYWNpbmc7Ci0gICAgICAgICAgICAKKyAgICAgICAgICAgIGlu dCByb3dJbmRleCA9IGNlbGwtPnJvd0luZGV4KCk7CisgICAgICAgICAgICBpbnQgckhlaWdodCA9 IG1fcm93UG9zW3Jvd0luZGV4ICsgY2VsbC0+cm93U3BhbigpXSAtIG1fcm93UG9zW3Jvd0luZGV4 XSAtIHZzcGFjaW5nOworCiAgICAgICAgICAgICAvLyBGb3JjZSBwZXJjZW50IGhlaWdodCBjaGls ZHJlbiB0byBsYXkgdGhlbXNlbHZlcyBvdXQgYWdhaW4uCiAgICAgICAgICAgICAvLyBUaGlzIHdp bGwgY2F1c2UgdGhlc2UgY2hpbGRyZW4gdG8gZ3JvdyB0byBmaWxsIHRoZSBjZWxsLgogICAgICAg ICAgICAgLy8gRklYTUU6IFRoZXJlIGlzIHN0aWxsIG1vcmUgd29yayB0byBkbyBoZXJlIHRvIGZ1 bGx5IG1hdGNoIFdpbklFIChzaG91bGQKQEAgLTYxNiw0NiArNjE0LDEyIEBAIHZvaWQgUmVuZGVy VGFibGVTZWN0aW9uOjpsYXlvdXRSb3dzKCkKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg ICB9CiAKLSAgICAgICAgICAgIGludCBvbGRJbnRyaW5zaWNQYWRkaW5nQmVmb3JlID0gY2VsbC0+ aW50cmluc2ljUGFkZGluZ0JlZm9yZSgpOwotICAgICAgICAgICAgaW50IG9sZEludHJpbnNpY1Bh ZGRpbmdBZnRlciA9IGNlbGwtPmludHJpbnNpY1BhZGRpbmdBZnRlcigpOwotICAgICAgICAgICAg aW50IGxvZ2ljYWxIZWlnaHRXaXRob3V0SW50cmluc2ljUGFkZGluZyA9IGNlbGwtPnBpeGVsU25h cHBlZExvZ2ljYWxIZWlnaHQoKSAtIG9sZEludHJpbnNpY1BhZGRpbmdCZWZvcmUgLSBvbGRJbnRy aW5zaWNQYWRkaW5nQWZ0ZXI7Ci0KLSAgICAgICAgICAgIGludCBpbnRyaW5zaWNQYWRkaW5nQmVm b3JlID0gMDsKLSAgICAgICAgICAgIHN3aXRjaCAoY2VsbC0+c3R5bGUoKS0+dmVydGljYWxBbGln bigpKSB7Ci0gICAgICAgICAgICAgICAgY2FzZSBTVUI6Ci0gICAgICAgICAgICAgICAgY2FzZSBT VVBFUjoKLSAgICAgICAgICAgICAgICBjYXNlIFRFWFRfVE9QOgotICAgICAgICAgICAgICAgIGNh c2UgVEVYVF9CT1RUT006Ci0gICAgICAgICAgICAgICAgY2FzZSBMRU5HVEg6Ci0gICAgICAgICAg ICAgICAgY2FzZSBCQVNFTElORTogewotICAgICAgICAgICAgICAgICAgICBMYXlvdXRVbml0IGJh c2VsaW5lID0gY2VsbC0+Y2VsbEJhc2VsaW5lUG9zaXRpb24oKTsKLSAgICAgICAgICAgICAgICAg ICAgaWYgKGJhc2VsaW5lID4gY2VsbC0+Ym9yZGVyQmVmb3JlKCkgKyBjZWxsLT5wYWRkaW5nQmVm b3JlKCkpCi0gICAgICAgICAgICAgICAgICAgICAgICBpbnRyaW5zaWNQYWRkaW5nQmVmb3JlID0g Z2V0QmFzZWxpbmUoY2VsbC0+cm93SW5kZXgoKSkgLSAoYmFzZWxpbmUgLSBvbGRJbnRyaW5zaWNQ YWRkaW5nQmVmb3JlKTsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAg ICAgfQotICAgICAgICAgICAgICAgIGNhc2UgVE9QOgotICAgICAgICAgICAgICAgICAgICBicmVh azsKLSAgICAgICAgICAgICAgICBjYXNlIE1JRERMRToKLSAgICAgICAgICAgICAgICAgICAgaW50 cmluc2ljUGFkZGluZ0JlZm9yZSA9IChySGVpZ2h0IC0gbG9naWNhbEhlaWdodFdpdGhvdXRJbnRy aW5zaWNQYWRkaW5nKSAvIDI7Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAg ICAgICAgIGNhc2UgQk9UVE9NOgotICAgICAgICAgICAgICAgICAgICBpbnRyaW5zaWNQYWRkaW5n QmVmb3JlID0gckhlaWdodCAtIGxvZ2ljYWxIZWlnaHRXaXRob3V0SW50cmluc2ljUGFkZGluZzsK LSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgZGVmYXVsdDoKLSAg ICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICAKLSAg ICAgICAgICAgIGludCBpbnRyaW5zaWNQYWRkaW5nQWZ0ZXIgPSBySGVpZ2h0IC0gbG9naWNhbEhl aWdodFdpdGhvdXRJbnRyaW5zaWNQYWRkaW5nIC0gaW50cmluc2ljUGFkZGluZ0JlZm9yZTsKLSAg ICAgICAgICAgIGNlbGwtPnNldEludHJpbnNpY1BhZGRpbmdCZWZvcmUoaW50cmluc2ljUGFkZGlu Z0JlZm9yZSk7Ci0gICAgICAgICAgICBjZWxsLT5zZXRJbnRyaW5zaWNQYWRkaW5nQWZ0ZXIoaW50 cmluc2ljUGFkZGluZ0FmdGVyKTsKKyAgICAgICAgICAgIGNlbGwtPmNvbXB1dGVJbnRyaW5zaWNQ YWRkaW5nKHJIZWlnaHQpOwogCiAgICAgICAgICAgICBMYXlvdXRSZWN0IG9sZENlbGxSZWN0ID0g Y2VsbC0+ZnJhbWVSZWN0KCk7CiAKICAgICAgICAgICAgIHNldExvZ2ljYWxQb3NpdGlvbkZvckNl bGwoY2VsbCwgYyk7CiAKLSAgICAgICAgICAgIGlmIChpbnRyaW5zaWNQYWRkaW5nQmVmb3JlICE9 IG9sZEludHJpbnNpY1BhZGRpbmdCZWZvcmUgfHwgaW50cmluc2ljUGFkZGluZ0FmdGVyICE9IG9s ZEludHJpbnNpY1BhZGRpbmdBZnRlcikKLSAgICAgICAgICAgICAgICBjZWxsLT5zZXROZWVkc0xh eW91dCh0cnVlLCBNYXJrT25seVRoaXMpOwotCiAgICAgICAgICAgICBpZiAoIWNlbGwtPm5lZWRz TGF5b3V0KCkgJiYgdmlldygpLT5sYXlvdXRTdGF0ZSgpLT5wYWdlTG9naWNhbEhlaWdodCgpICYm IHZpZXcoKS0+bGF5b3V0U3RhdGUoKS0+cGFnZUxvZ2ljYWxPZmZzZXQoY2VsbCwgY2VsbC0+bG9n aWNhbFRvcCgpKSAhPSBjZWxsLT5wYWdlTG9naWNhbE9mZnNldCgpKQogICAgICAgICAgICAgICAg IGNlbGwtPnNldENoaWxkTmVlZHNMYXlvdXQodHJ1ZSwgTWFya09ubHlUaGlzKTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5oCmluZGV4IGNlMjFhOWVm MTI5NzJkY2JmZGM0MGEyYmRmZjUyYzZiMzk5ZDg3YTguLjAyYTUyOTk5NDQ2MDljOWY5N2QyODI1 YWM4OGYxN2FlOGM3YzIyMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUYWJsZVNlY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGFibGVTZWN0aW9uLmgKQEAgLTE3Myw3ICsxNzMsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBuZWVk c0NlbGxSZWNhbGMoKSBjb25zdCB7IHJldHVybiBtX25lZWRzQ2VsbFJlY2FsYzsgfQogICAgIHZv aWQgc2V0TmVlZHNDZWxsUmVjYWxjKCk7CiAKLSAgICBMYXlvdXRVbml0IGdldEJhc2VsaW5lKHVu c2lnbmVkIHJvdykgeyByZXR1cm4gbV9ncmlkW3Jvd10uYmFzZWxpbmU7IH0KKyAgICBMYXlvdXRV bml0IHJvd0Jhc2VsaW5lKHVuc2lnbmVkIHJvdykgeyByZXR1cm4gbV9ncmlkW3Jvd10uYmFzZWxp bmU7IH0KIAogICAgIHZvaWQgcm93TG9naWNhbEhlaWdodENoYW5nZWQodW5zaWduZWQgcm93SW5k ZXgpOwogCg==