147638 2015-08-04 11:35:26 -0700 RenderTheme::paint() should take RenderBox instead of RenderObject. 2015-08-04 13:46:20 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 1114668 0 zalan 2015-08-04 11:35:26 -0700 SSIA 1114670 1 258190 zalan 2015-08-04 11:37:10 -0700 Created attachment 258190 Patch 1114751 2 258190 commit-queue 2015-08-04 13:46:18 -0700 Comment on attachment 258190 Patch Clearing flags on attachment: 258190 Committed r187885: <http://trac.webkit.org/changeset/187885> 1114752 3 commit-queue 2015-08-04 13:46:20 -0700 All reviewed patches have been landed. Closing bug. 258190 2015-08-04 11:37:10 -0700 2015-08-04 13:46:18 -0700 Patch bug-147638-20150804113703.patch text/plain 14306 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3ODU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzc0OWU1MDU3ZGQ1OGEx ZjhlZTIzYzFiZmI2ZGUzMWNjMDg2MmEwMy4uYTMwNWRhNDY4Mjg0MTQ3YWE1YTFjZDE4NmFkNGU4 MzM1NDI3MjEwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA4LTA0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuZGVyVGhlbWU6OnBhaW50 KCkgc2hvdWxkIHRha2UgUmVuZGVyQm94IGluc3RlYWQgb2YgUmVuZGVyT2JqZWN0LgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3NjM4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGZ1 bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWU6OnBhaW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRoZW1lOjp1cGRhdGVDb250cm9sU3RhdGVzRm9yUmVuZGVyZXIpOiAtPlJlbmRlckJveCB0 b28uCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZTo6aXNBY3RpdmUpOiBSZW1vdmUgcmVk dW5kYW50IGNvZGUuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmg6CisKIDIwMTUt MDgtMDMgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBJ bnRyb2R1Y2UgQ09NUElMRVIoR0NDX09SX0NMQU5HKSBndWFyZCBhbmQgbWFrZSBDT01QSUxFUihH Q0MpIHRydWUgb25seSBmb3IgR0NDCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGhlbWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l LmNwcAppbmRleCBiNGRmMjNjOGFhMjJkMWRmMzFlOTRlMTFhNmM1OTc1MzU5NmU0YmJiLi45MWUw YmIxMGNkZWEwZjlkNTEyNGEwOWIyZDFlYjJiY2M5NzMyYmI3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUaGVtZS5jcHAKQEAgLTI2MiwyNiArMjYyLDI2IEBAIHZvaWQgUmVuZGVy VGhlbWU6OmFkanVzdFN0eWxlKFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIFJlbmRlclN0 eWxlJiBzdHlsZSwKICAgICB9CiB9CiAKLWJvb2wgUmVuZGVyVGhlbWU6OnBhaW50KGNvbnN0IFJl bmRlck9iamVjdCYgbywgQ29udHJvbFN0YXRlcyYgY29udHJvbFN0YXRlcywgY29uc3QgUGFpbnRJ bmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFJlY3QmIHIpCitib29sIFJlbmRlclRoZW1lOjpw YWludChjb25zdCBSZW5kZXJCb3gmIGJveCwgQ29udHJvbFN0YXRlcyYgY29udHJvbFN0YXRlcywg Y29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFJlY3QmIHJlY3QpCiB7CiAg ICAgLy8gSWYgcGFpbnRpbmcgaXMgZGlzYWJsZWQsIGJ1dCB3ZSBhcmVuJ3QgdXBkYXRpbmcgY29u dHJvbCB0aW50cywgdGhlbiBqdXN0IGJhaWwuCiAgICAgLy8gSWYgd2UgYXJlIHVwZGF0aW5nIGNv bnRyb2wgdGludHMsIGp1c3Qgc2NoZWR1bGUgYSByZXBhaW50IGlmIHRoZSB0aGVtZSBzdXBwb3J0 cyB0aW50aW5nCiAgICAgLy8gZm9yIHRoYXQgY29udHJvbC4KICAgICBpZiAocGFpbnRJbmZvLmNv bnRleHQtPnVwZGF0aW5nQ29udHJvbFRpbnRzKCkpIHsKLSAgICAgICAgaWYgKGNvbnRyb2xTdXBw b3J0c1RpbnRzKG8pKQotICAgICAgICAgICAgby5yZXBhaW50KCk7CisgICAgICAgIGlmIChjb250 cm9sU3VwcG9ydHNUaW50cyhib3gpKQorICAgICAgICAgICAgYm94LnJlcGFpbnQoKTsKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgIH0KICAgICBpZiAocGFpbnRJbmZvLmNvbnRleHQtPnBhaW50 aW5nRGlzYWJsZWQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgQ29udHJvbFBhcnQg cGFydCA9IG8uc3R5bGUoKS5hcHBlYXJhbmNlKCk7Ci0gICAgSW50UmVjdCBpbnRlZ3JhbFNuYXBw ZWRSZWN0ID0gc25hcHBlZEludFJlY3Qocik7Ci0gICAgZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3Ig PSBvLmRvY3VtZW50KCkuZGV2aWNlU2NhbGVGYWN0b3IoKTsKLSAgICBGbG9hdFJlY3QgZGV2aWNl UGl4ZWxTbmFwcGVkUmVjdCA9IHNuYXBSZWN0VG9EZXZpY2VQaXhlbHMociwgZGV2aWNlU2NhbGVG YWN0b3IpOworICAgIENvbnRyb2xQYXJ0IHBhcnQgPSBib3guc3R5bGUoKS5hcHBlYXJhbmNlKCk7 CisgICAgSW50UmVjdCBpbnRlZ3JhbFNuYXBwZWRSZWN0ID0gc25hcHBlZEludFJlY3QocmVjdCk7 CisgICAgZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IgPSBib3guZG9jdW1lbnQoKS5kZXZpY2VTY2Fs ZUZhY3RvcigpOworICAgIEZsb2F0UmVjdCBkZXZpY2VQaXhlbFNuYXBwZWRSZWN0ID0gc25hcFJl Y3RUb0RldmljZVBpeGVscyhyZWN0LCBkZXZpY2VTY2FsZUZhY3Rvcik7CiAKICNpZiBVU0UoTkVX X1RIRU1FKQotICAgIGZsb2F0IHBhZ2VTY2FsZUZhY3RvciA9IG8uZG9jdW1lbnQoKS5wYWdlKCkg PyBvLmRvY3VtZW50KCkucGFnZSgpLT5wYWdlU2NhbGVGYWN0b3IoKSA6IDEuMGY7CisgICAgZmxv YXQgcGFnZVNjYWxlRmFjdG9yID0gYm94LmRvY3VtZW50KCkucGFnZSgpID8gYm94LmRvY3VtZW50 KCkucGFnZSgpLT5wYWdlU2NhbGVGYWN0b3IoKSA6IDEuMGY7CiAgICAgCiAgICAgc3dpdGNoIChw YXJ0KSB7CiAgICAgY2FzZSBDaGVja2JveFBhcnQ6CkBAIC0yOTEsOCArMjkxLDggQEAgYm9vbCBS ZW5kZXJUaGVtZTo6cGFpbnQoY29uc3QgUmVuZGVyT2JqZWN0JiBvLCBDb250cm9sU3RhdGVzJiBj b250cm9sU3RhdGVzLCBjb24KICAgICBjYXNlIERlZmF1bHRCdXR0b25QYXJ0OgogICAgIGNhc2Ug QnV0dG9uUGFydDoKICAgICBjYXNlIElubmVyU3BpbkJ1dHRvblBhcnQ6Ci0gICAgICAgIHVwZGF0 ZUNvbnRyb2xTdGF0ZXNGb3JSZW5kZXJlcihvLCBjb250cm9sU3RhdGVzKTsKLSAgICAgICAgbV90 aGVtZS0+cGFpbnQocGFydCwgY29udHJvbFN0YXRlcywgY29uc3RfY2FzdDxHcmFwaGljc0NvbnRl eHQqPihwYWludEluZm8uY29udGV4dCksIGRldmljZVBpeGVsU25hcHBlZFJlY3QsIG8uc3R5bGUo KS5lZmZlY3RpdmVab29tKCksICZvLnZpZXcoKS5mcmFtZVZpZXcoKSwgZGV2aWNlU2NhbGVGYWN0 b3IsIHBhZ2VTY2FsZUZhY3Rvcik7CisgICAgICAgIHVwZGF0ZUNvbnRyb2xTdGF0ZXNGb3JSZW5k ZXJlcihib3gsIGNvbnRyb2xTdGF0ZXMpOworICAgICAgICBtX3RoZW1lLT5wYWludChwYXJ0LCBj b250cm9sU3RhdGVzLCBjb25zdF9jYXN0PEdyYXBoaWNzQ29udGV4dCo+KHBhaW50SW5mby5jb250 ZXh0KSwgZGV2aWNlUGl4ZWxTbmFwcGVkUmVjdCwgYm94LnN0eWxlKCkuZWZmZWN0aXZlWm9vbSgp LCAmYm94LnZpZXcoKS5mcmFtZVZpZXcoKSwgZGV2aWNlU2NhbGVGYWN0b3IsIHBhZ2VTY2FsZUZh Y3Rvcik7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBkZWZhdWx0OgogICAgICAgICBicmVh azsKQEAgLTMwNSwxMDIgKzMwNSwxMDIgQEAgYm9vbCBSZW5kZXJUaGVtZTo6cGFpbnQoY29uc3Qg UmVuZGVyT2JqZWN0JiBvLCBDb250cm9sU3RhdGVzJiBjb250cm9sU3RhdGVzLCBjb24KICAgICBz d2l0Y2ggKHBhcnQpIHsKICNpZiAhVVNFKE5FV19USEVNRSkKICAgICBjYXNlIENoZWNrYm94UGFy dDoKLSAgICAgICAgcmV0dXJuIHBhaW50Q2hlY2tib3gobywgcGFpbnRJbmZvLCBpbnRlZ3JhbFNu YXBwZWRSZWN0KTsKKyAgICAgICAgcmV0dXJuIHBhaW50Q2hlY2tib3goYm94LCBwYWludEluZm8s IGludGVncmFsU25hcHBlZFJlY3QpOwogICAgIGNhc2UgUmFkaW9QYXJ0OgotICAgICAgICByZXR1 cm4gcGFpbnRSYWRpbyhvLCBwYWludEluZm8sIGludGVncmFsU25hcHBlZFJlY3QpOworICAgICAg ICByZXR1cm4gcGFpbnRSYWRpbyhib3gsIHBhaW50SW5mbywgaW50ZWdyYWxTbmFwcGVkUmVjdCk7 CiAgICAgY2FzZSBQdXNoQnV0dG9uUGFydDoKICAgICBjYXNlIFNxdWFyZUJ1dHRvblBhcnQ6CiAg ICAgY2FzZSBEZWZhdWx0QnV0dG9uUGFydDoKICAgICBjYXNlIEJ1dHRvblBhcnQ6Ci0gICAgICAg IHJldHVybiBwYWludEJ1dHRvbihvLCBwYWludEluZm8sIGludGVncmFsU25hcHBlZFJlY3QpOwor ICAgICAgICByZXR1cm4gcGFpbnRCdXR0b24oYm94LCBwYWludEluZm8sIGludGVncmFsU25hcHBl ZFJlY3QpOwogICAgIGNhc2UgSW5uZXJTcGluQnV0dG9uUGFydDoKLSAgICAgICAgcmV0dXJuIHBh aW50SW5uZXJTcGluQnV0dG9uKG8sIHBhaW50SW5mbywgaW50ZWdyYWxTbmFwcGVkUmVjdCk7Cisg ICAgICAgIHJldHVybiBwYWludElubmVyU3BpbkJ1dHRvbihib3gsIHBhaW50SW5mbywgaW50ZWdy YWxTbmFwcGVkUmVjdCk7CiAjZW5kaWYKICAgICBjYXNlIE1lbnVsaXN0UGFydDoKLSAgICAgICAg cmV0dXJuIHBhaW50TWVudUxpc3QobywgcGFpbnRJbmZvLCBkZXZpY2VQaXhlbFNuYXBwZWRSZWN0 KTsKKyAgICAgICAgcmV0dXJuIHBhaW50TWVudUxpc3QoYm94LCBwYWludEluZm8sIGRldmljZVBp eGVsU25hcHBlZFJlY3QpOwogI2lmIEVOQUJMRShNRVRFUl9FTEVNRU5UKQogICAgIGNhc2UgTWV0 ZXJQYXJ0OgogICAgIGNhc2UgUmVsZXZhbmN5TGV2ZWxJbmRpY2F0b3JQYXJ0OgogICAgIGNhc2Ug Q29udGludW91c0NhcGFjaXR5TGV2ZWxJbmRpY2F0b3JQYXJ0OgogICAgIGNhc2UgRGlzY3JldGVD YXBhY2l0eUxldmVsSW5kaWNhdG9yUGFydDoKICAgICBjYXNlIFJhdGluZ0xldmVsSW5kaWNhdG9y UGFydDoKLSAgICAgICAgcmV0dXJuIHBhaW50TWV0ZXIobywgcGFpbnRJbmZvLCBpbnRlZ3JhbFNu YXBwZWRSZWN0KTsKKyAgICAgICAgcmV0dXJuIHBhaW50TWV0ZXIoYm94LCBwYWludEluZm8sIGlu dGVncmFsU25hcHBlZFJlY3QpOwogI2VuZGlmCiAgICAgY2FzZSBQcm9ncmVzc0JhclBhcnQ6Ci0g ICAgICAgIHJldHVybiBwYWludFByb2dyZXNzQmFyKG8sIHBhaW50SW5mbywgaW50ZWdyYWxTbmFw cGVkUmVjdCk7CisgICAgICAgIHJldHVybiBwYWludFByb2dyZXNzQmFyKGJveCwgcGFpbnRJbmZv LCBpbnRlZ3JhbFNuYXBwZWRSZWN0KTsKICAgICBjYXNlIFNsaWRlckhvcml6b250YWxQYXJ0Ogog ICAgIGNhc2UgU2xpZGVyVmVydGljYWxQYXJ0OgotICAgICAgICByZXR1cm4gcGFpbnRTbGlkZXJU cmFjayhvLCBwYWludEluZm8sIGludGVncmFsU25hcHBlZFJlY3QpOworICAgICAgICByZXR1cm4g cGFpbnRTbGlkZXJUcmFjayhib3gsIHBhaW50SW5mbywgaW50ZWdyYWxTbmFwcGVkUmVjdCk7CiAg ICAgY2FzZSBTbGlkZXJUaHVtYkhvcml6b250YWxQYXJ0OgogICAgIGNhc2UgU2xpZGVyVGh1bWJW ZXJ0aWNhbFBhcnQ6Ci0gICAgICAgIHJldHVybiBwYWludFNsaWRlclRodW1iKG8sIHBhaW50SW5m bywgaW50ZWdyYWxTbmFwcGVkUmVjdCk7CisgICAgICAgIHJldHVybiBwYWludFNsaWRlclRodW1i KGJveCwgcGFpbnRJbmZvLCBpbnRlZ3JhbFNuYXBwZWRSZWN0KTsKICAgICBjYXNlIE1lZGlhRW50 ZXJGdWxsc2NyZWVuQnV0dG9uUGFydDoKICAgICBjYXNlIE1lZGlhRXhpdEZ1bGxzY3JlZW5CdXR0 b25QYXJ0OgotICAgICAgICByZXR1cm4gcGFpbnRNZWRpYUZ1bGxzY3JlZW5CdXR0b24obywgcGFp bnRJbmZvLCBpbnRlZ3JhbFNuYXBwZWRSZWN0KTsKKyAgICAgICAgcmV0dXJuIHBhaW50TWVkaWFG dWxsc2NyZWVuQnV0dG9uKGJveCwgcGFpbnRJbmZvLCBpbnRlZ3JhbFNuYXBwZWRSZWN0KTsKICAg ICBjYXNlIE1lZGlhUGxheUJ1dHRvblBhcnQ6Ci0gICAgICAgIHJldHVybiBwYWludE1lZGlhUGxh eUJ1dHRvbihvLCBwYWludEluZm8sIGludGVncmFsU25hcHBlZFJlY3QpOworICAgICAgICByZXR1 cm4gcGFpbnRNZWRpYVBsYXlCdXR0b24oYm94LCBwYWludEluZm8sIGludGVncmFsU25hcHBlZFJl Y3QpOwogICAgIGNhc2UgTWVkaWFPdmVybGF5UGxheUJ1dHRvblBhcnQ6Ci0gICAgICAgIHJldHVy biBwYWludE1lZGlhT3ZlcmxheVBsYXlCdXR0b24obywgcGFpbnRJbmZvLCBpbnRlZ3JhbFNuYXBw ZWRSZWN0KTsKKyAgICAgICAgcmV0dXJuIHBhaW50TWVkaWFPdmVybGF5UGxheUJ1dHRvbihib3gs IHBhaW50SW5mbywgaW50ZWdyYWxTbmFwcGVkUmVjdCk7CiAgICAgY2FzZSBNZWRpYU11dGVCdXR0 b25QYXJ0OgotICAgICAgICByZXR1cm4gcGFpbnRNZWRpYU11dGVCdXR0b24obywgcGFpbnRJbmZv LCBpbnRlZ3JhbFNuYXBwZWRSZWN0KTsKKyAgICAgICAgcmV0dXJuIHBhaW50TWVkaWFNdXRlQnV0 dG9uKGJveCwgcGFpbnRJbmZvLCBpbnRlZ3JhbFNuYXBwZWRSZWN0KTsKICAgICBjYXNlIE1lZGlh U2Vla0JhY2tCdXR0b25QYXJ0OgotICAgICAgICByZXR1cm4gcGFpbnRNZWRpYVNlZWtCYWNrQnV0 dG9uKG8sIHBhaW50SW5mbywgaW50ZWdyYWxTbmFwcGVkUmVjdCk7CisgICAgICAgIHJldHVybiBw YWludE1lZGlhU2Vla0JhY2tCdXR0b24oYm94LCBwYWludEluZm8sIGludGVncmFsU25hcHBlZFJl Y3QpOwogICAgIGNhc2UgTWVkaWFTZWVrRm9yd2FyZEJ1dHRvblBhcnQ6Ci0gICAgICAgIHJldHVy biBwYWludE1lZGlhU2Vla0ZvcndhcmRCdXR0b24obywgcGFpbnRJbmZvLCBpbnRlZ3JhbFNuYXBw ZWRSZWN0KTsKKyAgICAgICAgcmV0dXJuIHBhaW50TWVkaWFTZWVrRm9yd2FyZEJ1dHRvbihib3gs IHBhaW50SW5mbywgaW50ZWdyYWxTbmFwcGVkUmVjdCk7CiAgICAgY2FzZSBNZWRpYVJld2luZEJ1 dHRvblBhcnQ6Ci0gICAgICAgIHJldHVybiBwYWludE1lZGlhUmV3aW5kQnV0dG9uKG8sIHBhaW50 SW5mbywgaW50ZWdyYWxTbmFwcGVkUmVjdCk7CisgICAgICAgIHJldHVybiBwYWludE1lZGlhUmV3 aW5kQnV0dG9uKGJveCwgcGFpbnRJbmZvLCBpbnRlZ3JhbFNuYXBwZWRSZWN0KTsKICAgICBjYXNl IE1lZGlhUmV0dXJuVG9SZWFsdGltZUJ1dHRvblBhcnQ6Ci0gICAgICAgIHJldHVybiBwYWludE1l ZGlhUmV0dXJuVG9SZWFsdGltZUJ1dHRvbihvLCBwYWludEluZm8sIGludGVncmFsU25hcHBlZFJl Y3QpOworICAgICAgICByZXR1cm4gcGFpbnRNZWRpYVJldHVyblRvUmVhbHRpbWVCdXR0b24oYm94 LCBwYWludEluZm8sIGludGVncmFsU25hcHBlZFJlY3QpOwogICAgIGNhc2UgTWVkaWFUb2dnbGVD bG9zZWRDYXB0aW9uc0J1dHRvblBhcnQ6Ci0gICAgICAgIHJldHVybiBwYWludE1lZGlhVG9nZ2xl Q2xvc2VkQ2FwdGlvbnNCdXR0b24obywgcGFpbnRJbmZvLCBpbnRlZ3JhbFNuYXBwZWRSZWN0KTsK KyAgICAgICAgcmV0dXJuIHBhaW50TWVkaWFUb2dnbGVDbG9zZWRDYXB0aW9uc0J1dHRvbihib3gs IHBhaW50SW5mbywgaW50ZWdyYWxTbmFwcGVkUmVjdCk7CiAgICAgY2FzZSBNZWRpYVNsaWRlclBh cnQ6Ci0gICAgICAgIHJldHVybiBwYWludE1lZGlhU2xpZGVyVHJhY2sobywgcGFpbnRJbmZvLCBp bnRlZ3JhbFNuYXBwZWRSZWN0KTsKKyAgICAgICAgcmV0dXJuIHBhaW50TWVkaWFTbGlkZXJUcmFj ayhib3gsIHBhaW50SW5mbywgaW50ZWdyYWxTbmFwcGVkUmVjdCk7CiAgICAgY2FzZSBNZWRpYVNs aWRlclRodW1iUGFydDoKLSAgICAgICAgcmV0dXJuIHBhaW50TWVkaWFTbGlkZXJUaHVtYihvLCBw YWludEluZm8sIGludGVncmFsU25hcHBlZFJlY3QpOworICAgICAgICByZXR1cm4gcGFpbnRNZWRp YVNsaWRlclRodW1iKGJveCwgcGFpbnRJbmZvLCBpbnRlZ3JhbFNuYXBwZWRSZWN0KTsKICAgICBj YXNlIE1lZGlhVm9sdW1lU2xpZGVyTXV0ZUJ1dHRvblBhcnQ6Ci0gICAgICAgIHJldHVybiBwYWlu dE1lZGlhTXV0ZUJ1dHRvbihvLCBwYWludEluZm8sIGludGVncmFsU25hcHBlZFJlY3QpOworICAg ICAgICByZXR1cm4gcGFpbnRNZWRpYU11dGVCdXR0b24oYm94LCBwYWludEluZm8sIGludGVncmFs U25hcHBlZFJlY3QpOwogICAgIGNhc2UgTWVkaWFWb2x1bWVTbGlkZXJDb250YWluZXJQYXJ0Ogot ICAgICAgICByZXR1cm4gcGFpbnRNZWRpYVZvbHVtZVNsaWRlckNvbnRhaW5lcihvLCBwYWludElu Zm8sIGludGVncmFsU25hcHBlZFJlY3QpOworICAgICAgICByZXR1cm4gcGFpbnRNZWRpYVZvbHVt ZVNsaWRlckNvbnRhaW5lcihib3gsIHBhaW50SW5mbywgaW50ZWdyYWxTbmFwcGVkUmVjdCk7CiAg ICAgY2FzZSBNZWRpYVZvbHVtZVNsaWRlclBhcnQ6Ci0gICAgICAgIHJldHVybiBwYWludE1lZGlh Vm9sdW1lU2xpZGVyVHJhY2sobywgcGFpbnRJbmZvLCBpbnRlZ3JhbFNuYXBwZWRSZWN0KTsKKyAg ICAgICAgcmV0dXJuIHBhaW50TWVkaWFWb2x1bWVTbGlkZXJUcmFjayhib3gsIHBhaW50SW5mbywg aW50ZWdyYWxTbmFwcGVkUmVjdCk7CiAgICAgY2FzZSBNZWRpYVZvbHVtZVNsaWRlclRodW1iUGFy dDoKLSAgICAgICAgcmV0dXJuIHBhaW50TWVkaWFWb2x1bWVTbGlkZXJUaHVtYihvLCBwYWludElu Zm8sIGludGVncmFsU25hcHBlZFJlY3QpOworICAgICAgICByZXR1cm4gcGFpbnRNZWRpYVZvbHVt ZVNsaWRlclRodW1iKGJveCwgcGFpbnRJbmZvLCBpbnRlZ3JhbFNuYXBwZWRSZWN0KTsKICAgICBj YXNlIE1lZGlhRnVsbFNjcmVlblZvbHVtZVNsaWRlclBhcnQ6Ci0gICAgICAgIHJldHVybiBwYWlu dE1lZGlhRnVsbFNjcmVlblZvbHVtZVNsaWRlclRyYWNrKG8sIHBhaW50SW5mbywgaW50ZWdyYWxT bmFwcGVkUmVjdCk7CisgICAgICAgIHJldHVybiBwYWludE1lZGlhRnVsbFNjcmVlblZvbHVtZVNs aWRlclRyYWNrKGJveCwgcGFpbnRJbmZvLCBpbnRlZ3JhbFNuYXBwZWRSZWN0KTsKICAgICBjYXNl IE1lZGlhRnVsbFNjcmVlblZvbHVtZVNsaWRlclRodW1iUGFydDoKLSAgICAgICAgcmV0dXJuIHBh aW50TWVkaWFGdWxsU2NyZWVuVm9sdW1lU2xpZGVyVGh1bWIobywgcGFpbnRJbmZvLCBpbnRlZ3Jh bFNuYXBwZWRSZWN0KTsKKyAgICAgICAgcmV0dXJuIHBhaW50TWVkaWFGdWxsU2NyZWVuVm9sdW1l U2xpZGVyVGh1bWIoYm94LCBwYWludEluZm8sIGludGVncmFsU25hcHBlZFJlY3QpOwogICAgIGNh c2UgTWVkaWFUaW1lUmVtYWluaW5nUGFydDoKLSAgICAgICAgcmV0dXJuIHBhaW50TWVkaWFUaW1l UmVtYWluaW5nKG8sIHBhaW50SW5mbywgaW50ZWdyYWxTbmFwcGVkUmVjdCk7CisgICAgICAgIHJl dHVybiBwYWludE1lZGlhVGltZVJlbWFpbmluZyhib3gsIHBhaW50SW5mbywgaW50ZWdyYWxTbmFw cGVkUmVjdCk7CiAgICAgY2FzZSBNZWRpYUN1cnJlbnRUaW1lUGFydDoKLSAgICAgICAgcmV0dXJu IHBhaW50TWVkaWFDdXJyZW50VGltZShvLCBwYWludEluZm8sIGludGVncmFsU25hcHBlZFJlY3Qp OworICAgICAgICByZXR1cm4gcGFpbnRNZWRpYUN1cnJlbnRUaW1lKGJveCwgcGFpbnRJbmZvLCBp bnRlZ3JhbFNuYXBwZWRSZWN0KTsKICAgICBjYXNlIE1lZGlhQ29udHJvbHNCYWNrZ3JvdW5kUGFy dDoKLSAgICAgICAgcmV0dXJuIHBhaW50TWVkaWFDb250cm9sc0JhY2tncm91bmQobywgcGFpbnRJ bmZvLCBpbnRlZ3JhbFNuYXBwZWRSZWN0KTsKKyAgICAgICAgcmV0dXJuIHBhaW50TWVkaWFDb250 cm9sc0JhY2tncm91bmQoYm94LCBwYWludEluZm8sIGludGVncmFsU25hcHBlZFJlY3QpOwogICAg IGNhc2UgTWVudWxpc3RCdXR0b25QYXJ0OgogICAgIGNhc2UgVGV4dEZpZWxkUGFydDoKICAgICBj YXNlIFRleHRBcmVhUGFydDoKICAgICBjYXNlIExpc3Rib3hQYXJ0OgogICAgICAgICByZXR1cm4g dHJ1ZTsKICAgICBjYXNlIFNlYXJjaEZpZWxkUGFydDoKLSAgICAgICAgcmV0dXJuIHBhaW50U2Vh cmNoRmllbGQobywgcGFpbnRJbmZvLCBpbnRlZ3JhbFNuYXBwZWRSZWN0KTsKKyAgICAgICAgcmV0 dXJuIHBhaW50U2VhcmNoRmllbGQoYm94LCBwYWludEluZm8sIGludGVncmFsU25hcHBlZFJlY3Qp OwogICAgIGNhc2UgU2VhcmNoRmllbGRDYW5jZWxCdXR0b25QYXJ0OgotICAgICAgICByZXR1cm4g cGFpbnRTZWFyY2hGaWVsZENhbmNlbEJ1dHRvbihvLCBwYWludEluZm8sIGludGVncmFsU25hcHBl ZFJlY3QpOworICAgICAgICByZXR1cm4gcGFpbnRTZWFyY2hGaWVsZENhbmNlbEJ1dHRvbihib3gs IHBhaW50SW5mbywgaW50ZWdyYWxTbmFwcGVkUmVjdCk7CiAgICAgY2FzZSBTZWFyY2hGaWVsZERl Y29yYXRpb25QYXJ0OgotICAgICAgICByZXR1cm4gcGFpbnRTZWFyY2hGaWVsZERlY29yYXRpb25Q YXJ0KG8sIHBhaW50SW5mbywgaW50ZWdyYWxTbmFwcGVkUmVjdCk7CisgICAgICAgIHJldHVybiBw YWludFNlYXJjaEZpZWxkRGVjb3JhdGlvblBhcnQoYm94LCBwYWludEluZm8sIGludGVncmFsU25h cHBlZFJlY3QpOwogICAgIGNhc2UgU2VhcmNoRmllbGRSZXN1bHRzRGVjb3JhdGlvblBhcnQ6Ci0g ICAgICAgIHJldHVybiBwYWludFNlYXJjaEZpZWxkUmVzdWx0c0RlY29yYXRpb25QYXJ0KG8sIHBh aW50SW5mbywgaW50ZWdyYWxTbmFwcGVkUmVjdCk7CisgICAgICAgIHJldHVybiBwYWludFNlYXJj aEZpZWxkUmVzdWx0c0RlY29yYXRpb25QYXJ0KGJveCwgcGFpbnRJbmZvLCBpbnRlZ3JhbFNuYXBw ZWRSZWN0KTsKICAgICBjYXNlIFNlYXJjaEZpZWxkUmVzdWx0c0J1dHRvblBhcnQ6Ci0gICAgICAg IHJldHVybiBwYWludFNlYXJjaEZpZWxkUmVzdWx0c0J1dHRvbihvLCBwYWludEluZm8sIGludGVn cmFsU25hcHBlZFJlY3QpOworICAgICAgICByZXR1cm4gcGFpbnRTZWFyY2hGaWVsZFJlc3VsdHNC dXR0b24oYm94LCBwYWludEluZm8sIGludGVncmFsU25hcHBlZFJlY3QpOwogICAgIGNhc2UgU25h cHNob3R0ZWRQbHVnaW5PdmVybGF5UGFydDoKLSAgICAgICAgcmV0dXJuIHBhaW50U25hcHNob3R0 ZWRQbHVnaW5PdmVybGF5KG8sIHBhaW50SW5mbywgaW50ZWdyYWxTbmFwcGVkUmVjdCk7CisgICAg ICAgIHJldHVybiBwYWludFNuYXBzaG90dGVkUGx1Z2luT3ZlcmxheShib3gsIHBhaW50SW5mbywg aW50ZWdyYWxTbmFwcGVkUmVjdCk7CiAjaWYgRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCiAgICAg Y2FzZSBJbWFnZUNvbnRyb2xzQnV0dG9uUGFydDoKLSAgICAgICAgcmV0dXJuIHBhaW50SW1hZ2VD b250cm9sc0J1dHRvbihvLCBwYWludEluZm8sIGludGVncmFsU25hcHBlZFJlY3QpOworICAgICAg ICByZXR1cm4gcGFpbnRJbWFnZUNvbnRyb2xzQnV0dG9uKGJveCwgcGFpbnRJbmZvLCBpbnRlZ3Jh bFNuYXBwZWRSZWN0KTsKICNlbmRpZgogICAgIGNhc2UgQ2Fwc0xvY2tJbmRpY2F0b3JQYXJ0Ogot ICAgICAgICByZXR1cm4gcGFpbnRDYXBzTG9ja0luZGljYXRvcihvLCBwYWludEluZm8sIGludGVn cmFsU25hcHBlZFJlY3QpOworICAgICAgICByZXR1cm4gcGFpbnRDYXBzTG9ja0luZGljYXRvcihi b3gsIHBhaW50SW5mbywgaW50ZWdyYWxTbmFwcGVkUmVjdCk7CiAjaWYgRU5BQkxFKEFUVEFDSE1F TlRfRUxFTUVOVCkKICAgICBjYXNlIEF0dGFjaG1lbnRQYXJ0OgotICAgICAgICByZXR1cm4gcGFp bnRBdHRhY2htZW50KG8sIHBhaW50SW5mbywgaW50ZWdyYWxTbmFwcGVkUmVjdCk7CisgICAgICAg IHJldHVybiBwYWludEF0dGFjaG1lbnQoYm94LCBwYWludEluZm8sIGludGVncmFsU25hcHBlZFJl Y3QpOwogI2VuZGlmCiAgICAgZGVmYXVsdDoKICAgICAgICAgYnJlYWs7CkBAIC03NDMsMTIgKzc0 MywxMiBAQCBib29sIFJlbmRlclRoZW1lOjpzdGF0ZUNoYW5nZWQoY29uc3QgUmVuZGVyT2JqZWN0 JiBvLCBDb250cm9sU3RhdGVzOjpTdGF0ZXMgc3RhdAogICAgIHJldHVybiB0cnVlOwogfQogCi12 b2lkIFJlbmRlclRoZW1lOjp1cGRhdGVDb250cm9sU3RhdGVzRm9yUmVuZGVyZXIoY29uc3QgUmVu ZGVyT2JqZWN0JiBvLCBDb250cm9sU3RhdGVzJiBjb250cm9sU3RhdGVzKSBjb25zdAordm9pZCBS ZW5kZXJUaGVtZTo6dXBkYXRlQ29udHJvbFN0YXRlc0ZvclJlbmRlcmVyKGNvbnN0IFJlbmRlckJv eCYgYm94LCBDb250cm9sU3RhdGVzJiBjb250cm9sU3RhdGVzKSBjb25zdAogewotICAgIENvbnRy b2xTdGF0ZXMgbmV3U3RhdGVzID0gZXh0cmFjdENvbnRyb2xTdGF0ZXNGb3JSZW5kZXJlcihvKTsK KyAgICBDb250cm9sU3RhdGVzIG5ld1N0YXRlcyA9IGV4dHJhY3RDb250cm9sU3RhdGVzRm9yUmVu ZGVyZXIoYm94KTsKICAgICBjb250cm9sU3RhdGVzLnNldFN0YXRlcyhuZXdTdGF0ZXMuc3RhdGVz KCkpOwotICAgIGlmIChpc0ZvY3VzZWQobykpCi0gICAgICAgIGNvbnRyb2xTdGF0ZXMuc2V0VGlt ZVNpbmNlQ29udHJvbFdhc0ZvY3VzZWQoby5kb2N1bWVudCgpLnBhZ2UoKS0+Zm9jdXNDb250cm9s bGVyKCkudGltZVNpbmNlRm9jdXNXYXNTZXQoKSk7CisgICAgaWYgKGlzRm9jdXNlZChib3gpKQor ICAgICAgICBjb250cm9sU3RhdGVzLnNldFRpbWVTaW5jZUNvbnRyb2xXYXNGb2N1c2VkKGJveC5k b2N1bWVudCgpLnBhZ2UoKS0+Zm9jdXNDb250cm9sbGVyKCkudGltZVNpbmNlRm9jdXNXYXNTZXQo KSk7CiB9CiAKIENvbnRyb2xTdGF0ZXM6OlN0YXRlcyBSZW5kZXJUaGVtZTo6ZXh0cmFjdENvbnRy b2xTdGF0ZXNGb3JSZW5kZXJlcihjb25zdCBSZW5kZXJPYmplY3QmIG8pIGNvbnN0CkBAIC03ODEs MTUgKzc4MSw3IEBAIENvbnRyb2xTdGF0ZXM6OlN0YXRlcyBSZW5kZXJUaGVtZTo6ZXh0cmFjdENv bnRyb2xTdGF0ZXNGb3JSZW5kZXJlcihjb25zdCBSZW5kZXJPCiAKIGJvb2wgUmVuZGVyVGhlbWU6 OmlzQWN0aXZlKGNvbnN0IFJlbmRlck9iamVjdCYgbykgY29uc3QKIHsKLSAgICBOb2RlKiBub2Rl ID0gby5ub2RlKCk7Ci0gICAgaWYgKCFub2RlKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAg ICBGcmFtZSogZnJhbWUgPSBub2RlLT5kb2N1bWVudCgpLmZyYW1lKCk7Ci0gICAgaWYgKCFmcmFt ZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgUGFnZSogcGFnZSA9IGZyYW1lLT5wYWdl KCk7CisgICAgUGFnZSogcGFnZSA9IG8uZG9jdW1lbnQoKS5wYWdlKCk7CiAgICAgaWYgKCFwYWdl KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUaGVtZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lLmgKaW5kZXggNzFiNjRhOGY1ZWMyNzc3MjI1N2U1Y2M1YTc2N2QzZTQzZTU0MzU3Mi4uMjY5 ODJiYWJhM2U2NzYwYTUzZjUyY2U3NTYzMmE5YTdlNTAzNGE0YiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRoZW1lLmgKQEAgLTc5LDcgKzc5LDcgQEAgcHVibGljOgogICAgIC8vIFRo aXMgbWV0aG9kIGlzIGNhbGxlZCB0byBwYWludCB0aGUgd2lkZ2V0IGFzIGEgYmFja2dyb3VuZCBv ZiB0aGUgUmVuZGVyT2JqZWN0LiAgQSB3aWRnZXQncyBmb3JlZ3JvdW5kLCBlLmcuLCB0aGUKICAg ICAvLyB0ZXh0IG9mIGEgYnV0dG9uLCBpcyBhbHdheXMgcmVuZGVyZWQgYnkgdGhlIGVuZ2luZSBp dHNlbGYuICBUaGUgYm9vbGVhbiByZXR1cm4gdmFsdWUgaW5kaWNhdGVzCiAgICAgLy8gd2hldGhl ciB0aGUgQ1NTIGJvcmRlci9iYWNrZ3JvdW5kIHNob3VsZCBhbHNvIGJlIHBhaW50ZWQuCi0gICAg Ym9vbCBwYWludChjb25zdCBSZW5kZXJPYmplY3QmLCBDb250cm9sU3RhdGVzJiwgY29uc3QgUGFp bnRJbmZvJiwgY29uc3QgTGF5b3V0UmVjdCYpOworICAgIGJvb2wgcGFpbnQoY29uc3QgUmVuZGVy Qm94JiwgQ29udHJvbFN0YXRlcyYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IExheW91dFJlY3Qm KTsKICAgICBib29sIHBhaW50Qm9yZGVyT25seShjb25zdCBSZW5kZXJCb3gmLCBjb25zdCBQYWlu dEluZm8mLCBjb25zdCBMYXlvdXRSZWN0Jik7CiAgICAgYm9vbCBwYWludERlY29yYXRpb25zKGNv bnN0IFJlbmRlckJveCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IExheW91dFJlY3QmKTsKIApA QCAtMzc5LDcgKzM3OSw3IEBAIHByb3RlY3RlZDoKICNlbmRpZgogCiBwdWJsaWM6Ci0gICAgdm9p ZCB1cGRhdGVDb250cm9sU3RhdGVzRm9yUmVuZGVyZXIoY29uc3QgUmVuZGVyT2JqZWN0JiwgQ29u dHJvbFN0YXRlcyYpIGNvbnN0OworICAgIHZvaWQgdXBkYXRlQ29udHJvbFN0YXRlc0ZvclJlbmRl cmVyKGNvbnN0IFJlbmRlckJveCYsIENvbnRyb2xTdGF0ZXMmKSBjb25zdDsKICAgICBDb250cm9s U3RhdGVzOjpTdGF0ZXMgZXh0cmFjdENvbnRyb2xTdGF0ZXNGb3JSZW5kZXJlcihjb25zdCBSZW5k ZXJPYmplY3QmKSBjb25zdDsKICAgICBib29sIGlzQWN0aXZlKGNvbnN0IFJlbmRlck9iamVjdCYp IGNvbnN0OwogICAgIGJvb2wgaXNDaGVja2VkKGNvbnN0IFJlbmRlck9iamVjdCYpIGNvbnN0Owo=