60713 2011-05-12 11:23:15 -0700 Switch paintBoxShadow to use IntRect 2011-05-12 15:00:46 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 leviw leviw eae eric simon.fraser oldest_to_newest 402997 0 leviw 2011-05-12 11:23:15 -0700 It currently takes four ints representing a rect. 403167 1 93345 leviw 2011-05-12 14:37:54 -0700 Created attachment 93345 Patch 403176 2 93345 eric 2011-05-12 14:52:29 -0700 Comment on attachment 93345 Patch You make it look easy! 403181 3 93345 leviw 2011-05-12 15:00:43 -0700 Comment on attachment 93345 Patch Clearing flags on attachment: 93345 Committed r86384: <http://trac.webkit.org/changeset/86384> 403182 4 leviw 2011-05-12 15:00:46 -0700 All reviewed patches have been landed. Closing bug. 93345 2011-05-12 14:37:54 -0700 2011-05-12 15:00:42 -0700 Patch bug-60713-20110512143752.patch text/plain 14674 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2MzgwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMDUtMTIgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBwYWludEJveFNoYWRvdyB0byB1c2UgSW50UmVj dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA3MTMK KworICAgICAgICBTd2l0Y2hpbmcgcGFpbnRCb3hTaGFkb3cgZnJvbSB0YWtpbmcgZm91ciBpbnRz IHRvIHRha2luZyBhbiBJbnRSZWN0LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBzaW5jZSB0aGlz IGlzIHJlZmFjdG9yaW5nLgorCisgICAgICAgICogcmVuZGVyaW5nL0lubGluZUZsb3dCb3guY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lRmxvd0JveDo6cGFpbnRCb3hTaGFkb3cpOgorICAg ICAgICAoV2ViQ29yZTo6SW5saW5lRmxvd0JveDo6cGFpbnRCb3hEZWNvcmF0aW9ucyk6CisgICAg ICAgICogcmVuZGVyaW5nL0lubGluZUZsb3dCb3guaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6cGFpbnRCb3hEZWNvcmF0 aW9uc1dpdGhTaXplKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3Qu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50Qm94U2hh ZG93KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuaDoKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyRmllbGRzZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyRmllbGRzZXQ6OnBhaW50Qm94RGVjb3JhdGlvbnMpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJUYWJsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZTo6cGFpbnRCb3hE ZWNvcmF0aW9ucyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlQ2VsbC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZUNlbGw6OnBhaW50Qm94RGVjb3JhdGlvbnMpOgor CiAyMDExLTA1LTEyICBMZXZpIFdlaW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9JbmxpbmVGbG93Qm94LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvSW5saW5lRmxvd0JveC5jcHAJKHJldmlzaW9uIDg2Mzc3KQorKysgU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDYzLDE0 ICsxMDYzLDE0IEBAIHZvaWQgSW5saW5lRmxvd0JveDo6cGFpbnRGaWxsTGF5ZXIoY29uc3QKICAg ICB9CiB9CiAKLXZvaWQgSW5saW5lRmxvd0JveDo6cGFpbnRCb3hTaGFkb3coR3JhcGhpY3NDb250 ZXh0KiBjb250ZXh0LCBSZW5kZXJTdHlsZSogcywgU2hhZG93U3R5bGUgc2hhZG93U3R5bGUsIGlu dCB0eCwgaW50IHR5LCBpbnQgdywgaW50IGgpCit2b2lkIElubGluZUZsb3dCb3g6OnBhaW50Qm94 U2hhZG93KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgUmVuZGVyU3R5bGUqIHMsIFNoYWRvd1N0 eWxlIHNoYWRvd1N0eWxlLCBjb25zdCBJbnRSZWN0JiBwYWludFJlY3QpCiB7CiAgICAgaWYgKCgh cHJldkxpbmVCb3goKSAmJiAhbmV4dExpbmVCb3goKSkgfHwgIXBhcmVudCgpKQotICAgICAgICBi b3hNb2RlbE9iamVjdCgpLT5wYWludEJveFNoYWRvdyhjb250ZXh0LCB0eCwgdHksIHcsIGgsIHMs IHNoYWRvd1N0eWxlKTsKKyAgICAgICAgYm94TW9kZWxPYmplY3QoKS0+cGFpbnRCb3hTaGFkb3co Y29udGV4dCwgcGFpbnRSZWN0LCBzLCBzaGFkb3dTdHlsZSk7CiAgICAgZWxzZSB7CiAgICAgICAg IC8vIEZJWE1FOiBXZSBjYW4gZG8gYmV0dGVyIGhlcmUgaW4gdGhlIG11bHRpLWxpbmUgY2FzZS4g V2Ugd2FudCB0byBwdXNoIGEgY2xpcCBzbyB0aGF0IHRoZSBzaGFkb3cgZG9lc24ndAogICAgICAg ICAvLyBwcm90cnVkZSBpbmNvcnJlY3RseSBhdCB0aGUgZWRnZXMsIGFuZCB3ZSB3YW50IHRvIHBv c3NpYmx5IGluY2x1ZGUgc2hhZG93cyBjYXN0IGZyb20gdGhlIHByZXZpb3VzL2ZvbGxvd2luZyBs aW5lcwotICAgICAgICBib3hNb2RlbE9iamVjdCgpLT5wYWludEJveFNoYWRvdyhjb250ZXh0LCB0 eCwgdHksIHcsIGgsIHMsIHNoYWRvd1N0eWxlLCBpbmNsdWRlTG9naWNhbExlZnRFZGdlKCksIGlu Y2x1ZGVMb2dpY2FsUmlnaHRFZGdlKCkpOworICAgICAgICBib3hNb2RlbE9iamVjdCgpLT5wYWlu dEJveFNoYWRvdyhjb250ZXh0LCBwYWludFJlY3QsIHMsIHNoYWRvd1N0eWxlLCBpbmNsdWRlTG9n aWNhbExlZnRFZGdlKCksIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKCkpOwogICAgIH0KIH0KIApA QCAtMTEwOSwxMiArMTEwOSwxMyBAQCB2b2lkIElubGluZUZsb3dCb3g6OnBhaW50Qm94RGVjb3Jh dGlvbnMoCiAgICAgLy8gYSBsaW5lIG1heSBhY3R1YWxseSBoYXZlIHRvIHBhaW50IGEgYmFja2dy b3VuZC4KICAgICBSZW5kZXJTdHlsZSogc3R5bGVUb1VzZSA9IHJlbmRlcmVyKCktPnN0eWxlKG1f Zmlyc3RMaW5lKTsKICAgICBpZiAoKCFwYXJlbnQoKSAmJiBtX2ZpcnN0TGluZSAmJiBzdHlsZVRv VXNlICE9IHJlbmRlcmVyKCktPnN0eWxlKCkpIHx8IChwYXJlbnQoKSAmJiByZW5kZXJlcigpLT5o YXNCb3hEZWNvcmF0aW9ucygpKSkgeworICAgICAgICBJbnRSZWN0IHBhaW50UmVjdCA9IEludFJl Y3QodHgsIHR5LCB3LCBoKTsKICAgICAgICAgLy8gU2hhZG93IGNvbWVzIGZpcnN0IGFuZCBpcyBi ZWhpbmQgdGhlIGJhY2tncm91bmQgYW5kIGJvcmRlci4KLSAgICAgICAgcGFpbnRCb3hTaGFkb3co Y29udGV4dCwgc3R5bGVUb1VzZSwgTm9ybWFsLCB0eCwgdHksIHcsIGgpOworICAgICAgICBwYWlu dEJveFNoYWRvdyhjb250ZXh0LCBzdHlsZVRvVXNlLCBOb3JtYWwsIHBhaW50UmVjdCk7CiAKICAg ICAgICAgQ29sb3IgYyA9IHN0eWxlVG9Vc2UtPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9w ZXJ0eUJhY2tncm91bmRDb2xvcik7Ci0gICAgICAgIHBhaW50RmlsbExheWVycyhwYWludEluZm8s IGMsIHN0eWxlVG9Vc2UtPmJhY2tncm91bmRMYXllcnMoKSwgSW50UmVjdCh0eCwgdHksIHcsIGgp KTsKLSAgICAgICAgcGFpbnRCb3hTaGFkb3coY29udGV4dCwgc3R5bGVUb1VzZSwgSW5zZXQsIHR4 LCB0eSwgdywgaCk7CisgICAgICAgIHBhaW50RmlsbExheWVycyhwYWludEluZm8sIGMsIHN0eWxl VG9Vc2UtPmJhY2tncm91bmRMYXllcnMoKSwgcGFpbnRSZWN0KTsKKyAgICAgICAgcGFpbnRCb3hT aGFkb3coY29udGV4dCwgc3R5bGVUb1VzZSwgSW5zZXQsIHBhaW50UmVjdCk7CiAKICAgICAgICAg Ly8gOmZpcnN0LWxpbmUgY2Fubm90IGJlIHVzZWQgdG8gcHV0IGJvcmRlcnMgb24gYSBsaW5lLiBB bHdheXMgcGFpbnQgYm9yZGVycyB3aXRoIG91cgogICAgICAgICAvLyBub24tZmlyc3QtbGluZSBz dHlsZS4KQEAgLTExMjcsNyArMTEyOCw3IEBAIHZvaWQgSW5saW5lRmxvd0JveDo6cGFpbnRCb3hE ZWNvcmF0aW9ucygKICAgICAgICAgICAgIC8vIFRoZSBzaW1wbGUgY2FzZSBpcyB3aGVyZSB3ZSBl aXRoZXIgaGF2ZSBubyBib3JkZXIgaW1hZ2Ugb3Igd2UgYXJlIHRoZSBvbmx5IGJveCBmb3IgdGhp cyBvYmplY3QuICBJbiB0aG9zZQogICAgICAgICAgICAgLy8gY2FzZXMgb25seSBhIHNpbmdsZSBj YWxsIHRvIGRyYXcgaXMgcmVxdWlyZWQuCiAgICAgICAgICAgICBpZiAoIWhhc0JvcmRlckltYWdl IHx8ICghcHJldkxpbmVCb3goKSAmJiAhbmV4dExpbmVCb3goKSkpCi0gICAgICAgICAgICAgICAg Ym94TW9kZWxPYmplY3QoKS0+cGFpbnRCb3JkZXIoY29udGV4dCwgSW50UmVjdCh0eCwgdHksIHcs IGgpLCByZW5kZXJlcigpLT5zdHlsZSgpLCBCYWNrZ3JvdW5kQmxlZWROb25lLCBpbmNsdWRlTG9n aWNhbExlZnRFZGdlKCksIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKCkpOworICAgICAgICAgICAg ICAgIGJveE1vZGVsT2JqZWN0KCktPnBhaW50Qm9yZGVyKGNvbnRleHQsIHBhaW50UmVjdCwgcmVu ZGVyZXIoKS0+c3R5bGUoKSwgQmFja2dyb3VuZEJsZWVkTm9uZSwgaW5jbHVkZUxvZ2ljYWxMZWZ0 RWRnZSgpLCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSgpKTsKICAgICAgICAgICAgIGVsc2Ugewog ICAgICAgICAgICAgICAgIC8vIFdlIGhhdmUgYSBib3JkZXIgaW1hZ2UgdGhhdCBzcGFucyBtdWx0 aXBsZSBsaW5lcy4KICAgICAgICAgICAgICAgICAvLyBXZSBuZWVkIHRvIGFkanVzdCB0eCBhbmQg dHkgYnkgdGhlIHdpZHRoIG9mIGFsbCBwcmV2aW91cyBsaW5lcy4KSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guaAkocmV2aXNpb24gODYzNzcpCisrKyBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lRmxvd0JveC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDcs NyArMTA3LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBwYWludE1hc2soUGFpbnRJbmZv JiwgaW50IHR4LCBpbnQgdHkpOwogICAgIHZvaWQgcGFpbnRGaWxsTGF5ZXJzKGNvbnN0IFBhaW50 SW5mbyYsIGNvbnN0IENvbG9yJiwgY29uc3QgRmlsbExheWVyKiwgY29uc3QgSW50UmVjdCYsIENv bXBvc2l0ZU9wZXJhdG9yID0gQ29tcG9zaXRlU291cmNlT3Zlcik7CiAgICAgdm9pZCBwYWludEZp bGxMYXllcihjb25zdCBQYWludEluZm8mLCBjb25zdCBDb2xvciYsIGNvbnN0IEZpbGxMYXllcios IGNvbnN0IEludFJlY3QmLCBDb21wb3NpdGVPcGVyYXRvciA9IENvbXBvc2l0ZVNvdXJjZU92ZXIp OwotICAgIHZvaWQgcGFpbnRCb3hTaGFkb3coR3JhcGhpY3NDb250ZXh0KiwgUmVuZGVyU3R5bGUq LCBTaGFkb3dTdHlsZSwgaW50IHR4LCBpbnQgdHksIGludCB3LCBpbnQgaCk7CisgICAgdm9pZCBw YWludEJveFNoYWRvdyhHcmFwaGljc0NvbnRleHQqLCBSZW5kZXJTdHlsZSosIFNoYWRvd1N0eWxl LCBjb25zdCBJbnRSZWN0Jik7CiAgICAgdmlydHVhbCB2b2lkIHBhaW50KFBhaW50SW5mbyYsIGlu dCB0eCwgaW50IHR5LCBpbnQgbGluZVRvcCwgaW50IGxpbmVCb3R0b20pOwogICAgIHZpcnR1YWwg Ym9vbCBub2RlQXRQb2ludChjb25zdCBIaXRUZXN0UmVxdWVzdCYsIEhpdFRlc3RSZXN1bHQmLCBp bnQgeCwgaW50IHksIGludCB0eCwgaW50IHR5LCBpbnQgbGluZVRvcCwgaW50IGxpbmVCb3R0b20p OwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAkocmV2aXNpb24g ODYzNzcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtODQxLDcgKzg0MSw3IEBAIHZvaWQgUmVuZGVyQm94OjpwYWludEJveERlY29y YXRpb25zV2l0aFMKIAogICAgIC8vIEZJWE1FOiBTaG91bGQgZXZlbnR1YWxseSBnaXZlIHRoZSB0 aGVtZSBjb250cm9sIG92ZXIgd2hldGhlciB0aGUgYm94IHNoYWRvdyBzaG91bGQgcGFpbnQsIHNp bmNlIGNvbnRyb2xzIGNvdWxkIGhhdmUKICAgICAvLyBjdXN0b20gc2hhZG93cyBvZiB0aGVpciBv d24uCi0gICAgcGFpbnRCb3hTaGFkb3cocGFpbnRJbmZvLmNvbnRleHQsIHBhaW50UmVjdC54KCks IHBhaW50UmVjdC55KCksIHBhaW50UmVjdC53aWR0aCgpLCBwYWludFJlY3QuaGVpZ2h0KCksIHN0 eWxlKCksIE5vcm1hbCk7CisgICAgcGFpbnRCb3hTaGFkb3cocGFpbnRJbmZvLmNvbnRleHQsIHBh aW50UmVjdCwgc3R5bGUoKSwgTm9ybWFsKTsKIAogICAgIEJhY2tncm91bmRCbGVlZEF2b2lkYW5j ZSBibGVlZEF2b2lkYW5jZSA9IGRldGVybWluZUJhY2tncm91bmRCbGVlZEF2b2lkYW5jZShwYWlu dEluZm8uY29udGV4dCk7CiAKQEAgLTg3MCw3ICs4NzAsNyBAQCB2b2lkIFJlbmRlckJveDo6cGFp bnRCb3hEZWNvcmF0aW9uc1dpdGhTCiAgICAgICAgIGlmIChzdHlsZSgpLT5oYXNBcHBlYXJhbmNl KCkpCiAgICAgICAgICAgICB0aGVtZSgpLT5wYWludERlY29yYXRpb25zKHRoaXMsIHBhaW50SW5m bywgcGFpbnRSZWN0KTsKICAgICB9Ci0gICAgcGFpbnRCb3hTaGFkb3cocGFpbnRJbmZvLmNvbnRl eHQsIHBhaW50UmVjdC54KCksIHBhaW50UmVjdC55KCksIHBhaW50UmVjdC53aWR0aCgpLCBwYWlu dFJlY3QuaGVpZ2h0KCksIHN0eWxlKCksIEluc2V0KTsKKyAgICBwYWludEJveFNoYWRvdyhwYWlu dEluZm8uY29udGV4dCwgcGFpbnRSZWN0LCBzdHlsZSgpLCBJbnNldCk7CiAKICAgICAvLyBUaGUg dGhlbWUgd2lsbCB0ZWxsIHVzIHdoZXRoZXIgb3Igbm90IHdlIHNob3VsZCBhbHNvIHBhaW50IHRo ZSBDU1MgYm9yZGVyLgogICAgIGlmICgoIXN0eWxlKCktPmhhc0FwcGVhcmFuY2UoKSB8fCAoIXRo ZW1lUGFpbnRlZCAmJiB0aGVtZSgpLT5wYWludEJvcmRlck9ubHkodGhpcywgcGFpbnRJbmZvLCBw YWludFJlY3QpKSkgJiYgc3R5bGUoKS0+aGFzQm9yZGVyKCkpCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAJKHJldmlzaW9uIDg2 Mzc3KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjA4MCwxNiArMjA4MCwxNSBAQCBzdGF0aWMgaW5saW5lIElu dFJlY3QgYXJlYUNhc3RpbmdTaGFkb3dJCiAgICAgcmV0dXJuIHVuaW9uUmVjdChib3VuZHMsIG9m ZnNldEJvdW5kcyk7CiB9CiAKLXZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50Qm94U2hh ZG93KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgaW50IHR4LCBpbnQgdHksIGludCB3LCBpbnQg aCwgY29uc3QgUmVuZGVyU3R5bGUqIHMsIFNoYWRvd1N0eWxlIHNoYWRvd1N0eWxlLCBib29sIGlu Y2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UpCit2b2lk IFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludEJveFNoYWRvdyhHcmFwaGljc0NvbnRleHQqIGNv bnRleHQsIGNvbnN0IEludFJlY3QmIHBhaW50UmVjdCwgY29uc3QgUmVuZGVyU3R5bGUqIHMsIFNo YWRvd1N0eWxlIHNoYWRvd1N0eWxlLCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGJvb2wg aW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UpCiB7CiAgICAgLy8gRklYTUU6IERlYWwgd2l0aCBib3Jk ZXItaW1hZ2UuICBXb3VsZCBiZSBncmVhdCB0byB1c2UgYm9yZGVyLWltYWdlIGFzIGEgbWFzay4K IAogICAgIGlmIChjb250ZXh0LT5wYWludGluZ0Rpc2FibGVkKCkgfHwgIXMtPmJveFNoYWRvdygp KQogICAgICAgICByZXR1cm47CiAKLSAgICBJbnRSZWN0IGJvcmRlclJlY3QodHgsIHR5LCB3LCBo KTsKLSAgICBSb3VuZGVkSW50UmVjdCBib3JkZXIgPSAoc2hhZG93U3R5bGUgPT0gSW5zZXQpID8g cy0+Z2V0Um91bmRlZElubmVyQm9yZGVyRm9yKGJvcmRlclJlY3QsIGluY2x1ZGVMb2dpY2FsTGVm dEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKQotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgOiBzLT5nZXRSb3VuZGVkQm9yZGVyRm9yKGJvcmRl clJlY3QsIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKTsK KyAgICBSb3VuZGVkSW50UmVjdCBib3JkZXIgPSAoc2hhZG93U3R5bGUgPT0gSW5zZXQpID8gcy0+ Z2V0Um91bmRlZElubmVyQm9yZGVyRm9yKHBhaW50UmVjdCwgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRn ZSwgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICA6IHMtPmdldFJvdW5kZWRCb3JkZXJGb3IocGFpbnRSZWN0 LCBpbmNsdWRlTG9naWNhbExlZnRFZGdlLCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSk7CiAKICAg ICBib29sIGhhc0JvcmRlclJhZGl1cyA9IHMtPmhhc0JvcmRlclJhZGl1cygpOwogICAgIGJvb2wg aXNIb3Jpem9udGFsID0gcy0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKTsKQEAgLTIxMjMsNyAr MjEyMiw3IEBAIHZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50Qm94U2hhZG8KIAogICAg ICAgICAgICAgLy8gTW92ZSB0aGUgZmlsbCBqdXN0IG91dHNpZGUgdGhlIGNsaXAsIGFkZGluZyAx IHBpeGVsIHNlcGFyYXRpb24gc28gdGhhdCB0aGUgZmlsbCBkb2VzIG5vdAogICAgICAgICAgICAg Ly8gYmxlZWQgaW4gKGR1ZSB0byBhbnRpYWxpYXNpbmcpIGlmIHRoZSBjb250ZXh0IGlzIHRyYW5z Zm9ybWVkLgotICAgICAgICAgICAgSW50U2l6ZSBleHRyYU9mZnNldCh3ICsgbWF4KDAsIHNoYWRv d09mZnNldC53aWR0aCgpKSArIHNoYWRvd0JsdXIgKyAyICogc2hhZG93U3ByZWFkICsgMSwgMCk7 CisgICAgICAgICAgICBJbnRTaXplIGV4dHJhT2Zmc2V0KHBhaW50UmVjdC53aWR0aCgpICsgbWF4 KDAsIHNoYWRvd09mZnNldC53aWR0aCgpKSArIHNoYWRvd0JsdXIgKyAyICogc2hhZG93U3ByZWFk ICsgMSwgMCk7CiAgICAgICAgICAgICBzaGFkb3dPZmZzZXQgLT0gZXh0cmFPZmZzZXQ7CiAgICAg ICAgICAgICBmaWxsUmVjdC5tb3ZlKGV4dHJhT2Zmc2V0KTsKIApAQCAtMjIwOCw3ICsyMjA3LDcg QEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRCb3hTaGFkbwogICAgICAgICAgICAg fSBlbHNlCiAgICAgICAgICAgICAgICAgY29udGV4dC0+Y2xpcChib3JkZXIucmVjdCgpKTsKIAot ICAgICAgICAgICAgSW50U2l6ZSBleHRyYU9mZnNldCgyICogdyArIG1heCgwLCBzaGFkb3dPZmZz ZXQud2lkdGgoKSkgKyBzaGFkb3dCbHVyIC0gMiAqIHNoYWRvd1NwcmVhZCArIDEsIDApOworICAg ICAgICAgICAgSW50U2l6ZSBleHRyYU9mZnNldCgyICogcGFpbnRSZWN0LndpZHRoKCkgKyBtYXgo MCwgc2hhZG93T2Zmc2V0LndpZHRoKCkpICsgc2hhZG93Qmx1ciAtIDIgKiBzaGFkb3dTcHJlYWQg KyAxLCAwKTsKICAgICAgICAgICAgIGNvbnRleHQtPnRyYW5zbGF0ZShleHRyYU9mZnNldC53aWR0 aCgpLCBleHRyYU9mZnNldC5oZWlnaHQoKSk7CiAgICAgICAgICAgICBzaGFkb3dPZmZzZXQgLT0g ZXh0cmFPZmZzZXQ7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hN b2RlbE9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3hNb2RlbE9iamVjdC5oCShyZXZpc2lvbiA4NjM3NykKKysrIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjAsNyAr MTIwLDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBwYWludEJvcmRlcihHcmFwaGljc0NvbnRleHQq LCBjb25zdCBJbnRSZWN0JiwgY29uc3QgUmVuZGVyU3R5bGUqLCBCYWNrZ3JvdW5kQmxlZWRBdm9p ZGFuY2UgPSBCYWNrZ3JvdW5kQmxlZWROb25lLCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2Ug PSB0cnVlLCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlID0gdHJ1ZSk7CiAgICAgYm9vbCBw YWludE5pbmVQaWVjZUltYWdlKEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmLCBjb25z dCBSZW5kZXJTdHlsZSosIGNvbnN0IE5pbmVQaWVjZUltYWdlJiwgQ29tcG9zaXRlT3BlcmF0b3Ig PSBDb21wb3NpdGVTb3VyY2VPdmVyKTsKLSAgICB2b2lkIHBhaW50Qm94U2hhZG93KEdyYXBoaWNz Q29udGV4dCosIGludCB0eCwgaW50IHR5LCBpbnQgdywgaW50IGgsIGNvbnN0IFJlbmRlclN0eWxl KiwgU2hhZG93U3R5bGUsIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSA9IHRydWUsIGJvb2wg aW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UgPSB0cnVlKTsKKyAgICB2b2lkIHBhaW50Qm94U2hhZG93 KEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmLCBjb25zdCBSZW5kZXJTdHlsZSosIFNo YWRvd1N0eWxlLCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UgPSB0cnVlLCBib29sIGluY2x1 ZGVMb2dpY2FsUmlnaHRFZGdlID0gdHJ1ZSk7CiAgICAgdm9pZCBwYWludEZpbGxMYXllckV4dGVu ZGVkKGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IENvbG9yJiwgY29uc3QgRmlsbExheWVyKiwgY29u c3QgSW50UmVjdCYsIEJhY2tncm91bmRCbGVlZEF2b2lkYW5jZSwgSW5saW5lRmxvd0JveCogPSAw LCBjb25zdCBJbnRTaXplJiA9IEludFNpemUoKSwgQ29tcG9zaXRlT3BlcmF0b3IgPSBDb21wb3Np dGVTb3VyY2VPdmVyLCBSZW5kZXJPYmplY3QqIGJhY2tncm91bmRPYmplY3QgPSAwKTsKICAgICAK ICAgICAvLyBPdmVycmlkZGVuIGJ5IHN1YmNsYXNzZXMgdG8gZGV0ZXJtaW5lIGxpbmUgaGVpZ2h0 IGFuZCBiYXNlbGluZSBwb3NpdGlvbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJGaWVsZHNldC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckZpZWxkc2V0LmNwcAkocmV2aXNpb24gODYzNzcpCisrKyBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyRmllbGRzZXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDIsMTAgKzE0 MiwxMSBAQCB2b2lkIFJlbmRlckZpZWxkc2V0OjpwYWludEJveERlY29yYXRpb25zCiAgICAgICAg IHR4ICs9IHhPZmY7CiAgICAgfQogCi0gICAgcGFpbnRCb3hTaGFkb3cocGFpbnRJbmZvLmNvbnRl eHQsIHR4LCB0eSwgdywgaCwgc3R5bGUoKSwgTm9ybWFsKTsKLQotICAgIHBhaW50RmlsbExheWVy cyhwYWludEluZm8sIHN0eWxlKCktPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUJh Y2tncm91bmRDb2xvciksIHN0eWxlKCktPmJhY2tncm91bmRMYXllcnMoKSwgSW50UmVjdCh0eCwg dHksIHcsIGgpKTsKLSAgICBwYWludEJveFNoYWRvdyhwYWludEluZm8uY29udGV4dCwgdHgsIHR5 LCB3LCBoLCBzdHlsZSgpLCBJbnNldCk7CisgICAgSW50UmVjdCBwYWludFJlY3QgPSBJbnRSZWN0 KHR4LCB0eSwgdywgaCk7CisgICAgCisgICAgcGFpbnRCb3hTaGFkb3cocGFpbnRJbmZvLmNvbnRl eHQsIHBhaW50UmVjdCwgc3R5bGUoKSwgTm9ybWFsKTsKKyAgICBwYWludEZpbGxMYXllcnMocGFp bnRJbmZvLCBzdHlsZSgpLT52aXNpdGVkRGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlCYWNrZ3Jv dW5kQ29sb3IpLCBzdHlsZSgpLT5iYWNrZ3JvdW5kTGF5ZXJzKCksIHBhaW50UmVjdCk7CisgICAg cGFpbnRCb3hTaGFkb3cocGFpbnRJbmZvLmNvbnRleHQsIHBhaW50UmVjdCwgc3R5bGUoKSwgSW5z ZXQpOwogCiAgICAgaWYgKCFzdHlsZSgpLT5oYXNCb3JkZXIoKSkKICAgICAgICAgcmV0dXJuOwpA QCAtMTY3LDcgKzE2OCw3IEBAIHZvaWQgUmVuZGVyRmllbGRzZXQ6OnBhaW50Qm94RGVjb3JhdGlv bnMKICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5jbGlwT3V0KEludFJlY3QoY2xpcExlZnQsIHR5 ICsgbGVnZW5kLT55KCksIGNsaXBXaWR0aCwgbGVnZW5kLT5oZWlnaHQoKSkpOwogICAgIH0KIAot ICAgIHBhaW50Qm9yZGVyKHBhaW50SW5mby5jb250ZXh0LCBJbnRSZWN0KHR4LCB0eSwgdywgaCks IHN0eWxlKCkpOworICAgIHBhaW50Qm9yZGVyKHBhaW50SW5mby5jb250ZXh0LCBwYWludFJlY3Qs IHN0eWxlKCkpOwogfQogCiB2b2lkIFJlbmRlckZpZWxkc2V0OjpwYWludE1hc2soUGFpbnRJbmZv JiBwYWludEluZm8sIEludFNpemUgcGFpbnRPZmZzZXQpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUYWJsZS5jcHAJKHJldmlzaW9uIDg2Mzc3KQorKysgU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTU4LDcgKzU1 OCw3IEBAIHZvaWQgUmVuZGVyVGFibGU6OnBhaW50Qm94RGVjb3JhdGlvbnMoUGEKICAgICBJbnRS ZWN0IHJlY3QodHgsIHR5LCB3aWR0aCgpLCBoZWlnaHQoKSk7CiAgICAgc3VidHJhY3RDYXB0aW9u UmVjdChyZWN0KTsKIAotICAgIHBhaW50Qm94U2hhZG93KHBhaW50SW5mby5jb250ZXh0LCByZWN0 LngoKSwgcmVjdC55KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSwgc3R5bGUoKSwgTm9y bWFsKTsKKyAgICBwYWludEJveFNoYWRvdyhwYWludEluZm8uY29udGV4dCwgcmVjdCwgc3R5bGUo KSwgTm9ybWFsKTsKICAgICAKICAgICBpZiAoaXNSb290KCkpCiAgICAgICAgIHBhaW50Um9vdEJv eEZpbGxMYXllcnMocGFpbnRJbmZvKTsKQEAgLTU2Nyw3ICs1NjcsNyBAQCB2b2lkIFJlbmRlclRh YmxlOjpwYWludEJveERlY29yYXRpb25zKFBhCiAgICAgICAgIC8vIGluZGVwZW5kZW50IG9mIHRo ZSBib2R5LgogICAgICAgICBwYWludEZpbGxMYXllcnMocGFpbnRJbmZvLCBzdHlsZSgpLT52aXNp dGVkRGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IpLCBzdHlsZSgpLT5i YWNrZ3JvdW5kTGF5ZXJzKCksIHJlY3QpOwogCi0gICAgcGFpbnRCb3hTaGFkb3cocGFpbnRJbmZv LmNvbnRleHQsIHJlY3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgp LCBzdHlsZSgpLCBJbnNldCk7CisgICAgcGFpbnRCb3hTaGFkb3cocGFpbnRJbmZvLmNvbnRleHQs IHJlY3QsIHN0eWxlKCksIEluc2V0KTsKIAogICAgIGlmIChzdHlsZSgpLT5oYXNCb3JkZXIoKSAm JiAhY29sbGFwc2VCb3JkZXJzKCkpCiAgICAgICAgIHBhaW50Qm9yZGVyKHBhaW50SW5mby5jb250 ZXh0LCByZWN0LCBzdHlsZSgpKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUYWJsZUNlbGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUYWJsZUNlbGwuY3BwCShyZXZpc2lvbiA4NjM3NykKKysrIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDA3LDIwICsx MDA3LDE4IEBAIHZvaWQgUmVuZGVyVGFibGVDZWxsOjpwYWludEJveERlY29yYXRpb24KICAgICBp ZiAoIXRhYmxlRWx0LT5jb2xsYXBzZUJvcmRlcnMoKSAmJiBzdHlsZSgpLT5lbXB0eUNlbGxzKCkg PT0gSElERSAmJiAhZmlyc3RDaGlsZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpbnQgdyA9 IHdpZHRoKCk7Ci0gICAgaW50IGggPSBoZWlnaHQoKTsKLSAgIAotICAgIHBhaW50Qm94U2hhZG93 KHBhaW50SW5mby5jb250ZXh0LCB0eCwgdHksIHcsIGgsIHN0eWxlKCksIE5vcm1hbCk7CisgICAg SW50UmVjdCBwYWludFJlY3QgPSBJbnRSZWN0KEludFBvaW50KHR4LCB0eSksIHNpemUoKSk7Cisg ICAgcGFpbnRCb3hTaGFkb3cocGFpbnRJbmZvLmNvbnRleHQsIHBhaW50UmVjdCwgc3R5bGUoKSwg Tm9ybWFsKTsKICAgICAKICAgICAvLyBQYWludCBvdXIgY2VsbCBiYWNrZ3JvdW5kLgogICAgIHBh aW50QmFja2dyb3VuZHNCZWhpbmRDZWxsKHBhaW50SW5mbywgdHgsIHR5LCB0aGlzKTsKIAotICAg IHBhaW50Qm94U2hhZG93KHBhaW50SW5mby5jb250ZXh0LCB0eCwgdHksIHcsIGgsIHN0eWxlKCks IEluc2V0KTsKKyAgICBwYWludEJveFNoYWRvdyhwYWludEluZm8uY29udGV4dCwgcGFpbnRSZWN0 LCBzdHlsZSgpLCBJbnNldCk7CiAKICAgICBpZiAoIXN0eWxlKCktPmhhc0JvcmRlcigpIHx8IHRh YmxlRWx0LT5jb2xsYXBzZUJvcmRlcnMoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgcGFpbnRC b3JkZXIocGFpbnRJbmZvLmNvbnRleHQsIEludFJlY3QodHgsIHR5LCB3LCBoKSwgc3R5bGUoKSk7 CisgICAgcGFpbnRCb3JkZXIocGFpbnRJbmZvLmNvbnRleHQsIHBhaW50UmVjdCwgc3R5bGUoKSk7 CiB9CiAKIHZvaWQgUmVuZGVyVGFibGVDZWxsOjpwYWludE1hc2soUGFpbnRJbmZvJiBwYWludElu Zm8sIEludFNpemUgcGFpbnRPZmZzZXQpCg==