133206 2014-05-22 22:54:12 -0700 Switch CSSGradientValue to use more references 2014-05-23 09:13:38 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc glenn gyuyoung.kim macpherson menard oldest_to_newest 1011171 0 simon.fraser 2014-05-22 22:54:12 -0700 Switch CSSGradientValue to use more references 1011172 1 231944 simon.fraser 2014-05-22 22:54:42 -0700 Created attachment 231944 Patch 1011176 2 231944 kling 2014-05-22 23:20:26 -0700 Comment on attachment 231944 Patch r=me! 1011248 3 231944 commit-queue 2014-05-23 09:13:33 -0700 Comment on attachment 231944 Patch Clearing flags on attachment: 231944 Committed r169258: <http://trac.webkit.org/changeset/169258> 1011249 4 commit-queue 2014-05-23 09:13:38 -0700 All reviewed patches have been landed. Closing bug. 231944 2014-05-22 22:54:42 -0700 2014-05-23 09:13:33 -0700 Patch bug-133206-20140522225418.patch text/plain 14980 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5MjQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjU0MjJlYzRhOWU1NjQ0 MmJmZmNjZmY3MWJhN2JiZjcwZjQyZmJiNi4uZGEzMWYxZWEwNjE5YTExNjE0ZDk3ZjQ4YWRmNDVl NWYyYmFjNWNiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE0LTA1LTIyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIFN3aXRjaCBDU1NH cmFkaWVudFZhbHVlIHRvIHVzZSBtb3JlIHJlZmVyZW5jZXMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzIwNgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBmcm9tIHBvaW50ZXJzIHRvIHJlZmVy ZW5jZXMgaW4gdmFyaW91cyBwbGFjZXMuCisKKyAgICAgICAgKiBjc3MvQ1NTR3JhZGllbnRWYWx1 ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NHcmFkaWVudFZhbHVlOjppbWFnZSk6CisgICAg ICAgIChXZWJDb3JlOjpDU1NHcmFkaWVudFZhbHVlOjphZGRTdG9wcyk6CisgICAgICAgIChXZWJD b3JlOjpwb3NpdGlvbkZyb21WYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NHcmFkaWVudFZh bHVlOjpjb21wdXRlRW5kUG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTTGluZWFyR3JhZGll bnRWYWx1ZTo6Y3JlYXRlR3JhZGllbnQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUmFkaWFsR3Jh ZGllbnRWYWx1ZTo6cmVzb2x2ZVJhZGl1cyk6CisgICAgICAgIChXZWJDb3JlOjpDU1NSYWRpYWxH cmFkaWVudFZhbHVlOjpjcmVhdGVHcmFkaWVudCk6CisgICAgICAgICogY3NzL0NTU0dyYWRpZW50 VmFsdWUuaDoKKworMjAxNC0wNS0yMiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxl LmNvbT4KKwogICAgICAgICBNYWtlIHZpZXdwb3J0IHVuaXRzIHdvcmsgaW4gQ1NTIGdyYWRpZW50 cwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzMjA0 CiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNzAxMjI1OT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NHcmFkaWVudFZhbHVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NH cmFkaWVudFZhbHVlLmNwcAppbmRleCAwZDg1ZDk0NGViMGM2OWRiYzJlODhkNTFkMDZhYTFlMmNl ZmVkOTI1Li44MjdhMjE1Yjc4YmY1NDkyMWIzYTQwYzRlMmMwNWE3ZWU5ZGMwMzEyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTR3JhZGllbnRWYWx1ZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvY3NzL0NTU0dyYWRpZW50VmFsdWUuY3BwCkBAIC02MCw5ICs2MCw5IEBAIFBhc3NS ZWZQdHI8SW1hZ2U+IENTU0dyYWRpZW50VmFsdWU6OmltYWdlKFJlbmRlckVsZW1lbnQqIHJlbmRl cmVyLCBjb25zdCBGbG9hdFNpCiAgICAgUmVmUHRyPEdyYWRpZW50PiBncmFkaWVudDsKIAogICAg IGlmIChpc0xpbmVhckdyYWRpZW50VmFsdWUoKSkKLSAgICAgICAgZ3JhZGllbnQgPSB0b0NTU0xp bmVhckdyYWRpZW50VmFsdWUodGhpcyktPmNyZWF0ZUdyYWRpZW50KHJlbmRlcmVyLCBzaXplKTsK KyAgICAgICAgZ3JhZGllbnQgPSB0b0NTU0xpbmVhckdyYWRpZW50VmFsdWUodGhpcyktPmNyZWF0 ZUdyYWRpZW50KCpyZW5kZXJlciwgc2l6ZSk7CiAgICAgZWxzZQotICAgICAgICBncmFkaWVudCA9 IHRvQ1NTUmFkaWFsR3JhZGllbnRWYWx1ZSh0aGlzKS0+Y3JlYXRlR3JhZGllbnQocmVuZGVyZXIs IHNpemUpOworICAgICAgICBncmFkaWVudCA9IHRvQ1NTUmFkaWFsR3JhZGllbnRWYWx1ZSh0aGlz KS0+Y3JlYXRlR3JhZGllbnQoKnJlbmRlcmVyLCBzaXplKTsKIAogICAgIFJlZlB0cjxHcmFkaWVu dEltYWdlPiBuZXdJbWFnZSA9IEdyYWRpZW50SW1hZ2U6OmNyZWF0ZShncmFkaWVudCwgc2l6ZSk7 CiAgICAgaWYgKGNhY2hlYWJsZSkKQEAgLTEyOSw3ICsxMjksNyBAQCBQYXNzUmVmUHRyPENTU0dy YWRpZW50VmFsdWU+IENTU0dyYWRpZW50VmFsdWU6OmdyYWRpZW50V2l0aFN0eWxlc1Jlc29sdmVk KFN0eWxlUgogICAgIHJldHVybiByZXN1bHQucmVsZWFzZSgpOwogfQogCi12b2lkIENTU0dyYWRp ZW50VmFsdWU6OmFkZFN0b3BzKEdyYWRpZW50KiBncmFkaWVudCwgUmVuZGVyVmlldyogcmVuZGVy VmlldywgY29uc3QgQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YSYgY29udmVyc2lvbkRhdGEsIGZs b2F0IG1heExlbmd0aEZvclJlcGVhdCkKK3ZvaWQgQ1NTR3JhZGllbnRWYWx1ZTo6YWRkU3RvcHMo R3JhZGllbnQmIGdyYWRpZW50LCBSZW5kZXJWaWV3JiByZW5kZXJWaWV3LCBjb25zdCBDU1NUb0xl bmd0aENvbnZlcnNpb25EYXRhJiBjb252ZXJzaW9uRGF0YSwgZmxvYXQgbWF4TGVuZ3RoRm9yUmVw ZWF0KQogewogICAgIGlmIChtX2dyYWRpZW50VHlwZSA9PSBDU1NEZXByZWNhdGVkTGluZWFyR3Jh ZGllbnQgfHwgbV9ncmFkaWVudFR5cGUgPT0gQ1NTRGVwcmVjYXRlZFJhZGlhbEdyYWRpZW50KSB7 CiAgICAgICAgIHNvcnRTdG9wc0lmTmVlZGVkKCk7CkBAIC0xNDMsMTEgKzE0MywxMSBAQCB2b2lk IENTU0dyYWRpZW50VmFsdWU6OmFkZFN0b3BzKEdyYWRpZW50KiBncmFkaWVudCwgUmVuZGVyVmll dyogcmVuZGVyVmlldywgY29ucwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIG9m ZnNldCA9IHN0b3AubV9wb3NpdGlvbi0+Z2V0RmxvYXRWYWx1ZShDU1NQcmltaXRpdmVWYWx1ZTo6 Q1NTX05VTUJFUik7CiAKLSAgICAgICAgICAgIGdyYWRpZW50LT5hZGRDb2xvclN0b3Aob2Zmc2V0 LCBzdG9wLm1fcmVzb2x2ZWRDb2xvcik7CisgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0 b3Aob2Zmc2V0LCBzdG9wLm1fcmVzb2x2ZWRDb2xvcik7CiAgICAgICAgIH0KIAogICAgICAgICAv LyBUaGUgYmFjayBlbmQgYWxyZWFkeSBzb3J0ZWQgdGhlIHN0b3BzLgotICAgICAgICBncmFkaWVu dC0+c2V0U3RvcHNTb3J0ZWQodHJ1ZSk7CisgICAgICAgIGdyYWRpZW50LnNldFN0b3BzU29ydGVk KHRydWUpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0xNTgsMTIgKzE1OCwxMiBAQCB2 b2lkIENTU0dyYWRpZW50VmFsdWU6OmFkZFN0b3BzKEdyYWRpZW50KiBncmFkaWVudCwgUmVuZGVy VmlldyogcmVuZGVyVmlldywgY29ucwogICAgIGZsb2F0IGdyYWRpZW50TGVuZ3RoID0gMDsKICAg ICBib29sIGNvbXB1dGVkR3JhZGllbnRMZW5ndGggPSBmYWxzZTsKIAotICAgIEZsb2F0UG9pbnQg Z3JhZGllbnRTdGFydCA9IGdyYWRpZW50LT5wMCgpOworICAgIEZsb2F0UG9pbnQgZ3JhZGllbnRT dGFydCA9IGdyYWRpZW50LnAwKCk7CiAgICAgRmxvYXRQb2ludCBncmFkaWVudEVuZDsKICAgICBp ZiAoaXNMaW5lYXJHcmFkaWVudFZhbHVlKCkpCi0gICAgICAgIGdyYWRpZW50RW5kID0gZ3JhZGll bnQtPnAxKCk7CisgICAgICAgIGdyYWRpZW50RW5kID0gZ3JhZGllbnQucDEoKTsKICAgICBlbHNl IGlmIChpc1JhZGlhbEdyYWRpZW50VmFsdWUoKSkKLSAgICAgICAgZ3JhZGllbnRFbmQgPSBncmFk aWVudFN0YXJ0ICsgRmxvYXRTaXplKGdyYWRpZW50LT5lbmRSYWRpdXMoKSwgMCk7CisgICAgICAg IGdyYWRpZW50RW5kID0gZ3JhZGllbnRTdGFydCArIEZsb2F0U2l6ZShncmFkaWVudC5lbmRSYWRp dXMoKSwgMCk7CiAKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG51bVN0b3BzOyArK2kpIHsK ICAgICAgICAgY29uc3QgQ1NTR3JhZGllbnRDb2xvclN0b3AmIHN0b3AgPSBtX3N0b3BzW2ldOwpA QCAtMTgzLDcgKzE4Myw3IEBAIHZvaWQgQ1NTR3JhZGllbnRWYWx1ZTo6YWRkU3RvcHMoR3JhZGll bnQqIGdyYWRpZW50LCBSZW5kZXJWaWV3KiByZW5kZXJWaWV3LCBjb25zCiAgICAgICAgICAgICAg ICAgaWYgKHBvc2l0aW9uVmFsdWUuaXNMZW5ndGgoKSkKICAgICAgICAgICAgICAgICAgICAgbGVu Z3RoID0gcG9zaXRpb25WYWx1ZS5jb21wdXRlTGVuZ3RoPGZsb2F0Pihjb252ZXJzaW9uRGF0YSk7 CiAgICAgICAgICAgICAgICAgZWxzZSBpZiAocG9zaXRpb25WYWx1ZS5pc1ZpZXdwb3J0UGVyY2Vu dGFnZUxlbmd0aCgpKQotICAgICAgICAgICAgICAgICAgICBsZW5ndGggPSB2YWx1ZUZvckxlbmd0 aChwb3NpdGlvblZhbHVlLnZpZXdwb3J0UGVyY2VudGFnZUxlbmd0aCgpLCAwLCByZW5kZXJWaWV3 KTsKKyAgICAgICAgICAgICAgICAgICAgbGVuZ3RoID0gdmFsdWVGb3JMZW5ndGgocG9zaXRpb25W YWx1ZS52aWV3cG9ydFBlcmNlbnRhZ2VMZW5ndGgoKSwgMCwgJnJlbmRlclZpZXcpOwogICAgICAg ICAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAgICAgICBSZWY8Q2FsY3VsYXRpb25WYWx1 ZT4gY2FsY3VsYXRpb25WYWx1ZSB7IHBvc2l0aW9uVmFsdWUuY3NzQ2FsY1ZhbHVlKCktPmNyZWF0 ZUNhbGN1bGF0aW9uVmFsdWUoY29udmVyc2lvbkRhdGEpIH07CiAgICAgICAgICAgICAgICAgICAg IGxlbmd0aCA9IGNhbGN1bGF0aW9uVmFsdWUtPmV2YWx1YXRlKGdyYWRpZW50TGVuZ3RoKTsKQEAg LTMzNSwxMCArMzM1LDEwIEBAIHZvaWQgQ1NTR3JhZGllbnRWYWx1ZTo6YWRkU3RvcHMoR3JhZGll bnQqIGdyYWRpZW50LCBSZW5kZXJWaWV3KiByZW5kZXJWaWV3LCBjb25zCiAgICAgICAgICAgICAg ICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBudW1TdG9wczsgKytpKQogICAgICAgICAgICAgICAg ICAgICBzdG9wc1tpXS5vZmZzZXQgPSAoc3RvcHNbaV0ub2Zmc2V0IC0gZmlyc3RPZmZzZXQpIC8g c2NhbGU7CiAKLSAgICAgICAgICAgICAgICBGbG9hdFBvaW50IHAwID0gZ3JhZGllbnQtPnAwKCk7 Ci0gICAgICAgICAgICAgICAgRmxvYXRQb2ludCBwMSA9IGdyYWRpZW50LT5wMSgpOwotICAgICAg ICAgICAgICAgIGdyYWRpZW50LT5zZXRQMChGbG9hdFBvaW50KHAwLngoKSArIGZpcnN0T2Zmc2V0 ICogKHAxLngoKSAtIHAwLngoKSksIHAwLnkoKSArIGZpcnN0T2Zmc2V0ICogKHAxLnkoKSAtIHAw LnkoKSkpKTsKLSAgICAgICAgICAgICAgICBncmFkaWVudC0+c2V0UDEoRmxvYXRQb2ludChwMS54 KCkgKyAobGFzdE9mZnNldCAtIDEpICogKHAxLngoKSAtIHAwLngoKSksIHAxLnkoKSArIChsYXN0 T2Zmc2V0IC0gMSkgKiAocDEueSgpIC0gcDAueSgpKSkpOworICAgICAgICAgICAgICAgIEZsb2F0 UG9pbnQgcDAgPSBncmFkaWVudC5wMCgpOworICAgICAgICAgICAgICAgIEZsb2F0UG9pbnQgcDEg PSBncmFkaWVudC5wMSgpOworICAgICAgICAgICAgICAgIGdyYWRpZW50LnNldFAwKEZsb2F0UG9p bnQocDAueCgpICsgZmlyc3RPZmZzZXQgKiAocDEueCgpIC0gcDAueCgpKSwgcDAueSgpICsgZmly c3RPZmZzZXQgKiAocDEueSgpIC0gcDAueSgpKSkpOworICAgICAgICAgICAgICAgIGdyYWRpZW50 LnNldFAxKEZsb2F0UG9pbnQocDEueCgpICsgKGxhc3RPZmZzZXQgLSAxKSAqIChwMS54KCkgLSBw MC54KCkpLCBwMS55KCkgKyAobGFzdE9mZnNldCAtIDEpICogKHAxLnkoKSAtIHAwLnkoKSkpKTsK ICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgLy8gVGhlcmUncyBhIHNpbmds ZSBwb3NpdGlvbiB0aGF0IGlzIG91dHNpZGUgdGhlIHNjYWxlLCBjbGFtcCB0aGUgcG9zaXRpb25z IHRvIDEuCiAgICAgICAgICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBudW1TdG9wczsg KytpKQpAQCAtMzgzLDMyICszODMsMzIgQEAgdm9pZCBDU1NHcmFkaWVudFZhbHVlOjphZGRTdG9w cyhHcmFkaWVudCogZ3JhZGllbnQsIFJlbmRlclZpZXcqIHJlbmRlclZpZXcsIGNvbnMKICAgICAg ICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbnVtU3RvcHM7ICsraSkKICAgICAgICAgICAg ICAgICBzdG9wc1tpXS5vZmZzZXQgLz0gc2NhbGU7CiAKLSAgICAgICAgICAgIGdyYWRpZW50LT5z ZXRTdGFydFJhZGl1cyhncmFkaWVudC0+c3RhcnRSYWRpdXMoKSAqIHNjYWxlKTsKLSAgICAgICAg ICAgIGdyYWRpZW50LT5zZXRFbmRSYWRpdXMoZ3JhZGllbnQtPmVuZFJhZGl1cygpICogc2NhbGUp OworICAgICAgICAgICAgZ3JhZGllbnQuc2V0U3RhcnRSYWRpdXMoZ3JhZGllbnQuc3RhcnRSYWRp dXMoKSAqIHNjYWxlKTsKKyAgICAgICAgICAgIGdyYWRpZW50LnNldEVuZFJhZGl1cyhncmFkaWVu dC5lbmRSYWRpdXMoKSAqIHNjYWxlKTsKICAgICAgICAgfQogICAgIH0KIAogICAgIGZvciAodW5z aWduZWQgaSA9IDA7IGkgPCBudW1TdG9wczsgaSsrKQotICAgICAgICBncmFkaWVudC0+YWRkQ29s b3JTdG9wKHN0b3BzW2ldLm9mZnNldCwgc3RvcHNbaV0uY29sb3IpOworICAgICAgICBncmFkaWVu dC5hZGRDb2xvclN0b3Aoc3RvcHNbaV0ub2Zmc2V0LCBzdG9wc1tpXS5jb2xvcik7CiAKLSAgICBn cmFkaWVudC0+c2V0U3RvcHNTb3J0ZWQodHJ1ZSk7CisgICAgZ3JhZGllbnQuc2V0U3RvcHNTb3J0 ZWQodHJ1ZSk7CiB9CiAKLXN0YXRpYyBmbG9hdCBwb3NpdGlvbkZyb21WYWx1ZShDU1NQcmltaXRp dmVWYWx1ZSogdmFsdWUsIGNvbnN0IENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmIGNvbnZlcnNp b25EYXRhLCBjb25zdCBGbG9hdFNpemUmIHNpemUsIGJvb2wgaXNIb3Jpem9udGFsKQorc3RhdGlj IGZsb2F0IHBvc2l0aW9uRnJvbVZhbHVlKENTU1ByaW1pdGl2ZVZhbHVlJiB2YWx1ZSwgY29uc3Qg Q1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YSYgY29udmVyc2lvbkRhdGEsIGNvbnN0IEZsb2F0U2l6 ZSYgc2l6ZSwgYm9vbCBpc0hvcml6b250YWwpCiB7Ci0gICAgaWYgKHZhbHVlLT5pc051bWJlcigp KQotICAgICAgICByZXR1cm4gdmFsdWUtPmdldEZsb2F0VmFsdWUoKSAqIGNvbnZlcnNpb25EYXRh Lnpvb20oKTsKKyAgICBpZiAodmFsdWUuaXNOdW1iZXIoKSkKKyAgICAgICAgcmV0dXJuIHZhbHVl LmdldEZsb2F0VmFsdWUoKSAqIGNvbnZlcnNpb25EYXRhLnpvb20oKTsKIAogICAgIGludCBlZGdl RGlzdGFuY2UgPSBpc0hvcml6b250YWwgPyBzaXplLndpZHRoKCkgOiBzaXplLmhlaWdodCgpOwot ICAgIGlmICh2YWx1ZS0+aXNQZXJjZW50YWdlKCkpCi0gICAgICAgIHJldHVybiB2YWx1ZS0+Z2V0 RmxvYXRWYWx1ZSgpIC8gMTAwLmYgKiBlZGdlRGlzdGFuY2U7CisgICAgaWYgKHZhbHVlLmlzUGVy Y2VudGFnZSgpKQorICAgICAgICByZXR1cm4gdmFsdWUuZ2V0RmxvYXRWYWx1ZSgpIC8gMTAwLmYg KiBlZGdlRGlzdGFuY2U7CiAKLSAgICBpZiAodmFsdWUtPmlzQ2FsY3VsYXRlZFBlcmNlbnRhZ2VX aXRoTGVuZ3RoKCkpIHsKLSAgICAgICAgUmVmPENhbGN1bGF0aW9uVmFsdWU+IGNhbGN1bGF0aW9u VmFsdWUgeyB2YWx1ZS0+Y3NzQ2FsY1ZhbHVlKCktPmNyZWF0ZUNhbGN1bGF0aW9uVmFsdWUoY29u dmVyc2lvbkRhdGEpIH07CisgICAgaWYgKHZhbHVlLmlzQ2FsY3VsYXRlZFBlcmNlbnRhZ2VXaXRo TGVuZ3RoKCkpIHsKKyAgICAgICAgUmVmPENhbGN1bGF0aW9uVmFsdWU+IGNhbGN1bGF0aW9uVmFs dWUgeyB2YWx1ZS5jc3NDYWxjVmFsdWUoKS0+Y3JlYXRlQ2FsY3VsYXRpb25WYWx1ZShjb252ZXJz aW9uRGF0YSkgfTsKICAgICAgICAgcmV0dXJuIGNhbGN1bGF0aW9uVmFsdWUtPmV2YWx1YXRlKGVk Z2VEaXN0YW5jZSk7CiAgICAgfQogCi0gICAgc3dpdGNoICh2YWx1ZS0+Z2V0VmFsdWVJRCgpKSB7 CisgICAgc3dpdGNoICh2YWx1ZS5nZXRWYWx1ZUlEKCkpIHsKICAgICBjYXNlIENTU1ZhbHVlVG9w OgogICAgICAgICBBU1NFUlQoIWlzSG9yaXpvbnRhbCk7CiAgICAgICAgIHJldHVybiAwOwpAQCAt NDI1LDcgKzQyNSw3IEBAIHN0YXRpYyBmbG9hdCBwb3NpdGlvbkZyb21WYWx1ZShDU1NQcmltaXRp dmVWYWx1ZSogdmFsdWUsIGNvbnN0IENTU1RvTGVuZ3RoQ29udmVyCiAgICAgICAgIGJyZWFrOwog ICAgIH0KIAotICAgIHJldHVybiB2YWx1ZS0+Y29tcHV0ZUxlbmd0aDxmbG9hdD4oY29udmVyc2lv bkRhdGEpOworICAgIHJldHVybiB2YWx1ZS5jb21wdXRlTGVuZ3RoPGZsb2F0Pihjb252ZXJzaW9u RGF0YSk7CiB9CiAKIEZsb2F0UG9pbnQgQ1NTR3JhZGllbnRWYWx1ZTo6Y29tcHV0ZUVuZFBvaW50 KENTU1ByaW1pdGl2ZVZhbHVlKiBob3Jpem9udGFsLCBDU1NQcmltaXRpdmVWYWx1ZSogdmVydGlj YWwsIGNvbnN0IENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmIGNvbnZlcnNpb25EYXRhLCBjb25z dCBGbG9hdFNpemUmIHNpemUpCkBAIC00MzMsMTAgKzQzMywxMCBAQCBGbG9hdFBvaW50IENTU0dy YWRpZW50VmFsdWU6OmNvbXB1dGVFbmRQb2ludChDU1NQcmltaXRpdmVWYWx1ZSogaG9yaXpvbnRh bCwgQ1NTUAogICAgIEZsb2F0UG9pbnQgcmVzdWx0OwogCiAgICAgaWYgKGhvcml6b250YWwpCi0g ICAgICAgIHJlc3VsdC5zZXRYKHBvc2l0aW9uRnJvbVZhbHVlKGhvcml6b250YWwsIGNvbnZlcnNp b25EYXRhLCBzaXplLCB0cnVlKSk7CisgICAgICAgIHJlc3VsdC5zZXRYKHBvc2l0aW9uRnJvbVZh bHVlKCpob3Jpem9udGFsLCBjb252ZXJzaW9uRGF0YSwgc2l6ZSwgdHJ1ZSkpOwogCiAgICAgaWYg KHZlcnRpY2FsKQotICAgICAgICByZXN1bHQuc2V0WShwb3NpdGlvbkZyb21WYWx1ZSh2ZXJ0aWNh bCwgY29udmVyc2lvbkRhdGEsIHNpemUsIGZhbHNlKSk7CisgICAgICAgIHJlc3VsdC5zZXRZKHBv c2l0aW9uRnJvbVZhbHVlKCp2ZXJ0aWNhbCwgY29udmVyc2lvbkRhdGEsIHNpemUsIGZhbHNlKSk7 CiAKICAgICByZXR1cm4gcmVzdWx0OwogfQpAQCAtNjQzLDExICs2NDMsMTEgQEAgc3RhdGljIHZv aWQgZW5kUG9pbnRzRnJvbUFuZ2xlKGZsb2F0IGFuZ2xlRGVnLCBjb25zdCBGbG9hdFNpemUmIHNp emUsIEZsb2F0UG9pbnQKICAgICBmaXJzdFBvaW50LnNldChoYWxmV2lkdGggLSBlbmRYLCBoYWxm SGVpZ2h0ICsgZW5kWSk7CiB9CiAKLVBhc3NSZWZQdHI8R3JhZGllbnQ+IENTU0xpbmVhckdyYWRp ZW50VmFsdWU6OmNyZWF0ZUdyYWRpZW50KFJlbmRlckVsZW1lbnQqIHJlbmRlcmVyLCBjb25zdCBG bG9hdFNpemUmIHNpemUpCitQYXNzUmVmUHRyPEdyYWRpZW50PiBDU1NMaW5lYXJHcmFkaWVudFZh bHVlOjpjcmVhdGVHcmFkaWVudChSZW5kZXJFbGVtZW50JiByZW5kZXJlciwgY29uc3QgRmxvYXRT aXplJiBzaXplKQogewogICAgIEFTU0VSVCghc2l6ZS5pc0VtcHR5KCkpOwogCi0gICAgQ1NTVG9M ZW5ndGhDb252ZXJzaW9uRGF0YSBjb252ZXJzaW9uRGF0YSgmcmVuZGVyZXItPnN0eWxlKCksIHJl bmRlcmVyLT5kb2N1bWVudCgpLmRvY3VtZW50RWxlbWVudCgpLT5yZW5kZXJTdHlsZSgpKTsKKyAg ICBDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhIGNvbnZlcnNpb25EYXRhKCZyZW5kZXJlci5zdHls ZSgpLCByZW5kZXJlci5kb2N1bWVudCgpLmRvY3VtZW50RWxlbWVudCgpLT5yZW5kZXJTdHlsZSgp KTsKIAogICAgIEZsb2F0UG9pbnQgZmlyc3RQb2ludDsKICAgICBGbG9hdFBvaW50IHNlY29uZFBv aW50OwpAQCAtNzA0LDcgKzcwNCw3IEBAIFBhc3NSZWZQdHI8R3JhZGllbnQ+IENTU0xpbmVhckdy YWRpZW50VmFsdWU6OmNyZWF0ZUdyYWRpZW50KFJlbmRlckVsZW1lbnQqIHJlbmRlCiAgICAgUmVm UHRyPEdyYWRpZW50PiBncmFkaWVudCA9IEdyYWRpZW50OjpjcmVhdGUoZmlyc3RQb2ludCwgc2Vj b25kUG9pbnQpOwogCiAgICAgLy8gTm93IGFkZCB0aGUgc3RvcHMuCi0gICAgYWRkU3RvcHMoZ3Jh ZGllbnQuZ2V0KCksICZyZW5kZXJlci0+dmlldygpLCBjb252ZXJzaW9uRGF0YSwgMSk7CisgICAg YWRkU3RvcHMoKmdyYWRpZW50LCByZW5kZXJlci52aWV3KCksIGNvbnZlcnNpb25EYXRhLCAxKTsK IAogICAgIHJldHVybiBncmFkaWVudC5yZWxlYXNlKCk7CiB9CkBAIC04OTEsMTUgKzg5MSwxNSBA QCBTdHJpbmcgQ1NTUmFkaWFsR3JhZGllbnRWYWx1ZTo6Y3VzdG9tQ1NTVGV4dCgpIGNvbnN0CiAg ICAgcmV0dXJuIHJlc3VsdC50b1N0cmluZygpOwogfQogCi1mbG9hdCBDU1NSYWRpYWxHcmFkaWVu dFZhbHVlOjpyZXNvbHZlUmFkaXVzKENTU1ByaW1pdGl2ZVZhbHVlKiByYWRpdXMsIGNvbnN0IENT U1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmIGNvbnZlcnNpb25EYXRhLCBmbG9hdCogd2lkdGhPckhl aWdodCkKK2Zsb2F0IENTU1JhZGlhbEdyYWRpZW50VmFsdWU6OnJlc29sdmVSYWRpdXMoQ1NTUHJp bWl0aXZlVmFsdWUmIHJhZGl1cywgY29uc3QgQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YSYgY29u dmVyc2lvbkRhdGEsIGZsb2F0KiB3aWR0aE9ySGVpZ2h0KQogewogICAgIGZsb2F0IHJlc3VsdCA9 IDA7Ci0gICAgaWYgKHJhZGl1cy0+aXNOdW1iZXIoKSkgLy8gQ2FuIHRoZSByYWRpdXMgYmUgYSBw ZXJjZW50YWdlPwotICAgICAgICByZXN1bHQgPSByYWRpdXMtPmdldEZsb2F0VmFsdWUoKSAqIGNv bnZlcnNpb25EYXRhLnpvb20oKTsKLSAgICBlbHNlIGlmICh3aWR0aE9ySGVpZ2h0ICYmIHJhZGl1 cy0+aXNQZXJjZW50YWdlKCkpCi0gICAgICAgIHJlc3VsdCA9ICp3aWR0aE9ySGVpZ2h0ICogcmFk aXVzLT5nZXRGbG9hdFZhbHVlKCkgLyAxMDA7CisgICAgaWYgKHJhZGl1cy5pc051bWJlcigpKSAv LyBDYW4gdGhlIHJhZGl1cyBiZSBhIHBlcmNlbnRhZ2U/CisgICAgICAgIHJlc3VsdCA9IHJhZGl1 cy5nZXRGbG9hdFZhbHVlKCkgKiBjb252ZXJzaW9uRGF0YS56b29tKCk7CisgICAgZWxzZSBpZiAo d2lkdGhPckhlaWdodCAmJiByYWRpdXMuaXNQZXJjZW50YWdlKCkpCisgICAgICAgIHJlc3VsdCA9 ICp3aWR0aE9ySGVpZ2h0ICogcmFkaXVzLmdldEZsb2F0VmFsdWUoKSAvIDEwMDsKICAgICBlbHNl Ci0gICAgICAgIHJlc3VsdCA9IHJhZGl1cy0+Y29tcHV0ZUxlbmd0aDxmbG9hdD4oY29udmVyc2lv bkRhdGEpOworICAgICAgICByZXN1bHQgPSByYWRpdXMuY29tcHV0ZUxlbmd0aDxmbG9hdD4oY29u dmVyc2lvbkRhdGEpOwogCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KQEAgLTk4MSwxMSArOTgxLDEx IEBAIHN0YXRpYyBpbmxpbmUgZmxvYXQgaG9yaXpvbnRhbEVsbGlwc2VSYWRpdXMoY29uc3QgRmxv YXRTaXplJiBwLCBmbG9hdCBhc3BlY3RSYXRpCiB9CiAKIC8vIEZJWE1FOiBzaGFyZSBjb2RlIHdp dGggdGhlIGxpbmVhciB2ZXJzaW9uCi1QYXNzUmVmUHRyPEdyYWRpZW50PiBDU1NSYWRpYWxHcmFk aWVudFZhbHVlOjpjcmVhdGVHcmFkaWVudChSZW5kZXJFbGVtZW50KiByZW5kZXJlciwgY29uc3Qg RmxvYXRTaXplJiBzaXplKQorUGFzc1JlZlB0cjxHcmFkaWVudD4gQ1NTUmFkaWFsR3JhZGllbnRW YWx1ZTo6Y3JlYXRlR3JhZGllbnQoUmVuZGVyRWxlbWVudCYgcmVuZGVyZXIsIGNvbnN0IEZsb2F0 U2l6ZSYgc2l6ZSkKIHsKICAgICBBU1NFUlQoIXNpemUuaXNFbXB0eSgpKTsKIAotICAgIENTU1Rv TGVuZ3RoQ29udmVyc2lvbkRhdGEgY29udmVyc2lvbkRhdGEoJnJlbmRlcmVyLT5zdHlsZSgpLCBy ZW5kZXJlci0+ZG9jdW1lbnQoKS5kb2N1bWVudEVsZW1lbnQoKS0+cmVuZGVyU3R5bGUoKSk7Cisg ICAgQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YSBjb252ZXJzaW9uRGF0YSgmcmVuZGVyZXIuc3R5 bGUoKSwgcmVuZGVyZXIuZG9jdW1lbnQoKS5kb2N1bWVudEVsZW1lbnQoKS0+cmVuZGVyU3R5bGUo KSk7CiAKICAgICBGbG9hdFBvaW50IGZpcnN0UG9pbnQgPSBjb21wdXRlRW5kUG9pbnQobV9maXJz dFguZ2V0KCksIG1fZmlyc3RZLmdldCgpLCBjb252ZXJzaW9uRGF0YSwgc2l6ZSk7CiAgICAgaWYg KCFtX2ZpcnN0WCkKQEAgLTEwMDEsMTggKzEwMDEsMTggQEAgUGFzc1JlZlB0cjxHcmFkaWVudD4g Q1NTUmFkaWFsR3JhZGllbnRWYWx1ZTo6Y3JlYXRlR3JhZGllbnQoUmVuZGVyRWxlbWVudCogcmVu ZGUKIAogICAgIGZsb2F0IGZpcnN0UmFkaXVzID0gMDsKICAgICBpZiAobV9maXJzdFJhZGl1cykK LSAgICAgICAgZmlyc3RSYWRpdXMgPSByZXNvbHZlUmFkaXVzKG1fZmlyc3RSYWRpdXMuZ2V0KCks IGNvbnZlcnNpb25EYXRhKTsKKyAgICAgICAgZmlyc3RSYWRpdXMgPSByZXNvbHZlUmFkaXVzKCpt X2ZpcnN0UmFkaXVzLCBjb252ZXJzaW9uRGF0YSk7CiAKICAgICBmbG9hdCBzZWNvbmRSYWRpdXMg PSAwOwogICAgIGZsb2F0IGFzcGVjdFJhdGlvID0gMTsgLy8gd2lkdGggLyBoZWlnaHQuCiAgICAg aWYgKG1fc2Vjb25kUmFkaXVzKQotICAgICAgICBzZWNvbmRSYWRpdXMgPSByZXNvbHZlUmFkaXVz KG1fc2Vjb25kUmFkaXVzLmdldCgpLCBjb252ZXJzaW9uRGF0YSk7CisgICAgICAgIHNlY29uZFJh ZGl1cyA9IHJlc29sdmVSYWRpdXMoKm1fc2Vjb25kUmFkaXVzLCBjb252ZXJzaW9uRGF0YSk7CiAg ICAgZWxzZSBpZiAobV9lbmRIb3Jpem9udGFsU2l6ZSkgewogICAgICAgICBmbG9hdCB3aWR0aCA9 IHNpemUud2lkdGgoKTsKICAgICAgICAgZmxvYXQgaGVpZ2h0ID0gc2l6ZS5oZWlnaHQoKTsKLSAg ICAgICAgc2Vjb25kUmFkaXVzID0gcmVzb2x2ZVJhZGl1cyhtX2VuZEhvcml6b250YWxTaXplLmdl dCgpLCBjb252ZXJzaW9uRGF0YSwgJndpZHRoKTsKKyAgICAgICAgc2Vjb25kUmFkaXVzID0gcmVz b2x2ZVJhZGl1cygqbV9lbmRIb3Jpem9udGFsU2l6ZSwgY29udmVyc2lvbkRhdGEsICZ3aWR0aCk7 CiAgICAgICAgIGlmIChtX2VuZFZlcnRpY2FsU2l6ZSkKLSAgICAgICAgICAgIGFzcGVjdFJhdGlv ID0gc2Vjb25kUmFkaXVzIC8gcmVzb2x2ZVJhZGl1cyhtX2VuZFZlcnRpY2FsU2l6ZS5nZXQoKSwg Y29udmVyc2lvbkRhdGEsICZoZWlnaHQpOworICAgICAgICAgICAgYXNwZWN0UmF0aW8gPSBzZWNv bmRSYWRpdXMgLyByZXNvbHZlUmFkaXVzKCptX2VuZFZlcnRpY2FsU2l6ZSwgY29udmVyc2lvbkRh dGEsICZoZWlnaHQpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBhc3BlY3RSYXRpbyA9IDE7 CiAgICAgfSBlbHNlIHsKQEAgLTExMTgsNyArMTExOCw3IEBAIFBhc3NSZWZQdHI8R3JhZGllbnQ+ IENTU1JhZGlhbEdyYWRpZW50VmFsdWU6OmNyZWF0ZUdyYWRpZW50KFJlbmRlckVsZW1lbnQqIHJl bmRlCiAgICAgfQogCiAgICAgLy8gTm93IGFkZCB0aGUgc3RvcHMuCi0gICAgYWRkU3RvcHMoZ3Jh ZGllbnQuZ2V0KCksICZyZW5kZXJlci0+dmlldygpLCBjb252ZXJzaW9uRGF0YSwgbWF4RXh0ZW50 KTsKKyAgICBhZGRTdG9wcygqZ3JhZGllbnQsIHJlbmRlcmVyLnZpZXcoKSwgY29udmVyc2lvbkRh dGEsIG1heEV4dGVudCk7CiAKICAgICByZXR1cm4gZ3JhZGllbnQucmVsZWFzZSgpOwogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0dyYWRpZW50VmFsdWUuaCBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NHcmFkaWVudFZhbHVlLmgKaW5kZXggNGU1YmFjMDJjOTdmNzIxM2ViZTYz OGZiNjI0NmI5OGM1MmE2MjA1Yi4uZjQ2NWE1NDBlODIwZmZiY2I4MTFkMzEwZDkwNWJlZjNmNGQ0 YTVmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0dyYWRpZW50VmFsdWUuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTR3JhZGllbnRWYWx1ZS5oCkBAIC0xMTAsNyArMTEw LDcgQEAgcHJvdGVjdGVkOgogICAgIHsKICAgICB9CiAKLSAgICB2b2lkIGFkZFN0b3BzKEdyYWRp ZW50KiwgUmVuZGVyVmlldyosIGNvbnN0IENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmLCBmbG9h dCBtYXhMZW5ndGhGb3JSZXBlYXQgPSAwKTsKKyAgICB2b2lkIGFkZFN0b3BzKEdyYWRpZW50Jiwg UmVuZGVyVmlldyYsIGNvbnN0IENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmLCBmbG9hdCBtYXhM ZW5ndGhGb3JSZXBlYXQgPSAwKTsKIAogICAgIC8vIFJlc29sdmUgcG9pbnRzL3JhZGlpIHRvIGZy b250IGVuZCB2YWx1ZXMuCiAgICAgRmxvYXRQb2ludCBjb21wdXRlRW5kUG9pbnQoQ1NTUHJpbWl0 aXZlVmFsdWUqLCBDU1NQcmltaXRpdmVWYWx1ZSosIGNvbnN0IENTU1RvTGVuZ3RoQ29udmVyc2lv bkRhdGEmLCBjb25zdCBGbG9hdFNpemUmKTsKQEAgLTE0Niw3ICsxNDYsNyBAQCBwdWJsaWM6CiAg ICAgU3RyaW5nIGN1c3RvbUNTU1RleHQoKSBjb25zdDsKIAogICAgIC8vIENyZWF0ZSB0aGUgZ3Jh ZGllbnQgZm9yIGEgZ2l2ZW4gc2l6ZS4KLSAgICBQYXNzUmVmUHRyPEdyYWRpZW50PiBjcmVhdGVH cmFkaWVudChSZW5kZXJFbGVtZW50KiwgY29uc3QgRmxvYXRTaXplJik7CisgICAgUGFzc1JlZlB0 cjxHcmFkaWVudD4gY3JlYXRlR3JhZGllbnQoUmVuZGVyRWxlbWVudCYsIGNvbnN0IEZsb2F0U2l6 ZSYpOwogCiAgICAgUGFzc1JlZjxDU1NMaW5lYXJHcmFkaWVudFZhbHVlPiBjbG9uZSgpIGNvbnN0 CiAgICAgewpAQCAtMTk2LDcgKzE5Niw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEVuZFZlcnRp Y2FsU2l6ZShQYXNzUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiB2YWwpIHsgbV9lbmRWZXJ0aWNh bFNpemUgPSB2YWw7IH0KIAogICAgIC8vIENyZWF0ZSB0aGUgZ3JhZGllbnQgZm9yIGEgZ2l2ZW4g c2l6ZS4KLSAgICBQYXNzUmVmUHRyPEdyYWRpZW50PiBjcmVhdGVHcmFkaWVudChSZW5kZXJFbGVt ZW50KiwgY29uc3QgRmxvYXRTaXplJik7CisgICAgUGFzc1JlZlB0cjxHcmFkaWVudD4gY3JlYXRl R3JhZGllbnQoUmVuZGVyRWxlbWVudCYsIGNvbnN0IEZsb2F0U2l6ZSYpOwogCiAgICAgYm9vbCBl cXVhbHMoY29uc3QgQ1NTUmFkaWFsR3JhZGllbnRWYWx1ZSYpIGNvbnN0OwogCkBAIC0yMTksNyAr MjE5LDcgQEAgcHJpdmF0ZToKIAogCiAgICAgLy8gUmVzb2x2ZSBwb2ludHMvcmFkaWkgdG8gZnJv bnQgZW5kIHZhbHVlcy4KLSAgICBmbG9hdCByZXNvbHZlUmFkaXVzKENTU1ByaW1pdGl2ZVZhbHVl KiwgY29uc3QgQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YSYsIGZsb2F0KiB3aWR0aE9ySGVpZ2h0 ID0gMCk7CisgICAgZmxvYXQgcmVzb2x2ZVJhZGl1cyhDU1NQcmltaXRpdmVWYWx1ZSYsIGNvbnN0 IENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmLCBmbG9hdCogd2lkdGhPckhlaWdodCA9IDApOwog CiAgICAgLy8gVGhlc2UgbWF5IGJlIG51bGwgZm9yIG5vbi1kZXByZWNhdGVkIGdyYWRpZW50cy4K ICAgICBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IG1fZmlyc3RSYWRpdXM7Cg==