37810 2010-04-19 10:53:44 -0700 Canvas overloads cleanup 2010-04-20 07:16:48 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 yaar webkit-unassigned commit-queue japhet sam webkit.review.bot oldest_to_newest 214106 0 yaar 2010-04-19 10:53:44 -0700 Canvas overloads cleanup 214110 1 53691 yaar 2010-04-19 11:02:57 -0700 Created attachment 53691 Patch 214111 2 53691 yaar 2010-04-19 11:03:32 -0700 Comment on attachment 53691 Patch Please cq+ if ok. 214114 3 webkit.review.bot 2010-04-19 11:07:01 -0700 Attachment 53691 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/bindings/v8/test/V8TestObj.cpp:308: An else if statement should be written as an if statement when the prior "if" concludes with a return, break, continue or goto statement. [readability/control_flow] [4] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 214284 4 53691 japhet 2010-04-19 15:22:56 -0700 Comment on attachment 53691 Patch Ok. 214643 5 53691 commit-queue 2010-04-20 07:16:42 -0700 Comment on attachment 53691 Patch Clearing flags on attachment: 53691 Committed r57889: <http://trac.webkit.org/changeset/57889> 214645 6 commit-queue 2010-04-20 07:16:48 -0700 All reviewed patches have been landed. Closing bug. 53691 2010-04-19 11:02:57 -0700 2010-04-20 07:16:42 -0700 Patch bug-37810-20100419110256.patch text/plain 14815 yaar ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YzliY2MwYi4uMmMyNmViOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wNC0xOSAgWWFhciBTY2huaXRt YW4gIDx5YWFyQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBOdWxsIHZhbHVlIHNob3VsZCBiZSBsZWdpdCB2YWx1ZSBmb3Igd3Jh cHBlZCB0eXBlcy4gVGhpcyByZXF1aXJlcyBzb21lIGNsZWFudXAgaW4gY2FudmFzIHdoaWNoIHdh cyBtaXNzaW5nIGJ1aWx0LWluIG51bGwgYXJndW1lbnQgY2hlY2tzOworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzc4MTAKKworICAgICAgICAqIGJpbmRp bmdzL2pzL0pTQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkpTQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UpOiBQYXNzZXMgZWMg dG8gZHJhd0ltYWdlKDMpIHRvbworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVy YXRvclY4LnBtOiBBIG51bGwgdmFsdWUgaXMgbm93IGxlZ2l0IHZhbHVlIGZvciB3cmFwcGVkIHR5 cGVzLgorICAgICAgICAqIGJpbmRpbmdzL3Y4L3Rlc3QvVjhUZXN0T2JqLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlRlc3RPYmpJbnRlcm5hbDo6b3ZlcmxvYWRlZE1ldGhvZENhbGxiYWNrKToKKyAg ICAgICAgKiBodG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UpOiBBZGRlZCBu dWxsIGNoZWNrcy4KKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6 Y3JlYXRlUGF0dGVybik6IEFkZGVkIG51bGwgY2hlY2tzLgorICAgICAgICAqIGh0bWwvY2FudmFz L0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5oOiBBZGRlZCBuZWVkZWQgcmFpc2VzICJET01FeGNl cHRpb24iLgorICAgICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5p ZGw6IEFkZGVkIG5lZWRlZCByYWlzZXMgIkRPTUV4Y2VwdGlvbiIuCisKIDIwMTAtMDQtMTYgIFlh YXIgU2Nobml0bWFuICA8eWFhckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ2FudmFz UmVuZGVyaW5nQ29udGV4dDJEQ3VzdG9tLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDYW52 YXNSZW5kZXJpbmdDb250ZXh0MkRDdXN0b20uY3BwCmluZGV4IGEyNzE5MjMuLmUwMjVmZTEgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRD dXN0b20uY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDYW52YXNSZW5kZXJpbmdDb250 ZXh0MkRDdXN0b20uY3BwCkBAIC0xOTgsNyArMTk4LDcgQEAgSlNWYWx1ZSBKU0NhbnZhc1JlbmRl cmluZ0NvbnRleHQyRDo6ZHJhd0ltYWdlKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgQXJnTGlzdCYg YXIKICAgICAgICAgSFRNTEltYWdlRWxlbWVudCogaW1nRWx0ID0gc3RhdGljX2Nhc3Q8SFRNTElt YWdlRWxlbWVudCo+KHN0YXRpY19jYXN0PEpTSFRNTEVsZW1lbnQqPihvKS0+aW1wbCgpKTsKICAg ICAgICAgc3dpdGNoIChhcmdzLnNpemUoKSkgewogICAgICAgICAgICAgY2FzZSAzOgotICAgICAg ICAgICAgICAgIGNvbnRleHQtPmRyYXdJbWFnZShpbWdFbHQsIGFyZ3MuYXQoMSkudG9GbG9hdChl eGVjKSwgYXJncy5hdCgyKS50b0Zsb2F0KGV4ZWMpKTsKKyAgICAgICAgICAgICAgICBjb250ZXh0 LT5kcmF3SW1hZ2UoaW1nRWx0LCBhcmdzLmF0KDEpLnRvRmxvYXQoZXhlYyksIGFyZ3MuYXQoMiku dG9GbG9hdChleGVjKSwgZWMpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAg Y2FzZSA1OgogICAgICAgICAgICAgICAgIGNvbnRleHQtPmRyYXdJbWFnZShpbWdFbHQsIGFyZ3Mu YXQoMSkudG9GbG9hdChleGVjKSwgYXJncy5hdCgyKS50b0Zsb2F0KGV4ZWMpLApAQCAtMjE5LDcg KzIxOSw3IEBAIEpTVmFsdWUgSlNDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJbWFnZShF eGVjU3RhdGUqIGV4ZWMsIGNvbnN0IEFyZ0xpc3QmIGFyCiAgICAgICAgIEhUTUxDYW52YXNFbGVt ZW50KiBjYW52YXMgPSBzdGF0aWNfY2FzdDxIVE1MQ2FudmFzRWxlbWVudCo+KHN0YXRpY19jYXN0 PEpTSFRNTEVsZW1lbnQqPihvKS0+aW1wbCgpKTsKICAgICAgICAgc3dpdGNoIChhcmdzLnNpemUo KSkgewogICAgICAgICAgICAgY2FzZSAzOgotICAgICAgICAgICAgICAgIGNvbnRleHQtPmRyYXdJ bWFnZShjYW52YXMsIGFyZ3MuYXQoMSkudG9GbG9hdChleGVjKSwgYXJncy5hdCgyKS50b0Zsb2F0 KGV4ZWMpKTsKKyAgICAgICAgICAgICAgICBjb250ZXh0LT5kcmF3SW1hZ2UoY2FudmFzLCBhcmdz LmF0KDEpLnRvRmxvYXQoZXhlYyksIGFyZ3MuYXQoMikudG9GbG9hdChleGVjKSwgZWMpOwogICAg ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSA1OgogICAgICAgICAgICAgICAg IGNvbnRleHQtPmRyYXdJbWFnZShjYW52YXMsIGFyZ3MuYXQoMSkudG9GbG9hdChleGVjKSwgYXJn cy5hdCgyKS50b0Zsb2F0KGV4ZWMpLApAQCAtMjQxLDcgKzI0MSw3IEBAIEpTVmFsdWUgSlNDYW52 YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJbWFnZShFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IEFy Z0xpc3QmIGFyCiAgICAgICAgICAgICBIVE1MVmlkZW9FbGVtZW50KiB2aWRlbyA9IHN0YXRpY19j YXN0PEhUTUxWaWRlb0VsZW1lbnQqPihzdGF0aWNfY2FzdDxKU0hUTUxFbGVtZW50Kj4obyktPmlt cGwoKSk7CiAgICAgICAgICAgICBzd2l0Y2ggKGFyZ3Muc2l6ZSgpKSB7CiAgICAgICAgICAgICAg ICAgY2FzZSAzOgotICAgICAgICAgICAgICAgICAgICBjb250ZXh0LT5kcmF3SW1hZ2UodmlkZW8s IGFyZ3MuYXQoMSkudG9GbG9hdChleGVjKSwgYXJncy5hdCgyKS50b0Zsb2F0KGV4ZWMpKTsKKyAg ICAgICAgICAgICAgICAgICAgY29udGV4dC0+ZHJhd0ltYWdlKHZpZGVvLCBhcmdzLmF0KDEpLnRv RmxvYXQoZXhlYyksIGFyZ3MuYXQoMikudG9GbG9hdChleGVjKSwgZWMpOwogICAgICAgICAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICBjYXNlIDU6CiAgICAgICAgICAgICAgICAg ICAgIGNvbnRleHQtPmRyYXdJbWFnZSh2aWRlbywgYXJncy5hdCgxKS50b0Zsb2F0KGV4ZWMpLCBh cmdzLmF0KDIpLnRvRmxvYXQoZXhlYyksCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtIGIvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVH ZW5lcmF0b3JWOC5wbQppbmRleCAwZDM1NTZiLi40MmNkYTk5IDEwMDY0NAotLS0gYS9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCisrKyBiL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KQEAgLTEwMzYsNyArMTAzNiw3IEBAIHN1YiBH ZW5lcmF0ZVBhcmFtZXRlcnNDaGVja0V4cHJlc3Npb24KICAgICAgICAgIyB0aGVzZSBhcmUgYWNj ZXB0YWJsZSB2YWx1ZXMgZm9yIGEgRE9NU3RyaW5nIGFyZ3VtZW50IChhbnkgT2JqZWN0IGNhbgog ICAgICAgICAjIGJlIGNvbnZlcnRlZCB0byBhIHN0cmluZyB2aWEgLnRvU3RyaW5nKS4KICAgICAg ICAgcHVzaChAYW5kRXhwcmVzc2lvbiwgIigke3ZhbHVlfS0+SXNOdWxsKCkgfHwgJHt2YWx1ZX0t PklzVW5kZWZpbmVkKCkgfHwgJHt2YWx1ZX0tPklzU3RyaW5nKCkgfHwgJHt2YWx1ZX0tPklzT2Jq ZWN0KCkpIikgaWYgJGNvZGVHZW5lcmF0b3ItPklzU3RyaW5nVHlwZSgkdHlwZSk7Ci0gICAgICAg IHB1c2goQGFuZEV4cHJlc3Npb24sICJWOCR7dHlwZX06Okhhc0luc3RhbmNlKCR2YWx1ZSkiKSBp ZiBJc1dyYXBwZXJUeXBlKCR0eXBlKTsKKyAgICAgICAgcHVzaChAYW5kRXhwcmVzc2lvbiwgIigk e3ZhbHVlfS0+SXNOdWxsKCkgfHwgVjgke3R5cGV9OjpIYXNJbnN0YW5jZSgkdmFsdWUpKSIpIGlm IElzV3JhcHBlclR5cGUoJHR5cGUpOwogCiAgICAgICAgICRwYXJhbWV0ZXJJbmRleCsrOwogICAg IH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvdGVzdC9WOFRlc3RPYmouY3BwIGIv V2ViQ29yZS9iaW5kaW5ncy92OC90ZXN0L1Y4VGVzdE9iai5jcHAKaW5kZXggNDJhMjVmZS4uNzg0 NDYyMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC90ZXN0L1Y4VGVzdE9iai5jcHAK KysrIGIvV2ViQ29yZS9iaW5kaW5ncy92OC90ZXN0L1Y4VGVzdE9iai5jcHAKQEAgLTMwNSw5ICsz MDUsOSBAQCBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IG92ZXJsb2FkZWRNZXRob2Q0Q2Fs bGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncwogCiBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6 VmFsdWU+IG92ZXJsb2FkZWRNZXRob2RDYWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdz KSB7CiAgICAgSU5DX1NUQVRTKCJET00uVGVzdE9iai5vdmVybG9hZGVkTWV0aG9kIik7Ci0gICAg aWYgKChhcmdzLkxlbmd0aCgpID09IDIgJiYgVjhUZXN0T2JqOjpIYXNJbnN0YW5jZShhcmdzWzBd KSAmJiAoYXJnc1sxXS0+SXNOdWxsKCkgfHwgYXJnc1sxXS0+SXNVbmRlZmluZWQoKSB8fCBhcmdz WzFdLT5Jc1N0cmluZygpIHx8IGFyZ3NbMV0tPklzT2JqZWN0KCkpKSkgeworICAgIGlmICgoYXJn cy5MZW5ndGgoKSA9PSAyICYmIChhcmdzWzBdLT5Jc051bGwoKSB8fCBWOFRlc3RPYmo6Okhhc0lu c3RhbmNlKGFyZ3NbMF0pKSAmJiAoYXJnc1sxXS0+SXNOdWxsKCkgfHwgYXJnc1sxXS0+SXNVbmRl ZmluZWQoKSB8fCBhcmdzWzFdLT5Jc1N0cmluZygpIHx8IGFyZ3NbMV0tPklzT2JqZWN0KCkpKSkg ewogICAgICAgICByZXR1cm4gb3ZlcmxvYWRlZE1ldGhvZDFDYWxsYmFjayhhcmdzKTsKLSAgICB9 IGVsc2UgaWYgKChhcmdzLkxlbmd0aCgpID09IDEgJiYgVjhUZXN0T2JqOjpIYXNJbnN0YW5jZShh cmdzWzBdKSkgfHwgKGFyZ3MuTGVuZ3RoKCkgPT0gMiAmJiBWOFRlc3RPYmo6Okhhc0luc3RhbmNl KGFyZ3NbMF0pKSkgeworICAgIH0gZWxzZSBpZiAoKGFyZ3MuTGVuZ3RoKCkgPT0gMSAmJiAoYXJn c1swXS0+SXNOdWxsKCkgfHwgVjhUZXN0T2JqOjpIYXNJbnN0YW5jZShhcmdzWzBdKSkpIHx8IChh cmdzLkxlbmd0aCgpID09IDIgJiYgKGFyZ3NbMF0tPklzTnVsbCgpIHx8IFY4VGVzdE9iajo6SGFz SW5zdGFuY2UoYXJnc1swXSkpKSkgewogICAgICAgICByZXR1cm4gb3ZlcmxvYWRlZE1ldGhvZDJD YWxsYmFjayhhcmdzKTsKICAgICB9IGVsc2UgaWYgKChhcmdzLkxlbmd0aCgpID09IDEgJiYgKGFy Z3NbMF0tPklzTnVsbCgpIHx8IGFyZ3NbMF0tPklzVW5kZWZpbmVkKCkgfHwgYXJnc1swXS0+SXNT dHJpbmcoKSB8fCBhcmdzWzBdLT5Jc09iamVjdCgpKSkpIHsKICAgICAgICAgcmV0dXJuIG92ZXJs b2FkZWRNZXRob2QzQ2FsbGJhY2soYXJncyk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvY2Fu dmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAgYi9XZWJDb3JlL2h0bWwvY2FudmFzL0Nh bnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAKaW5kZXggMDMyYmJhMC4uMzczMjQ4NyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCisr KyBiL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcApAQCAt OTU0LDE4ICs5NTQsMjMgQEAgdm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmNoZWNrT3Jp Z2luKGNvbnN0IFN0cmluZyYgdXJsKQogICAgIGNoZWNrT3JpZ2luKEtVUkwoS1VSTCgpLCB1cmwp KTsKIH0KIAotdm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJbWFnZShIVE1MSW1h Z2VFbGVtZW50KiBpbWFnZSwgZmxvYXQgeCwgZmxvYXQgeSkKK3ZvaWQgQ2FudmFzUmVuZGVyaW5n Q29udGV4dDJEOjpkcmF3SW1hZ2UoSFRNTEltYWdlRWxlbWVudCogaW1hZ2UsIGZsb2F0IHgsIGZs b2F0IHksIEV4Y2VwdGlvbkNvZGUmIGVjKQogewotICAgIEFTU0VSVChpbWFnZSk7CisgICAgaWYg KCFpbWFnZSkgeworICAgICAgICBlYyA9IFRZUEVfTUlTTUFUQ0hfRVJSOworICAgICAgICByZXR1 cm47CisgICAgfQogICAgIEludFNpemUgcyA9IHNpemUoaW1hZ2UpOwotICAgIEV4Y2VwdGlvbkNv ZGUgZWM7CiAgICAgZHJhd0ltYWdlKGltYWdlLCB4LCB5LCBzLndpZHRoKCksIHMuaGVpZ2h0KCks IGVjKTsKIH0KIAogdm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJbWFnZShIVE1M SW1hZ2VFbGVtZW50KiBpbWFnZSwKICAgICBmbG9hdCB4LCBmbG9hdCB5LCBmbG9hdCB3aWR0aCwg ZmxvYXQgaGVpZ2h0LCBFeGNlcHRpb25Db2RlJiBlYykKIHsKLSAgICBBU1NFUlQoaW1hZ2UpOwor ICAgIGlmICghaW1hZ2UpIHsKKyAgICAgICAgZWMgPSBUWVBFX01JU01BVENIX0VSUjsKKyAgICAg ICAgcmV0dXJuOworICAgIH0KICAgICBJbnRTaXplIHMgPSBzaXplKGltYWdlKTsKICAgICBkcmF3 SW1hZ2UoaW1hZ2UsIEZsb2F0UmVjdCgwLCAwLCBzLndpZHRoKCksIHMuaGVpZ2h0KCkpLCBGbG9h dFJlY3QoeCwgeSwgd2lkdGgsIGhlaWdodCksIGVjKTsKIH0KQEAgLTk3NCwxMyArOTc5LDIwIEBA IHZvaWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UoSFRNTEltYWdlRWxlbWVu dCogaW1hZ2UsCiAgICAgZmxvYXQgc3gsIGZsb2F0IHN5LCBmbG9hdCBzdywgZmxvYXQgc2gsCiAg ICAgZmxvYXQgZHgsIGZsb2F0IGR5LCBmbG9hdCBkdywgZmxvYXQgZGgsIEV4Y2VwdGlvbkNvZGUm IGVjKQogeworICAgIGlmICghaW1hZ2UpIHsKKyAgICAgICAgZWMgPSBUWVBFX01JU01BVENIX0VS UjsKKyAgICAgICAgcmV0dXJuOworICAgIH0KICAgICBkcmF3SW1hZ2UoaW1hZ2UsIEZsb2F0UmVj dChzeCwgc3ksIHN3LCBzaCksIEZsb2F0UmVjdChkeCwgZHksIGR3LCBkaCksIGVjKTsKIH0KIAog dm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJbWFnZShIVE1MSW1hZ2VFbGVtZW50 KiBpbWFnZSwgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBjb25zdCBGbG9hdFJlY3QmIGRzdFJl Y3QsCiAgICAgRXhjZXB0aW9uQ29kZSYgZWMpCiB7Ci0gICAgQVNTRVJUKGltYWdlKTsKKyAgICBp ZiAoIWltYWdlKSB7CisgICAgICAgIGVjID0gVFlQRV9NSVNNQVRDSF9FUlI7CisgICAgICAgIHJl dHVybjsKKyAgICB9CiAKICAgICBlYyA9IDA7CiAKQEAgLTEwMTUsMTcgKzEwMjcsMjIgQEAgdm9p ZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJbWFnZShIVE1MSW1hZ2VFbGVtZW50KiBp bWFnZSwgY29uc3QgRmxvYXRSZWMKICAgICBjLT5kcmF3SW1hZ2UoY2FjaGVkSW1hZ2UtPmltYWdl KCksIERldmljZUNvbG9yU3BhY2UsIGRlc3RSZWN0LCBzb3VyY2VSZWN0LCBzdGF0ZSgpLm1fZ2xv YmFsQ29tcG9zaXRlKTsKIH0KIAotdm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJ bWFnZShIVE1MQ2FudmFzRWxlbWVudCogY2FudmFzLCBmbG9hdCB4LCBmbG9hdCB5KQordm9pZCBD YW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJbWFnZShIVE1MQ2FudmFzRWxlbWVudCogY2Fu dmFzLCBmbG9hdCB4LCBmbG9hdCB5LCBFeGNlcHRpb25Db2RlJiBlYykKIHsKLSAgICBBU1NFUlQo Y2FudmFzKTsKLSAgICBFeGNlcHRpb25Db2RlIGVjOworICAgIGlmICghY2FudmFzKSB7CisgICAg ICAgIGVjID0gVFlQRV9NSVNNQVRDSF9FUlI7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAg ZHJhd0ltYWdlKGNhbnZhcywgeCwgeSwgY2FudmFzLT53aWR0aCgpLCBjYW52YXMtPmhlaWdodCgp LCBlYyk7CiB9CiAKIHZvaWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UoSFRN TENhbnZhc0VsZW1lbnQqIGNhbnZhcywKICAgICBmbG9hdCB4LCBmbG9hdCB5LCBmbG9hdCB3aWR0 aCwgZmxvYXQgaGVpZ2h0LCBFeGNlcHRpb25Db2RlJiBlYykKIHsKLSAgICBBU1NFUlQoY2FudmFz KTsKKyAgICBpZiAoIWNhbnZhcykgeworICAgICAgICBlYyA9IFRZUEVfTUlTTUFUQ0hfRVJSOwor ICAgICAgICByZXR1cm47CisgICAgfQogICAgIGRyYXdJbWFnZShjYW52YXMsIEZsb2F0UmVjdCgw LCAwLCBjYW52YXMtPndpZHRoKCksIGNhbnZhcy0+aGVpZ2h0KCkpLCBGbG9hdFJlY3QoeCwgeSwg d2lkdGgsIGhlaWdodCksIGVjKTsKIH0KIApAQCAtMTAzOSw3ICsxMDU2LDEwIEBAIHZvaWQgQ2Fu dmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UoSFRNTENhbnZhc0VsZW1lbnQqIGNhbnZh cywKIHZvaWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UoSFRNTENhbnZhc0Vs ZW1lbnQqIHNvdXJjZUNhbnZhcywgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LAogICAgIGNvbnN0 IEZsb2F0UmVjdCYgZHN0UmVjdCwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7Ci0gICAgQVNTRVJUKHNv dXJjZUNhbnZhcyk7CisgICAgaWYgKCFzb3VyY2VDYW52YXMpIHsKKyAgICAgICAgZWMgPSBUWVBF X01JU01BVENIX0VSUjsKKyAgICAgICAgcmV0dXJuOworICAgIH0KIAogICAgIGVjID0gMDsKIApA QCAtMTA3NSwxOCArMTA5NSwyMyBAQCB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6ZHJh d0ltYWdlKEhUTUxDYW52YXNFbGVtZW50KiBzb3VyY2VDYW52YXMsIGNvbnN0CiB9CiAKICNpZiBF TkFCTEUoVklERU8pCi12b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6ZHJhd0ltYWdlKEhU TUxWaWRlb0VsZW1lbnQqIHZpZGVvLCBmbG9hdCB4LCBmbG9hdCB5KQordm9pZCBDYW52YXNSZW5k ZXJpbmdDb250ZXh0MkQ6OmRyYXdJbWFnZShIVE1MVmlkZW9FbGVtZW50KiB2aWRlbywgZmxvYXQg eCwgZmxvYXQgeSwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7Ci0gICAgQVNTRVJUKHZpZGVvKTsKKyAg ICBpZiAoIXZpZGVvKSB7CisgICAgICAgIGVjID0gVFlQRV9NSVNNQVRDSF9FUlI7CisgICAgICAg IHJldHVybjsKKyAgICB9CiAgICAgSW50U2l6ZSBzID0gc2l6ZSh2aWRlbyk7Ci0gICAgRXhjZXB0 aW9uQ29kZSBlYzsKICAgICBkcmF3SW1hZ2UodmlkZW8sIHgsIHksIHMud2lkdGgoKSwgcy5oZWln aHQoKSwgZWMpOwogfQogCiB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6ZHJhd0ltYWdl KEhUTUxWaWRlb0VsZW1lbnQqIHZpZGVvLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBmbG9hdCB4LCBmbG9hdCB5LCBmbG9hdCB3aWR0aCwgZmxvYXQgaGVpZ2h0LCBF eGNlcHRpb25Db2RlJiBlYykKIHsKLSAgICBBU1NFUlQodmlkZW8pOworICAgIGlmICghdmlkZW8p IHsKKyAgICAgICAgZWMgPSBUWVBFX01JU01BVENIX0VSUjsKKyAgICAgICAgcmV0dXJuOworICAg IH0KICAgICBJbnRTaXplIHMgPSBzaXplKHZpZGVvKTsKICAgICBkcmF3SW1hZ2UodmlkZW8sIEZs b2F0UmVjdCgwLCAwLCBzLndpZHRoKCksIHMuaGVpZ2h0KCkpLCBGbG9hdFJlY3QoeCwgeSwgd2lk dGgsIGhlaWdodCksIGVjKTsKIH0KQEAgLTExMDEsNyArMTEyNiwxMCBAQCB2b2lkIENhbnZhc1Jl bmRlcmluZ0NvbnRleHQyRDo6ZHJhd0ltYWdlKEhUTUxWaWRlb0VsZW1lbnQqIHZpZGVvLAogdm9p ZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJbWFnZShIVE1MVmlkZW9FbGVtZW50KiB2 aWRlbywgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBjb25zdCBGbG9hdFJlY3QmIGRzdFJlY3Qs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEV4Y2VwdGlvbkNvZGUm IGVjKQogewotICAgIEFTU0VSVCh2aWRlbyk7CisgICAgaWYgKCF2aWRlbykgeworICAgICAgICBl YyA9IFRZUEVfTUlTTUFUQ0hfRVJSOworICAgICAgICByZXR1cm47CisgICAgfQogICAgIAogICAg IGVjID0gMDsKICAgICBGbG9hdFJlY3QgdmlkZW9SZWN0ID0gRmxvYXRSZWN0KEZsb2F0UG9pbnQo KSwgc2l6ZSh2aWRlbykpOwpAQCAtMTIyMCw2ICsxMjQ4LDEwIEBAIFBhc3NSZWZQdHI8Q2FudmFz R3JhZGllbnQ+IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6Y3JlYXRlUmFkaWFsR3JhZGllbnQo ZmxvYXQKIFBhc3NSZWZQdHI8Q2FudmFzUGF0dGVybj4gQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJE OjpjcmVhdGVQYXR0ZXJuKEhUTUxJbWFnZUVsZW1lbnQqIGltYWdlLAogICAgIGNvbnN0IFN0cmlu ZyYgcmVwZXRpdGlvblR5cGUsIEV4Y2VwdGlvbkNvZGUmIGVjKQogeworICAgIGlmICghaW1hZ2Up IHsKKyAgICAgICAgZWMgPSBUWVBFX01JU01BVENIX0VSUjsKKyAgICAgICAgcmV0dXJuIDA7Cisg ICAgfQogICAgIGJvb2wgcmVwZWF0WCwgcmVwZWF0WTsKICAgICBlYyA9IDA7CiAgICAgQ2FudmFz UGF0dGVybjo6cGFyc2VSZXBldGl0aW9uVHlwZShyZXBldGl0aW9uVHlwZSwgcmVwZWF0WCwgcmVw ZWF0WSwgZWMpOwpAQCAtMTI0Miw2ICsxMjc0LDEwIEBAIFBhc3NSZWZQdHI8Q2FudmFzUGF0dGVy bj4gQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpjcmVhdGVQYXR0ZXJuKEhUTUxJbWFnZUVsZW1l CiBQYXNzUmVmUHRyPENhbnZhc1BhdHRlcm4+IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6Y3Jl YXRlUGF0dGVybihIVE1MQ2FudmFzRWxlbWVudCogY2FudmFzLAogICAgIGNvbnN0IFN0cmluZyYg cmVwZXRpdGlvblR5cGUsIEV4Y2VwdGlvbkNvZGUmIGVjKQogeworICAgIGlmICghY2FudmFzKSB7 CisgICAgICAgIGVjID0gVFlQRV9NSVNNQVRDSF9FUlI7CisgICAgICAgIHJldHVybiAwOworICAg IH0KICAgICBpZiAoIWNhbnZhcy0+d2lkdGgoKSB8fCAhY2FudmFzLT5oZWlnaHQoKSkgewogICAg ICAgICBlYyA9IElOVkFMSURfU1RBVEVfRVJSOwogICAgICAgICByZXR1cm4gMDsKZGlmZiAtLWdp dCBhL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmggYi9XZWJD b3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5oCmluZGV4IDViOTNjOTIu LjJiYWM5MDIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5n Q29udGV4dDJELmgKKysrIGIvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250 ZXh0MkQuaApAQCAtMTU0LDE2ICsxNTQsMTYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAg ICAgIHZvaWQgY2xlYXJTaGFkb3coKTsKIAotICAgICAgICB2b2lkIGRyYXdJbWFnZShIVE1MSW1h Z2VFbGVtZW50KiwgZmxvYXQgeCwgZmxvYXQgeSk7CisgICAgICAgIHZvaWQgZHJhd0ltYWdlKEhU TUxJbWFnZUVsZW1lbnQqLCBmbG9hdCB4LCBmbG9hdCB5LCBFeGNlcHRpb25Db2RlJik7CiAgICAg ICAgIHZvaWQgZHJhd0ltYWdlKEhUTUxJbWFnZUVsZW1lbnQqLCBmbG9hdCB4LCBmbG9hdCB5LCBm bG9hdCB3aWR0aCwgZmxvYXQgaGVpZ2h0LCBFeGNlcHRpb25Db2RlJik7CiAgICAgICAgIHZvaWQg ZHJhd0ltYWdlKEhUTUxJbWFnZUVsZW1lbnQqLCBmbG9hdCBzeCwgZmxvYXQgc3ksIGZsb2F0IHN3 LCBmbG9hdCBzaCwgZmxvYXQgZHgsIGZsb2F0IGR5LCBmbG9hdCBkdywgZmxvYXQgZGgsIEV4Y2Vw dGlvbkNvZGUmKTsKICAgICAgICAgdm9pZCBkcmF3SW1hZ2UoSFRNTEltYWdlRWxlbWVudCosIGNv bnN0IEZsb2F0UmVjdCYgc3JjUmVjdCwgY29uc3QgRmxvYXRSZWN0JiBkc3RSZWN0LCBFeGNlcHRp b25Db2RlJik7Ci0gICAgICAgIHZvaWQgZHJhd0ltYWdlKEhUTUxDYW52YXNFbGVtZW50KiwgZmxv YXQgeCwgZmxvYXQgeSk7CisgICAgICAgIHZvaWQgZHJhd0ltYWdlKEhUTUxDYW52YXNFbGVtZW50 KiwgZmxvYXQgeCwgZmxvYXQgeSwgRXhjZXB0aW9uQ29kZSYpOwogICAgICAgICB2b2lkIGRyYXdJ bWFnZShIVE1MQ2FudmFzRWxlbWVudCosIGZsb2F0IHgsIGZsb2F0IHksIGZsb2F0IHdpZHRoLCBm bG9hdCBoZWlnaHQsIEV4Y2VwdGlvbkNvZGUmKTsKICAgICAgICAgdm9pZCBkcmF3SW1hZ2UoSFRN TENhbnZhc0VsZW1lbnQqLCBmbG9hdCBzeCwgZmxvYXQgc3ksIGZsb2F0IHN3LCBmbG9hdCBzaCwg ZmxvYXQgZHgsIGZsb2F0IGR5LCBmbG9hdCBkdywgZmxvYXQgZGgsIEV4Y2VwdGlvbkNvZGUmKTsK ICAgICAgICAgdm9pZCBkcmF3SW1hZ2UoSFRNTENhbnZhc0VsZW1lbnQqLCBjb25zdCBGbG9hdFJl Y3QmIHNyY1JlY3QsIGNvbnN0IEZsb2F0UmVjdCYgZHN0UmVjdCwgRXhjZXB0aW9uQ29kZSYpOwog I2lmIEVOQUJMRShWSURFTykKLSAgICAgICAgdm9pZCBkcmF3SW1hZ2UoSFRNTFZpZGVvRWxlbWVu dCosIGZsb2F0IHgsIGZsb2F0IHkpOworICAgICAgICB2b2lkIGRyYXdJbWFnZShIVE1MVmlkZW9F bGVtZW50KiwgZmxvYXQgeCwgZmxvYXQgeSwgRXhjZXB0aW9uQ29kZSYpOwogICAgICAgICB2b2lk IGRyYXdJbWFnZShIVE1MVmlkZW9FbGVtZW50KiwgZmxvYXQgeCwgZmxvYXQgeSwgZmxvYXQgd2lk dGgsIGZsb2F0IGhlaWdodCwgRXhjZXB0aW9uQ29kZSYpOwogICAgICAgICB2b2lkIGRyYXdJbWFn ZShIVE1MVmlkZW9FbGVtZW50KiwgZmxvYXQgc3gsIGZsb2F0IHN5LCBmbG9hdCBzdywgZmxvYXQg c2gsIGZsb2F0IGR4LCBmbG9hdCBkeSwgZmxvYXQgZHcsIGZsb2F0IGRoLCBFeGNlcHRpb25Db2Rl Jik7CiAgICAgICAgIHZvaWQgZHJhd0ltYWdlKEhUTUxWaWRlb0VsZW1lbnQqLCBjb25zdCBGbG9h dFJlY3QmIHNyY1JlY3QsIGNvbnN0IEZsb2F0UmVjdCYgZHN0UmVjdCwgRXhjZXB0aW9uQ29kZSYp OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0 MkQuaWRsIGIvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuaWRs CmluZGV4IGJhYTY4OGYuLmEzYzgzY2EgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9jYW52YXMv Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmlkbAorKysgYi9XZWJDb3JlL2h0bWwvY2FudmFzL0Nh bnZhc1JlbmRlcmluZ0NvbnRleHQyRC5pZGwKQEAgLTExMywxOCArMTEzLDIxIEBAIG1vZHVsZSBo dG1sIHsKIAogICAgICAgICB2b2lkIHN0cm9rZVJlY3QoaW4gZmxvYXQgeCwgaW4gZmxvYXQgeSwg aW4gZmxvYXQgd2lkdGgsIGluIGZsb2F0IGhlaWdodCwgaW4gW09wdGlvbmFsXSBmbG9hdCBsaW5l V2lkdGgpOwogCi0gICAgICAgIHZvaWQgZHJhd0ltYWdlKGluIEhUTUxJbWFnZUVsZW1lbnQgaW1h Z2UsIGluIGZsb2F0IHgsIGluIGZsb2F0IHkpOworICAgICAgICB2b2lkIGRyYXdJbWFnZShpbiBI VE1MSW1hZ2VFbGVtZW50IGltYWdlLCBpbiBmbG9hdCB4LCBpbiBmbG9hdCB5KQorICAgICAgICAg ICAgcmFpc2VzIChET01FeGNlcHRpb24pOwogICAgICAgICB2b2lkIGRyYXdJbWFnZShpbiBIVE1M SW1hZ2VFbGVtZW50IGltYWdlLCBpbiBmbG9hdCB4LCBpbiBmbG9hdCB5LCBpbiBmbG9hdCB3aWR0 aCwgaW4gZmxvYXQgaGVpZ2h0KQogICAgICAgICAgICAgcmFpc2VzIChET01FeGNlcHRpb24pOwog ICAgICAgICB2b2lkIGRyYXdJbWFnZShpbiBIVE1MSW1hZ2VFbGVtZW50IGltYWdlLCBpbiBmbG9h dCBzeCwgaW4gZmxvYXQgc3ksIGluIGZsb2F0IHN3LCBpbiBmbG9hdCBzaCwgaW4gZmxvYXQgZHgs IGluIGZsb2F0IGR5LCBpbiBmbG9hdCBkdywgaW4gZmxvYXQgZGgpCiAgICAgICAgICAgICByYWlz ZXMgKERPTUV4Y2VwdGlvbik7Ci0gICAgICAgIHZvaWQgZHJhd0ltYWdlKGluIEhUTUxDYW52YXNF bGVtZW50IGNhbnZhcywgaW4gZmxvYXQgeCwgaW4gZmxvYXQgeSk7CisgICAgICAgIHZvaWQgZHJh d0ltYWdlKGluIEhUTUxDYW52YXNFbGVtZW50IGNhbnZhcywgaW4gZmxvYXQgeCwgaW4gZmxvYXQg eSkKKyAgICAgICAgICAgIHJhaXNlcyAoRE9NRXhjZXB0aW9uKTsKICAgICAgICAgdm9pZCBkcmF3 SW1hZ2UoaW4gSFRNTENhbnZhc0VsZW1lbnQgY2FudmFzLCBpbiBmbG9hdCB4LCBpbiBmbG9hdCB5 LCBpbiBmbG9hdCB3aWR0aCwgaW4gZmxvYXQgaGVpZ2h0KQogICAgICAgICAgICAgcmFpc2VzIChE T01FeGNlcHRpb24pOwogICAgICAgICB2b2lkIGRyYXdJbWFnZShpbiBIVE1MQ2FudmFzRWxlbWVu dCBjYW52YXMsIGluIGZsb2F0IHN4LCBpbiBmbG9hdCBzeSwgaW4gZmxvYXQgc3csIGluIGZsb2F0 IHNoLCBpbiBmbG9hdCBkeCwgaW4gZmxvYXQgZHksIGluIGZsb2F0IGR3LCBpbiBmbG9hdCBkaCkK ICAgICAgICAgICAgIHJhaXNlcyAoRE9NRXhjZXB0aW9uKTsKICNpZiBkZWZpbmVkKEVOQUJMRV9W SURFTykgJiYgRU5BQkxFX1ZJREVPCi0gICAgICAgIHZvaWQgZHJhd0ltYWdlKGluIEhUTUxWaWRl b0VsZW1lbnQgdmlkZW8sIGluIGZsb2F0IHgsIGluIGZsb2F0IHkpOworICAgICAgICB2b2lkIGRy YXdJbWFnZShpbiBIVE1MVmlkZW9FbGVtZW50IHZpZGVvLCBpbiBmbG9hdCB4LCBpbiBmbG9hdCB5 KQorICAgICAgICAgICAgcmFpc2VzIChET01FeGNlcHRpb24pOwogICAgICAgICB2b2lkIGRyYXdJ bWFnZShpbiBIVE1MVmlkZW9FbGVtZW50IHZpZGVvLCBpbiBmbG9hdCB4LCBpbiBmbG9hdCB5LCBp biBmbG9hdCB3aWR0aCwgaW4gZmxvYXQgaGVpZ2h0KQogICAgICAgICAgICAgcmFpc2VzIChET01F eGNlcHRpb24pOwogICAgICAgICB2b2lkIGRyYXdJbWFnZShpbiBIVE1MVmlkZW9FbGVtZW50IHZp ZGVvLCBpbiBmbG9hdCBzeCwgaW4gZmxvYXQgc3ksIGluIGZsb2F0IHN3LCBpbiBmbG9hdCBzaCwg aW4gZmxvYXQgZHgsIGluIGZsb2F0IGR5LCBpbiBmbG9hdCBkdywgaW4gZmxvYXQgZGgpCg==