110130 2013-02-18 09:14:54 -0800 Web Inspector: [Canvas] use timeline's didBeginFrame for marking frame end calls 2013-02-19 08:34:33 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 110227 1 aandrey aandrey apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 835544 0 aandrey 2013-02-18 09:14:54 -0800 Use timeline's didBeginFrame for marking frame end calls instead of an ad-hoc timeout-based solution. Patch to follow. 835550 1 188902 aandrey 2013-02-18 09:19:12 -0800 Created attachment 188902 Patch 836364 2 aandrey 2013-02-19 07:15:30 -0800 Committed r143328: <http://trac.webkit.org/changeset/143328> 836426 3 aandrey 2013-02-19 08:34:33 -0800 This patch broke Win Debug Build: 7> Creating library C:\cygwin\home\buildbot\slave\win-debug\build\WebKitBuild\Debug\lib\WebKit.lib and object C:\cygwin\home\buildbot\slave\win-debug\build\WebKitBuild\Debug\lib\WebKit.exp 7>WebCore.lib(InspectorController.obj) : error LNK2001: unresolved external symbol "public: void __thiscall WebCore::InspectorCanvasAgent::didBeginFrame(void)" (?didBeginFrame@InspectorCanvasAgent@WebCore@@QAEXXZ) 7>C:\cygwin\home\buildbot\slave\win-debug\build\WebKitBuild\Debug\bin\WebKit.dll : fatal error LNK1120: 1 unresolved externals 7>Build log was saved at "file://C:\cygwin\home\buildbot\slave\win-debug\build\WebKitBuild\Debug\obj\WebKitLib\BuildLog.htm" 7>WebKitLib - 2 error(s), 1 warning(s) Patch with the fix is on the way: https://bugs.webkit.org/show_bug.cgi?id=110227 188902 2013-02-18 09:19:12 -0800 2013-02-19 06:25:34 -0800 Patch bug-110130-20130218211534.patch text/plain 13121 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzMjA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTkyN2FjYWM3ZDlkNTI2 YWM0YjMwZTRhMjYyMDc0YTAxZTBmMzM0NC4uYTVjMDZiZjlmYTZhZDUxN2NlYmVlZjJjZThjNjhk YTQ2ZTgyOWZhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMzIEBACiAyMDEzLTAyLTE4ICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtDYW52YXNdIHVzZSB0aW1lbGluZSdzIGRpZEJlZ2luRnJhbWUgZm9yIG1hcmtpbmcgZnJh bWUgZW5kIGNhbGxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTAxMzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBJbiBXZWIgSW5zcGVjdG9yIGNhbnZhcyBwcm9maWxlciB1c2UgdGltZWxpbmUncyBkaWRC ZWdpbkZyYW1lIGZvciBtYXJraW5nIGZyYW1lIGVuZCBjYWxscyBpbnN0ZWFkIG9mIGFuIGFkLWhv YyB0aW1lb3V0LWJhc2VkIHNvbHV0aW9uLgorCisgICAgICAgICogaW5zcGVjdG9yL0luamVjdGVk U2NyaXB0Q2FudmFzTW9kdWxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkluamVjdGVkU2NyaXB0 Q2FudmFzTW9kdWxlOjptYXJrRnJhbWVFbmQpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAg ICogaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlLmg6CisgICAgICAgIChJbmpl Y3RlZFNjcmlwdENhbnZhc01vZHVsZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luamVjdGVkU2Ny aXB0Q2FudmFzTW9kdWxlU291cmNlLmpzOgorICAgICAgICAoLik6CisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3RvckNhbnZhc0FnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv ckNhbnZhc0FnZW50OjpoYXNVbmluc3RydW1lbnRlZENhbnZhc2VzKToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckNhbnZhc0FnZW50Ojpub3RpZnlSZW5kZXJpbmdDb250ZXh0V2FzV3JhcHBl ZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDYW52YXNBZ2VudDo6ZmluZEZyYW1lc1dp dGhVbmluc3RydW1lbnRlZENhbnZhc2VzKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNh bnZhc0FnZW50OjpmcmFtZU5hdmlnYXRlZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JD YW52YXNBZ2VudDo6ZGlkQmVnaW5GcmFtZSk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yQ2FudmFzQWdlbnQuaDoKKyAgICAgICAgKEluc3BlY3RvckNh bnZhc0FnZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRCZWdpbkZyYW1lKToK KworMjAxMy0wMi0xOCAgQW5kcmV5IEFkYWlraW4gIDxhYW5kcmV5QGNocm9taXVtLm9yZz4KKwog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBbQ2FudmFzXSBncm91cCByZXBsYXkgbG9nIGNhbGxzIGJ5 IGZyYW1lcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTEwMTAxCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNj cmlwdENhbnZhc01vZHVsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRT Y3JpcHRDYW52YXNNb2R1bGUuY3BwCmluZGV4IDQ3NDkyOWQ4YjJhOTVhYmM2ZTViYzYyNjY1ZTk5 M2ZhMWU2NWE1NWEuLmM4NTUzZmY4YWEwODEzNTRhMDU2OGI1YTIwNTY3NjI1NjkzNmVmMzUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdENhbnZhc01v ZHVsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0Q2Fu dmFzTW9kdWxlLmNwcApAQCAtOTEsNiArOTEsMTQgQEAgU2NyaXB0T2JqZWN0IEluamVjdGVkU2Ny aXB0Q2FudmFzTW9kdWxlOjpjYWxsV3JhcENvbnRleHRGdW5jdGlvbihjb25zdCBTdHJpbmcmIGYK ICAgICByZXR1cm4gU2NyaXB0T2JqZWN0KGNvbnRleHQuc2NyaXB0U3RhdGUoKSwgcmVzdWx0VmFs dWUpOwogfQogCit2b2lkIEluamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlOjptYXJrRnJhbWVFbmQo KQoreworICAgIFNjcmlwdEZ1bmN0aW9uQ2FsbCBmdW5jdGlvbihpbmplY3RlZFNjcmlwdE9iamVj dCgpLCAibWFya0ZyYW1lRW5kIik7CisgICAgUmVmUHRyPEluc3BlY3RvclZhbHVlPiByZXN1bHRW YWx1ZTsKKyAgICBtYWtlQ2FsbChmdW5jdGlvbiwgJnJlc3VsdFZhbHVlKTsKKyAgICBBU1NFUlQo cmVzdWx0VmFsdWUpOworfQorCiB2b2lkIEluamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlOjpjYXB0 dXJlRnJhbWUoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBUcmFjZUxvZ0lkKiB0cmFjZUxvZ0lk KQogewogICAgIGNhbGxTdGFydENhcHR1cmluZ0Z1bmN0aW9uKCJjYXB0dXJlRnJhbWUiLCBlcnJv clN0cmluZywgdHJhY2VMb2dJZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5qZWN0ZWRTY3JpcHRDYW52YXNNb2R1bGUuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZS5oCmluZGV4IGU1Y2U3MGU5YTUzM2Y3N2NhOTNj OTJhM2I5NGZiMTQ2ZmRlYmI3MjcuLmJmZGQzMzYxMWViNzMxOTc0M2NkMGE1MTcyYzNiZjVhMmFh ZWFjNWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlw dENhbnZhc01vZHVsZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNj cmlwdENhbnZhc01vZHVsZS5oCkBAIC01NCw2ICs1NCw3IEBAIHB1YmxpYzoKICNpZiBFTkFCTEUo V0VCR0wpCiAgICAgU2NyaXB0T2JqZWN0IHdyYXBXZWJHTENvbnRleHQoY29uc3QgU2NyaXB0T2Jq ZWN0Jik7CiAjZW5kaWYKKyAgICB2b2lkIG1hcmtGcmFtZUVuZCgpOwogCiAgICAgdm9pZCBjYXB0 dXJlRnJhbWUoRXJyb3JTdHJpbmcqLCBUeXBlQnVpbGRlcjo6Q2FudmFzOjpUcmFjZUxvZ0lkKik7 CiAgICAgdm9pZCBzdGFydENhcHR1cmluZyhFcnJvclN0cmluZyosIFR5cGVCdWlsZGVyOjpDYW52 YXM6OlRyYWNlTG9nSWQqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bmplY3RlZFNjcmlwdENhbnZhc01vZHVsZVNvdXJjZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZVNvdXJjZS5qcwppbmRleCAzNjFlZWU0NjNm N2I1YzNlZjEyYTgwODc2MGM3MmU4OWU4NTM3ZmFkLi4yY2QyNTVmNzQ3NDhkZmJlOGQ0MWJmNmEy NjZiNjcyMWIzNWNkMjY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5q ZWN0ZWRTY3JpcHRDYW52YXNNb2R1bGVTb3VyY2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlU291cmNlLmpzCkBAIC0yODY2LDUyICsy ODY2LDEyIEBAIFRyYWNlTG9nUGxheWVyLnByb3RvdHlwZSA9IHsKIAogLyoqCiAgKiBAY29uc3Ry dWN0b3IKLSAqIEBwYXJhbSB7ZnVuY3Rpb24oKX0gY2FsbGJhY2sKLSAqLwotZnVuY3Rpb24gWmVy b1RpbWVvdXRDYWxsYmFjayhjYWxsYmFjaykKLXsKLSAgICB0aGlzLl9jYWxsYmFjayA9IGNhbGxi YWNrOwotICAgIHRoaXMuX3NjaGVkdWxlZCA9IGZhbHNlOwotfQotCi1aZXJvVGltZW91dENhbGxi YWNrLnByb3RvdHlwZSA9IHsKLSAgICBzY2hlZHVsZTogZnVuY3Rpb24oKQotICAgIHsKLSAgICAg ICAgaWYgKHRoaXMuX3NjaGVkdWxlZCkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgdGhp cy5fc2NoZWR1bGVkID0gdHJ1ZTsKLSAgICAgICAgdmFyIGNhbGxiYWNrID0gdGhpcy5fb25DYWxs YmFjay5iaW5kKHRoaXMpOwotICAgICAgICAvLyBXZSBuZWVkIGEgZmFzdGVzdCBhc3luYyBjYWxs YmFjaywgd2hhdGV2ZXIgZmlyZXMgZmlyc3QuCi0gICAgICAgIC8vIFVzdWFsbHkgYSBwb3N0TWVz c2FnZSBzaG91bGQgYmUgZmFzdGVyIHRoYW4gYSBzZXRUaW1lb3V0KDApLgotICAgICAgICB2YXIg Y2hhbm5lbCA9IG5ldyBNZXNzYWdlQ2hhbm5lbCgpOwotICAgICAgICBjaGFubmVsLnBvcnQxLm9u bWVzc2FnZSA9IGNhbGxiYWNrOwotICAgICAgICBjaGFubmVsLnBvcnQyLnBvc3RNZXNzYWdlKCIi KTsKLSAgICAgICAgaW5zcGVjdGVkV2luZG93LnNldFRpbWVvdXQoY2FsbGJhY2ssIDApOwotICAg IH0sCi0KLSAgICBjYW5jZWw6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHRoaXMuX3NjaGVk dWxlZCA9IGZhbHNlOwotICAgIH0sCi0KLSAgICBfb25DYWxsYmFjazogZnVuY3Rpb24oKQotICAg IHsKLSAgICAgICAgaWYgKCF0aGlzLl9zY2hlZHVsZWQpCi0gICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgIHRoaXMuX3NjaGVkdWxlZCA9IGZhbHNlOwotICAgICAgICB0aGlzLl9jYWxsYmFjaygp OwotICAgIH0KLX0KLQotLyoqCi0gKiBAY29uc3RydWN0b3IKICAqLwogZnVuY3Rpb24gUmVzb3Vy Y2VUcmFja2luZ01hbmFnZXIoKQogewogICAgIHRoaXMuX2NhcHR1cmluZyA9IGZhbHNlOwogICAg IHRoaXMuX3N0b3BDYXB0dXJpbmdPbkZyYW1lRW5kID0gZmFsc2U7CiAgICAgdGhpcy5fbGFzdFRy YWNlTG9nID0gbnVsbDsKLSAgICB0aGlzLl9mcmFtZUVuZFNjaGVkdWxlciA9IG5ldyBaZXJvVGlt ZW91dENhbGxiYWNrKHRoaXMubWFya0ZyYW1lRW5kLmJpbmQodGhpcykpOwogfQogCiBSZXNvdXJj ZVRyYWNraW5nTWFuYWdlci5wcm90b3R5cGUgPSB7CkBAIC0yOTU2LDcgKzI5MTYsNiBAQCBSZXNv dXJjZVRyYWNraW5nTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIHRoaXMuX2NhcHR1cmluZyA9IGZhbHNlOwogICAgICAgICB0aGlzLl9zdG9wQ2FwdHVy aW5nT25GcmFtZUVuZCA9IGZhbHNlOwotICAgICAgICB0aGlzLl9mcmFtZUVuZFNjaGVkdWxlci5j YW5jZWwoKTsKICAgICAgICAgaWYgKHRoaXMuX2xhc3RUcmFjZUxvZykKICAgICAgICAgICAgIHRo aXMuX2xhc3RUcmFjZUxvZy5hZGRGcmFtZUVuZE1hcmsoKTsKICAgICB9LApAQCAtMzAwMiw3ICsy OTYxLDYgQEAgUmVzb3VyY2VUcmFja2luZ01hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICBp ZiAoIXRoaXMuX2NhcHR1cmluZykKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgdGhpcy5f bGFzdFRyYWNlTG9nLmFkZENhbGwoY2FsbCk7Ci0gICAgICAgIHRoaXMuX2ZyYW1lRW5kU2NoZWR1 bGVyLnNjaGVkdWxlKCk7CiAgICAgfSwKIAogICAgIG1hcmtGcmFtZUVuZDogZnVuY3Rpb24oKQpA QCAtMzAxMCw3ICsyOTY4LDcgQEAgUmVzb3VyY2VUcmFja2luZ01hbmFnZXIucHJvdG90eXBlID0g ewogICAgICAgICBpZiAoIXRoaXMuX2xhc3RUcmFjZUxvZykKICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgdGhpcy5fbGFzdFRyYWNlTG9nLmFkZEZyYW1lRW5kTWFyaygpOwotICAgICAgICBp ZiAodGhpcy5fc3RvcENhcHR1cmluZ09uRnJhbWVFbmQpCisgICAgICAgIGlmICh0aGlzLl9zdG9w Q2FwdHVyaW5nT25GcmFtZUVuZCAmJiB0aGlzLl9sYXN0VHJhY2VMb2cuc2l6ZSgpKQogICAgICAg ICAgICAgdGhpcy5zdG9wQ2FwdHVyaW5nKHRoaXMuX2xhc3RUcmFjZUxvZyk7CiAgICAgfQogfQpA QCAtMzA2OSw2ICszMDI3LDExIEBAIEluamVjdGVkQ2FudmFzTW9kdWxlLnByb3RvdHlwZSA9IHsK ICAgICAgICAgcmV0dXJuIHRoaXMuX2NhbGxTdGFydENhcHR1cmluZ0Z1bmN0aW9uKHRoaXMuX21h bmFnZXIuc3RhcnRDYXB0dXJpbmcpOwogICAgIH0sCiAKKyAgICBtYXJrRnJhbWVFbmQ6IGZ1bmN0 aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX21hbmFnZXIubWFya0ZyYW1lRW5kKCk7CisgICAg fSwKKwogICAgIC8qKgogICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24odGhpczpSZXNvdXJjZVRyYWNr aW5nTWFuYWdlcil9IGZ1bmMKICAgICAgKiBAcmV0dXJuIHtDYW52YXNBZ2VudC5UcmFjZUxvZ0lk fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNhbnZhc0Fn ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDYW52YXNBZ2VudC5j cHAKaW5kZXggYjljZWY4ZjYxZDU4MGE4YmYxNmRlNzExYTgxNTU5MTFjY2JmMDI0My4uY2Y5OTQw ZDJhYjBiMDUxZTcwNzYxMDY4MGU1ZGQyMTE2YWRmM2YxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNhbnZhc0FnZW50LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ2FudmFzQWdlbnQuY3BwCkBAIC0xMjcsNyArMTI3LDEz IEBAIHZvaWQgSW5zcGVjdG9yQ2FudmFzQWdlbnQ6Omhhc1VuaW5zdHJ1bWVudGVkQ2FudmFzZXMo RXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBiCiB7CiAgICAgaWYgKCFjaGVja0lzRW5hYmxlZChl cnJvclN0cmluZykpCiAgICAgICAgIHJldHVybjsKLSAgICAqcmVzdWx0ID0gIW1fZnJhbWVzV2l0 aFVuaW5zdHJ1bWVudGVkQ2FudmFzZXMuaXNFbXB0eSgpOworICAgIGZvciAoRnJhbWVzV2l0aFVu aW5zdHJ1bWVudGVkQ2FudmFzZXM6Oml0ZXJhdG9yIGl0ID0gbV9mcmFtZXNXaXRoVW5pbnN0cnVt ZW50ZWRDYW52YXNlcy5iZWdpbigpOyBpdCAhPSBtX2ZyYW1lc1dpdGhVbmluc3RydW1lbnRlZENh bnZhc2VzLmVuZCgpOyArK2l0KSB7CisgICAgICAgIGlmIChpdC0+dmFsdWUpIHsKKyAgICAgICAg ICAgICpyZXN1bHQgPSB0cnVlOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAg fQorICAgICpyZXN1bHQgPSBmYWxzZTsKIH0KIAogdm9pZCBJbnNwZWN0b3JDYW52YXNBZ2VudDo6 Y2FwdHVyZUZyYW1lKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgY29uc3QgRnJhbWVJZCogZnJh bWVJZCwgVHJhY2VMb2dJZCogdHJhY2VMb2dJZCkKQEAgLTIxMSw2ICsyMTcsOCBAQCBTY3JpcHRP YmplY3QgSW5zcGVjdG9yQ2FudmFzQWdlbnQ6Om5vdGlmeVJlbmRlcmluZ0NvbnRleHRXYXNXcmFw cGVkKGNvbnN0IFNjcmlwdAogICAgIFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSA9IHdyYXBwZWRD b250ZXh0LnNjcmlwdFN0YXRlKCk7CiAgICAgRE9NV2luZG93KiBkb21XaW5kb3cgPSBzY3JpcHRT dGF0ZSA/IGRvbVdpbmRvd0Zyb21TY3JpcHRTdGF0ZShzY3JpcHRTdGF0ZSkgOiAwOwogICAgIEZy YW1lKiBmcmFtZSA9IGRvbVdpbmRvdyA/IGRvbVdpbmRvdy0+ZnJhbWUoKSA6IDA7CisgICAgaWYg KGZyYW1lICYmICFtX2ZyYW1lc1dpdGhVbmluc3RydW1lbnRlZENhbnZhc2VzLmNvbnRhaW5zKGZy YW1lKSkKKyAgICAgICAgbV9mcmFtZXNXaXRoVW5pbnN0cnVtZW50ZWRDYW52YXNlcy5zZXQoZnJh bWUsIGZhbHNlKTsKICAgICBTdHJpbmcgZnJhbWVJZCA9IG1fcGFnZUFnZW50LT5mcmFtZUlkKGZy YW1lKTsKICAgICBpZiAoIWZyYW1lSWQuaXNFbXB0eSgpKQogICAgICAgICBtX2Zyb250ZW5kLT5j b250ZXh0Q3JlYXRlZChmcmFtZUlkKTsKQEAgLTI1Nyw3ICsyNjUsNyBAQCB2b2lkIEluc3BlY3Rv ckNhbnZhc0FnZW50OjpmaW5kRnJhbWVzV2l0aFVuaW5zdHJ1bWVudGVkQ2FudmFzZXMoKQogewog ICAgIGNsYXNzIE5vZGVWaXNpdG9yIDogcHVibGljIFdyYXBwZWROb2RlVmlzaXRvciB7CiAgICAg cHVibGljOgotICAgICAgICBOb2RlVmlzaXRvcihQYWdlKiBwYWdlLCBIYXNoU2V0PEZyYW1lKj4m IHJlc3VsdCkKKyAgICAgICAgTm9kZVZpc2l0b3IoUGFnZSogcGFnZSwgRnJhbWVzV2l0aFVuaW5z dHJ1bWVudGVkQ2FudmFzZXMmIHJlc3VsdCkKICAgICAgICAgICAgIDogbV9wYWdlKHBhZ2UpCiAg ICAgICAgICAgICAsIG1fZnJhbWVzV2l0aFVuaW5zdHJ1bWVudGVkQ2FudmFzZXMocmVzdWx0KQog ICAgICAgICB7CkBAIC0yNzQsMTkgKzI4MiwxOSBAQCB2b2lkIEluc3BlY3RvckNhbnZhc0FnZW50 OjpmaW5kRnJhbWVzV2l0aFVuaW5zdHJ1bWVudGVkQ2FudmFzZXMoKQogCiAgICAgICAgICAgICBI VE1MQ2FudmFzRWxlbWVudCogY2FudmFzID0gc3RhdGljX2Nhc3Q8SFRNTENhbnZhc0VsZW1lbnQq Pihub2RlKTsKICAgICAgICAgICAgIGlmIChjYW52YXMtPnJlbmRlcmluZ0NvbnRleHQoKSkKLSAg ICAgICAgICAgICAgICBtX2ZyYW1lc1dpdGhVbmluc3RydW1lbnRlZENhbnZhc2VzLmFkZChmcmFt ZSk7CisgICAgICAgICAgICAgICAgbV9mcmFtZXNXaXRoVW5pbnN0cnVtZW50ZWRDYW52YXNlcy5z ZXQoZnJhbWUsIHRydWUpOwogICAgICAgICB9CiAKICAgICBwcml2YXRlOgogICAgICAgICBQYWdl KiBtX3BhZ2U7Ci0gICAgICAgIEhhc2hTZXQ8RnJhbWUqPiYgbV9mcmFtZXNXaXRoVW5pbnN0cnVt ZW50ZWRDYW52YXNlczsKKyAgICAgICAgRnJhbWVzV2l0aFVuaW5zdHJ1bWVudGVkQ2FudmFzZXMm IG1fZnJhbWVzV2l0aFVuaW5zdHJ1bWVudGVkQ2FudmFzZXM7CiAgICAgfSBub2RlVmlzaXRvciht X3BhZ2VBZ2VudC0+cGFnZSgpLCBtX2ZyYW1lc1dpdGhVbmluc3RydW1lbnRlZENhbnZhc2VzKTsK IAogICAgIG1fZnJhbWVzV2l0aFVuaW5zdHJ1bWVudGVkQ2FudmFzZXMuY2xlYXIoKTsKICAgICBT Y3JpcHRQcm9maWxlcjo6dmlzaXROb2RlV3JhcHBlcnMoJm5vZGVWaXNpdG9yKTsKIAotICAgIGZv ciAoSGFzaFNldDxGcmFtZSo+OjppdGVyYXRvciBpdCA9IG1fZnJhbWVzV2l0aFVuaW5zdHJ1bWVu dGVkQ2FudmFzZXMuYmVnaW4oKTsgaXQgIT0gbV9mcmFtZXNXaXRoVW5pbnN0cnVtZW50ZWRDYW52 YXNlcy5lbmQoKTsgKytpdCkgewotICAgICAgICBTdHJpbmcgZnJhbWVJZCA9IG1fcGFnZUFnZW50 LT5mcmFtZUlkKCppdCk7CisgICAgZm9yIChGcmFtZXNXaXRoVW5pbnN0cnVtZW50ZWRDYW52YXNl czo6aXRlcmF0b3IgaXQgPSBtX2ZyYW1lc1dpdGhVbmluc3RydW1lbnRlZENhbnZhc2VzLmJlZ2lu KCk7IGl0ICE9IG1fZnJhbWVzV2l0aFVuaW5zdHJ1bWVudGVkQ2FudmFzZXMuZW5kKCk7ICsraXQp IHsKKyAgICAgICAgU3RyaW5nIGZyYW1lSWQgPSBtX3BhZ2VBZ2VudC0+ZnJhbWVJZChpdC0+a2V5 KTsKICAgICAgICAgaWYgKCFmcmFtZUlkLmlzRW1wdHkoKSkKICAgICAgICAgICAgIG1fZnJvbnRl bmQtPmNvbnRleHRDcmVhdGVkKGZyYW1lSWQpOwogICAgIH0KQEAgLTMwNSwxMSArMzEzLDEzIEBA IHZvaWQgSW5zcGVjdG9yQ2FudmFzQWdlbnQ6OmZyYW1lTmF2aWdhdGVkKEZyYW1lKiBmcmFtZSkK ICAgICBpZiAoIW1fZW5hYmxlZCkKICAgICAgICAgcmV0dXJuOwogICAgIGlmIChmcmFtZSA9PSBt X3BhZ2VBZ2VudC0+bWFpbkZyYW1lKCkpIHsKLSAgICAgICAgbV9mcmFtZXNXaXRoVW5pbnN0cnVt ZW50ZWRDYW52YXNlcy5jbGVhcigpOworICAgICAgICBmb3IgKEZyYW1lc1dpdGhVbmluc3RydW1l bnRlZENhbnZhc2VzOjppdGVyYXRvciBpdCA9IG1fZnJhbWVzV2l0aFVuaW5zdHJ1bWVudGVkQ2Fu dmFzZXMuYmVnaW4oKTsgaXQgIT0gbV9mcmFtZXNXaXRoVW5pbnN0cnVtZW50ZWRDYW52YXNlcy5l bmQoKTsgKytpdCkKKyAgICAgICAgICAgIG1fZnJhbWVzV2l0aFVuaW5zdHJ1bWVudGVkQ2FudmFz ZXMuc2V0KGl0LT5rZXksIGZhbHNlKTsKICAgICAgICAgbV9mcm9udGVuZC0+dHJhY2VMb2dzUmVt b3ZlZCgwLCAwKTsKICAgICB9IGVsc2UgewogICAgICAgICB3aGlsZSAoZnJhbWUpIHsKLSAgICAg ICAgICAgIG1fZnJhbWVzV2l0aFVuaW5zdHJ1bWVudGVkQ2FudmFzZXMucmVtb3ZlKGZyYW1lKTsK KyAgICAgICAgICAgIGlmIChtX2ZyYW1lc1dpdGhVbmluc3RydW1lbnRlZENhbnZhc2VzLmNvbnRh aW5zKGZyYW1lKSkKKyAgICAgICAgICAgICAgICBtX2ZyYW1lc1dpdGhVbmluc3RydW1lbnRlZENh bnZhc2VzLnNldChmcmFtZSwgZmFsc2UpOwogICAgICAgICAgICAgaWYgKG1fcGFnZUFnZW50LT5o YXNJZEZvckZyYW1lKGZyYW1lKSkgewogICAgICAgICAgICAgICAgIFN0cmluZyBmcmFtZUlkID0g bV9wYWdlQWdlbnQtPmZyYW1lSWQoZnJhbWUpOwogICAgICAgICAgICAgICAgIG1fZnJvbnRlbmQt PnRyYWNlTG9nc1JlbW92ZWQoJmZyYW1lSWQsIDApOwpAQCAtMzI1LDYgKzMzNSwxOCBAQCB2b2lk IEluc3BlY3RvckNhbnZhc0FnZW50OjpmcmFtZURldGFjaGVkKEZyYW1lKiBmcmFtZSkKICAgICAg ICAgbV9mcmFtZXNXaXRoVW5pbnN0cnVtZW50ZWRDYW52YXNlcy5yZW1vdmUoZnJhbWUpOwogfQog Cit2b2lkIEluc3BlY3RvckNhbnZhc0FnZW50OjpkaWRCZWdpbkZyYW1lKCkKK3sKKyAgICBpZiAo IW1fZW5hYmxlZCkKKyAgICAgICAgcmV0dXJuOworICAgIEVycm9yU3RyaW5nIGVycm9yOworICAg IGZvciAoRnJhbWVzV2l0aFVuaW5zdHJ1bWVudGVkQ2FudmFzZXM6Oml0ZXJhdG9yIGl0ID0gbV9m cmFtZXNXaXRoVW5pbnN0cnVtZW50ZWRDYW52YXNlcy5iZWdpbigpOyBpdCAhPSBtX2ZyYW1lc1dp dGhVbmluc3RydW1lbnRlZENhbnZhc2VzLmVuZCgpOyArK2l0KSB7CisgICAgICAgIEluamVjdGVk U2NyaXB0Q2FudmFzTW9kdWxlIG1vZHVsZSA9IGluamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlKCZl cnJvciwgbWFpbldvcmxkU2NyaXB0U3RhdGUoaXQtPmtleSkpOworICAgICAgICBpZiAoIW1vZHVs ZS5oYXNOb1ZhbHVlKCkpCisgICAgICAgICAgICBtb2R1bGUubWFya0ZyYW1lRW5kKCk7CisgICAg fQorfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBFTkFCTEUoSU5TUEVD VE9SKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNhbnZh c0FnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ2FudmFzQWdlbnQu aAppbmRleCA2YjYyNmZjYzBmODY2ZWZkMmVkNzZhODY0NTMyOTQ0NTg3ODMyOWFjLi5hNTNkYTky NmJlMGM3MzAyZjM5ZjUwZGI1M2MwYTI3N2EzYzQzMWM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ2FudmFzQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ2FudmFzQWdlbnQuaApAQCAtMzcsNyArMzcsNyBAQAogI2lu Y2x1ZGUgIkluc3BlY3RvckZyb250ZW5kLmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yVHlwZUJ1aWxk ZXIuaCIKICNpbmNsdWRlICJTY3JpcHRTdGF0ZS5oIgotI2luY2x1ZGUgPHd0Zi9IYXNoU2V0Lmg+ CisjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KICNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgog I2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5n Lmg+CkBAIC02NiwxMSArNjYsMTEgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBjbGVhckZy b250ZW5kKCk7CiAgICAgdmlydHVhbCB2b2lkIHJlc3RvcmUoKTsKIAotICAgIC8vIENhbGxlZCBm cm9tIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbgogICAgIHZvaWQgZnJhbWVOYXZpZ2F0ZWQoRnJh bWUqKTsKICAgICB2b2lkIGZyYW1lRGV0YWNoZWQoRnJhbWUqKTsKKyAgICB2b2lkIGRpZEJlZ2lu RnJhbWUoKTsKIAotICAgIC8vIENhbGxlZCBmcm9tIEluc3BlY3RvckNhbnZhc0luc3RydW1lbnRh dGlvbgorICAgIC8vIENhbGxlZCBmcm9tIEluc3BlY3RvckNhbnZhc0luc3RydW1lbnRhdGlvbi4K ICAgICBTY3JpcHRPYmplY3Qgd3JhcENhbnZhczJEUmVuZGVyaW5nQ29udGV4dEZvckluc3RydW1l bnRhdGlvbihjb25zdCBTY3JpcHRPYmplY3QmKTsKICNpZiBFTkFCTEUoV0VCR0wpCiAgICAgU2Ny aXB0T2JqZWN0IHdyYXBXZWJHTFJlbmRlcmluZ0NvbnRleHRGb3JJbnN0cnVtZW50YXRpb24oY29u c3QgU2NyaXB0T2JqZWN0Jik7CkBAIC0xMDQsNyArMTA0LDkgQEAgcHJpdmF0ZToKICAgICBJbmpl Y3RlZFNjcmlwdE1hbmFnZXIqIG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyOwogICAgIEluc3BlY3Rv ckZyb250ZW5kOjpDYW52YXMqIG1fZnJvbnRlbmQ7CiAgICAgYm9vbCBtX2VuYWJsZWQ7Ci0gICAg SGFzaFNldDxGcmFtZSo+IG1fZnJhbWVzV2l0aFVuaW5zdHJ1bWVudGVkQ2FudmFzZXM7CisgICAg Ly8gQ29udGFpbnMgYWxsIGZyYW1lcyB3aXRoIGNhbnZhc2VzLCB2YWx1ZSBpcyB0cnVlIG9ubHkg Zm9yIGZyYW1lcyB0aGF0IGhhdmUgYW4gdW5pbnN0cnVtZW50ZWQgY2FudmFzLgorICAgIHR5cGVk ZWYgSGFzaE1hcDxGcmFtZSosIGJvb2w+IEZyYW1lc1dpdGhVbmluc3RydW1lbnRlZENhbnZhc2Vz OworICAgIEZyYW1lc1dpdGhVbmluc3RydW1lbnRlZENhbnZhc2VzIG1fZnJhbWVzV2l0aFVuaW5z dHJ1bWVudGVkQ2FudmFzZXM7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggNjI3 ZGU5Y2E4ZjIyZWExNzAyNjkwZTA5YWY1YzIzZWQ2ZGJmM2VlYy4uODU0ODM2MjMxMDFlZDdhNThm OGMyYjQ5NTBlNTUxYzI4MzEwMzBkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAtNDUwLDYgKzQ1MCw4IEBAIHZvaWQgSW5zcGVj dG9yQ29udHJvbGxlcjo6ZGlkQmVnaW5GcmFtZSgpCiB7CiAgICAgaWYgKEluc3BlY3RvclRpbWVs aW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBtX2luc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3Rv clRpbWVsaW5lQWdlbnQoKSkKICAgICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkQmVnaW5GcmFtZSgp OworICAgIGlmIChJbnNwZWN0b3JDYW52YXNBZ2VudCogY2FudmFzQWdlbnQgPSBtX2luc3RydW1l bnRpbmdBZ2VudHMtPmluc3BlY3RvckNhbnZhc0FnZW50KCkpCisgICAgICAgIGNhbnZhc0FnZW50 LT5kaWRCZWdpbkZyYW1lKCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkQ2Fu Y2VsRnJhbWUoKQo=