102002 2012-11-12 15:53:37 -0800 Fix filter dirty rect regression from r134311 2012-11-12 17:14:40 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser bdakin eric simon.fraser webkit.review.bot oldest_to_newest 764907 0 simon.fraser 2012-11-12 15:53:37 -0800 Fix filter dirty rect regression from r134311 764911 1 173747 simon.fraser 2012-11-12 15:55:59 -0800 Created attachment 173747 Patch 765005 2 simon.fraser 2012-11-12 17:14:40 -0800 http://trac.webkit.org/changeset/134330 173747 2012-11-12 15:55:59 -0800 2012-11-12 15:58:20 -0800 Patch bug-102002-20121112155401.patch text/plain 14418 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDQ2NDQyZTEyNzM2MDc0 NDZkZjY0MjE5ODAyOTdmYTEwN2VlMTI1My4uMzgzYmMwNmI0ZmM0MjQzZDBjMzhmZDRkNTQ4MzMw YTdhNTFhOWJlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDEyLTExLTEyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIEZpeCBmaWx0ZXIg ZGlydHkgcmVjdCByZWdyZXNzaW9uIGZyb20gcjEzNDMxMQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyMDAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiByZW5kZXJpbmcgd2l0aCBmaWx0ZXJzLCB0 aGUgY29kZSBjYW4gaW5mbGF0ZSB0aGUgcm9vdC1yZWxhdGl2ZQorICAgICAgICBwYWludERpcnR5 UmVjdCBpbiBSZW5kZXJMYXllcjo6cGFpbnRMYXllckNvbnRlbnRzKCksIGFuZCBteSBjbGVhbnVw CisgICAgICAgIGJyb2tlIHRoaXMgYmVoYXZpb3IuCisgICAgCisgICAgICAgIEZpeCBieSBtYWtp bmcgYSBsb2NhbCBjb3B5IG9mIExheWVyUGFpbnRpbmdJbmZvLCB1cGRhdGluZyBpdHMgcGFpbnRE aXJ0eVJlY3QsCisgICAgICAgIGFuZCB1c2luZyBpdCBmb3IgdGhlIHJlc3Qgb2YgdGhlIGZ1bmN0 aW9uLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxheWVyOjpwYWludExheWVyQ29udGVudHMpOgorCisyMDEyLTExLTEyICBT aW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFJlZHVjZSB0 aGUgY3JhenkgbnVtYmVyIG9mIHBhcmFtZXRlcnMgdG8gUmVuZGVyTGF5ZXIgcGFpbnRpbmcgbWVt YmVyIGZ1bmN0aW9ucwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTAxODk1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmlu ZGV4IDNmM2Y2ZTc2ZTE5MDQ1OTQ4NTEzZWE0ODAyYTI2ZmFkY2E4NDBlZjcuLmRkNDYxNWM3MDdl ZTMyN2Q0ZDM1YmJhNTlhYWMxYThhMDIzODdiZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmNwcApAQCAtMzE3Niw3ICszMTc2LDYgQEAgdm9pZCBSZW5kZXJMYXllcjo6 cGFpbnRMYXllckNvbnRlbnRzKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgTGF5ZXJQ YWludGkKICAgICBMYXlvdXRSZWN0IGxheWVyQm91bmRzOwogICAgIENsaXBSZWN0IGRhbWFnZVJl Y3QsIGNsaXBSZWN0VG9BcHBseSwgb3V0bGluZVJlY3Q7CiAgICAgTGF5b3V0UG9pbnQgcGFpbnRP ZmZzZXQ7Ci0gICAgTGF5b3V0UmVjdCBwYWludERpcnR5UmVjdCA9IHBhaW50aW5nSW5mby5wYWlu dERpcnR5UmVjdDsKICAgICAKICAgICBib29sIHVzZUNsaXBSZWN0ID0gdHJ1ZTsKICAgICBHcmFw aGljc0NvbnRleHQqIHRyYW5zcGFyZW5jeUxheWVyQ29udGV4dCA9IGNvbnRleHQ7CkBAIC0zMjA3 LDYgKzMyMDYsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludExheWVyQ29udGVudHMoR3JhcGhp Y3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBMYXllclBhaW50aQogI2VuZGlmCiAgICAgfQogCisg ICAgTGF5ZXJQYWludGluZ0luZm8gbG9jYWxQYWludGluZ0luZm8ocGFpbnRpbmdJbmZvKTsKICNp ZiBFTkFCTEUoQ1NTX0ZJTFRFUlMpCiAgICAgRmlsdGVyRWZmZWN0UmVuZGVyZXJIZWxwZXIgZmls dGVyUGFpbnRlcihmaWx0ZXJSZW5kZXJlcigpICYmIHBhaW50c1dpdGhGaWx0ZXJzKCkpOwogICAg IGlmIChmaWx0ZXJQYWludGVyLmhhdmVGaWx0ZXJFZmZlY3QoKSAmJiAhY29udGV4dC0+cGFpbnRp bmdEaXNhYmxlZCgpKSB7CkBAIC0zMjI4LDcgKzMyMjgsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpw YWludExheWVyQ29udGVudHMoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBMYXllclBh aW50aQogCiAgICAgICAgICAgICAvLyBDaGVjayB0aGF0IHdlIGRpZG4ndCBmYWlsIHRvIGFsbG9j YXRlIHRoZSBncmFwaGljcyBjb250ZXh0IGZvciB0aGUgb2Zmc2NyZWVuIGJ1ZmZlci4KICAgICAg ICAgICAgIGlmIChmaWx0ZXJQYWludGVyLmhhc1N0YXJ0ZWRGaWx0ZXJFZmZlY3QoKSkgewotICAg ICAgICAgICAgICAgIHBhaW50RGlydHlSZWN0ID0gZmlsdGVyUGFpbnRlci5yZXBhaW50UmVjdCgp OworICAgICAgICAgICAgICAgIGxvY2FsUGFpbnRpbmdJbmZvLnBhaW50RGlydHlSZWN0ID0gZmls dGVyUGFpbnRlci5yZXBhaW50UmVjdCgpOwogICAgICAgICAgICAgICAgIC8vIElmIHRoZSBmaWx0 ZXIgbmVlZHMgdGhlIGZ1bGwgc291cmNlIGltYWdlLCB3ZSBuZWVkIHRvIGF2b2lkIHVzaW5nIHRo ZSBjbGlwIHJlY3RhbmdsZXMuCiAgICAgICAgICAgICAgICAgLy8gT3RoZXJ3aXNlLCBpZiBmb3Ig ZXhhbXBsZSB0aGlzIGxheWVyIGhhcyBvdmVyZmxvdzpoaWRkZW4sIGEgZHJvcCBzaGFkb3cgd2ls bCBub3QgY29tcHV0ZSBjb3JyZWN0bHkuCiAgICAgICAgICAgICAgICAgLy8gTm90ZSB0aGF0IHdl IHdpbGwgc3RpbGwgYXBwbHkgdGhlIGNsaXBwaW5nIG9uIHRoZSBmaW5hbCByZW5kZXJpbmcgb2Yg dGhlIGZpbHRlci4KQEAgLTMyMzksNTUgKzMyMzksNTUgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFp bnRMYXllckNvbnRlbnRzKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgTGF5ZXJQYWlu dGkKICNlbmRpZgogICAgIAogICAgIGlmIChzaG91bGRQYWludENvbnRlbnQgfHwgc2hvdWxkUGFp bnRPdXRsaW5lIHx8IGlzUGFpbnRpbmdPdmVybGF5U2Nyb2xsYmFycykgewotICAgICAgICBjYWxj dWxhdGVSZWN0cyhwYWludGluZ0luZm8ucm9vdExheWVyLCBwYWludGluZ0luZm8ucmVnaW9uLCAo bG9jYWxQYWludEZsYWdzICYgUGFpbnRMYXllclRlbXBvcmFyeUNsaXBSZWN0cykgPyBUZW1wb3Jh cnlDbGlwUmVjdHMgOiBQYWludGluZ0NsaXBSZWN0cywgcGFpbnREaXJ0eVJlY3QsIGxheWVyQm91 bmRzLCBkYW1hZ2VSZWN0LCBjbGlwUmVjdFRvQXBwbHksIG91dGxpbmVSZWN0LAorICAgICAgICBj YWxjdWxhdGVSZWN0cyhsb2NhbFBhaW50aW5nSW5mby5yb290TGF5ZXIsIGxvY2FsUGFpbnRpbmdJ bmZvLnJlZ2lvbiwgKGxvY2FsUGFpbnRGbGFncyAmIFBhaW50TGF5ZXJUZW1wb3JhcnlDbGlwUmVj dHMpID8gVGVtcG9yYXJ5Q2xpcFJlY3RzIDogUGFpbnRpbmdDbGlwUmVjdHMsIGxvY2FsUGFpbnRp bmdJbmZvLnBhaW50RGlydHlSZWN0LCBsYXllckJvdW5kcywgZGFtYWdlUmVjdCwgY2xpcFJlY3RU b0FwcGx5LCBvdXRsaW5lUmVjdCwKICAgICAgICAgICAgIElnbm9yZU92ZXJsYXlTY3JvbGxiYXJT aXplLCBsb2NhbFBhaW50RmxhZ3MgJiBQYWludExheWVyUGFpbnRpbmdPdmVyZmxvd0NvbnRlbnRz ID8gSWdub3JlT3ZlcmZsb3dDbGlwIDogUmVzcGVjdE92ZXJmbG93Q2xpcCk7Ci0gICAgICAgIHBh aW50T2Zmc2V0ID0gdG9Qb2ludChsYXllckJvdW5kcy5sb2NhdGlvbigpIC0gcmVuZGVyQm94TG9j YXRpb24oKSArIHBhaW50aW5nSW5mby5zdWJQaXhlbEFjY3VtdWxhdGlvbik7Ci0gICAgICAgIGlm ICh0aGlzID09IHBhaW50aW5nSW5mby5yb290TGF5ZXIpCisgICAgICAgIHBhaW50T2Zmc2V0ID0g dG9Qb2ludChsYXllckJvdW5kcy5sb2NhdGlvbigpIC0gcmVuZGVyQm94TG9jYXRpb24oKSArIGxv Y2FsUGFpbnRpbmdJbmZvLnN1YlBpeGVsQWNjdW11bGF0aW9uKTsKKyAgICAgICAgaWYgKHRoaXMg PT0gbG9jYWxQYWludGluZ0luZm8ucm9vdExheWVyKQogICAgICAgICAgICAgcGFpbnRPZmZzZXQg PSByb3VuZGVkSW50UG9pbnQocGFpbnRPZmZzZXQpOwogICAgIH0KIAotICAgIGJvb2wgZm9yY2VC bGFja1RleHQgPSBwYWludGluZ0luZm8ucGFpbnRCZWhhdmlvciAmIFBhaW50QmVoYXZpb3JGb3Jj ZUJsYWNrVGV4dDsKLSAgICBib29sIHNlbGVjdGlvbk9ubHkgID0gcGFpbnRpbmdJbmZvLnBhaW50 QmVoYXZpb3IgJiBQYWludEJlaGF2aW9yU2VsZWN0aW9uT25seTsKKyAgICBib29sIGZvcmNlQmxh Y2tUZXh0ID0gbG9jYWxQYWludGluZ0luZm8ucGFpbnRCZWhhdmlvciAmIFBhaW50QmVoYXZpb3JG b3JjZUJsYWNrVGV4dDsKKyAgICBib29sIHNlbGVjdGlvbk9ubHkgID0gbG9jYWxQYWludGluZ0lu Zm8ucGFpbnRCZWhhdmlvciAmIFBhaW50QmVoYXZpb3JTZWxlY3Rpb25Pbmx5OwogICAgIAogICAg IC8vIElmIHRoaXMgbGF5ZXIncyByZW5kZXJlciBpcyBhIGNoaWxkIG9mIHRoZSBwYWludGluZ1Jv b3QsIHdlIHJlbmRlciB1bmNvbmRpdGlvbmFsbHksIHdoaWNoCiAgICAgLy8gaXMgZG9uZSBieSBw YXNzaW5nIGEgbmlsIHBhaW50aW5nUm9vdCBkb3duIHRvIG91ciByZW5kZXJlciAoYXMgaWYgbm8g cGFpbnRpbmdSb290IHdhcyBldmVyIHNldCkuCiAgICAgLy8gRWxzZSwgb3VyIHJlbmRlcmVyIHRy ZWUgbWF5IG9yIG1heSBub3QgY29udGFpbiB0aGUgcGFpbnRpbmcgcm9vdCwgc28gd2UgcGFzcyB0 aGF0IHJvb3QgYWxvbmcKICAgICAvLyBzbyBpdCB3aWxsIGJlIHRlc3RlZCBhZ2FpbnN0IGFzIHdl IGRlc2NlbmQgdGhyb3VnaCB0aGUgcmVuZGVyZXJzLgogICAgIFJlbmRlck9iamVjdCogcGFpbnRp bmdSb290Rm9yUmVuZGVyZXIgPSAwOwotICAgIGlmIChwYWludGluZ0luZm8ucGFpbnRpbmdSb290 ICYmICFyZW5kZXJlcigpLT5pc0Rlc2NlbmRhbnRPZihwYWludGluZ0luZm8ucGFpbnRpbmdSb290 KSkKLSAgICAgICAgcGFpbnRpbmdSb290Rm9yUmVuZGVyZXIgPSBwYWludGluZ0luZm8ucGFpbnRp bmdSb290OworICAgIGlmIChsb2NhbFBhaW50aW5nSW5mby5wYWludGluZ1Jvb3QgJiYgIXJlbmRl cmVyKCktPmlzRGVzY2VuZGFudE9mKGxvY2FsUGFpbnRpbmdJbmZvLnBhaW50aW5nUm9vdCkpCisg ICAgICAgIHBhaW50aW5nUm9vdEZvclJlbmRlcmVyID0gbG9jYWxQYWludGluZ0luZm8ucGFpbnRp bmdSb290OwogCi0gICAgaWYgKHBhaW50aW5nSW5mby5vdmVybGFwVGVzdFJlcXVlc3RzICYmIGlz U2VsZlBhaW50aW5nTGF5ZXIpCi0gICAgICAgIHBlcmZvcm1PdmVybGFwVGVzdHMoKnBhaW50aW5n SW5mby5vdmVybGFwVGVzdFJlcXVlc3RzLCBwYWludGluZ0luZm8ucm9vdExheWVyLCB0aGlzKTsK KyAgICBpZiAobG9jYWxQYWludGluZ0luZm8ub3ZlcmxhcFRlc3RSZXF1ZXN0cyAmJiBpc1NlbGZQ YWludGluZ0xheWVyKQorICAgICAgICBwZXJmb3JtT3ZlcmxhcFRlc3RzKCpsb2NhbFBhaW50aW5n SW5mby5vdmVybGFwVGVzdFJlcXVlc3RzLCBsb2NhbFBhaW50aW5nSW5mby5yb290TGF5ZXIsIHRo aXMpOwogCiAgICAgLy8gV2Ugd2FudCB0byBwYWludCBvdXIgbGF5ZXIsIGJ1dCBvbmx5IGlmIHdl IGludGVyc2VjdCB0aGUgZGFtYWdlIHJlY3QuCi0gICAgaWYgKHRoaXMgIT0gcGFpbnRpbmdJbmZv LnJvb3RMYXllciB8fCAhKGxvY2FsUGFpbnRGbGFncyAmIFBhaW50TGF5ZXJQYWludGluZ092ZXJm bG93Q29udGVudHMpKQotICAgICAgICBzaG91bGRQYWludENvbnRlbnQgJj0gaW50ZXJzZWN0c0Rh bWFnZVJlY3QobGF5ZXJCb3VuZHMsIGRhbWFnZVJlY3QucmVjdCgpLCBwYWludGluZ0luZm8ucm9v dExheWVyKTsKKyAgICBpZiAodGhpcyAhPSBsb2NhbFBhaW50aW5nSW5mby5yb290TGF5ZXIgfHwg IShsb2NhbFBhaW50RmxhZ3MgJiBQYWludExheWVyUGFpbnRpbmdPdmVyZmxvd0NvbnRlbnRzKSkK KyAgICAgICAgc2hvdWxkUGFpbnRDb250ZW50ICY9IGludGVyc2VjdHNEYW1hZ2VSZWN0KGxheWVy Qm91bmRzLCBkYW1hZ2VSZWN0LnJlY3QoKSwgbG9jYWxQYWludGluZ0luZm8ucm9vdExheWVyKTsK ICAgICAKICAgICBpZiAobG9jYWxQYWludEZsYWdzICYgUGFpbnRMYXllclBhaW50aW5nQ29tcG9z aXRpbmdCYWNrZ3JvdW5kUGhhc2UpIHsKICAgICAgICAgaWYgKHNob3VsZFBhaW50Q29udGVudCAm JiAhc2VsZWN0aW9uT25seSkgewogICAgICAgICAgICAgLy8gQmVnaW4gdHJhbnNwYXJlbmN5IGxh eWVycyBsYXppbHkgbm93IHRoYXQgd2Uga25vdyB3ZSBoYXZlIHRvIHBhaW50IHNvbWV0aGluZy4K ICAgICAgICAgICAgIGlmIChoYXZlVHJhbnNwYXJlbmN5KQotICAgICAgICAgICAgICAgIGJlZ2lu VHJhbnNwYXJlbmN5TGF5ZXJzKHRyYW5zcGFyZW5jeUxheWVyQ29udGV4dCwgcGFpbnRpbmdJbmZv LnJvb3RMYXllciwgcGFpbnRpbmdJbmZvLnBhaW50RGlydHlSZWN0LCBwYWludGluZ0luZm8ucGFp bnRCZWhhdmlvcik7CisgICAgICAgICAgICAgICAgYmVnaW5UcmFuc3BhcmVuY3lMYXllcnModHJh bnNwYXJlbmN5TGF5ZXJDb250ZXh0LCBsb2NhbFBhaW50aW5nSW5mby5yb290TGF5ZXIsIGxvY2Fs UGFpbnRpbmdJbmZvLnBhaW50RGlydHlSZWN0LCBsb2NhbFBhaW50aW5nSW5mby5wYWludEJlaGF2 aW9yKTsKICAgICAgICAgCiAgICAgICAgICAgICBpZiAodXNlQ2xpcFJlY3QpIHsKICAgICAgICAg ICAgICAgICAvLyBQYWludCBvdXIgYmFja2dyb3VuZCBmaXJzdCwgYmVmb3JlIHBhaW50aW5nIGFu eSBjaGlsZCBsYXllcnMuCiAgICAgICAgICAgICAgICAgLy8gRXN0YWJsaXNoIHRoZSBjbGlwIHVz ZWQgdG8gcGFpbnQgb3VyIGJhY2tncm91bmQuCi0gICAgICAgICAgICAgICAgY2xpcFRvUmVjdChw YWludGluZ0luZm8ucm9vdExheWVyLCBjb250ZXh0LCBwYWludGluZ0luZm8ucGFpbnREaXJ0eVJl Y3QsIGRhbWFnZVJlY3QsIERvTm90SW5jbHVkZVNlbGZGb3JCb3JkZXJSYWRpdXMpOyAvLyBCYWNr Z3JvdW5kIHBhaW50aW5nIHdpbGwgaGFuZGxlIGNsaXBwaW5nIHRvIHNlbGYuCisgICAgICAgICAg ICAgICAgY2xpcFRvUmVjdChsb2NhbFBhaW50aW5nSW5mby5yb290TGF5ZXIsIGNvbnRleHQsIGxv Y2FsUGFpbnRpbmdJbmZvLnBhaW50RGlydHlSZWN0LCBkYW1hZ2VSZWN0LCBEb05vdEluY2x1ZGVT ZWxmRm9yQm9yZGVyUmFkaXVzKTsgLy8gQmFja2dyb3VuZCBwYWludGluZyB3aWxsIGhhbmRsZSBj bGlwcGluZyB0byBzZWxmLgogICAgICAgICAgICAgfQogICAgICAgICAgICAgCiAgICAgICAgICAg ICAvLyBQYWludCB0aGUgYmFja2dyb3VuZC4KLSAgICAgICAgICAgIFBhaW50SW5mbyBwYWludElu Zm8oY29udGV4dCwgcGl4ZWxTbmFwcGVkSW50UmVjdChkYW1hZ2VSZWN0LnJlY3QoKSksIFBhaW50 UGhhc2VCbG9ja0JhY2tncm91bmQsIGZhbHNlLCBwYWludGluZ1Jvb3RGb3JSZW5kZXJlciwgcGFp bnRpbmdJbmZvLnJlZ2lvbiwgMCk7CisgICAgICAgICAgICBQYWludEluZm8gcGFpbnRJbmZvKGNv bnRleHQsIHBpeGVsU25hcHBlZEludFJlY3QoZGFtYWdlUmVjdC5yZWN0KCkpLCBQYWludFBoYXNl QmxvY2tCYWNrZ3JvdW5kLCBmYWxzZSwgcGFpbnRpbmdSb290Rm9yUmVuZGVyZXIsIGxvY2FsUGFp bnRpbmdJbmZvLnJlZ2lvbiwgMCk7CiAgICAgICAgICAgICByZW5kZXJlcigpLT5wYWludChwYWlu dEluZm8sIHBhaW50T2Zmc2V0KTsKIAogICAgICAgICAgICAgaWYgKHVzZUNsaXBSZWN0KSB7CiAg ICAgICAgICAgICAgICAgLy8gUmVzdG9yZSB0aGUgY2xpcC4KLSAgICAgICAgICAgICAgICByZXN0 b3JlQ2xpcChjb250ZXh0LCBwYWludGluZ0luZm8ucGFpbnREaXJ0eVJlY3QsIGRhbWFnZVJlY3Qp OworICAgICAgICAgICAgICAgIHJlc3RvcmVDbGlwKGNvbnRleHQsIGxvY2FsUGFpbnRpbmdJbmZv LnBhaW50RGlydHlSZWN0LCBkYW1hZ2VSZWN0KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQog CiAgICAgICAgIC8vIE5vdyB3YWxrIHRoZSBzb3J0ZWQgbGlzdCBvZiBjaGlsZHJlbiB3aXRoIG5l Z2F0aXZlIHotaW5kaWNlcy4KLSAgICAgICAgcGFpbnRMaXN0KG5lZ1pPcmRlckxpc3QoKSwgY29u dGV4dCwgcGFpbnRpbmdJbmZvLCBsb2NhbFBhaW50RmxhZ3MpOworICAgICAgICBwYWludExpc3Qo bmVnWk9yZGVyTGlzdCgpLCBjb250ZXh0LCBsb2NhbFBhaW50aW5nSW5mbywgbG9jYWxQYWludEZs YWdzKTsKICAgICB9CiAgICAgCiAgICAgaWYgKGxvY2FsUGFpbnRGbGFncyAmIFBhaW50TGF5ZXJQ YWludGluZ0NvbXBvc2l0aW5nRm9yZWdyb3VuZFBoYXNlKSB7CkBAIC0zMjk1LDIyICszMjk1LDIy IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXJDb250ZW50cyhHcmFwaGljc0NvbnRleHQq IGNvbnRleHQsIGNvbnN0IExheWVyUGFpbnRpCiAgICAgICAgIGlmIChzaG91bGRQYWludENvbnRl bnQgJiYgIWNsaXBSZWN0VG9BcHBseS5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIC8vIEJlZ2lu IHRyYW5zcGFyZW5jeSBsYXllcnMgbGF6aWx5IG5vdyB0aGF0IHdlIGtub3cgd2UgaGF2ZSB0byBw YWludCBzb21ldGhpbmcuCiAgICAgICAgICAgICBpZiAoaGF2ZVRyYW5zcGFyZW5jeSkKLSAgICAg ICAgICAgICAgICBiZWdpblRyYW5zcGFyZW5jeUxheWVycyh0cmFuc3BhcmVuY3lMYXllckNvbnRl eHQsIHBhaW50aW5nSW5mby5yb290TGF5ZXIsIHBhaW50aW5nSW5mby5wYWludERpcnR5UmVjdCwg cGFpbnRpbmdJbmZvLnBhaW50QmVoYXZpb3IpOworICAgICAgICAgICAgICAgIGJlZ2luVHJhbnNw YXJlbmN5TGF5ZXJzKHRyYW5zcGFyZW5jeUxheWVyQ29udGV4dCwgbG9jYWxQYWludGluZ0luZm8u cm9vdExheWVyLCBsb2NhbFBhaW50aW5nSW5mby5wYWludERpcnR5UmVjdCwgbG9jYWxQYWludGlu Z0luZm8ucGFpbnRCZWhhdmlvcik7CiAKICAgICAgICAgICAgIGlmICh1c2VDbGlwUmVjdCkgewog ICAgICAgICAgICAgICAgIC8vIFNldCB1cCB0aGUgY2xpcCB1c2VkIHdoZW4gcGFpbnRpbmcgb3Vy IGNoaWxkcmVuLgotICAgICAgICAgICAgICAgIGNsaXBUb1JlY3QocGFpbnRpbmdJbmZvLnJvb3RM YXllciwgY29udGV4dCwgcGFpbnRpbmdJbmZvLnBhaW50RGlydHlSZWN0LCBjbGlwUmVjdFRvQXBw bHkpOworICAgICAgICAgICAgICAgIGNsaXBUb1JlY3QobG9jYWxQYWludGluZ0luZm8ucm9vdExh eWVyLCBjb250ZXh0LCBsb2NhbFBhaW50aW5nSW5mby5wYWludERpcnR5UmVjdCwgY2xpcFJlY3RU b0FwcGx5KTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIAogICAgICAgICAgICAgUGFpbnRJ bmZvIHBhaW50SW5mbyhjb250ZXh0LCBwaXhlbFNuYXBwZWRJbnRSZWN0KGNsaXBSZWN0VG9BcHBs eS5yZWN0KCkpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxlY3Rpb25Pbmx5 ID8gUGFpbnRQaGFzZVNlbGVjdGlvbiA6IFBhaW50UGhhc2VDaGlsZEJsb2NrQmFja2dyb3VuZHMs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZvcmNlQmxhY2tUZXh0LCBwYWludGlu Z1Jvb3RGb3JSZW5kZXJlciwgcGFpbnRpbmdJbmZvLnJlZ2lvbiwgMCk7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGZvcmNlQmxhY2tUZXh0LCBwYWludGluZ1Jvb3RGb3JSZW5kZXJl ciwgbG9jYWxQYWludGluZ0luZm8ucmVnaW9uLCAwKTsKICAgICAgICAgICAgIHJlbmRlcmVyKCkt PnBhaW50KHBhaW50SW5mbywgcGFpbnRPZmZzZXQpOwogICAgICAgICAgICAgaWYgKCFzZWxlY3Rp b25Pbmx5KSB7CiAgICAgICAgICAgICAgICAgcGFpbnRJbmZvLnBoYXNlID0gUGFpbnRQaGFzZUZs b2F0OwogICAgICAgICAgICAgICAgIHJlbmRlcmVyKCktPnBhaW50KHBhaW50SW5mbywgcGFpbnRP ZmZzZXQpOwogICAgICAgICAgICAgICAgIHBhaW50SW5mby5waGFzZSA9IFBhaW50UGhhc2VGb3Jl Z3JvdW5kOwotICAgICAgICAgICAgICAgIHBhaW50SW5mby5vdmVybGFwVGVzdFJlcXVlc3RzID0g cGFpbnRpbmdJbmZvLm92ZXJsYXBUZXN0UmVxdWVzdHM7CisgICAgICAgICAgICAgICAgcGFpbnRJ bmZvLm92ZXJsYXBUZXN0UmVxdWVzdHMgPSBsb2NhbFBhaW50aW5nSW5mby5vdmVybGFwVGVzdFJl cXVlc3RzOwogICAgICAgICAgICAgICAgIHJlbmRlcmVyKCktPnBhaW50KHBhaW50SW5mbywgcGFp bnRPZmZzZXQpOwogICAgICAgICAgICAgICAgIHBhaW50SW5mby5waGFzZSA9IFBhaW50UGhhc2VD aGlsZE91dGxpbmVzOwogICAgICAgICAgICAgICAgIHJlbmRlcmVyKCktPnBhaW50KHBhaW50SW5m bywgcGFpbnRPZmZzZXQpOwpAQCAtMzMxOCwzNyArMzMxOCwzNyBAQCB2b2lkIFJlbmRlckxheWVy OjpwYWludExheWVyQ29udGVudHMoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBMYXll clBhaW50aQogCiAgICAgICAgICAgICBpZiAodXNlQ2xpcFJlY3QpIHsKICAgICAgICAgICAgICAg ICAvLyBOb3cgcmVzdG9yZSBvdXIgY2xpcC4KLSAgICAgICAgICAgICAgICByZXN0b3JlQ2xpcChj b250ZXh0LCBwYWludGluZ0luZm8ucGFpbnREaXJ0eVJlY3QsIGNsaXBSZWN0VG9BcHBseSk7Cisg ICAgICAgICAgICAgICAgcmVzdG9yZUNsaXAoY29udGV4dCwgbG9jYWxQYWludGluZ0luZm8ucGFp bnREaXJ0eVJlY3QsIGNsaXBSZWN0VG9BcHBseSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0K IAogICAgICAgICBpZiAoc2hvdWxkUGFpbnRPdXRsaW5lICYmICFvdXRsaW5lUmVjdC5pc0VtcHR5 KCkpIHsKICAgICAgICAgICAgIC8vIFBhaW50IG91ciBvd24gb3V0bGluZQotICAgICAgICAgICAg UGFpbnRJbmZvIHBhaW50SW5mbyhjb250ZXh0LCBwaXhlbFNuYXBwZWRJbnRSZWN0KG91dGxpbmVS ZWN0LnJlY3QoKSksIFBhaW50UGhhc2VTZWxmT3V0bGluZSwgZmFsc2UsIHBhaW50aW5nUm9vdEZv clJlbmRlcmVyLCBwYWludGluZ0luZm8ucmVnaW9uLCAwKTsKLSAgICAgICAgICAgIGNsaXBUb1Jl Y3QocGFpbnRpbmdJbmZvLnJvb3RMYXllciwgY29udGV4dCwgcGFpbnRpbmdJbmZvLnBhaW50RGly dHlSZWN0LCBvdXRsaW5lUmVjdCwgRG9Ob3RJbmNsdWRlU2VsZkZvckJvcmRlclJhZGl1cyk7Cisg ICAgICAgICAgICBQYWludEluZm8gcGFpbnRJbmZvKGNvbnRleHQsIHBpeGVsU25hcHBlZEludFJl Y3Qob3V0bGluZVJlY3QucmVjdCgpKSwgUGFpbnRQaGFzZVNlbGZPdXRsaW5lLCBmYWxzZSwgcGFp bnRpbmdSb290Rm9yUmVuZGVyZXIsIGxvY2FsUGFpbnRpbmdJbmZvLnJlZ2lvbiwgMCk7CisgICAg ICAgICAgICBjbGlwVG9SZWN0KGxvY2FsUGFpbnRpbmdJbmZvLnJvb3RMYXllciwgY29udGV4dCwg bG9jYWxQYWludGluZ0luZm8ucGFpbnREaXJ0eVJlY3QsIG91dGxpbmVSZWN0LCBEb05vdEluY2x1 ZGVTZWxmRm9yQm9yZGVyUmFkaXVzKTsKICAgICAgICAgICAgIHJlbmRlcmVyKCktPnBhaW50KHBh aW50SW5mbywgcGFpbnRPZmZzZXQpOwotICAgICAgICAgICAgcmVzdG9yZUNsaXAoY29udGV4dCwg cGFpbnRpbmdJbmZvLnBhaW50RGlydHlSZWN0LCBvdXRsaW5lUmVjdCk7CisgICAgICAgICAgICBy ZXN0b3JlQ2xpcChjb250ZXh0LCBsb2NhbFBhaW50aW5nSW5mby5wYWludERpcnR5UmVjdCwgb3V0 bGluZVJlY3QpOwogICAgICAgICB9CiAgICAgCiAgICAgICAgIC8vIFBhaW50IGFueSBjaGlsZCBs YXllcnMgdGhhdCBoYXZlIG92ZXJmbG93LgotICAgICAgICBwYWludExpc3QobV9ub3JtYWxGbG93 TGlzdCwgY29udGV4dCwgcGFpbnRpbmdJbmZvLCBsb2NhbFBhaW50RmxhZ3MpOworICAgICAgICBw YWludExpc3QobV9ub3JtYWxGbG93TGlzdCwgY29udGV4dCwgbG9jYWxQYWludGluZ0luZm8sIGxv Y2FsUGFpbnRGbGFncyk7CiAgICAgCiAgICAgICAgIC8vIE5vdyB3YWxrIHRoZSBzb3J0ZWQgbGlz dCBvZiBjaGlsZHJlbiB3aXRoIHBvc2l0aXZlIHotaW5kaWNlcy4KLSAgICAgICAgcGFpbnRMaXN0 KHBvc1pPcmRlckxpc3QoKSwgY29udGV4dCwgcGFpbnRpbmdJbmZvLCBsb2NhbFBhaW50RmxhZ3Mp OworICAgICAgICBwYWludExpc3QocG9zWk9yZGVyTGlzdCgpLCBjb250ZXh0LCBsb2NhbFBhaW50 aW5nSW5mbywgbG9jYWxQYWludEZsYWdzKTsKICAgICB9CiAKICAgICBpZiAoaXNQYWludGluZ092 ZXJsYXlTY3JvbGxiYXJzKSB7Ci0gICAgICAgIGNsaXBUb1JlY3QocGFpbnRpbmdJbmZvLnJvb3RM YXllciwgY29udGV4dCwgcGFpbnREaXJ0eVJlY3QsIGRhbWFnZVJlY3QpOworICAgICAgICBjbGlw VG9SZWN0KGxvY2FsUGFpbnRpbmdJbmZvLnJvb3RMYXllciwgY29udGV4dCwgbG9jYWxQYWludGlu Z0luZm8ucGFpbnREaXJ0eVJlY3QsIGRhbWFnZVJlY3QpOwogICAgICAgICBwYWludE92ZXJmbG93 Q29udHJvbHMoY29udGV4dCwgcm91bmRlZEludFBvaW50KHBhaW50T2Zmc2V0KSwgcGl4ZWxTbmFw cGVkSW50UmVjdChkYW1hZ2VSZWN0LnJlY3QoKSksIHRydWUpOwotICAgICAgICByZXN0b3JlQ2xp cChjb250ZXh0LCBwYWludGluZ0luZm8ucGFpbnREaXJ0eVJlY3QsIGRhbWFnZVJlY3QpOworICAg ICAgICByZXN0b3JlQ2xpcChjb250ZXh0LCBsb2NhbFBhaW50aW5nSW5mby5wYWludERpcnR5UmVj dCwgZGFtYWdlUmVjdCk7CiAgICAgfQogCiAjaWYgRU5BQkxFKENTU19GSUxURVJTKQogICAgIGlm IChmaWx0ZXJQYWludGVyLmhhc1N0YXJ0ZWRGaWx0ZXJFZmZlY3QoKSkgewogICAgICAgICAvLyBB cHBseSB0aGUgY29ycmVjdCBjbGlwcGluZyAoaWUuIG92ZXJmbG93OiBoaWRkZW4pLgotICAgICAg ICBjbGlwVG9SZWN0KHBhaW50aW5nSW5mby5yb290TGF5ZXIsIHRyYW5zcGFyZW5jeUxheWVyQ29u dGV4dCwgcGFpbnRpbmdJbmZvLnBhaW50RGlydHlSZWN0LCBkYW1hZ2VSZWN0KTsKKyAgICAgICAg Y2xpcFRvUmVjdChsb2NhbFBhaW50aW5nSW5mby5yb290TGF5ZXIsIHRyYW5zcGFyZW5jeUxheWVy Q29udGV4dCwgbG9jYWxQYWludGluZ0luZm8ucGFpbnREaXJ0eVJlY3QsIGRhbWFnZVJlY3QpOwog ICAgICAgICBjb250ZXh0ID0gZmlsdGVyUGFpbnRlci5hcHBseUZpbHRlckVmZmVjdCgpOwotICAg ICAgICByZXN0b3JlQ2xpcCh0cmFuc3BhcmVuY3lMYXllckNvbnRleHQsIHBhaW50aW5nSW5mby5w YWludERpcnR5UmVjdCwgZGFtYWdlUmVjdCk7CisgICAgICAgIHJlc3RvcmVDbGlwKHRyYW5zcGFy ZW5jeUxheWVyQ29udGV4dCwgbG9jYWxQYWludGluZ0luZm8ucGFpbnREaXJ0eVJlY3QsIGRhbWFn ZVJlY3QpOwogICAgIH0KICNlbmRpZgogCkBAIC0zMzU3LDE1ICszMzU3LDE1IEBAIHZvaWQgUmVu ZGVyTGF5ZXI6OnBhaW50TGF5ZXJDb250ZW50cyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNv bnN0IExheWVyUGFpbnRpCiAKICAgICBpZiAoKGxvY2FsUGFpbnRGbGFncyAmIFBhaW50TGF5ZXJQ YWludGluZ0NvbXBvc2l0aW5nTWFza1BoYXNlKSAmJiBzaG91bGRQYWludENvbnRlbnQgJiYgcmVu ZGVyZXIoKS0+aGFzTWFzaygpICYmICFzZWxlY3Rpb25Pbmx5KSB7CiAgICAgICAgIGlmICh1c2VD bGlwUmVjdCkKLSAgICAgICAgICAgIGNsaXBUb1JlY3QocGFpbnRpbmdJbmZvLnJvb3RMYXllciwg Y29udGV4dCwgcGFpbnRpbmdJbmZvLnBhaW50RGlydHlSZWN0LCBkYW1hZ2VSZWN0LCBEb05vdElu Y2x1ZGVTZWxmRm9yQm9yZGVyUmFkaXVzKTsgLy8gTWFzayBwYWludGluZyB3aWxsIGhhbmRsZSBj bGlwcGluZyB0byBzZWxmLgorICAgICAgICAgICAgY2xpcFRvUmVjdChsb2NhbFBhaW50aW5nSW5m by5yb290TGF5ZXIsIGNvbnRleHQsIGxvY2FsUGFpbnRpbmdJbmZvLnBhaW50RGlydHlSZWN0LCBk YW1hZ2VSZWN0LCBEb05vdEluY2x1ZGVTZWxmRm9yQm9yZGVyUmFkaXVzKTsgLy8gTWFzayBwYWlu dGluZyB3aWxsIGhhbmRsZSBjbGlwcGluZyB0byBzZWxmLgogICAgICAgICAKICAgICAgICAgLy8g UGFpbnQgdGhlIG1hc2suCi0gICAgICAgIFBhaW50SW5mbyBwYWludEluZm8oY29udGV4dCwgcGl4 ZWxTbmFwcGVkSW50UmVjdChkYW1hZ2VSZWN0LnJlY3QoKSksIFBhaW50UGhhc2VNYXNrLCBmYWxz ZSwgcGFpbnRpbmdSb290Rm9yUmVuZGVyZXIsIHBhaW50aW5nSW5mby5yZWdpb24sIDApOworICAg ICAgICBQYWludEluZm8gcGFpbnRJbmZvKGNvbnRleHQsIHBpeGVsU25hcHBlZEludFJlY3QoZGFt YWdlUmVjdC5yZWN0KCkpLCBQYWludFBoYXNlTWFzaywgZmFsc2UsIHBhaW50aW5nUm9vdEZvclJl bmRlcmVyLCBsb2NhbFBhaW50aW5nSW5mby5yZWdpb24sIDApOwogICAgICAgICByZW5kZXJlcigp LT5wYWludChwYWludEluZm8sIHBhaW50T2Zmc2V0KTsKICAgICAgICAgCiAgICAgICAgIGlmICh1 c2VDbGlwUmVjdCkgewogICAgICAgICAgICAgLy8gUmVzdG9yZSB0aGUgY2xpcC4KLSAgICAgICAg ICAgIHJlc3RvcmVDbGlwKGNvbnRleHQsIHBhaW50aW5nSW5mby5wYWludERpcnR5UmVjdCwgZGFt YWdlUmVjdCk7CisgICAgICAgICAgICByZXN0b3JlQ2xpcChjb250ZXh0LCBsb2NhbFBhaW50aW5n SW5mby5wYWludERpcnR5UmVjdCwgZGFtYWdlUmVjdCk7CiAgICAgICAgIH0KICAgICB9CiAK