63570 2011-06-28 15:18:41 -0700 Switch paintFillLayer* to new layout types 2011-06-28 15:41:43 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 63567 1 leviw leviw eae eric simon.fraser webkit.review.bot oldest_to_newest 429178 0 leviw 2011-06-28 15:18:41 -0700 Starting the transition to the new abstraction. 429184 1 98980 leviw 2011-06-28 15:23:22 -0700 Created attachment 98980 Patch 429187 2 98980 eric 2011-06-28 15:24:52 -0700 Comment on attachment 98980 Patch Seems fine to me. 429189 3 98980 leviw 2011-06-28 15:26:21 -0700 Comment on attachment 98980 Patch Thanks for the review! 429200 4 98980 leviw 2011-06-28 15:41:40 -0700 Comment on attachment 98980 Patch Clearing flags on attachment: 98980 Committed r89970: <http://trac.webkit.org/changeset/89970> 429201 5 leviw 2011-06-28 15:41:43 -0700 All reviewed patches have been landed. Closing bug. 98980 2011-06-28 15:23:22 -0700 2011-06-28 15:41:39 -0700 Patch bug-63570-20110628152320.patch text/plain 16034 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5OTY3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDYtMjggIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBwYWludEZpbGxMYXllciogdG8gbmV3IGxheW91 dCB0eXBlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjM1NzAKKworICAgICAgICBTd2l0Y2hpbmcgcGFpbkZpbGxMYXllciogdG8gbGF5b3V0IHR5cGUg YWJzdHJhY3Rpb24gZnJvbSBtb3JlIGludGVncmFsIHR5cGVzLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cyBhcyB0aGlzIGlzIGp1c3QgbW92aW5nIHRvIGFuIGFic3RyYWN0aW9uLgorCisgICAgICAg ICogcmVuZGVyaW5nL0lubGluZUZsb3dCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5l Rmxvd0JveDo6cGFpbnRGaWxsTGF5ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUZsb3dC b3g6OnBhaW50RmlsbExheWVyKToKKyAgICAgICAgKiByZW5kZXJpbmcvSW5saW5lRmxvd0JveC5o OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyQm94OjpwYWludEZpbGxMYXllcnMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 OjpwYWludEZpbGxMYXllcik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5oOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRGaWxsTGF5ZXJFeHRlbmRlZCk6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0Lmg6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlck9iamVjdC5oOgorCiAyMDExLTA2LTI4ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3 ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcAkocmV2aXNpb24gODk5NjIp CisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lRmxvd0JveC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTEwMTYsNyArMTAxNiw3IEBAIHZvaWQgSW5saW5lRmxvd0JveDo6cGFpbnQoUGFp bnRJbmZvJiBwYWkKICAgICB9CiB9CiAKLXZvaWQgSW5saW5lRmxvd0JveDo6cGFpbnRGaWxsTGF5 ZXJzKGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBDb2xvciYgYywgY29uc3QgRmls bExheWVyKiBmaWxsTGF5ZXIsIGNvbnN0IEludFJlY3QmIHJlY3QsIENvbXBvc2l0ZU9wZXJhdG9y IG9wKQordm9pZCBJbmxpbmVGbG93Qm94OjpwYWludEZpbGxMYXllcnMoY29uc3QgUGFpbnRJbmZv JiBwYWludEluZm8sIGNvbnN0IENvbG9yJiBjLCBjb25zdCBGaWxsTGF5ZXIqIGZpbGxMYXllciwg Y29uc3QgTGF5b3V0UmVjdCYgcmVjdCwgQ29tcG9zaXRlT3BlcmF0b3Igb3ApCiB7CiAgICAgaWYg KCFmaWxsTGF5ZXIpCiAgICAgICAgIHJldHVybjsKQEAgLTEwMjQsNyArMTAyNCw3IEBAIHZvaWQg SW5saW5lRmxvd0JveDo6cGFpbnRGaWxsTGF5ZXJzKGNvbnMKICAgICBwYWludEZpbGxMYXllcihw YWludEluZm8sIGMsIGZpbGxMYXllciwgcmVjdCwgb3ApOwogfQogCi12b2lkIElubGluZUZsb3dC b3g6OnBhaW50RmlsbExheWVyKGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBDb2xv ciYgYywgY29uc3QgRmlsbExheWVyKiBmaWxsTGF5ZXIsIGNvbnN0IEludFJlY3QmIHJlY3QsIENv bXBvc2l0ZU9wZXJhdG9yIG9wKQordm9pZCBJbmxpbmVGbG93Qm94OjpwYWludEZpbGxMYXllcihj b25zdCBQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgQ29sb3ImIGMsIGNvbnN0IEZpbGxMYXll ciogZmlsbExheWVyLCBjb25zdCBMYXlvdXRSZWN0JiByZWN0LCBDb21wb3NpdGVPcGVyYXRvciBv cCkKIHsKICAgICBTdHlsZUltYWdlKiBpbWcgPSBmaWxsTGF5ZXItPmltYWdlKCk7CiAgICAgYm9v bCBoYXNGaWxsSW1hZ2UgPSBpbWcgJiYgaW1nLT5jYW5SZW5kZXIocmVuZGVyZXIoKS0+c3R5bGUo KS0+ZWZmZWN0aXZlWm9vbSgpKTsKQEAgLTEwMzcsOCArMTAzNyw4IEBAIHZvaWQgSW5saW5lRmxv d0JveDo6cGFpbnRGaWxsTGF5ZXIoY29uc3QKICAgICAgICAgLy8gc3RyaXAuICBFdmVuIHRob3Vn aCB0aGF0IHN0cmlwIGhhcyBiZWVuIGJyb2tlbiB1cCBhY3Jvc3MgbXVsdGlwbGUgbGluZXMsIHlv dSBzdGlsbCBwYWludCBpdAogICAgICAgICAvLyBhcyB0aG91Z2ggeW91IGhhZCBvbmUgc2luZ2xl IGxpbmUuICBUaGlzIG1lYW5zIGVhY2ggbGluZSBoYXMgdG8gcGljayB1cCB0aGUgYmFja2dyb3Vu ZCB3aGVyZQogICAgICAgICAvLyB0aGUgcHJldmlvdXMgbGluZSBsZWZ0IG9mZi4KLSAgICAgICAg aW50IGxvZ2ljYWxPZmZzZXRPbkxpbmUgPSAwOwotICAgICAgICBpbnQgdG90YWxMb2dpY2FsV2lk dGg7CisgICAgICAgIExheW91dFVuaXQgbG9naWNhbE9mZnNldE9uTGluZSA9IDA7CisgICAgICAg IExheW91dFVuaXQgdG90YWxMb2dpY2FsV2lkdGg7CiAgICAgICAgIGlmIChyZW5kZXJlcigpLT5z dHlsZSgpLT5kaXJlY3Rpb24oKSA9PSBMVFIpIHsKICAgICAgICAgICAgIGZvciAoSW5saW5lRmxv d0JveCogY3VyciA9IHByZXZMaW5lQm94KCk7IGN1cnI7IGN1cnIgPSBjdXJyLT5wcmV2TGluZUJv eCgpKQogICAgICAgICAgICAgICAgIGxvZ2ljYWxPZmZzZXRPbkxpbmUgKz0gY3Vyci0+bG9naWNh bFdpZHRoKCk7CkBAIC0xMDUyLDE0ICsxMDUyLDE0IEBAIHZvaWQgSW5saW5lRmxvd0JveDo6cGFp bnRGaWxsTGF5ZXIoY29uc3QKICAgICAgICAgICAgIGZvciAoSW5saW5lRmxvd0JveCogY3VyciA9 IHRoaXM7IGN1cnI7IGN1cnIgPSBjdXJyLT5wcmV2TGluZUJveCgpKQogICAgICAgICAgICAgICAg IHRvdGFsTG9naWNhbFdpZHRoICs9IGN1cnItPmxvZ2ljYWxXaWR0aCgpOwogICAgICAgICB9Ci0g ICAgICAgIGludCBzdHJpcFggPSByZWN0LngoKSAtIChpc0hvcml6b250YWwoKSA/IGxvZ2ljYWxP ZmZzZXRPbkxpbmUgOiAwKTsKLSAgICAgICAgaW50IHN0cmlwWSA9IHJlY3QueSgpIC0gKGlzSG9y aXpvbnRhbCgpID8gMCA6IGxvZ2ljYWxPZmZzZXRPbkxpbmUpOwotICAgICAgICBpbnQgc3RyaXBX aWR0aCA9IGlzSG9yaXpvbnRhbCgpID8gdG90YWxMb2dpY2FsV2lkdGggOiB3aWR0aCgpOwotICAg ICAgICBpbnQgc3RyaXBIZWlnaHQgPSBpc0hvcml6b250YWwoKSA/IGhlaWdodCgpIDogdG90YWxM b2dpY2FsV2lkdGg7CisgICAgICAgIExheW91dFVuaXQgc3RyaXBYID0gcmVjdC54KCkgLSAoaXNI b3Jpem9udGFsKCkgPyBsb2dpY2FsT2Zmc2V0T25MaW5lIDogMCk7CisgICAgICAgIExheW91dFVu aXQgc3RyaXBZID0gcmVjdC55KCkgLSAoaXNIb3Jpem9udGFsKCkgPyAwIDogbG9naWNhbE9mZnNl dE9uTGluZSk7CisgICAgICAgIExheW91dFVuaXQgc3RyaXBXaWR0aCA9IGlzSG9yaXpvbnRhbCgp ID8gdG90YWxMb2dpY2FsV2lkdGggOiB3aWR0aCgpOworICAgICAgICBMYXlvdXRVbml0IHN0cmlw SGVpZ2h0ID0gaXNIb3Jpem9udGFsKCkgPyBoZWlnaHQoKSA6IHRvdGFsTG9naWNhbFdpZHRoOwog CiAgICAgICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcigqcGFpbnRJbmZv LmNvbnRleHQpOwotICAgICAgICBwYWludEluZm8uY29udGV4dC0+Y2xpcChJbnRSZWN0KHJlY3Qu eCgpLCByZWN0LnkoKSwgd2lkdGgoKSwgaGVpZ2h0KCkpKTsKLSAgICAgICAgYm94TW9kZWxPYmpl Y3QoKS0+cGFpbnRGaWxsTGF5ZXJFeHRlbmRlZChwYWludEluZm8sIGMsIGZpbGxMYXllciwgSW50 UmVjdChzdHJpcFgsIHN0cmlwWSwgc3RyaXBXaWR0aCwgc3RyaXBIZWlnaHQpLCBCYWNrZ3JvdW5k QmxlZWROb25lLCB0aGlzLCByZWN0LnNpemUoKSwgb3ApOworICAgICAgICBwYWludEluZm8uY29u dGV4dC0+Y2xpcChMYXlvdXRSZWN0KHJlY3QueCgpLCByZWN0LnkoKSwgd2lkdGgoKSwgaGVpZ2h0 KCkpKTsKKyAgICAgICAgYm94TW9kZWxPYmplY3QoKS0+cGFpbnRGaWxsTGF5ZXJFeHRlbmRlZChw YWludEluZm8sIGMsIGZpbGxMYXllciwgTGF5b3V0UmVjdChzdHJpcFgsIHN0cmlwWSwgc3RyaXBX aWR0aCwgc3RyaXBIZWlnaHQpLCBCYWNrZ3JvdW5kQmxlZWROb25lLCB0aGlzLCByZWN0LnNpemUo KSwgb3ApOwogICAgIH0KIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGlu ZUZsb3dCb3guaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5l Rmxvd0JveC5oCShyZXZpc2lvbiA4OTk2MikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9J bmxpbmVGbG93Qm94LmgJKHdvcmtpbmcgY29weSkKQEAgLTEwNSw4ICsxMDUsOCBAQCBwdWJsaWM6 CiAgICAgCiAgICAgdmlydHVhbCB2b2lkIHBhaW50Qm94RGVjb3JhdGlvbnMoUGFpbnRJbmZvJiwg Y29uc3QgSW50UG9pbnQmKTsKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRNYXNrKFBhaW50SW5mbyYs IGNvbnN0IEludFBvaW50Jik7Ci0gICAgdm9pZCBwYWludEZpbGxMYXllcnMoY29uc3QgUGFpbnRJ bmZvJiwgY29uc3QgQ29sb3ImLCBjb25zdCBGaWxsTGF5ZXIqLCBjb25zdCBJbnRSZWN0JiwgQ29t cG9zaXRlT3BlcmF0b3IgPSBDb21wb3NpdGVTb3VyY2VPdmVyKTsKLSAgICB2b2lkIHBhaW50Rmls bExheWVyKGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IENvbG9yJiwgY29uc3QgRmlsbExheWVyKiwg Y29uc3QgSW50UmVjdCYsIENvbXBvc2l0ZU9wZXJhdG9yID0gQ29tcG9zaXRlU291cmNlT3Zlcik7 CisgICAgdm9pZCBwYWludEZpbGxMYXllcnMoY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgQ29sb3Im LCBjb25zdCBGaWxsTGF5ZXIqLCBjb25zdCBMYXlvdXRSZWN0JiwgQ29tcG9zaXRlT3BlcmF0b3Ig PSBDb21wb3NpdGVTb3VyY2VPdmVyKTsKKyAgICB2b2lkIHBhaW50RmlsbExheWVyKGNvbnN0IFBh aW50SW5mbyYsIGNvbnN0IENvbG9yJiwgY29uc3QgRmlsbExheWVyKiwgY29uc3QgTGF5b3V0UmVj dCYsIENvbXBvc2l0ZU9wZXJhdG9yID0gQ29tcG9zaXRlU291cmNlT3Zlcik7CiAgICAgdm9pZCBw YWludEJveFNoYWRvdyhHcmFwaGljc0NvbnRleHQqLCBSZW5kZXJTdHlsZSosIFNoYWRvd1N0eWxl LCBjb25zdCBJbnRSZWN0Jik7CiAgICAgdmlydHVhbCB2b2lkIHBhaW50KFBhaW50SW5mbyYsIGNv bnN0IEludFBvaW50JiwgaW50IGxpbmVUb3AsIGludCBsaW5lQm90dG9tKTsKICAgICB2aXJ0dWFs IGJvb2wgbm9kZUF0UG9pbnQoY29uc3QgSGl0VGVzdFJlcXVlc3QmLCBIaXRUZXN0UmVzdWx0Jiwg Y29uc3QgSW50UG9pbnQmIHBvaW50SW5Db250YWluZXIsIGNvbnN0IEludFBvaW50JiBhY2N1bXVs YXRlZE9mZnNldCwgaW50IGxpbmVUb3AsIGludCBsaW5lQm90dG9tKTsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCShyZXZpc2lvbiA4OTk2MikKKysrIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NzcsNyAr OTc3LDcgQEAgSW50UmVjdCBSZW5kZXJCb3g6Om1hc2tDbGlwUmVjdCgpCiAgICAgcmV0dXJuIHJl c3VsdDsKIH0KIAotdm9pZCBSZW5kZXJCb3g6OnBhaW50RmlsbExheWVycyhjb25zdCBQYWludElu Zm8mIHBhaW50SW5mbywgY29uc3QgQ29sb3ImIGMsIGNvbnN0IEZpbGxMYXllciogZmlsbExheWVy LCBjb25zdCBJbnRSZWN0JiByZWN0LAordm9pZCBSZW5kZXJCb3g6OnBhaW50RmlsbExheWVycyhj b25zdCBQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgQ29sb3ImIGMsIGNvbnN0IEZpbGxMYXll ciogZmlsbExheWVyLCBjb25zdCBMYXlvdXRSZWN0JiByZWN0LAogICAgIEJhY2tncm91bmRCbGVl ZEF2b2lkYW5jZSBibGVlZEF2b2lkYW5jZSwgQ29tcG9zaXRlT3BlcmF0b3Igb3AsIFJlbmRlck9i amVjdCogYmFja2dyb3VuZE9iamVjdCkKIHsKICAgICBpZiAoIWZpbGxMYXllcikKQEAgLTk4Nyw3 ICs5ODcsNyBAQCB2b2lkIFJlbmRlckJveDo6cGFpbnRGaWxsTGF5ZXJzKGNvbnN0IFBhCiAgICAg cGFpbnRGaWxsTGF5ZXIocGFpbnRJbmZvLCBjLCBmaWxsTGF5ZXIsIHJlY3QsIGJsZWVkQXZvaWRh bmNlLCBvcCwgYmFja2dyb3VuZE9iamVjdCk7CiB9CiAKLXZvaWQgUmVuZGVyQm94OjpwYWludEZp bGxMYXllcihjb25zdCBQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgQ29sb3ImIGMsIGNvbnN0 IEZpbGxMYXllciogZmlsbExheWVyLCBjb25zdCBJbnRSZWN0JiByZWN0LAordm9pZCBSZW5kZXJC b3g6OnBhaW50RmlsbExheWVyKGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBDb2xv ciYgYywgY29uc3QgRmlsbExheWVyKiBmaWxsTGF5ZXIsIGNvbnN0IExheW91dFJlY3QmIHJlY3Qs CiAgICAgQmFja2dyb3VuZEJsZWVkQXZvaWRhbmNlIGJsZWVkQXZvaWRhbmNlLCBDb21wb3NpdGVP cGVyYXRvciBvcCwgUmVuZGVyT2JqZWN0KiBiYWNrZ3JvdW5kT2JqZWN0KQogewogICAgIHBhaW50 RmlsbExheWVyRXh0ZW5kZWQocGFpbnRJbmZvLCBjLCBmaWxsTGF5ZXIsIHJlY3QsIGJsZWVkQXZv aWRhbmNlLCAwLCBJbnRTaXplKCksIG9wLCBiYWNrZ3JvdW5kT2JqZWN0KTsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgJKHJldmlzaW9uIDg5OTYyKQorKysgU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCSh3b3JraW5nIGNvcHkpCkBAIC00MTcsOCArNDE3 LDggQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgdm9pZCBzdHlsZURpZENoYW5nZShTdHlsZURp ZmZlcmVuY2UsIGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdHlsZSk7CiAgICAgdmlydHVhbCB2b2lk IHVwZGF0ZUJveE1vZGVsSW5mb0Zyb21TdHlsZSgpOwogCi0gICAgdm9pZCBwYWludEZpbGxMYXll cihjb25zdCBQYWludEluZm8mLCBjb25zdCBDb2xvciYsIGNvbnN0IEZpbGxMYXllciosIGNvbnN0 IEludFJlY3QmLCBCYWNrZ3JvdW5kQmxlZWRBdm9pZGFuY2UsIENvbXBvc2l0ZU9wZXJhdG9yLCBS ZW5kZXJPYmplY3QqIGJhY2tncm91bmRPYmplY3QpOwotICAgIHZvaWQgcGFpbnRGaWxsTGF5ZXJz KGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IENvbG9yJiwgY29uc3QgRmlsbExheWVyKiwgY29uc3Qg SW50UmVjdCYsIEJhY2tncm91bmRCbGVlZEF2b2lkYW5jZSA9IEJhY2tncm91bmRCbGVlZE5vbmUs IENvbXBvc2l0ZU9wZXJhdG9yID0gQ29tcG9zaXRlU291cmNlT3ZlciwgUmVuZGVyT2JqZWN0KiBi YWNrZ3JvdW5kT2JqZWN0ID0gMCk7CisgICAgdm9pZCBwYWludEZpbGxMYXllcihjb25zdCBQYWlu dEluZm8mLCBjb25zdCBDb2xvciYsIGNvbnN0IEZpbGxMYXllciosIGNvbnN0IExheW91dFJlY3Qm LCBCYWNrZ3JvdW5kQmxlZWRBdm9pZGFuY2UsIENvbXBvc2l0ZU9wZXJhdG9yLCBSZW5kZXJPYmpl Y3QqIGJhY2tncm91bmRPYmplY3QpOworICAgIHZvaWQgcGFpbnRGaWxsTGF5ZXJzKGNvbnN0IFBh aW50SW5mbyYsIGNvbnN0IENvbG9yJiwgY29uc3QgRmlsbExheWVyKiwgY29uc3QgTGF5b3V0UmVj dCYsIEJhY2tncm91bmRCbGVlZEF2b2lkYW5jZSA9IEJhY2tncm91bmRCbGVlZE5vbmUsIENvbXBv c2l0ZU9wZXJhdG9yID0gQ29tcG9zaXRlU291cmNlT3ZlciwgUmVuZGVyT2JqZWN0KiBiYWNrZ3Jv dW5kT2JqZWN0ID0gMCk7CiAKICAgICB2b2lkIHBhaW50TWFza0ltYWdlcyhjb25zdCBQYWludElu Zm8mLCBjb25zdCBJbnRSZWN0Jik7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAkocmV2aXNpb24gODk5NjIpCisrKyBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC01ODksOCArNTg5LDggQEAgc3RhdGljIEludFJlY3QgYmFja2dyb3VuZFJlY3RBZGp1 c3RlZEZvcgogICAgIHJldHVybiBhZGp1c3RlZFJlY3Q7CiB9CiAKLXZvaWQgUmVuZGVyQm94TW9k ZWxPYmplY3Q6OnBhaW50RmlsbExheWVyRXh0ZW5kZWQoY29uc3QgUGFpbnRJbmZvJiBwYWludElu Zm8sIGNvbnN0IENvbG9yJiBjb2xvciwgY29uc3QgRmlsbExheWVyKiBiZ0xheWVyLCBjb25zdCBJ bnRSZWN0JiByZWN0LAotICAgIEJhY2tncm91bmRCbGVlZEF2b2lkYW5jZSBibGVlZEF2b2lkYW5j ZSwgSW5saW5lRmxvd0JveCogYm94LCBjb25zdCBJbnRTaXplJiBib3hTaXplLCBDb21wb3NpdGVP cGVyYXRvciBvcCwgUmVuZGVyT2JqZWN0KiBiYWNrZ3JvdW5kT2JqZWN0KQordm9pZCBSZW5kZXJC b3hNb2RlbE9iamVjdDo6cGFpbnRGaWxsTGF5ZXJFeHRlbmRlZChjb25zdCBQYWludEluZm8mIHBh aW50SW5mbywgY29uc3QgQ29sb3ImIGNvbG9yLCBjb25zdCBGaWxsTGF5ZXIqIGJnTGF5ZXIsIGNv bnN0IExheW91dFJlY3QmIHJlY3QsCisgICAgQmFja2dyb3VuZEJsZWVkQXZvaWRhbmNlIGJsZWVk QXZvaWRhbmNlLCBJbmxpbmVGbG93Qm94KiBib3gsIGNvbnN0IExheW91dFNpemUmIGJveFNpemUs IENvbXBvc2l0ZU9wZXJhdG9yIG9wLCBSZW5kZXJPYmplY3QqIGJhY2tncm91bmRPYmplY3QpCiB7 CiAgICAgR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0ID0gcGFpbnRJbmZvLmNvbnRleHQ7CiAgICAg aWYgKGNvbnRleHQtPnBhaW50aW5nRGlzYWJsZWQoKSB8fCByZWN0LmlzRW1wdHkoKSkKQEAgLTY0 NiwxOSArNjQ2LDE5IEBAIHZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50RmlsbExheWUK ICAgICAgICAgY29udGV4dC0+YWRkUm91bmRlZFJlY3RDbGlwKGJvcmRlcik7CiAgICAgfQogICAg IAotICAgIGludCBiTGVmdCA9IGluY2x1ZGVMZWZ0RWRnZSA/IGJvcmRlckxlZnQoKSA6IDA7Ci0g ICAgaW50IGJSaWdodCA9IGluY2x1ZGVSaWdodEVkZ2UgPyBib3JkZXJSaWdodCgpIDogMDsKLSAg ICBpbnQgcExlZnQgPSBpbmNsdWRlTGVmdEVkZ2UgPyBwYWRkaW5nTGVmdCgpIDogMDsKLSAgICBp bnQgcFJpZ2h0ID0gaW5jbHVkZVJpZ2h0RWRnZSA/IHBhZGRpbmdSaWdodCgpIDogMDsKKyAgICBM YXlvdXRVbml0IGJMZWZ0ID0gaW5jbHVkZUxlZnRFZGdlID8gYm9yZGVyTGVmdCgpIDogMDsKKyAg ICBMYXlvdXRVbml0IGJSaWdodCA9IGluY2x1ZGVSaWdodEVkZ2UgPyBib3JkZXJSaWdodCgpIDog MDsKKyAgICBMYXlvdXRVbml0IHBMZWZ0ID0gaW5jbHVkZUxlZnRFZGdlID8gcGFkZGluZ0xlZnQo KSA6IDA7CisgICAgTGF5b3V0VW5pdCBwUmlnaHQgPSBpbmNsdWRlUmlnaHRFZGdlID8gcGFkZGlu Z1JpZ2h0KCkgOiAwOwogCiAgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBjbGlwV2l0aFNj cm9sbGluZ1N0YXRlU2F2ZXIoKmNvbnRleHQsIGNsaXBwZWRXaXRoTG9jYWxTY3JvbGxpbmcpOwot ICAgIEludFJlY3Qgc2Nyb2xsZWRQYWludFJlY3QgPSByZWN0OworICAgIExheW91dFJlY3Qgc2Ny b2xsZWRQYWludFJlY3QgPSByZWN0OwogICAgIGlmIChjbGlwcGVkV2l0aExvY2FsU2Nyb2xsaW5n KSB7CiAgICAgICAgIC8vIENsaXAgdG8gdGhlIG92ZXJmbG93IGFyZWEuCiAgICAgICAgIGNvbnRl eHQtPmNsaXAodG9SZW5kZXJCb3godGhpcyktPm92ZXJmbG93Q2xpcFJlY3QocmVjdC5sb2NhdGlv bigpKSk7CiAgICAgICAgIAogICAgICAgICAvLyBBZGp1c3QgdGhlIHBhaW50IHJlY3QgdG8gcmVm bGVjdCBhIHNjcm9sbGVkIGNvbnRlbnQgYm94IHdpdGggYm9yZGVycyBhdCB0aGUgZW5kcy4KLSAg ICAgICAgSW50U2l6ZSBvZmZzZXQgPSBsYXllcigpLT5zY3JvbGxlZENvbnRlbnRPZmZzZXQoKTsK KyAgICAgICAgTGF5b3V0U2l6ZSBvZmZzZXQgPSBsYXllcigpLT5zY3JvbGxlZENvbnRlbnRPZmZz ZXQoKTsKICAgICAgICAgc2Nyb2xsZWRQYWludFJlY3QubW92ZSgtb2Zmc2V0KTsKICAgICAgICAg c2Nyb2xsZWRQYWludFJlY3Quc2V0V2lkdGgoYkxlZnQgKyBsYXllcigpLT5zY3JvbGxXaWR0aCgp ICsgYlJpZ2h0KTsKICAgICAgICAgc2Nyb2xsZWRQYWludFJlY3Quc2V0SGVpZ2h0KGJvcmRlclRv cCgpICsgbGF5ZXIoKS0+c2Nyb2xsSGVpZ2h0KCkgKyBib3JkZXJCb3R0b20oKSk7CkBAIC02Njgs NyArNjY4LDcgQEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRGaWxsTGF5ZQogICAg IGlmIChiZ0xheWVyLT5jbGlwKCkgPT0gUGFkZGluZ0ZpbGxCb3ggfHwgYmdMYXllci0+Y2xpcCgp ID09IENvbnRlbnRGaWxsQm94KSB7CiAgICAgICAgIC8vIENsaXAgdG8gdGhlIHBhZGRpbmcgb3Ig Y29udGVudCBib3hlcyBhcyBuZWNlc3NhcnkuCiAgICAgICAgIGJvb2wgaW5jbHVkZVBhZGRpbmcg PSBiZ0xheWVyLT5jbGlwKCkgPT0gQ29udGVudEZpbGxCb3g7Ci0gICAgICAgIEludFJlY3QgY2xp cFJlY3QgPSBJbnRSZWN0KHNjcm9sbGVkUGFpbnRSZWN0LngoKSArIGJMZWZ0ICsgKGluY2x1ZGVQ YWRkaW5nID8gcExlZnQgOiAwKSwKKyAgICAgICAgTGF5b3V0UmVjdCBjbGlwUmVjdCA9IExheW91 dFJlY3Qoc2Nyb2xsZWRQYWludFJlY3QueCgpICsgYkxlZnQgKyAoaW5jbHVkZVBhZGRpbmcgPyBw TGVmdCA6IDApLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzY3JvbGxlZFBh aW50UmVjdC55KCkgKyBib3JkZXJUb3AoKSArIChpbmNsdWRlUGFkZGluZyA/IHBhZGRpbmdUb3Ao KSA6IDApLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzY3JvbGxlZFBhaW50 UmVjdC53aWR0aCgpIC0gYkxlZnQgLSBiUmlnaHQgLSAoaW5jbHVkZVBhZGRpbmcgPyBwTGVmdCAr IHBSaWdodCA6IDApLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzY3JvbGxl ZFBhaW50UmVjdC5oZWlnaHQoKSAtIGJvcmRlclRvcCgpIC0gYm9yZGVyQm90dG9tKCkgLSAoaW5j bHVkZVBhZGRpbmcgPyBwYWRkaW5nVG9wKCkgKyBwYWRkaW5nQm90dG9tKCkgOiAwKSk7CkBAIC02 NzgsNyArNjc4LDcgQEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRGaWxsTGF5ZQog ICAgICAgICAvLyBXZSBoYXZlIHRvIGRyYXcgb3VyIHRleHQgaW50byBhIG1hc2sgdGhhdCBjYW4g dGhlbiBiZSB1c2VkIHRvIGNsaXAgYmFja2dyb3VuZCBkcmF3aW5nLgogICAgICAgICAvLyBGaXJz dCBmaWd1cmUgb3V0IGhvdyBiaWcgdGhlIG1hc2sgaGFzIHRvIGJlLiAgSXQgc2hvdWxkIGJlIG5v IGJpZ2dlciB0aGFuIHdoYXQgd2UgbmVlZAogICAgICAgICAvLyB0byBhY3R1YWxseSByZW5kZXIs IHNvIHdlIHNob3VsZCBpbnRlcnNlY3QgdGhlIGRpcnR5IHJlY3Qgd2l0aCB0aGUgYm9yZGVyIGJv eCBvZiB0aGUgYmFja2dyb3VuZC4KLSAgICAgICAgSW50UmVjdCBtYXNrUmVjdCA9IHJlY3Q7Cisg ICAgICAgIExheW91dFJlY3QgbWFza1JlY3QgPSByZWN0OwogICAgICAgICBtYXNrUmVjdC5pbnRl cnNlY3QocGFpbnRJbmZvLnJlY3QpOwogICAgICAgICAKICAgICAgICAgLy8gTm93IGNyZWF0ZSB0 aGUgbWFzay4KQEAgLTY5NCw5ICs2OTQsOSBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0Ojpw YWludEZpbGxMYXllCiAgICAgICAgIFBhaW50SW5mbyBpbmZvKG1hc2tJbWFnZUNvbnRleHQsIG1h c2tSZWN0LCBQYWludFBoYXNlVGV4dENsaXAsIHRydWUsIDAsIDApOwogICAgICAgICBpZiAoYm94 KSB7CiAgICAgICAgICAgICBSb290SW5saW5lQm94KiByb290ID0gYm94LT5yb290KCk7Ci0gICAg ICAgICAgICBib3gtPnBhaW50KGluZm8sIEludFBvaW50KHNjcm9sbGVkUGFpbnRSZWN0LngoKSAt IGJveC0+eCgpLCBzY3JvbGxlZFBhaW50UmVjdC55KCkgLSBib3gtPnkoKSksIHJvb3QtPmxpbmVU b3AoKSwgcm9vdC0+bGluZUJvdHRvbSgpKTsKKyAgICAgICAgICAgIGJveC0+cGFpbnQoaW5mbywg TGF5b3V0UG9pbnQoc2Nyb2xsZWRQYWludFJlY3QueCgpIC0gYm94LT54KCksIHNjcm9sbGVkUGFp bnRSZWN0LnkoKSAtIGJveC0+eSgpKSwgcm9vdC0+bGluZVRvcCgpLCByb290LT5saW5lQm90dG9t KCkpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgSW50U2l6ZSBsb2NhbE9mZnNldCA9 IGlzQm94KCkgPyB0b1JlbmRlckJveCh0aGlzKS0+bG9jYXRpb25PZmZzZXQoKSA6IEludFNpemUo KTsKKyAgICAgICAgICAgIExheW91dFNpemUgbG9jYWxPZmZzZXQgPSBpc0JveCgpID8gdG9SZW5k ZXJCb3godGhpcyktPmxvY2F0aW9uT2Zmc2V0KCkgOiBMYXlvdXRTaXplKCk7CiAgICAgICAgICAg ICBwYWludChpbmZvLCBzY3JvbGxlZFBhaW50UmVjdC5sb2NhdGlvbigpIC0gbG9jYWxPZmZzZXQp OwogICAgICAgICB9CiAgICAgICAgIApAQCAtNzM4LDcgKzczOCw3IEBAIHZvaWQgUmVuZGVyQm94 TW9kZWxPYmplY3Q6OnBhaW50RmlsbExheWUKIAogICAgIC8vIFBhaW50IHRoZSBjb2xvciBmaXJz dCB1bmRlcm5lYXRoIGFsbCBpbWFnZXMuCiAgICAgaWYgKCFiZ0xheWVyLT5uZXh0KCkpIHsKLSAg ICAgICAgSW50UmVjdCBiYWNrZ3JvdW5kUmVjdChzY3JvbGxlZFBhaW50UmVjdCk7CisgICAgICAg IExheW91dFJlY3QgYmFja2dyb3VuZFJlY3Qoc2Nyb2xsZWRQYWludFJlY3QpOwogICAgICAgICBi YWNrZ3JvdW5kUmVjdC5pbnRlcnNlY3QocGFpbnRJbmZvLnJlY3QpOwogICAgICAgICAvLyBJZiB3 ZSBoYXZlIGFuIGFscGhhIGFuZCB3ZSBhcmUgcGFpbnRpbmcgdGhlIHJvb3QgZWxlbWVudCwgZ28g YWhlYWQgYW5kIGJsZW5kIHdpdGggdGhlIGJhc2UgYmFja2dyb3VuZCBjb2xvci4KICAgICAgICAg Q29sb3IgYmFzZUNvbG9yOwpAQCAtNzYzLDEyICs3NjMsMTIgQEAgdm9pZCBSZW5kZXJCb3hNb2Rl bE9iamVjdDo6cGFpbnRGaWxsTGF5ZQogCiAgICAgLy8gbm8gcHJvZ3Jlc3NpdmUgbG9hZGluZyBv ZiB0aGUgYmFja2dyb3VuZCBpbWFnZQogICAgIGlmIChzaG91bGRQYWludEJhY2tncm91bmRJbWFn ZSkgewotICAgICAgICBJbnRSZWN0IGRlc3RSZWN0OwotICAgICAgICBJbnRQb2ludCBwaGFzZTsK LSAgICAgICAgSW50U2l6ZSB0aWxlU2l6ZTsKKyAgICAgICAgTGF5b3V0UmVjdCBkZXN0UmVjdDsK KyAgICAgICAgTGF5b3V0UG9pbnQgcGhhc2U7CisgICAgICAgIExheW91dFNpemUgdGlsZVNpemU7 CiAKICAgICAgICAgY2FsY3VsYXRlQmFja2dyb3VuZEltYWdlR2VvbWV0cnkoYmdMYXllciwgc2Ny b2xsZWRQYWludFJlY3QsIGRlc3RSZWN0LCBwaGFzZSwgdGlsZVNpemUpOwotICAgICAgICBJbnRQ b2ludCBkZXN0T3JpZ2luID0gZGVzdFJlY3QubG9jYXRpb24oKTsKKyAgICAgICAgTGF5b3V0UG9p bnQgZGVzdE9yaWdpbiA9IGRlc3RSZWN0LmxvY2F0aW9uKCk7CiAgICAgICAgIGRlc3RSZWN0Lmlu dGVyc2VjdChwYWludEluZm8ucmVjdCk7CiAgICAgICAgIGlmICghZGVzdFJlY3QuaXNFbXB0eSgp KSB7CiAgICAgICAgICAgICBwaGFzZSArPSBkZXN0UmVjdC5sb2NhdGlvbigpIC0gZGVzdE9yaWdp bjsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9i amVjdC5oCShyZXZpc2lvbiA4OTk2MikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3hNb2RlbE9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjEsNyArMTIxLDcgQEAgcHVi bGljOgogICAgIHZvaWQgcGFpbnRCb3JkZXIoR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgSW50UmVj dCYsIGNvbnN0IFJlbmRlclN0eWxlKiwgQmFja2dyb3VuZEJsZWVkQXZvaWRhbmNlID0gQmFja2dy b3VuZEJsZWVkTm9uZSwgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRFZGdlID0gdHJ1ZSwgYm9vbCBp bmNsdWRlTG9naWNhbFJpZ2h0RWRnZSA9IHRydWUpOwogICAgIGJvb2wgcGFpbnROaW5lUGllY2VJ bWFnZShHcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRSZWN0JiwgY29uc3QgUmVuZGVyU3R5bGUq LCBjb25zdCBOaW5lUGllY2VJbWFnZSYsIENvbXBvc2l0ZU9wZXJhdG9yID0gQ29tcG9zaXRlU291 cmNlT3Zlcik7CiAgICAgdm9pZCBwYWludEJveFNoYWRvdyhHcmFwaGljc0NvbnRleHQqLCBjb25z dCBJbnRSZWN0JiwgY29uc3QgUmVuZGVyU3R5bGUqLCBTaGFkb3dTdHlsZSwgYm9vbCBpbmNsdWRl TG9naWNhbExlZnRFZGdlID0gdHJ1ZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSA9IHRy dWUpOwotICAgIHZvaWQgcGFpbnRGaWxsTGF5ZXJFeHRlbmRlZChjb25zdCBQYWludEluZm8mLCBj b25zdCBDb2xvciYsIGNvbnN0IEZpbGxMYXllciosIGNvbnN0IEludFJlY3QmLCBCYWNrZ3JvdW5k QmxlZWRBdm9pZGFuY2UsIElubGluZUZsb3dCb3gqID0gMCwgY29uc3QgSW50U2l6ZSYgPSBJbnRT aXplKCksIENvbXBvc2l0ZU9wZXJhdG9yID0gQ29tcG9zaXRlU291cmNlT3ZlciwgUmVuZGVyT2Jq ZWN0KiBiYWNrZ3JvdW5kT2JqZWN0ID0gMCk7CisgICAgdm9pZCBwYWludEZpbGxMYXllckV4dGVu ZGVkKGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IENvbG9yJiwgY29uc3QgRmlsbExheWVyKiwgY29u c3QgTGF5b3V0UmVjdCYsIEJhY2tncm91bmRCbGVlZEF2b2lkYW5jZSwgSW5saW5lRmxvd0JveCog PSAwLCBjb25zdCBMYXlvdXRTaXplJiA9IExheW91dFNpemUoKSwgQ29tcG9zaXRlT3BlcmF0b3Ig PSBDb21wb3NpdGVTb3VyY2VPdmVyLCBSZW5kZXJPYmplY3QqIGJhY2tncm91bmRPYmplY3QgPSAw KTsKICAgICAKICAgICAvLyBPdmVycmlkZGVuIGJ5IHN1YmNsYXNzZXMgdG8gZGV0ZXJtaW5lIGxp bmUgaGVpZ2h0IGFuZCBiYXNlbGluZSBwb3NpdGlvbi4KICAgICB2aXJ0dWFsIGludCBsaW5lSGVp Z2h0KGJvb2wgZmlyc3RMaW5lLCBMaW5lRGlyZWN0aW9uTW9kZSwgTGluZVBvc2l0aW9uTW9kZSA9 IFBvc2l0aW9uT25Db250YWluaW5nTGluZSkgY29uc3QgPSAwOwpJbmRleDogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAkocmV2aXNpb24gODk5NjIpCisrKyBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMw LDcgQEAKICNpbmNsdWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkVsZW1lbnQuaCIKICNpbmNs dWRlICJGbG9hdFF1YWQuaCIKKyNpbmNsdWRlICJMYXlvdXRUeXBlcy5oIgogI2luY2x1ZGUgIlBh aW50UGhhc2UuaCIKICNpbmNsdWRlICJSZW5kZXJPYmplY3RDaGlsZExpc3QuaCIKICNpbmNsdWRl ICJSZW5kZXJTdHlsZS5oIgo=