46125 2010-09-20 14:53:22 -0700 Convert table cell intrinsic padding to be logical instead of hardcoded. 2010-09-21 08:48:21 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 46123 1 hyatt hyatt abarth eric webkit.review.bot oldest_to_newest 281833 0 hyatt 2010-09-20 14:53:22 -0700 Table cell intrinsic padding needs to be converted to be logical instead of physical. This is complicated, since the intrinsic padding isn't based off the cell's block-flow/direction but off the table row's. 282128 1 68197 hyatt 2010-09-21 00:26:33 -0700 Created attachment 68197 Patch 282129 2 68197 mitz 2010-09-21 00:31:34 -0700 Comment on attachment 68197 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=68197&action=review > WebCore/ChangeLog:7 > + to before/after-based. That way a vertical text table can have intrinsic padding built into the left/right > + direction (and this allows the base class logical padding methods on RenderBoxModelObject to safe to use). Missing a word here. 282144 3 webkit.review.bot 2010-09-21 01:22:27 -0700 http://trac.webkit.org/changeset/67930 might have broken Qt Linux Release The following changes are on the blame list: http://trac.webkit.org/changeset/67929 http://trac.webkit.org/changeset/67930 282157 4 abarth 2010-09-21 02:25:19 -0700 http://build.webkit.org/results/Leopard%20Intel%20Release%20(Tests)/r67931%20(21481)/results.html Tests where results did not match expected results: svg/W3C-SVG-1.1/filters-image-01-b.svg expected actual diff pretty diff svg/batik/filters/filterRegions.svg expected actual diff pretty diff svg/batik/paints/gradientLimit.svg expected actual diff pretty diff svg/custom/empty-merge.svg expected actual diff pretty diff svg/custom/feDisplacementMap-01.svg expected actual diff pretty diff svg/custom/image-with-transform-clip-filter.svg expected actual diff pretty diff svg/custom/mask-with-default-value.svg expected actual diff pretty diff svg/custom/recursive-filter.svg expected actual diff pretty diff svg/custom/resource-invalidate-on-target-update.svg expected actual diff pretty diff svg/filters/feColorMatrix-values.svg expected actual diff pretty diff svg/filters/feOffset.svg expected actual diff pretty diff svg/filters/filterRes.svg expected actual diff pretty diff svg/filters/filteredImage.svg expected actual diff pretty diff svg/filters/parent-children-with-same-filter.svg expected actual diff pretty diff svg/filters/subRegion-in-userSpace.svg expected actual diff pretty diff svg/filters/subRegion-one-effect.svg expected actual diff pretty diff svg/filters/subRegion-two-effects.svg expected actual diff pretty diff 282158 5 abarth 2010-09-21 02:26:17 -0700 Looks like it might be fixed in http://trac.webkit.org/changeset/67933 282160 6 abarth 2010-09-21 02:27:41 -0700 Actually, looks like the problem was caused by https://bugs.webkit.org/show_bug.cgi?id=45612. Sorry for the noise. 282327 7 hyatt 2010-09-21 08:48:21 -0700 Fixed. 68197 2010-09-21 00:26:33 -0700 2010-09-21 00:31:34 -0700 Patch patch.txt text/plain 11305 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NzkyOCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzIgQEAKKzIwMTAtMDktMjEgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjEyNSwgY29udmVydCB0YWJsZSBj ZWxsIGludHJpbnNpYyBwYWRkaW5nIGZyb20gdG9wL2JvdHRvbS1iYXNlZAorICAgICAgICB0byBi ZWZvcmUvYWZ0ZXItYmFzZWQuICBUaGF0IHdheSBhIHZlcnRpY2FsIHRleHQgdGFibGUgY2FuIGhh dmUgaW50cmluc2ljIHBhZGRpbmcgYnVpbHQgaW50byB0aGUgbGVmdC9yaWdodAorICAgICAgICBk aXJlY3Rpb24gKGFuZCB0aGlzIGFsbG93cyB0aGUgYmFzZSBjbGFzcyBsb2dpY2FsIHBhZGRpbmcg bWV0aG9kcyBvbiBSZW5kZXJCb3hNb2RlbE9iamVjdCB0byBzYWZlIHRvIHVzZSkuCisKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRhYmxlQ2VsbDo6UmVuZGVyVGFibGVDZWxsKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRhYmxlQ2VsbDo6cGFkZGluZ1RvcCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZUNl bGw6OnBhZGRpbmdCb3R0b20pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGVDZWxsOjpw YWRkaW5nTGVmdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZUNlbGw6OnBhZGRpbmdS aWdodCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZUNlbGw6OnBhZGRpbmdCZWZvcmUp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGVDZWxsOjpwYWRkaW5nQWZ0ZXIpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRhYmxlQ2VsbDo6c2V0SW50cmluc2ljUGFkZGluZ0JlZm9yZSk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUYWJsZUNlbGw6OnNldEludHJpbnNpY1BhZGRpbmdBZnRlcik6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJUYWJsZUNlbGw6OnNldEludHJpbnNpY1BhZGRpbmcpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGFibGVDZWxsOjppbnRyaW5zaWNQYWRkaW5nQmVmb3JlKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlQ2VsbDo6aW50cmluc2ljUGFkZGluZ0FmdGVyKToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9uLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclRhYmxlU2VjdGlvbjo6Y2FsY1Jvd0hlaWdodCk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUYWJsZVNlY3Rpb246OmxheW91dFJvd3MpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJUcmVlQXNUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVBc1Rl eHQ6OndyaXRlUmVuZGVyT2JqZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OndyaXRlVGV4dFJ1bik6 CisKIDIwMTAtMDktMjAgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KSW5kZXg6IFdlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRhYmxlQ2VsbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGFibGVDZWxsLmNwcAkocmV2aXNpb24gNjc5MDMpCisrKyBXZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUYWJsZUNlbGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NSw4ICs0NSw4IEBAIFJl bmRlclRhYmxlQ2VsbDo6UmVuZGVyVGFibGVDZWxsKE5vZGUqIG4KICAgICAsIG1fY29sdW1uKC0x KQogICAgICwgbV9yb3dTcGFuKDEpCiAgICAgLCBtX2NvbHVtblNwYW4oMSkKLSAgICAsIG1faW50 cmluc2ljUGFkZGluZ1RvcCgwKQotICAgICwgbV9pbnRyaW5zaWNQYWRkaW5nQm90dG9tKDApCisg ICAgLCBtX2ludHJpbnNpY1BhZGRpbmdCZWZvcmUoMCkKKyAgICAsIG1faW50cmluc2ljUGFkZGlu Z0FmdGVyKDApCiAgICAgLCBtX3BlcmNlbnRhZ2VIZWlnaHQoMCkKIHsKICAgICB1cGRhdGVGcm9t RWxlbWVudCgpOwpAQCAtMTY0LDEyICsxNjQsNTEgQEAgdm9pZCBSZW5kZXJUYWJsZUNlbGw6Omxh eW91dCgpCiAKIGludCBSZW5kZXJUYWJsZUNlbGw6OnBhZGRpbmdUb3AoYm9vbCBpbmNsdWRlSW50 cmluc2ljUGFkZGluZykgY29uc3QKIHsKLSAgICByZXR1cm4gUmVuZGVyQmxvY2s6OnBhZGRpbmdU b3AoKSArIChpbmNsdWRlSW50cmluc2ljUGFkZGluZyA/IGludHJpbnNpY1BhZGRpbmdUb3AoKSA6 IDApOworICAgIGludCByZXN1bHQgPSBSZW5kZXJCbG9jazo6cGFkZGluZ1RvcCgpOworICAgIGlm ICghaW5jbHVkZUludHJpbnNpY1BhZGRpbmcgfHwgIXN0eWxlKCktPmlzVmVydGljYWxCbG9ja0Zs b3coKSkKKyAgICAgICAgcmV0dXJuIHJlc3VsdDsKKyAgICByZXR1cm4gcmVzdWx0ICsgKHN0eWxl KCktPmJsb2NrRmxvdygpID09IFRvcFRvQm90dG9tQmxvY2tGbG93ID8gaW50cmluc2ljUGFkZGlu Z0JlZm9yZSgpIDogaW50cmluc2ljUGFkZGluZ0FmdGVyKCkpOwogfQogCiBpbnQgUmVuZGVyVGFi bGVDZWxsOjpwYWRkaW5nQm90dG9tKGJvb2wgaW5jbHVkZUludHJpbnNpY1BhZGRpbmcpIGNvbnN0 CiB7Ci0gICAgcmV0dXJuIFJlbmRlckJsb2NrOjpwYWRkaW5nQm90dG9tKCkgKyAoaW5jbHVkZUlu dHJpbnNpY1BhZGRpbmcgPyBpbnRyaW5zaWNQYWRkaW5nQm90dG9tKCkgOiAwKTsKKyAgICBpbnQg cmVzdWx0ID0gUmVuZGVyQmxvY2s6OnBhZGRpbmdCb3R0b20oKTsKKyAgICBpZiAoIWluY2x1ZGVJ bnRyaW5zaWNQYWRkaW5nIHx8ICFzdHlsZSgpLT5pc1ZlcnRpY2FsQmxvY2tGbG93KCkpCisgICAg ICAgIHJldHVybiByZXN1bHQ7CisgICAgcmV0dXJuIHJlc3VsdCArIChzdHlsZSgpLT5ibG9ja0Zs b3coKSA9PSBUb3BUb0JvdHRvbUJsb2NrRmxvdyA/IGludHJpbnNpY1BhZGRpbmdBZnRlcigpIDog aW50cmluc2ljUGFkZGluZ0JlZm9yZSgpKTsKK30KKworaW50IFJlbmRlclRhYmxlQ2VsbDo6cGFk ZGluZ0xlZnQoYm9vbCBpbmNsdWRlSW50cmluc2ljUGFkZGluZykgY29uc3QKK3sKKyAgICBpbnQg cmVzdWx0ID0gUmVuZGVyQmxvY2s6OnBhZGRpbmdMZWZ0KCk7CisgICAgaWYgKCFpbmNsdWRlSW50 cmluc2ljUGFkZGluZyB8fCBzdHlsZSgpLT5pc1ZlcnRpY2FsQmxvY2tGbG93KCkpCisgICAgICAg IHJldHVybiByZXN1bHQ7CisgICAgcmV0dXJuIHJlc3VsdCArIChzdHlsZSgpLT5ibG9ja0Zsb3co KSA9PSBMZWZ0VG9SaWdodEJsb2NrRmxvdyA/IGludHJpbnNpY1BhZGRpbmdCZWZvcmUoKSA6IGlu dHJpbnNpY1BhZGRpbmdBZnRlcigpKTsKKyAgICAKK30KKworaW50IFJlbmRlclRhYmxlQ2VsbDo6 cGFkZGluZ1JpZ2h0KGJvb2wgaW5jbHVkZUludHJpbnNpY1BhZGRpbmcpIGNvbnN0Cit7ICAgCisg ICAgaW50IHJlc3VsdCA9IFJlbmRlckJsb2NrOjpwYWRkaW5nUmlnaHQoKTsKKyAgICBpZiAoIWlu Y2x1ZGVJbnRyaW5zaWNQYWRkaW5nIHx8IHN0eWxlKCktPmlzVmVydGljYWxCbG9ja0Zsb3coKSkK KyAgICAgICAgcmV0dXJuIHJlc3VsdDsKKyAgICByZXR1cm4gcmVzdWx0ICsgKHN0eWxlKCktPmJs b2NrRmxvdygpID09IExlZnRUb1JpZ2h0QmxvY2tGbG93ID8gaW50cmluc2ljUGFkZGluZ0FmdGVy KCkgOiBpbnRyaW5zaWNQYWRkaW5nQmVmb3JlKCkpOworfQorCitpbnQgUmVuZGVyVGFibGVDZWxs OjpwYWRkaW5nQmVmb3JlKGJvb2wgaW5jbHVkZUludHJpbnNpY1BhZGRpbmcpIGNvbnN0Cit7Cisg ICAgaW50IHJlc3VsdCA9IFJlbmRlckJsb2NrOjpwYWRkaW5nQmVmb3JlKCk7CisgICAgaWYgKCFp bmNsdWRlSW50cmluc2ljUGFkZGluZykKKyAgICAgICAgcmV0dXJuIHJlc3VsdDsKKyAgICByZXR1 cm4gcmVzdWx0ICsgaW50cmluc2ljUGFkZGluZ0JlZm9yZSgpOworfQorCitpbnQgUmVuZGVyVGFi bGVDZWxsOjpwYWRkaW5nQWZ0ZXIoYm9vbCBpbmNsdWRlSW50cmluc2ljUGFkZGluZykgY29uc3QK K3sKKyAgICBpbnQgcmVzdWx0ID0gUmVuZGVyQmxvY2s6OnBhZGRpbmdBZnRlcigpOworICAgIGlm ICghaW5jbHVkZUludHJpbnNpY1BhZGRpbmcpCisgICAgICAgIHJldHVybiByZXN1bHQ7CisgICAg cmV0dXJuIHJlc3VsdCArIGludHJpbnNpY1BhZGRpbmdBZnRlcigpOwogfQogCiB2b2lkIFJlbmRl clRhYmxlQ2VsbDo6c2V0T3ZlcnJpZGVTaXplKGludCBzaXplKQpJbmRleDogV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGFibGVDZWxsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGFibGVDZWxsLmgJKHJldmlzaW9uIDY3OTAzKQorKysgV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGFibGVDZWxsLmgJKHdvcmtpbmcgY29weSkKQEAgLTg2LDE2ICs4NiwyNCBAQCBwdWJs aWM6CiAKICAgICB2aXJ0dWFsIGludCBiYXNlbGluZVBvc2l0aW9uKGJvb2wgZmlyc3RMaW5lID0g ZmFsc2UsIGJvb2wgaXNSb290TGluZUJveCA9IGZhbHNlKSBjb25zdDsKIAotICAgIHZvaWQgc2V0 SW50cmluc2ljUGFkZGluZ1RvcChpbnQgcCkgeyBtX2ludHJpbnNpY1BhZGRpbmdUb3AgPSBwOyB9 Ci0gICAgdm9pZCBzZXRJbnRyaW5zaWNQYWRkaW5nQm90dG9tKGludCBwKSB7IG1faW50cmluc2lj UGFkZGluZ0JvdHRvbSA9IHA7IH0KLSAgICB2b2lkIHNldEludHJpbnNpY1BhZGRpbmcoaW50IHRv cCwgaW50IGJvdHRvbSkgeyBzZXRJbnRyaW5zaWNQYWRkaW5nVG9wKHRvcCk7IHNldEludHJpbnNp Y1BhZGRpbmdCb3R0b20oYm90dG9tKTsgfQorICAgIHZvaWQgc2V0SW50cmluc2ljUGFkZGluZ0Jl Zm9yZShpbnQgcCkgeyBtX2ludHJpbnNpY1BhZGRpbmdCZWZvcmUgPSBwOyB9CisgICAgdm9pZCBz ZXRJbnRyaW5zaWNQYWRkaW5nQWZ0ZXIoaW50IHApIHsgbV9pbnRyaW5zaWNQYWRkaW5nQWZ0ZXIg PSBwOyB9CisgICAgdm9pZCBzZXRJbnRyaW5zaWNQYWRkaW5nKGludCBiZWZvcmUsIGludCBhZnRl cikgeyBzZXRJbnRyaW5zaWNQYWRkaW5nQmVmb3JlKGJlZm9yZSk7IHNldEludHJpbnNpY1BhZGRp bmdBZnRlcihhZnRlcik7IH0KICAgICB2b2lkIGNsZWFySW50cmluc2ljUGFkZGluZygpIHsgc2V0 SW50cmluc2ljUGFkZGluZygwLCAwKTsgfQogCi0gICAgaW50IGludHJpbnNpY1BhZGRpbmdUb3Ao KSBjb25zdCB7IHJldHVybiBtX2ludHJpbnNpY1BhZGRpbmdUb3A7IH0KLSAgICBpbnQgaW50cmlu c2ljUGFkZGluZ0JvdHRvbSgpIGNvbnN0IHsgcmV0dXJuIG1faW50cmluc2ljUGFkZGluZ0JvdHRv bTsgfQorICAgIGludCBpbnRyaW5zaWNQYWRkaW5nQmVmb3JlKCkgY29uc3QgeyByZXR1cm4gbV9p bnRyaW5zaWNQYWRkaW5nQmVmb3JlOyB9CisgICAgaW50IGludHJpbnNpY1BhZGRpbmdBZnRlcigp IGNvbnN0IHsgcmV0dXJuIG1faW50cmluc2ljUGFkZGluZ0FmdGVyOyB9CiAKICAgICB2aXJ0dWFs IGludCBwYWRkaW5nVG9wKGJvb2wgaW5jbHVkZUludHJpbnNpY1BhZGRpbmcgPSB0cnVlKSBjb25z dDsKICAgICB2aXJ0dWFsIGludCBwYWRkaW5nQm90dG9tKGJvb2wgaW5jbHVkZUludHJpbnNpY1Bh ZGRpbmcgPSB0cnVlKSBjb25zdDsKKyAgICB2aXJ0dWFsIGludCBwYWRkaW5nTGVmdChib29sIGlu Y2x1ZGVJbnRyaW5zaWNQYWRkaW5nID0gdHJ1ZSkgY29uc3Q7CisgICAgdmlydHVhbCBpbnQgcGFk ZGluZ1JpZ2h0KGJvb2wgaW5jbHVkZUludHJpbnNpY1BhZGRpbmcgPSB0cnVlKSBjb25zdDsKKyAg ICAKKyAgICAvLyBGSVhNRTogRm9yIG5vdyB3ZSBqdXN0IGFzc3VtZSB0aGUgY2VsbCBoYXMgdGhl IHNhbWUgYmxvY2sgZmxvdyBkaXJlY3Rpb24gYXMgdGhlIHRhYmxlLiAgSXQncyBsaWtlbHkgd2Un bGwKKyAgICAvLyBjcmVhdGUgYW4gZXh0cmEgYW5vbnltb3VzIFJlbmRlckJsb2NrIHRvIGhhbmRs ZSBtaXhpbmcgZGlyZWN0aW9uYWxpdHkgYW55d2F5LCBpbiB3aGljaCBjYXNlIHdlIGNhbiBsb2Nr CisgICAgLy8gdGhlIGJsb2NrIGZsb3cgZGlyZWN0aW9uYWxpdHkgb2YgdGhlIGNlbGxzIHRvIHRo ZSB0YWJsZSdzIGRpcmVjdGlvbmFsaXR5LgorICAgIHZpcnR1YWwgaW50IHBhZGRpbmdCZWZvcmUo Ym9vbCBpbmNsdWRlSW50cmluc2ljUGFkZGluZyA9IHRydWUpIGNvbnN0OworICAgIHZpcnR1YWwg aW50IHBhZGRpbmdBZnRlcihib29sIGluY2x1ZGVJbnRyaW5zaWNQYWRkaW5nID0gdHJ1ZSkgY29u c3Q7CiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0T3ZlcnJpZGVTaXplKGludCk7CiAKQEAgLTEyOSw4 ICsxMzcsOCBAQCBwcml2YXRlOgogICAgIGludCBtX2NvbHVtbjsKICAgICBpbnQgbV9yb3dTcGFu OwogICAgIGludCBtX2NvbHVtblNwYW47Ci0gICAgaW50IG1faW50cmluc2ljUGFkZGluZ1RvcDsK LSAgICBpbnQgbV9pbnRyaW5zaWNQYWRkaW5nQm90dG9tOworICAgIGludCBtX2ludHJpbnNpY1Bh ZGRpbmdCZWZvcmU7CisgICAgaW50IG1faW50cmluc2ljUGFkZGluZ0FmdGVyOwogICAgIGludCBt X3BlcmNlbnRhZ2VIZWlnaHQ7CiB9OwogCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU YWJsZVNlY3Rpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRh YmxlU2VjdGlvbi5jcHAJKHJldmlzaW9uIDY3OTAzKQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGFibGVTZWN0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQyLDkgKzM0Miw5IEBAIGlu dCBSZW5kZXJUYWJsZVNlY3Rpb246OmNhbGNSb3dIZWlnaHQoKQogICAgICAgICAgICAgICAgIGNl bGwtPmxheW91dElmTmVlZGVkKCk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAKLSAgICAg ICAgICAgIGludCBhZGp1c3RlZFBhZGRpbmdUb3AgPSBjZWxsLT5wYWRkaW5nVG9wKCkgLSBjZWxs LT5pbnRyaW5zaWNQYWRkaW5nVG9wKCk7Ci0gICAgICAgICAgICBpbnQgYWRqdXN0ZWRQYWRkaW5n Qm90dG9tID0gY2VsbC0+cGFkZGluZ0JvdHRvbSgpIC0gY2VsbC0+aW50cmluc2ljUGFkZGluZ0Jv dHRvbSgpOwotICAgICAgICAgICAgaW50IGFkanVzdGVkSGVpZ2h0ID0gY2VsbC0+aGVpZ2h0KCkg LSAoY2VsbC0+aW50cmluc2ljUGFkZGluZ1RvcCgpICsgY2VsbC0+aW50cmluc2ljUGFkZGluZ0Jv dHRvbSgpKTsKKyAgICAgICAgICAgIGludCBhZGp1c3RlZFBhZGRpbmdUb3AgPSBjZWxsLT5wYWRk aW5nVG9wKCkgLSBjZWxsLT5pbnRyaW5zaWNQYWRkaW5nQmVmb3JlKCk7CisgICAgICAgICAgICBp bnQgYWRqdXN0ZWRQYWRkaW5nQm90dG9tID0gY2VsbC0+cGFkZGluZ0JvdHRvbSgpIC0gY2VsbC0+ aW50cmluc2ljUGFkZGluZ0FmdGVyKCk7CisgICAgICAgICAgICBpbnQgYWRqdXN0ZWRIZWlnaHQg PSBjZWxsLT5oZWlnaHQoKSAtIChjZWxsLT5pbnRyaW5zaWNQYWRkaW5nQmVmb3JlKCkgKyBjZWxs LT5pbnRyaW5zaWNQYWRkaW5nQWZ0ZXIoKSk7CiAgICAgICAgIAogICAgICAgICAgICAgLy8gRXhw bGljaXQgaGVpZ2h0cyB1c2UgdGhlIGJvcmRlciBib3ggaW4gcXVpcmtzIG1vZGUuICBJbiBzdHJp Y3QgbW9kZSBkbyB0aGUgcmlnaHQKICAgICAgICAgICAgIC8vIHRoaW5nIGFuZCBhY3R1YWxseSBh ZGQgaW4gdGhlIGJvcmRlciBhbmQgcGFkZGluZy4KQEAgLTM2Miw4ICszNjIsOCBAQCBpbnQgUmVu ZGVyVGFibGVTZWN0aW9uOjpjYWxjUm93SGVpZ2h0KCkKICAgICAgICAgICAgIGlmICh2YSA9PSBC QVNFTElORSB8fCB2YSA9PSBURVhUX0JPVFRPTSB8fCB2YSA9PSBURVhUX1RPUCB8fCB2YSA9PSBT VVBFUiB8fCB2YSA9PSBTVUIpIHsKICAgICAgICAgICAgICAgICBpbnQgYiA9IGNlbGwtPmJhc2Vs aW5lUG9zaXRpb24oKTsKICAgICAgICAgICAgICAgICBpZiAoYiA+IGNlbGwtPmJvcmRlclRvcCgp ICsgY2VsbC0+cGFkZGluZ1RvcCgpKSB7Ci0gICAgICAgICAgICAgICAgICAgIGJhc2VsaW5lID0g bWF4KGJhc2VsaW5lLCBiIC0gY2VsbC0+aW50cmluc2ljUGFkZGluZ1RvcCgpKTsKLSAgICAgICAg ICAgICAgICAgICAgYmRlc2MgPSBtYXgoYmRlc2MsIG1fcm93UG9zW2luZHhdICsgY2ggLSAoYiAt IGNlbGwtPmludHJpbnNpY1BhZGRpbmdUb3AoKSkpOworICAgICAgICAgICAgICAgICAgICBiYXNl bGluZSA9IG1heChiYXNlbGluZSwgYiAtIGNlbGwtPmludHJpbnNpY1BhZGRpbmdCZWZvcmUoKSk7 CisgICAgICAgICAgICAgICAgICAgIGJkZXNjID0gbWF4KGJkZXNjLCBtX3Jvd1Bvc1tpbmR4XSAr IGNoIC0gKGIgLSBjZWxsLT5pbnRyaW5zaWNQYWRkaW5nQmVmb3JlKCkpKTsKICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTU3MCw4ICs1NzAsOCBAQCBpbnQg UmVuZGVyVGFibGVTZWN0aW9uOjpsYXlvdXRSb3dzKGludCB0CiAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgfQogICAgICAgICAgICAgCi0gICAgICAgICAgICBpbnQgb2xkVGUgPSBjZWxs LT5pbnRyaW5zaWNQYWRkaW5nVG9wKCk7Ci0gICAgICAgICAgICBpbnQgb2xkQmUgPSBjZWxsLT5p bnRyaW5zaWNQYWRkaW5nQm90dG9tKCk7CisgICAgICAgICAgICBpbnQgb2xkVGUgPSBjZWxsLT5p bnRyaW5zaWNQYWRkaW5nQmVmb3JlKCk7CisgICAgICAgICAgICBpbnQgb2xkQmUgPSBjZWxsLT5p bnRyaW5zaWNQYWRkaW5nQWZ0ZXIoKTsKICAgICAgICAgICAgIGludCBoZWlnaHRXaXRob3V0SW50 cmluc2ljUGFkZGluZyA9IGNlbGwtPmhlaWdodCgpIC0gb2xkVGUgLSBvbGRCZTsKICAgICAgICAg ICAgIAogICAgICAgICAgICAgaW50IHRlID0gMDsKQEAgLTYwMCw4ICs2MDAsOCBAQCBpbnQgUmVu ZGVyVGFibGVTZWN0aW9uOjpsYXlvdXRSb3dzKGludCB0CiAgICAgICAgICAgICB9CiAgICAgICAg ICAgICAKICAgICAgICAgICAgIGludCBiZSA9IHJIZWlnaHQgLSBoZWlnaHRXaXRob3V0SW50cmlu c2ljUGFkZGluZyAtIHRlOwotICAgICAgICAgICAgY2VsbC0+c2V0SW50cmluc2ljUGFkZGluZ1Rv cCh0ZSk7Ci0gICAgICAgICAgICBjZWxsLT5zZXRJbnRyaW5zaWNQYWRkaW5nQm90dG9tKGJlKTsK KyAgICAgICAgICAgIGNlbGwtPnNldEludHJpbnNpY1BhZGRpbmdCZWZvcmUodGUpOworICAgICAg ICAgICAgY2VsbC0+c2V0SW50cmluc2ljUGFkZGluZ0FmdGVyKGJlKTsKICAgICAgICAgICAgIAog ICAgICAgICAgICAgSW50UmVjdCBvbGRDZWxsUmVjdChjZWxsLT54KCksIGNlbGwtPnkoKSAsIGNl bGwtPndpZHRoKCksIGNlbGwtPmhlaWdodCgpKTsKICAgICAgICAgICAgIApJbmRleDogV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVHJlZUFzVGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVHJlZUFzVGV4dC5jcHAJKHJldmlzaW9uIDY3OTAzKQorKysgV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVHJlZUFzVGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIyMywx MyArMjIzLDEzIEBAIHZvaWQgUmVuZGVyVHJlZUFzVGV4dDo6d3JpdGVSZW5kZXJPYmplY3QKICAg ICAgICAgLy8gdG8gY2xlYW4gdXAgdGhlIHJlc3VsdHMgdG8gZHVtcCBib3RoIHRoZSBvdXRlciBi b3ggYW5kIHRoZSBpbnRyaW5zaWMgcGFkZGluZyBzbyB0aGF0IGJvdGggYml0cyBvZiBpbmZvcm1h dGlvbiBhcmUKICAgICAgICAgLy8gY2FwdHVyZWQgYnkgdGhlIHJlc3VsdHMuCiAgICAgICAgIGNv bnN0IFJlbmRlclRhYmxlQ2VsbCYgY2VsbCA9ICp0b1JlbmRlclRhYmxlQ2VsbCgmbyk7Ci0gICAg ICAgIHIgPSBJbnRSZWN0KGNlbGwueCgpLCBjZWxsLnkoKSArIGNlbGwuaW50cmluc2ljUGFkZGlu Z1RvcCgpLCBjZWxsLndpZHRoKCksIGNlbGwuaGVpZ2h0KCkgLSBjZWxsLmludHJpbnNpY1BhZGRp bmdUb3AoKSAtIGNlbGwuaW50cmluc2ljUGFkZGluZ0JvdHRvbSgpKTsKKyAgICAgICAgciA9IElu dFJlY3QoY2VsbC54KCksIGNlbGwueSgpICsgY2VsbC5pbnRyaW5zaWNQYWRkaW5nQmVmb3JlKCks IGNlbGwud2lkdGgoKSwgY2VsbC5oZWlnaHQoKSAtIGNlbGwuaW50cmluc2ljUGFkZGluZ0JlZm9y ZSgpIC0gY2VsbC5pbnRyaW5zaWNQYWRkaW5nQWZ0ZXIoKSk7CiAgICAgfSBlbHNlIGlmIChvLmlz Qm94KCkpCiAgICAgICAgIHIgPSB0b1JlbmRlckJveCgmbyktPmZyYW1lUmVjdCgpOwogCiAgICAg Ly8gRklYTUU6IFRlbXBvcmFyeSBpbiBvcmRlciB0byBlbnN1cmUgY29tcGF0aWJpbGl0eSB3aXRo IGV4aXN0aW5nIGxheW91dCB0ZXN0IHJlc3VsdHMuCiAgICAgaWYgKGFkanVzdEZvclRhYmxlQ2Vs bHMpCi0gICAgICAgIHIubW92ZSgwLCAtdG9SZW5kZXJUYWJsZUNlbGwoby5jb250YWluaW5nQmxv Y2soKSktPmludHJpbnNpY1BhZGRpbmdUb3AoKSk7CisgICAgICAgIHIubW92ZSgwLCAtdG9SZW5k ZXJUYWJsZUNlbGwoby5jb250YWluaW5nQmxvY2soKSktPmludHJpbnNpY1BhZGRpbmdCZWZvcmUo KSk7CiAKICAgICB0cyA8PCAiICIgPDwgcjsKIApAQCAtMzk4LDcgKzM5OCw3IEBAIHN0YXRpYyB2 b2lkIHdyaXRlVGV4dFJ1bihUZXh0U3RyZWFtJiB0cywKICAgICAvLyBGSVhNRTogVGFibGUgY2Vs bCBhZGp1c3RtZW50IGlzIHRlbXBvcmFyeSB1bnRpbCByZXN1bHRzIGNhbiBiZSB1cGRhdGVkLgog ICAgIGludCB5ID0gcnVuLm1feTsKICAgICBpZiAoby5jb250YWluaW5nQmxvY2soKS0+aXNUYWJs ZUNlbGwoKSkKLSAgICAgICAgeSAtPSB0b1JlbmRlclRhYmxlQ2VsbChvLmNvbnRhaW5pbmdCbG9j aygpKS0+aW50cmluc2ljUGFkZGluZ1RvcCgpOworICAgICAgICB5IC09IHRvUmVuZGVyVGFibGVD ZWxsKG8uY29udGFpbmluZ0Jsb2NrKCkpLT5pbnRyaW5zaWNQYWRkaW5nQmVmb3JlKCk7CiAgICAg dHMgPDwgInRleHQgcnVuIGF0ICgiIDw8IHJ1bi5tX3ggPDwgIiwiIDw8IHkgPDwgIikgd2lkdGgg IiA8PCBydW4ubV93aWR0aDsKICAgICBpZiAocnVuLmRpcmVjdGlvbigpID09IFJUTCB8fCBydW4u bV9kaXJPdmVycmlkZSkgewogICAgICAgICB0cyA8PCAocnVuLmRpcmVjdGlvbigpID09IFJUTCA/ ICIgUlRMIiA6ICIgTFRSIik7Cg==