64464 2011-07-13 10:40:03 -0700 [CSS Exclusions] Fix for comment #23 on wrap-shape parsing bug 61726 2011-07-13 11:56:55 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 achicu webkit-unassigned tony webkit.review.bot oldest_to_newest 436512 0 achicu 2011-07-13 10:40:03 -0700 This is a fix for comment #23 from Tony Chang on bug 61726: View in context: https://bugs.webkit.org/attachment.cgi?id=100567&action=review > Source/WebCore/css/CSSParser.cpp:86 > +#include "CSSWrapShapes.h" Nit: It's better to put the #if in the .h file and always include the file. This reduces the number of #ifs and makes it easier for people to move files even if a feature is disabled. > Source/WebCore/css/CSSParser.cpp:3742 > + if (!valid) > + break; Nit: Wouldn't it be simpler to just return 0 here? > Source/WebCore/css/CSSParser.cpp:3765 > + valid = false; > + break; Nit: ... and here. > Source/WebCore/css/CSSParser.cpp:3771 > + if (!valid || argumentNumber < 3) Nit: Then you wouldn't need the variable valid anymore. > Source/WebCore/css/CSSWrapShapes.h:152 > + PassRefPtr<CSSPrimitiveValue> getXAt(unsigned i) { return m_values.at(i << 1); } Nit: Please use * 2 rather than bit shifting. > Source/WebCore/css/CSSWrapShapes.h:153 > + PassRefPtr<CSSPrimitiveValue> getYAt(unsigned i) { return m_values.at((i << 1) & 1); } This looks wrong, isn't it always 0? I would just write (i * 2) + 1. 436522 1 100685 achicu 2011-07-13 10:52:45 -0700 Created attachment 100685 Patch 436525 2 100685 tony 2011-07-13 10:56:40 -0700 Comment on attachment 100685 Patch thanks! 436582 3 100685 webkit.review.bot 2011-07-13 11:56:50 -0700 Comment on attachment 100685 Patch Clearing flags on attachment: 100685 Committed r90937: <http://trac.webkit.org/changeset/90937> 436583 4 webkit.review.bot 2011-07-13 11:56:55 -0700 All reviewed patches have been landed. Closing bug. 100685 2011-07-13 10:52:45 -0700 2011-07-13 11:56:50 -0700 Patch bug64464.patch text/plain 9113 achicu ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0NTRmYTQwLi42MDMyMWQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTEtMDctMTMgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgor CisgICAgICAgIFtDU1MgRXhjbHVzaW9uc10gRml4IGZvciBjb21tZW50ICMyMyBvbiB3cmFwLXNo YXBlIHBhcnNpbmcgYnVnIDYxNzI2CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02NDQ2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBuZWVkZWQuCisKKyAgICAgICAgKiBjc3MvQ1NTUGFy c2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6cGFyc2VXcmFwU2hhcGVSZWN0 KTogUmVtb3ZlZCB0aGUgInZhbGlkIiBsb2NhbC4KKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNl cjo6cGFyc2VXcmFwU2hhcGVDaXJjbGUpOiBSZW1vdmVkIHRoZSAidmFsaWQiIGxvY2FsLgorICAg ICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjpwYXJzZVdyYXBTaGFwZUVsbGlwc2UpOiBSZW1vdmVk IHRoZSAidmFsaWQiIGxvY2FsLgorICAgICAgICAqIGNzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHA6 CisgICAgICAgICogY3NzL0NTU1dyYXBTaGFwZXMuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1dy YXBTaGFwZVBvbHlnb246OmdldFhBdCk6IFJlcGxhY2VkIGJpdCBzaGlmdCB3aXRoIG11bHRpcGxp Y2F0aW9uLgorICAgICAgICAoV2ViQ29yZTo6Q1NTV3JhcFNoYXBlUG9seWdvbjo6Z2V0WUF0KTog UmVwbGFjZWQgYml0IHNoaWZ0IHdpdGggbXVsdGlwbGljYXRpb24uCisgICAgICAgICogcmVuZGVy aW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcDoKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvU3R5 bGVSYXJlTm9uSW5oZXJpdGVkRGF0YS5oOgorCiAyMDExLTA3LTEyICBNT1JJVEEgSGFqaW1lICA8 bW9ycml0YUBnb29nbGUuY29tPgogCiAgICAgICAgIFtSZWZhY3RvcmluZ11bU2hhZG93Q29udGVu dEVsZW1lbnRdIEZvcndhcmRlZCBub2RlIGxpc3Qgc2hvdWxkIGJlIGEgbGlua2VkLWxpc3QuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NQYXJzZXIuY3BwCmluZGV4IDEwODUzMTEuLjUxZGI2NTggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NQYXJzZXIuY3BwCkBAIC01Niw2ICs1Niw3IEBACiAjaW5jbHVkZSAiQ1NTVW5pY29kZVJh bmdlVmFsdWUuaCIKICNpbmNsdWRlICJDU1NWYWx1ZUtleXdvcmRzLmgiCiAjaW5jbHVkZSAiQ1NT VmFsdWVMaXN0LmgiCisjaW5jbHVkZSAiQ1NTV3JhcFNoYXBlcy5oIgogI2luY2x1ZGUgIkNvdW50 ZXIuaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkZsb2F0Q29udmVyc2lvbi5o IgpAQCAtODIsMTAgKzgzLDYgQEAKICNpbmNsdWRlICJEYXNoYm9hcmRSZWdpb24uaCIKICNlbmRp ZgogCi0jaWYgRU5BQkxFKENTU19FWENMVVNJT05TKQotI2luY2x1ZGUgIkNTU1dyYXBTaGFwZXMu aCIKLSNlbmRpZgotCiAjZGVmaW5lIFlZREVCVUcgMAogCiAjaWYgWVlERUJVRyA+IDAKQEAgLTM2 NzAsMTcgKzM2NjcsMTQgQEAgUGFzc1JlZlB0cjxDU1NXcmFwU2hhcGU+IENTU1BhcnNlcjo6cGFy c2VXcmFwU2hhcGVSZWN0KENTU1BhcnNlclZhbHVlTGlzdCogYXJncykKICAgICAvLyByZWN0KHgs IHksIHdpZHRoLCBoZWlnaHQsIFtbcnhdLCByeV0pCiAgICAgaWYgKGFyZ3MtPnNpemUoKSAhPSA3 ICYmIGFyZ3MtPnNpemUoKSAhPSA5ICYmIGFyZ3MtPnNpemUoKSAhPSAxMSkKICAgICAgICAgcmV0 dXJuIDA7Ci0gICAgICAgIAotICAgIGJvb2wgdmFsaWQgPSB0cnVlOwogICAgIAogICAgIFJlZlB0 cjxDU1NXcmFwU2hhcGVSZWN0PiBzaGFwZSA9IENTU1dyYXBTaGFwZVJlY3Q6OmNyZWF0ZSgpOwog ICAgIAogICAgIHVuc2lnbmVkIGFyZ3VtZW50TnVtYmVyID0gMDsKICAgICBDU1NQYXJzZXJWYWx1 ZSogYXJndW1lbnQgPSBhcmdzLT5jdXJyZW50KCk7CiAgICAgd2hpbGUgKGFyZ3VtZW50KSB7Ci0g ICAgICAgIHZhbGlkID0gdmFsaWRVbml0KGFyZ3VtZW50LCBGTGVuZ3RoLCBtX3N0cmljdCk7Ci0g ICAgICAgIGlmICghdmFsaWQpCi0gICAgICAgICAgICBicmVhazsKKyAgICAgICAgaWYgKCF2YWxp ZFVuaXQoYXJndW1lbnQsIEZMZW5ndGgsIG1fc3RyaWN0KSkKKyAgICAgICAgICAgIHJldHVybiAw OwogICAgICAgICAKICAgICAgICAgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBsZW5ndGggPSBw cmltaXRpdmVWYWx1ZUNhY2hlKCktPmNyZWF0ZVZhbHVlKGFyZ3VtZW50LT5mVmFsdWUsIAogICAg ICAgICAgICAgKENTU1ByaW1pdGl2ZVZhbHVlOjpVbml0VHlwZXMpIGFyZ3VtZW50LT51bml0KTsK QEAgLTM3MDcsMTcgKzM3MDEsMTUgQEAgUGFzc1JlZlB0cjxDU1NXcmFwU2hhcGU+IENTU1BhcnNl cjo6cGFyc2VXcmFwU2hhcGVSZWN0KENTU1BhcnNlclZhbHVlTGlzdCogYXJncykKICAgICAgICAg fQogICAgICAgICBhcmd1bWVudCA9IGFyZ3MtPm5leHQoKTsKICAgICAgICAgaWYgKGFyZ3VtZW50 KSB7Ci0gICAgICAgICAgICBpZiAoYXJndW1lbnQtPnVuaXQgPT0gQ1NTUGFyc2VyVmFsdWU6Ok9w ZXJhdG9yICYmIGFyZ3VtZW50LT5pVmFsdWUgPT0gJywnKQotICAgICAgICAgICAgICAgIGFyZ3Vt ZW50ID0gYXJncy0+bmV4dCgpOwotICAgICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAgICAg dmFsaWQgPSBmYWxzZTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIGlmIChhcmd1bWVudC0+dW5pdCAhPSBDU1NQYXJzZXJWYWx1ZTo6T3BlcmF0b3Ig fHwgYXJndW1lbnQtPmlWYWx1ZSAhPSAnLCcpCisgICAgICAgICAgICAgICAgcmV0dXJuIDA7Cisg ICAgICAgICAgICAKKyAgICAgICAgICAgIGFyZ3VtZW50ID0gYXJncy0+bmV4dCgpOwogICAgICAg ICB9CiAgICAgICAgIGFyZ3VtZW50TnVtYmVyKys7CiAgICAgfQogICAgIAotICAgIGlmICghdmFs aWQgfHwgYXJndW1lbnROdW1iZXIgPCA0KQorICAgIGlmIChhcmd1bWVudE51bWJlciA8IDQpCiAg ICAgICAgIHJldHVybiAwOyAgICAKICAgICByZXR1cm4gc2hhcGU7CiB9CkBAIC0zNzMwLDE2ICsz NzIyLDEzIEBAIFBhc3NSZWZQdHI8Q1NTV3JhcFNoYXBlPiBDU1NQYXJzZXI6OnBhcnNlV3JhcFNo YXBlQ2lyY2xlKENTU1BhcnNlclZhbHVlTGlzdCogYXJnCiAgICAgaWYgKGFyZ3MtPnNpemUoKSAh PSA1KQogICAgICAgICByZXR1cm4gMDsKICAgICAgICAgCi0gICAgYm9vbCB2YWxpZCA9IHRydWU7 Ci0gICAgCiAgICAgUmVmUHRyPENTU1dyYXBTaGFwZUNpcmNsZT4gc2hhcGUgPSBDU1NXcmFwU2hh cGVDaXJjbGU6OmNyZWF0ZSgpOwogICAgIAogICAgIHVuc2lnbmVkIGFyZ3VtZW50TnVtYmVyID0g MDsKICAgICBDU1NQYXJzZXJWYWx1ZSogYXJndW1lbnQgPSBhcmdzLT5jdXJyZW50KCk7CiAgICAg d2hpbGUgKGFyZ3VtZW50KSB7Ci0gICAgICAgIHZhbGlkID0gdmFsaWRVbml0KGFyZ3VtZW50LCBG TGVuZ3RoLCBtX3N0cmljdCk7Ci0gICAgICAgIGlmICghdmFsaWQpCi0gICAgICAgICAgICBicmVh azsKKyAgICAgICAgaWYgKCF2YWxpZFVuaXQoYXJndW1lbnQsIEZMZW5ndGgsIG1fc3RyaWN0KSkK KyAgICAgICAgICAgIHJldHVybiAwOwogCiAgICAgICAgIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1 ZT4gbGVuZ3RoID0gcHJpbWl0aXZlVmFsdWVDYWNoZSgpLT5jcmVhdGVWYWx1ZShhcmd1bWVudC0+ ZlZhbHVlLCAKICAgICAgICAgICAgIChDU1NQcmltaXRpdmVWYWx1ZTo6VW5pdFR5cGVzKSBhcmd1 bWVudC0+dW5pdCk7CkBAIC0zNzU4LDE3ICszNzQ3LDE0IEBAIFBhc3NSZWZQdHI8Q1NTV3JhcFNo YXBlPiBDU1NQYXJzZXI6OnBhcnNlV3JhcFNoYXBlQ2lyY2xlKENTU1BhcnNlclZhbHVlTGlzdCog YXJnCiAgICAgICAgIAogICAgICAgICBhcmd1bWVudCA9IGFyZ3MtPm5leHQoKTsKICAgICAgICAg aWYgKGFyZ3VtZW50KSB7Ci0gICAgICAgICAgICBpZiAoYXJndW1lbnQtPnVuaXQgPT0gQ1NTUGFy c2VyVmFsdWU6Ok9wZXJhdG9yICYmIGFyZ3VtZW50LT5pVmFsdWUgPT0gJywnKQotICAgICAgICAg ICAgICAgIGFyZ3VtZW50ID0gYXJncy0+bmV4dCgpOwotICAgICAgICAgICAgZWxzZSB7Ci0gICAg ICAgICAgICAgICAgdmFsaWQgPSBmYWxzZTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIGlmIChhcmd1bWVudC0+dW5pdCAhPSBDU1NQYXJzZXJWYWx1 ZTo6T3BlcmF0b3IgfHwgYXJndW1lbnQtPmlWYWx1ZSAhPSAnLCcpCisgICAgICAgICAgICAgICAg cmV0dXJuIDA7ICAgICAgICAgICAgCisgICAgICAgICAgICBhcmd1bWVudCA9IGFyZ3MtPm5leHQo KTsKICAgICAgICAgfQogICAgICAgICBhcmd1bWVudE51bWJlcisrOwogICAgIH0KICAgICAKLSAg ICBpZiAoIXZhbGlkIHx8IGFyZ3VtZW50TnVtYmVyIDwgMykKKyAgICBpZiAoYXJndW1lbnROdW1i ZXIgPCAzKQogICAgICAgICByZXR1cm4gMDsgICAgCiAgICAgcmV0dXJuIHNoYXBlOwogfQpAQCAt Mzc4MSwxNSArMzc2NywxMiBAQCBQYXNzUmVmUHRyPENTU1dyYXBTaGFwZT4gQ1NTUGFyc2VyOjpw YXJzZVdyYXBTaGFwZUVsbGlwc2UoQ1NTUGFyc2VyVmFsdWVMaXN0KiBhcgogICAgIGlmIChhcmdz LT5zaXplKCkgIT0gNykKICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgIAotICAgIGJvb2wgdmFs aWQgPSBmYWxzZTsKLSAgICAKICAgICBSZWZQdHI8Q1NTV3JhcFNoYXBlRWxsaXBzZT4gc2hhcGUg PSBDU1NXcmFwU2hhcGVFbGxpcHNlOjpjcmVhdGUoKTsKICAgICB1bnNpZ25lZCBhcmd1bWVudE51 bWJlciA9IDA7CiAgICAgQ1NTUGFyc2VyVmFsdWUqIGFyZ3VtZW50ID0gYXJncy0+Y3VycmVudCgp OwogICAgIHdoaWxlIChhcmd1bWVudCkgewotICAgICAgICB2YWxpZCA9IHZhbGlkVW5pdChhcmd1 bWVudCwgRkxlbmd0aCwgbV9zdHJpY3QpOwotICAgICAgICBpZiAoIXZhbGlkKQotICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgIGlmICghdmFsaWRVbml0KGFyZ3VtZW50LCBGTGVuZ3RoLCBtX3N0 cmljdCkpCisgICAgICAgICAgICByZXR1cm4gMDsKICAgICAgICAgCiAgICAgICAgIFJlZlB0cjxD U1NQcmltaXRpdmVWYWx1ZT4gbGVuZ3RoID0gcHJpbWl0aXZlVmFsdWVDYWNoZSgpLT5jcmVhdGVW YWx1ZShhcmd1bWVudC0+ZlZhbHVlLCAKICAgICAgICAgICAgIChDU1NQcmltaXRpdmVWYWx1ZTo6 VW5pdFR5cGVzKSBhcmd1bWVudC0+dW5pdCk7CkBAIC0zODExLDE3ICszNzk0LDE0IEBAIFBhc3NS ZWZQdHI8Q1NTV3JhcFNoYXBlPiBDU1NQYXJzZXI6OnBhcnNlV3JhcFNoYXBlRWxsaXBzZShDU1NQ YXJzZXJWYWx1ZUxpc3QqIGFyCiAgICAgICAgIAogICAgICAgICBhcmd1bWVudCA9IGFyZ3MtPm5l eHQoKTsKICAgICAgICAgaWYgKGFyZ3VtZW50KSB7Ci0gICAgICAgICAgICBpZiAoYXJndW1lbnQg JiYgYXJndW1lbnQtPnVuaXQgPT0gQ1NTUGFyc2VyVmFsdWU6Ok9wZXJhdG9yICYmIGFyZ3VtZW50 LT5pVmFsdWUgPT0gJywnKQotICAgICAgICAgICAgICAgIGFyZ3VtZW50ID0gYXJncy0+bmV4dCgp OwotICAgICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAgICAgdmFsaWQgPSBmYWxzZTsKLSAg ICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmIChhcmd1 bWVudC0+dW5pdCAhPSBDU1NQYXJzZXJWYWx1ZTo6T3BlcmF0b3IgfHwgYXJndW1lbnQtPmlWYWx1 ZSAhPSAnLCcpCisgICAgICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgICAgICBhcmd1bWVu dCA9IGFyZ3MtPm5leHQoKTsKICAgICAgICAgfQogICAgICAgICBhcmd1bWVudE51bWJlcisrOwog ICAgIH0KICAgICAKLSAgICBpZiAoIXZhbGlkIHx8IGFyZ3VtZW50TnVtYmVyIDwgNCkKKyAgICBp ZiAoYXJndW1lbnROdW1iZXIgPCA0KQogICAgICAgICByZXR1cm4gMDsKICAgICByZXR1cm4gc2hh cGU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUu Y3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmNwcAppbmRleCA1Yzhl NTVhLi4wMDg5MWI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZl VmFsdWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHAK QEAgLTI2LDYgKzI2LDcgQEAKICNpbmNsdWRlICJDU1NQcm9wZXJ0eU5hbWVzLmgiCiAjaW5jbHVk ZSAiQ1NTU3R5bGVTaGVldC5oIgogI2luY2x1ZGUgIkNTU1ZhbHVlS2V5d29yZHMuaCIKKyNpbmNs dWRlICJDU1NXcmFwU2hhcGVzLmgiCiAjaW5jbHVkZSAiQ29sb3IuaCIKICNpbmNsdWRlICJDb3Vu dGVyLmgiCiAjaW5jbHVkZSAiRXhjZXB0aW9uQ29kZS5oIgpAQCAtNDMsMTAgKzQ0LDYgQEAKICNp bmNsdWRlICJEYXNoYm9hcmRSZWdpb24uaCIKICNlbmRpZgogCi0jaWYgRU5BQkxFKENTU19FWENM VVNJT05TKQotI2luY2x1ZGUgIkNTU1dyYXBTaGFwZXMuaCIKLSNlbmRpZgotCiB1c2luZyBuYW1l c3BhY2UgV1RGOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTV3JhcFNoYXBlcy5oIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1dyYXBTaGFw ZXMuaAppbmRleCBkODhhMmRmLi45YjRkZDFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvQ1NTV3JhcFNoYXBlcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NXcmFwU2hhcGVz LmgKQEAgLTMwLDYgKzMwLDggQEAKICNpZm5kZWYgQ1NTV3JhcFNoYXBlc19oCiAjZGVmaW5lIENT U1dyYXBTaGFwZXNfaAogCisjaWYgRU5BQkxFKENTU19FWENMVVNJT05TKQorCiAjaW5jbHVkZSAi Q1NTUHJpbWl0aXZlVmFsdWUuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgogI2luY2x1 ZGUgIldpbmRSdWxlLmgiCkBAIC0xNDksOCArMTUxLDggQEAgcHVibGljOgogICAgICAgICBtX3Zh bHVlcy5hcHBlbmQoeSk7CiAgICAgfQogICAgIAotICAgIFBhc3NSZWZQdHI8Q1NTUHJpbWl0aXZl VmFsdWU+IGdldFhBdCh1bnNpZ25lZCBpKSB7IHJldHVybiBtX3ZhbHVlcy5hdChpIDw8IDEpOyB9 Ci0gICAgUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gZ2V0WUF0KHVuc2lnbmVkIGkpIHsg cmV0dXJuIG1fdmFsdWVzLmF0KChpIDw8IDEpICYgMSk7IH0KKyAgICBQYXNzUmVmUHRyPENTU1By aW1pdGl2ZVZhbHVlPiBnZXRYQXQodW5zaWduZWQgaSkgeyByZXR1cm4gbV92YWx1ZXMuYXQoaSAq IDIpOyB9CisgICAgUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gZ2V0WUF0KHVuc2lnbmVk IGkpIHsgcmV0dXJuIG1fdmFsdWVzLmF0KGkgKiAyICsgMSk7IH0KICAgICAKICAgICB2b2lkIHNl dFdpbmRSdWxlKFdpbmRSdWxlIHcpIHsgbV93aW5kUnVsZSA9IHc7IH0KICAgICBXaW5kUnVsZSB3 aW5kUnVsZSgpIGNvbnN0IHsgcmV0dXJuIG1fd2luZFJ1bGU7IH0KQEAgLTE3MCw0ICsxNzIsNiBA QCBwcml2YXRlOgogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKKyNlbmRpZiAvLyBFTkFCTEUo Q1NTX0VYQ0xVU0lPTlMpCisKICNlbmRpZiAvLyBDU1NXcmFwU2hhcGVzX2gKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCmluZGV4IDJkNzRlMTEuLjFm Yzk5YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJT dHlsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxl LmNwcApAQCAtMjYsNiArMjYsNyBAQAogI2luY2x1ZGUgIkN1cnNvckxpc3QuaCIKICNpbmNsdWRl ICJDU1NQcm9wZXJ0eU5hbWVzLmgiCiAjaW5jbHVkZSAiQ1NTU3R5bGVTZWxlY3Rvci5oIgorI2lu Y2x1ZGUgIkNTU1dyYXBTaGFwZXMuaCIKICNpbmNsdWRlICJGb250U2VsZWN0b3IuaCIKICNpbmNs dWRlICJRdW90ZXNEYXRhLmgiCiAjaW5jbHVkZSAiUmVuZGVyQXJlbmEuaCIKQEAgLTM2LDEwICsz Nyw2IEBACiAjaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgogI2luY2x1ZGUgPGFsZ29yaXRo bT4KIAotI2lmIEVOQUJMRShFWENMVVNJT04pCi0jaW5jbHVkZSAiQ1NTV3JhcFNoYXBlcy5oIgot I2VuZGlmCi0KIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVOb25Jbmhl cml0ZWREYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlTm9u SW5oZXJpdGVkRGF0YS5oCmluZGV4IGQ3YmUzMWEuLjdhMWM4YTYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZU5vbkluaGVyaXRlZERh dGEuaApAQCAtMjUsNiArMjUsNyBAQAogI2lmbmRlZiBTdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRh X2gKICNkZWZpbmUgU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YV9oCiAKKyNpbmNsdWRlICJDU1NX cmFwU2hhcGVzLmgiCiAjaW5jbHVkZSAiQ291bnRlckRpcmVjdGl2ZXMuaCIKICNpbmNsdWRlICJD dXJzb3JEYXRhLmgiCiAjaW5jbHVkZSAiRGF0YVJlZi5oIgpAQCAtMzYsMTAgKzM3LDYgQEAKICNp bmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KIAotI2lm IEVOQUJMRShDU1NfRVhDTFVTSU9OUykKLSNpbmNsdWRlICJDU1NXcmFwU2hhcGVzLmgiCi0jZW5k aWYKLQogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBBbmltYXRpb25MaXN0Owo=