128675 2014-02-12 10:30:56 -0800 RenderNamedFlowThread should only support RenderElement children. 2014-02-12 12:10:09 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue esprehn+autocc glenn kondapallykalyan WebkitBugTracker oldest_to_newest 979902 0 kling 2014-02-12 10:30:56 -0800 RenderNamedFlowThread should only support RenderElement children. 979903 1 223980 kling 2014-02-12 10:32:12 -0800 Created attachment 223980 Patch 979904 2 commit-queue 2014-02-12 10:33:21 -0800 Attachment 223980 did not pass style-queue: ERROR: Source/WebCore/rendering/RenderElement.cpp:36: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 979951 3 223980 commit-queue 2014-02-12 12:10:04 -0800 Comment on attachment 223980 Patch Clearing flags on attachment: 223980 Committed r163969: <http://trac.webkit.org/changeset/163969> 979952 4 commit-queue 2014-02-12 12:10:09 -0800 All reviewed patches have been landed. Closing bug. 223980 2014-02-12 10:32:12 -0800 2014-02-12 12:10:03 -0800 Patch bug-128675.diff text/plain 9758 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmY2VjZjI0Li4xNWEzMzk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTQtMDItMTIgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFJlbmRlck5hbWVkRmxvd1RocmVhZCBzaG91bGQgb25seSBzdXBwb3J0IFJlbmRlckVsZW1l bnQgY2hpbGRyZW4uCisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xMjg2NzU+CisKKyAg ICAgICAgVGlnaHRlbiB1cCBmbG93LXRocmVhZCByZW5kZXJpbmcgc28gdGhhdCBpdCBvbmx5IHN1 cHBvcnRzIGVsZW1lbnQKKyAgICAgICAgY2hpbGRyZW4gZGlyZWN0bHkuIFRoaXMgbWVhbnMgd2Ug ZG9uJ3QgaGF2ZSB0byB3b3JyeSBhYm91dCB0ZXh0CisgICAgICAgIHJlbmRlcmVycyBvbiB0aGlz IGNvZGUgcGF0aC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckVsZW1lbnQ6Omluc2VydGVkSW50b1RyZWUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy RWxlbWVudDo6d2lsbEJlUmVtb3ZlZEZyb21UcmVlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckVsZW1lbnQ6OndpbGxCZURlc3Ryb3llZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck5h bWVkRmxvd1RocmVhZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJOYW1lZEZsb3dUaHJl YWQ6Om5leHRSZW5kZXJlckZvckVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTmFt ZWRGbG93VGhyZWFkOjphZGRGbG93Q2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTmFt ZWRGbG93VGhyZWFkOjpyZW1vdmVGbG93Q2hpbGQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJOYW1lZEZsb3dUaHJlYWQuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6d2lsbEJlRGVzdHJveWVkKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6aW5zZXJ0ZWRJbnRvVHJlZSk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OndpbGxCZVJlbW92ZWRGcm9tVHJlZSk6CisgICAgICAg ICogc3R5bGUvU3R5bGVSZXNvbHZlVHJlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6 Y3JlYXRlUmVuZGVyZXJJZk5lZWRlZCk6CisKIDIwMTQtMDItMTEgIEFuZHJlYXMgS2xpbmcgIDxh a2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFByb3RlY3Qgc29tZSBSZW5kZXJGbG93VGhyZWFk IGZ1bmN0aW9ucy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJF bGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcApp bmRleCAzY2E0YzQ1Li4xMTRiNGVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckVsZW1lbnQuY3BwCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNs dWRlICJIVE1MRWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxOYW1lcy5oIgorI2luY2x1ZGUgIkZs b3dUaHJlYWRDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiUmVuZGVyQ291bnRlci5oIgogI2luY2x1 ZGUgIlJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5oIgogI2luY2x1ZGUgIlJlbmRlckZsZXhp YmxlQm94LmgiCkBAIC05NjMsNiArOTY0LDkgQEAgdm9pZCBSZW5kZXJFbGVtZW50OjppbnNlcnRl ZEludG9UcmVlKCkKIHsKICAgICBSZW5kZXJPYmplY3Q6Omluc2VydGVkSW50b1RyZWUoKTsKIAor ICAgIGlmIChhdXRvKiBjb250YWluZXJGbG93VGhyZWFkID0gcGFyZW50KCktPnJlbmRlck5hbWVk Rmxvd1RocmVhZFdyYXBwZXIoKSkKKyAgICAgICAgY29udGFpbmVyRmxvd1RocmVhZC0+YWRkRmxv d0NoaWxkKCp0aGlzKTsKKwogICAgIC8vIEtlZXAgb3VyIGxheWVyIGhpZXJhcmNoeSB1cGRhdGVk LiBPcHRpbWl6ZSBmb3IgdGhlIGNvbW1vbiBjYXNlIHdoZXJlIHdlIGRvbid0IGhhdmUgYW55IGNo aWxkcmVuCiAgICAgLy8gYW5kIGRvbid0IGhhdmUgYSBsYXllciBhdHRhY2hlZCB0byBvdXJzZWx2 ZXMuCiAgICAgUmVuZGVyTGF5ZXIqIGxheWVyID0gbnVsbHB0cjsKQEAgLTEwMDMsNiArMTAwNyw5 IEBAIHZvaWQgUmVuZGVyRWxlbWVudDo6d2lsbEJlUmVtb3ZlZEZyb21UcmVlKCkKICAgICBpZiAo aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgcGFyZW50KCktPmNoaWxkcmVuSW5saW5lKCkpCiAg ICAgICAgIHBhcmVudCgpLT5kaXJ0eUxpbmVzRnJvbUNoYW5nZWRDaGlsZCh0aGlzKTsKIAorICAg IGlmIChhdXRvKiBjb250YWluZXJGbG93VGhyZWFkID0gcGFyZW50KCktPnJlbmRlck5hbWVkRmxv d1RocmVhZFdyYXBwZXIoKSkKKyAgICAgICAgY29udGFpbmVyRmxvd1RocmVhZC0+cmVtb3ZlRmxv d0NoaWxkKCp0aGlzKTsKKwogICAgIFJlbmRlck9iamVjdDo6d2lsbEJlUmVtb3ZlZEZyb21UcmVl KCk7CiB9CiAKQEAgLTEwMTMsNiArMTAyMCwxNiBAQCB2b2lkIFJlbmRlckVsZW1lbnQ6OndpbGxC ZURlc3Ryb3llZCgpCiAgICAgZGVzdHJveUxlZnRvdmVyQ2hpbGRyZW4oKTsKIAogICAgIFJlbmRl ck9iamVjdDo6d2lsbEJlRGVzdHJveWVkKCk7CisKKyNpZiAhQVNTRVJUX0RJU0FCTEVECisgICAg aWYgKCFkb2N1bWVudEJlaW5nRGVzdHJveWVkKCkgJiYgdmlldygpLmhhc1JlbmRlck5hbWVkRmxv d1RocmVhZHMoKSkgeworICAgICAgICAvLyBBZnRlciByZW1vdmUsIHRoZSBvYmplY3QgYW5kIHRo ZSBhc3NvY2lhdGVkIGluZm9ybWF0aW9uIHNob3VsZCBub3QgYmUgaW4gYW55IGZsb3cgdGhyZWFk LgorICAgICAgICBmb3IgKGF1dG8mIGZsb3dUaHJlYWQgOiAqdmlldygpLmZsb3dUaHJlYWRDb250 cm9sbGVyKCkucmVuZGVyTmFtZWRGbG93VGhyZWFkTGlzdCgpKSB7CisgICAgICAgICAgICBBU1NF UlQoIWZsb3dUaHJlYWQtPmhhc0NoaWxkKCp0aGlzKSk7CisgICAgICAgICAgICBBU1NFUlQoIWZs b3dUaHJlYWQtPmhhc0NoaWxkSW5mbyh0aGlzKSk7CisgICAgICAgIH0KKyAgICB9CisjZW5kaWYK IH0KIAogdm9pZCBSZW5kZXJFbGVtZW50OjpzZXROZWVkc1Bvc2l0aW9uZWRNb3ZlbWVudExheW91 dChjb25zdCBSZW5kZXJTdHlsZSogb2xkU3R5bGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRGbG93VGhyZWFkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJOYW1lZEZsb3dUaHJlYWQuY3BwCmluZGV4IDEwMmRmZWEuLmI2MWJlNTYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJOYW1lZEZsb3dUaHJl YWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJOYW1lZEZsb3dUaHJl YWQuY3BwCkBAIC05NywxMSArOTcsMTEgQEAgdm9pZCBSZW5kZXJOYW1lZEZsb3dUaHJlYWQ6OnVw ZGF0ZVdyaXRpbmdNb2RlKCkKICAgICBzZXRTdHlsZShzdGQ6Om1vdmUobmV3U3R5bGUpKTsKIH0K IAotUmVuZGVyT2JqZWN0KiBSZW5kZXJOYW1lZEZsb3dUaHJlYWQ6Om5leHRSZW5kZXJlckZvck5v ZGUoTm9kZSogbm9kZSkgY29uc3QKK1JlbmRlckVsZW1lbnQqIFJlbmRlck5hbWVkRmxvd1RocmVh ZDo6bmV4dFJlbmRlcmVyRm9yRWxlbWVudChFbGVtZW50JiBlbGVtZW50KSBjb25zdAogewogICAg IGZvciAoYXV0byYgY2hpbGQgOiBtX2Zsb3dUaHJlYWRDaGlsZExpc3QpIHsKLSAgICAgICAgQVNT RVJUKGNoaWxkLT5ub2RlKCkpOwotICAgICAgICB1bnNpZ25lZCBzaG9ydCBwb3NpdGlvbiA9IG5v ZGUtPmNvbXBhcmVEb2N1bWVudFBvc2l0aW9uKGNoaWxkLT5ub2RlKCkpOworICAgICAgICBBU1NF UlQoIWNoaWxkLT5pc0Fub255bW91cygpKTsKKyAgICAgICAgdW5zaWduZWQgc2hvcnQgcG9zaXRp b24gPSBlbGVtZW50LmNvbXBhcmVEb2N1bWVudFBvc2l0aW9uKGNoaWxkLT5lbGVtZW50KCkpOwog ICAgICAgICBpZiAocG9zaXRpb24gJiBOb2RlOjpET0NVTUVOVF9QT1NJVElPTl9GT0xMT1dJTkcp CiAgICAgICAgICAgICByZXR1cm4gY2hpbGQ7CiAgICAgfQpAQCAtMTA5LDI5ICsxMDksMjQgQEAg UmVuZGVyT2JqZWN0KiBSZW5kZXJOYW1lZEZsb3dUaHJlYWQ6Om5leHRSZW5kZXJlckZvck5vZGUo Tm9kZSogbm9kZSkgY29uc3QKICAgICByZXR1cm4gMDsKIH0KIAotdm9pZCBSZW5kZXJOYW1lZEZs b3dUaHJlYWQ6OmFkZEZsb3dDaGlsZChSZW5kZXJPYmplY3QqIG5ld0NoaWxkKQordm9pZCBSZW5k ZXJOYW1lZEZsb3dUaHJlYWQ6OmFkZEZsb3dDaGlsZChSZW5kZXJFbGVtZW50JiBuZXdDaGlsZCkK IHsKICAgICAvLyBUaGUgY2hpbGQgbGlzdCBpcyB1c2VkIHRvIHNvcnQgdGhlIGZsb3cgdGhyZWFk J3MgY2hpbGRyZW4gcmVuZGVyIG9iamVjdHMgCiAgICAgLy8gYmFzZWQgb24gdGhlaXIgY29ycmVz cG9uZGluZyBub2RlcyBET00gb3JkZXIuIFRoZSBsaXN0IGlzIG5lZWRlZCB0byBhdm9pZCBzZWFy Y2hpbmcgdGhlIHdob2xlIERPTS4KIAotICAgIE5vZGUqIGNoaWxkTm9kZSA9IG5ld0NoaWxkLT5u b2RlKCk7Ci0KLSAgICAvLyBEbyBub3QgYWRkIGFub255bW91cyBvYmplY3RzLgotICAgIGlmICgh Y2hpbGROb2RlKQorICAgIGlmIChuZXdDaGlsZC5pc0Fub255bW91cygpKQogICAgICAgICByZXR1 cm47CiAKLSAgICBBU1NFUlQoY2hpbGROb2RlLT5pc0VsZW1lbnROb2RlKCkpOwotCi0gICAgUmVu ZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IG5leHRSZW5kZXJlckZvck5vZGUoY2hpbGROb2RlKTsK KyAgICBhdXRvKiBiZWZvcmVDaGlsZCA9IG5leHRSZW5kZXJlckZvckVsZW1lbnQoKm5ld0NoaWxk LmVsZW1lbnQoKSk7CiAgICAgaWYgKGJlZm9yZUNoaWxkKQotICAgICAgICBtX2Zsb3dUaHJlYWRD aGlsZExpc3QuaW5zZXJ0QmVmb3JlKGJlZm9yZUNoaWxkLCBuZXdDaGlsZCk7CisgICAgICAgIG1f Zmxvd1RocmVhZENoaWxkTGlzdC5pbnNlcnRCZWZvcmUoYmVmb3JlQ2hpbGQsICZuZXdDaGlsZCk7 CiAgICAgZWxzZQotICAgICAgICBtX2Zsb3dUaHJlYWRDaGlsZExpc3QuYWRkKG5ld0NoaWxkKTsK KyAgICAgICAgbV9mbG93VGhyZWFkQ2hpbGRMaXN0LmFkZCgmbmV3Q2hpbGQpOwogfQogCi12b2lk IFJlbmRlck5hbWVkRmxvd1RocmVhZDo6cmVtb3ZlRmxvd0NoaWxkKFJlbmRlck9iamVjdCogY2hp bGQpCit2b2lkIFJlbmRlck5hbWVkRmxvd1RocmVhZDo6cmVtb3ZlRmxvd0NoaWxkKFJlbmRlckVs ZW1lbnQmIGNoaWxkKQogewotICAgIG1fZmxvd1RocmVhZENoaWxkTGlzdC5yZW1vdmUoY2hpbGQp OworICAgIG1fZmxvd1RocmVhZENoaWxkTGlzdC5yZW1vdmUoJmNoaWxkKTsKIH0KIAogYm9vbCBS ZW5kZXJOYW1lZEZsb3dUaHJlYWQ6OmRlcGVuZHNPbihSZW5kZXJOYW1lZEZsb3dUaHJlYWQqIG90 aGVyUmVuZGVyRmxvd1RocmVhZCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJOYW1lZEZsb3dUaHJlYWQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJOYW1lZEZsb3dUaHJlYWQuaAppbmRleCBiMTQ3YTJhLi45NDg0Y2M1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRGbG93VGhyZWFkLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxvd1RocmVhZC5oCkBAIC01 MiwxMyArNTIsMTMgQEAgcHVibGljOgogCiAgICAgY29uc3QgUmVuZGVyUmVnaW9uTGlzdCYgaW52 YWxpZFJlbmRlclJlZ2lvbkxpc3QoKSBjb25zdCB7IHJldHVybiBtX2ludmFsaWRSZWdpb25MaXN0 OyB9CiAKLSAgICBSZW5kZXJPYmplY3QqIG5leHRSZW5kZXJlckZvck5vZGUoTm9kZSopIGNvbnN0 OworICAgIFJlbmRlckVsZW1lbnQqIG5leHRSZW5kZXJlckZvckVsZW1lbnQoRWxlbWVudCYpIGNv bnN0OwogCi0gICAgdm9pZCBhZGRGbG93Q2hpbGQoUmVuZGVyT2JqZWN0KiBuZXdDaGlsZCk7Ci0g ICAgdm9pZCByZW1vdmVGbG93Q2hpbGQoUmVuZGVyT2JqZWN0Kik7CisgICAgdm9pZCBhZGRGbG93 Q2hpbGQoUmVuZGVyRWxlbWVudCYpOworICAgIHZvaWQgcmVtb3ZlRmxvd0NoaWxkKFJlbmRlckVs ZW1lbnQmKTsKICAgICBib29sIGhhc0NoaWxkcmVuKCkgY29uc3QgeyByZXR1cm4gIW1fZmxvd1Ro cmVhZENoaWxkTGlzdC5pc0VtcHR5KCk7IH0KICNpZm5kZWYgTkRFQlVHCi0gICAgYm9vbCBoYXND aGlsZChSZW5kZXJPYmplY3QqIGNoaWxkKSBjb25zdCB7IHJldHVybiBtX2Zsb3dUaHJlYWRDaGls ZExpc3QuY29udGFpbnMoY2hpbGQpOyB9CisgICAgYm9vbCBoYXNDaGlsZChSZW5kZXJFbGVtZW50 JiBjaGlsZCkgY29uc3QgeyByZXR1cm4gbV9mbG93VGhyZWFkQ2hpbGRMaXN0LmNvbnRhaW5zKCZj aGlsZCk7IH0KICNlbmRpZgogCiAgICAgdm9pZCBwdXNoRGVwZW5kZW5jaWVzKFJlbmRlck5hbWVk Rmxvd1RocmVhZExpc3QmKTsKQEAgLTEyOSw3ICsxMjksNyBAQCBwcml2YXRlOgogICAgIFJlbmRl ck5hbWVkRmxvd1RocmVhZENvdW50ZWRTZXQgbV9sYXlvdXRCZWZvcmVUaHJlYWRzU2V0OwogCiAg ICAgLy8gSG9sZHMgdGhlIHNvcnRlZCBjaGlsZHJlbiBvZiBhIG5hbWVkIGZsb3cuIFRoaXMgaXMg dGhlIG9ubHkgd2F5IHdlIGNhbiBnZXQgdGhlIG9yZGVyaW5nIHJpZ2h0LgotICAgIExpc3RIYXNo U2V0PFJlbmRlck9iamVjdCo+IG1fZmxvd1RocmVhZENoaWxkTGlzdDsKKyAgICBMaXN0SGFzaFNl dDxSZW5kZXJFbGVtZW50Kj4gbV9mbG93VGhyZWFkQ2hpbGRMaXN0OwogCiAgICAgTmFtZWRGbG93 Q29udGVudEVsZW1lbnRzIG1fY29udGVudEVsZW1lbnRzOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJPYmplY3QuY3BwCmluZGV4IDBlNDFiNjcuLjQ0NzU4NTggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCkBAIC0xODU1LDE4ICsxODU1LDYgQEAg dm9pZCBSZW5kZXJPYmplY3Q6OndpbGxCZURlc3Ryb3llZCgpCiAgICAgaWYgKEFYT2JqZWN0Q2Fj aGUqIGNhY2hlID0gZG9jdW1lbnQoKS5leGlzdGluZ0FYT2JqZWN0Q2FjaGUoKSkKICAgICAgICAg Y2FjaGUtPnJlbW92ZSh0aGlzKTsKIAotI2lmbmRlZiBOREVCVUcKLSAgICBpZiAoIWRvY3VtZW50 QmVpbmdEZXN0cm95ZWQoKSAmJiB2aWV3KCkuaGFzUmVuZGVyTmFtZWRGbG93VGhyZWFkcygpKSB7 Ci0gICAgICAgIC8vIEFmdGVyIHJlbW92ZSwgdGhlIG9iamVjdCBhbmQgdGhlIGFzc29jaWF0ZWQg aW5mb3JtYXRpb24gc2hvdWxkIG5vdCBiZSBpbiBhbnkgZmxvdyB0aHJlYWQuCi0gICAgICAgIGNv bnN0IFJlbmRlck5hbWVkRmxvd1RocmVhZExpc3QqIGZsb3dUaHJlYWRMaXN0ID0gdmlldygpLmZs b3dUaHJlYWRDb250cm9sbGVyKCkucmVuZGVyTmFtZWRGbG93VGhyZWFkTGlzdCgpOwotICAgICAg ICBmb3IgKFJlbmRlck5hbWVkRmxvd1RocmVhZExpc3Q6OmNvbnN0X2l0ZXJhdG9yIGl0ZXIgPSBm bG93VGhyZWFkTGlzdC0+YmVnaW4oKTsgaXRlciAhPSBmbG93VGhyZWFkTGlzdC0+ZW5kKCk7ICsr aXRlcikgewotICAgICAgICAgICAgY29uc3QgUmVuZGVyTmFtZWRGbG93VGhyZWFkKiByZW5kZXJG bG93VGhyZWFkID0gKml0ZXI7Ci0gICAgICAgICAgICBBU1NFUlQoIXJlbmRlckZsb3dUaHJlYWQt Pmhhc0NoaWxkKHRoaXMpKTsKLSAgICAgICAgICAgIEFTU0VSVCghcmVuZGVyRmxvd1RocmVhZC0+ aGFzQ2hpbGRJbmZvKHRoaXMpKTsKLSAgICAgICAgfQotICAgIH0KLSNlbmRpZgotCiAgICAgLy8g SWYgdGhpcyByZW5kZXJlciBoYWQgYSBwYXJlbnQsIHJlbW92ZSBzaG91bGQgaGF2ZSBkZXN0cm95 ZWQgYW55IGNvdW50ZXJzCiAgICAgLy8gYXR0YWNoZWQgdG8gdGhpcyByZW5kZXJlciBhbmQgbWFy a2VkIHRoZSBhZmZlY3RlZCBvdGhlciBjb3VudGVycyBmb3IKICAgICAvLyByZWV2YWx1YXRpb24u IFRoaXMgYXBwYXJlbnRseSByZWR1bmRhbnQgY2hlY2sgaXMgaGVyZSBmb3IgdGhlIGNhc2Ugd2hl bgpAQCAtMTg5MSw5ICsxODc5LDYgQEAgdm9pZCBSZW5kZXJPYmplY3Q6Omluc2VydGVkSW50b1Ry ZWUoKQogCiAgICAgaWYgKCFpc0Zsb2F0aW5nKCkgJiYgcGFyZW50KCktPmNoaWxkcmVuSW5saW5l KCkpCiAgICAgICAgIHBhcmVudCgpLT5kaXJ0eUxpbmVzRnJvbUNoYW5nZWRDaGlsZCh0aGlzKTsK LQotICAgIGlmIChSZW5kZXJOYW1lZEZsb3dUaHJlYWQqIGNvbnRhaW5lckZsb3dUaHJlYWQgPSBw YXJlbnQoKS0+cmVuZGVyTmFtZWRGbG93VGhyZWFkV3JhcHBlcigpKQotICAgICAgICBjb250YWlu ZXJGbG93VGhyZWFkLT5hZGRGbG93Q2hpbGQodGhpcyk7CiB9CiAKIHZvaWQgUmVuZGVyT2JqZWN0 Ojp3aWxsQmVSZW1vdmVkRnJvbVRyZWUoKQpAQCAtMTkwMiw5ICsxODg3LDYgQEAgdm9pZCBSZW5k ZXJPYmplY3Q6OndpbGxCZVJlbW92ZWRGcm9tVHJlZSgpCiAKICAgICByZW1vdmVGcm9tUmVuZGVy Rmxvd1RocmVhZCgpOwogCi0gICAgaWYgKFJlbmRlck5hbWVkRmxvd1RocmVhZCogY29udGFpbmVy Rmxvd1RocmVhZCA9IHBhcmVudCgpLT5yZW5kZXJOYW1lZEZsb3dUaHJlYWRXcmFwcGVyKCkpCi0g ICAgICAgIGNvbnRhaW5lckZsb3dUaHJlYWQtPnJlbW92ZUZsb3dDaGlsZCh0aGlzKTsKLQogICAg IC8vIFVwZGF0ZSBjYWNoZWQgYm91bmRhcmllcyBpbiBTVkcgcmVuZGVyZXJzLCBpZiBhIGNoaWxk IGlzIHJlbW92ZWQuCiAgICAgcGFyZW50KCktPnNldE5lZWRzQm91bmRhcmllc1VwZGF0ZSgpOwog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlVHJlZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlc29sdmVUcmVlLmNwcAppbmRleCAyNzA3Yjg0 Li4wODM3YzFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlc29sdmVU cmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlc29sdmVUcmVlLmNwcApA QCAtMjI2LDcgKzIyNiw3IEBAIHN0YXRpYyB2b2lkIGNyZWF0ZVJlbmRlcmVySWZOZWVkZWQoRWxl bWVudCYgZWxlbWVudCwgUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gcmVzCiAgICAgUmVuZGVyT2Jq ZWN0KiBuZXh0UmVuZGVyZXI7CiAgICAgaWYgKHBhcmVudEZsb3dSZW5kZXJlcikgewogICAgICAg ICBwYXJlbnRSZW5kZXJlciA9IHBhcmVudEZsb3dSZW5kZXJlcjsKLSAgICAgICAgbmV4dFJlbmRl cmVyID0gcGFyZW50Rmxvd1JlbmRlcmVyLT5uZXh0UmVuZGVyZXJGb3JOb2RlKCZlbGVtZW50KTsK KyAgICAgICAgbmV4dFJlbmRlcmVyID0gcGFyZW50Rmxvd1JlbmRlcmVyLT5uZXh0UmVuZGVyZXJG b3JFbGVtZW50KGVsZW1lbnQpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIC8vIEZJWE1FOiBNYWtl IHRoaXMgcGF0aCBFbGVtZW50IG9ubHksIGhhbmRsZSB0aGUgcm9vdCBzcGVjaWFsIGNhc2Ugc2Vw YXJhdGVseS4KICAgICAgICAgcGFyZW50UmVuZGVyZXIgPSByZW5kZXJpbmdQYXJlbnROb2RlLT5y ZW5kZXJlcigpOwo=