114216 2013-04-08 14:09:31 -0700 [BlackBerry] Clean up render theme code. 2013-04-08 15:44:42 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 tijiang webkit-unassigned commit-queue mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 871161 0 tijiang 2013-04-08 14:09:31 -0700 Using GL paint method, clean up old code and parameters. 871183 1 196958 tijiang 2013-04-08 14:45:38 -0700 Created attachment 196958 Patch 871196 2 196958 rwlbuis 2013-04-08 14:58:27 -0700 Comment on attachment 196958 Patch LGTM. 871238 3 196958 commit-queue 2013-04-08 15:44:40 -0700 Comment on attachment 196958 Patch Clearing flags on attachment: 196958 Committed r147958: <http://trac.webkit.org/changeset/147958> 871239 4 commit-queue 2013-04-08 15:44:42 -0700 All reviewed patches have been landed. Closing bug. 196958 2013-04-08 14:45:38 -0700 2013-04-08 15:44:40 -0700 Patch bug-114216-20130408174521.patch text/plain 10233 tijiang U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3OTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFmYzBlOWUzNjRhY2Jh YmZhNGVjYmEwZDI0NmRlOWIzNGVhN2VlMS4uNzg1OGY4NmFlNzIzNTkyYTZjMDlmMGE2N2RkMzY1 MzVlZDcwMzhmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA0LTA4ICBUaWFu Y2hlbmcgSmlhbmcgIDx0aWppYW5nQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIENs ZWFuIHVwIHJlbmRlciB0aGVtZSBjb2RlLiAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExNDIxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEJsYWNrQmVycnkgUFIgMzIzMDYyCisKKyAgICAgICAgQ2xlYW4g dXAgcmVkdW5kYW50IGNvZGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRl clRoZW1lQmxhY2tCZXJyeS5jcHA6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRTbGlkZXJUcmFjayk6CisgICAgICAgICog cGxhdGZvcm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVtZUJsYWNrQmVycnkuaDoKKyAgICAgICAgKFJl bmRlclRoZW1lQmxhY2tCZXJyeSk6CisKIDIwMTMtMDQtMDggIEJldGggRGFraW4gIDxiZGFraW5A YXBwbGUuY29tPgogCiAgICAgICAgIENyYXNoIGluIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjptYWlu VGhyZWFkU2Nyb2xsaW5nUmVhc29ucygpIHdoZW4gZ29pbmcgYmFjawpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVtZUJsYWNrQmVycnkuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVtZUJsYWNrQmVy cnkuY3BwCmluZGV4IGVjNjM5YjE0YzE3Y2U3MjllYmM4YjEyOWFmMmRkNGEyMjdhZDkyMTguLmJi OTQ1NGRmZWI0ODQwOTA1ZWU4MDgxNjE3ZTMwNzk3NWRiMTA1NTcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvUmVuZGVyVGhlbWVCbGFja0JlcnJ5LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tC ZXJyeS5jcHAKQEAgLTQyLDEwICs0Miw2IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIC8vIFNp emVzICh1bml0IHB4KQotY29uc3QgdW5zaWduZWQgc21hbGxSYWRpdXMgPSAxOwotY29uc3QgdW5z aWduZWQgbGFyZ2VSYWRpdXMgPSAzOwotY29uc3QgdW5zaWduZWQgbGluZVdpZHRoID0gMTsKLWNv bnN0IGZsb2F0IG1hcmdpblNpemUgPSA0OwogY29uc3QgZmxvYXQgbWVkaWFDb250cm9sc0hlaWdo dCA9IDQ0OwogY29uc3QgZmxvYXQgbWVkaWFCYWNrQnV0dG9uSGVpZ2h0ID0gMzM7CiAvLyBTY2Fs ZSBleGl0LWZ1bGxzY3JlZW4gYnV0dG9uIHNpemUuCkBAIC01OSwxOCArNTUsNiBAQCBjb25zdCBm bG9hdCBtZWRpYVNsaWRlclRodW1iUmFkaXVzID0gMzsKIGNvbnN0IGZsb2F0IHNsaWRlclRodW1i V2lkdGggPSAxNTsKIGNvbnN0IGZsb2F0IHNsaWRlclRodW1iSGVpZ2h0ID0gMjU7CiAKLS8vIENo ZWNrYm94IGNoZWNrIHNjYWxlcnMKLWNvbnN0IGZsb2F0IGNoZWNrYm94TGVmdFggPSA3IC8gNDAu MDsKLWNvbnN0IGZsb2F0IGNoZWNrYm94TGVmdFkgPSAxIC8gMi4wOwotY29uc3QgZmxvYXQgY2hl Y2tib3hNaWRkbGVYID0gMTkgLyA1MC4wOwotY29uc3QgZmxvYXQgY2hlY2tib3hNaWRkbGVZID0g NyAvIDI1LjA7Ci1jb25zdCBmbG9hdCBjaGVja2JveFJpZ2h0WCA9IDMzIC8gNDAuMDsKLWNvbnN0 IGZsb2F0IGNoZWNrYm94UmlnaHRZID0gMSAvIDUuMDsKLWNvbnN0IGZsb2F0IGNoZWNrYm94U3Ry b2tlVGhpY2tuZXNzID0gNi41OwotCi0vLyBSYWRpbyBidXR0b24gc2NhbGVyCi1jb25zdCBmbG9h dCByYWRpb0J1dHRvbkNoZWNrU3RhdGVTY2FsZXIgPSA3IC8gMzAuMDsKLQogLy8gTXVsdGlwbGll cnMKIGNvbnN0IHVuc2lnbmVkIHBhZGRpbmdEaXZpc29yID0gMTA7CiBjb25zdCB1bnNpZ25lZCBm dWxsU2NyZWVuRW5sYXJnZW1lbnRGYWN0b3IgPSAyOwpAQCAtOTEsNTMgKzc1LDggQEAgY29uc3Qg ZmxvYXQgd2lkdGhSYXRpbyA9IDM7CiBjb25zdCBmbG9hdCBoZWlnaHRSYXRpbyA9IDAuMjM7CiAK IC8vIENvbG9ycwotY29uc3QgUkdCQTMyIGNhcmV0Qm90dG9tID0gMHhmZjIxNjNiZjsKLWNvbnN0 IFJHQkEzMiBjYXJldFRvcCA9IDB4ZmY2OWE1ZmE7Ci0KLWNvbnN0IFJHQkEzMiByZWd1bGFyQm90 dG9tID0gMHhmZmRjZGVlNDsKLWNvbnN0IFJHQkEzMiByZWd1bGFyVG9wID0gMHhmZmY3ZjJlZTsK LWNvbnN0IFJHQkEzMiBob3ZlckJvdHRvbSA9IDB4ZmZiNWQzZmM7Ci1jb25zdCBSR0JBMzIgaG92 ZXJUb3AgPSAweGZmY2NlYWZmOwotY29uc3QgUkdCQTMyIGRlcHJlc3NlZEJvdHRvbSA9IDB4ZmYz Mzg4ZmY7Ci1jb25zdCBSR0JBMzIgZGVwcmVzc2VkVG9wID0gMHhmZjY2YTBmMjsKLWNvbnN0IFJH QkEzMiBkaXNhYmxlZEJvdHRvbSA9IDB4ZmZlN2U3ZTc7Ci1jb25zdCBSR0JBMzIgZGlzYWJsZWRU b3AgPSAweGZmZWZlZmVmOwotCi1jb25zdCBSR0JBMzIgcmVndWxhckJvdHRvbU91dGxpbmUgPSAw eGZmNmU3MDczOwotY29uc3QgUkdCQTMyIHJlZ3VsYXJUb3BPdXRsaW5lID0gMHhmZmI5YjhiODsK LWNvbnN0IFJHQkEzMiBob3ZlckJvdHRvbU91dGxpbmUgPSAweGZmMjE2M2JmOwotY29uc3QgUkdC QTMyIGhvdmVyVG9wT3V0bGluZSA9IDB4ZmY2OWJlZmE7Ci1jb25zdCBSR0JBMzIgZGVwcmVzc2Vk Qm90dG9tT3V0bGluZSA9IDB4ZmYwYzNkODE7Ci1jb25zdCBSR0JBMzIgZGVwcmVzc2VkVG9wT3V0 bGluZSA9IDB4ZmYxZDRkNzA7Ci1jb25zdCBSR0JBMzIgZGlzYWJsZWRPdXRsaW5lID0gMHhmZmQ1 ZDlkZTsKLQotY29uc3QgUkdCQTMyIHByb2dyZXNzUmVndWxhckJvdHRvbSA9IGNhcmV0VG9wOwot Y29uc3QgUkdCQTMyIHByb2dyZXNzUmVndWxhclRvcCA9IGNhcmV0Qm90dG9tOwotCi1jb25zdCBS R0JBMzIgcmFuZ2VTbGlkZXJSZWd1bGFyQm90dG9tID0gMHhmZmY2ZjJlZTsKLWNvbnN0IFJHQkEz MiByYW5nZVNsaWRlclJlZ3VsYXJUb3AgPSAweGZmZGVlMGU1OwotY29uc3QgUkdCQTMyIHJhbmdl U2xpZGVyUm9sbEJvdHRvbSA9IDB4ZmZjOWU4ZmU7Ci1jb25zdCBSR0JBMzIgcmFuZ2VTbGlkZXJS b2xsVG9wID0gMHhmZmI1ZDNmYzsKLQotY29uc3QgUkdCQTMyIHJhbmdlU2xpZGVyUmVndWxhckJv dHRvbU91dGxpbmUgPSAweGZmYjliYWJkOwotY29uc3QgUkdCQTMyIHJhbmdlU2xpZGVyUmVndWxh clRvcE91dGxpbmUgPSAweGZmYjdiN2I3OwotY29uc3QgUkdCQTMyIHJhbmdlU2xpZGVyUm9sbEJv dHRvbU91dGxpbmUgPSAweGZmNjdhYmUwOwotY29uc3QgUkdCQTMyIHJhbmdlU2xpZGVyUm9sbFRv cE91dGxpbmUgPSAweGZmNjlhZGY5OwotCi1jb25zdCBSR0JBMzIgZHJhZ1JlZ3VsYXJMaWdodCA9 IDB4ZmZmZGZkZmQ7Ci1jb25zdCBSR0JBMzIgZHJhZ1JlZ3VsYXJEYXJrID0gMHhmZmJhYmFiYTsK LWNvbnN0IFJHQkEzMiBkcmFnUm9sbExpZ2h0ID0gMHhmZmYyZjJmMjsKLWNvbnN0IFJHQkEzMiBk cmFnUm9sbERhcmsgPSAweGZmNjlhOGZmOwotCi1jb25zdCBSR0JBMzIgYmxhY2tQZW4gPSBDb2xv cjo6YmxhY2s7CiBjb25zdCBSR0JBMzIgZm9jdXNSaW5nUGVuID0gMHhmZmEzYzhmZTsKIAotY29u c3QgUkdCQTMyIG1lZGlhU2xpZGVyVHJhY2tPdXRsaW5lID0gMHhmZjg0ODU4NzsKLWNvbnN0IFJH QkEzMiBtZWRpYVNsaWRlclRyYWNrUGxheWVkID0gMHhmZjJiOGZmZjsKLWNvbnN0IFJHQkEzMiBt ZWRpYVNsaWRlclRyYWNrQnVmZmVyZWQgPSAweGZmYmJiZGJmOwotCi1jb25zdCBSR0JBMzIgc2Vs ZWN0aW9uID0gMHhmZjJiOGZmZjsKLQogZmxvYXQgUmVuZGVyVGhlbWVCbGFja0JlcnJ5OjpkZWZh dWx0Rm9udFNpemUgPSAxNjsKIAogY29uc3QgU3RyaW5nJiBSZW5kZXJUaGVtZUJsYWNrQmVycnk6 OmRlZmF1bHRHVUlGb250KCkKQEAgLTE0NiwxNCArODUsNiBAQCBjb25zdCBTdHJpbmcmIFJlbmRl clRoZW1lQmxhY2tCZXJyeTo6ZGVmYXVsdEdVSUZvbnQoKQogICAgIHJldHVybiBmb250RmFjZTsK IH0KIAotc3RhdGljIFBhc3NSZWZQdHI8R3JhZGllbnQ+IGNyZWF0ZUxpbmVhckdyYWRpZW50KFJH QkEzMiB0b3AsIFJHQkEzMiBib3R0b20sIGNvbnN0IEludFBvaW50JiBhLCBjb25zdCBJbnRQb2lu dCYgYikKLXsKLSAgICBSZWZQdHI8R3JhZGllbnQ+IGdyYWRpZW50ID0gR3JhZGllbnQ6OmNyZWF0 ZShhLCBiKTsKLSAgICBncmFkaWVudC0+YWRkQ29sb3JTdG9wKDAuMCwgQ29sb3IodG9wKSk7Ci0g ICAgZ3JhZGllbnQtPmFkZENvbG9yU3RvcCgxLjAsIENvbG9yKGJvdHRvbSkpOwotICAgIHJldHVy biBncmFkaWVudC5yZWxlYXNlKCk7Ci19Ci0KIHN0YXRpYyBSZW5kZXJTbGlkZXIqIGRldGVybWlu ZVJlbmRlclNsaWRlcihSZW5kZXJPYmplY3QqIG9iamVjdCkKIHsKICAgICBBU1NFUlQob2JqZWN0 LT5pc1NsaWRlclRodW1iKCkpOwpAQCAtNzMxLDM2ICs2NjIsOCBAQCBib29sIFJlbmRlclRoZW1l QmxhY2tCZXJyeTo6cGFpbnRTbGlkZXJUcmFjayhSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3Qg UGFpbnRJbgogICAgICAgICByZWN0Mi5zZXRYKHJlY3QueCgpICsgKHJlY3Qud2lkdGgoKSAtIFNs aWRlclRyYWNrSGVpZ2h0KSAvIDIpOwogICAgICAgICByZWN0Mi5zZXRZKHJlY3QueSgpKTsKICAg ICB9Ci0gICAgcmV0dXJuIHBhaW50U2xpZGVyVHJhY2tSZWN0KG9iamVjdCwgaW5mbywgcmVjdDIp OwotfQotCi1ib29sIFJlbmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRTbGlkZXJUcmFja1JlY3Qo UmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0IFBhaW50SW5mbyYgaW5mbywgY29uc3QgSW50UmVj dCYgcmVjdCkKLXsKLSAgICByZXR1cm4gcGFpbnRTbGlkZXJUcmFja1JlY3Qob2JqZWN0LCBpbmZv LCByZWN0LCByYW5nZVNsaWRlclJlZ3VsYXJUb3BPdXRsaW5lLCByYW5nZVNsaWRlclJlZ3VsYXJC b3R0b21PdXRsaW5lLCByYW5nZVNsaWRlclJlZ3VsYXJUb3AsIHJhbmdlU2xpZGVyUmVndWxhckJv dHRvbSk7Ci19Ci0KLWJvb2wgUmVuZGVyVGhlbWVCbGFja0JlcnJ5OjpwYWludFNsaWRlclRyYWNr UmVjdChSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgUGFpbnRJbmZvJiBpbmZvLCBjb25zdCBJ bnRSZWN0JiByZWN0LCBSR0JBMzIgc3Ryb2tlQ29sb3JTdGFydCwgUkdCQTMyIHN0cm9rZUNvbG9y RW5kLCBSR0JBMzIgZmlsbENvbG9yU3RhcnQsIFJHQkEzMiBmaWxsQ29sb3JFbmQpCi17Ci0gICAg RmxvYXRTaXplIHNtYWxsQ29ybmVyKG1lZGlhU2xpZGVyVHJhY2tSYWRpdXMsIG1lZGlhU2xpZGVy VHJhY2tSYWRpdXMpOwotCi0gICAgaW5mby5jb250ZXh0LT5zYXZlKCk7Ci0gICAgaW5mby5jb250 ZXh0LT5zZXRTdHJva2VTdHlsZShTb2xpZFN0cm9rZSk7Ci0gICAgaW5mby5jb250ZXh0LT5zZXRT dHJva2VUaGlja25lc3MobGluZVdpZHRoKTsKLQotI2lmIFVTRShTS0lBKQotICAgIGluZm8uY29u dGV4dC0+c2V0U3Ryb2tlR3JhZGllbnQoY3JlYXRlTGluZWFyR3JhZGllbnQoc3Ryb2tlQ29sb3JT dGFydCwgc3Ryb2tlQ29sb3JFbmQsIHJlY3QubWF4WE1pbllDb3JuZXIoKSwgcmVjdC5tYXhYTWF4 WUNvcm5lcigpKSk7Ci0gICAgaW5mby5jb250ZXh0LT5zZXRGaWxsR3JhZGllbnQoY3JlYXRlTGlu ZWFyR3JhZGllbnQoZmlsbENvbG9yU3RhcnQsIGZpbGxDb2xvckVuZCwgcmVjdC5tYXhYTWluWUNv cm5lcigpLCByZWN0Lm1heFhNYXhZQ29ybmVyKCkpKTsKLSNlbHNlCi0gICAgaW5mby5jb250ZXh0 LT5zZXRTdHJva2VDb2xvcihzdHJva2VDb2xvclN0YXJ0LCBDb2xvclNwYWNlRGV2aWNlUkdCKTsK LSAgICBpbmZvLmNvbnRleHQtPnNldEZpbGxDb2xvcihmaWxsQ29sb3JTdGFydCwgQ29sb3JTcGFj ZURldmljZVJHQik7Ci0jZW5kaWYKLQotICAgIFBhdGggcGF0aDsKLSAgICBwYXRoLmFkZFJvdW5k ZWRSZWN0KHJlY3QsIHNtYWxsQ29ybmVyKTsKLSAgICBpbmZvLmNvbnRleHQtPmZpbGxQYXRoKHBh dGgpOwotCi0gICAgaW5mby5jb250ZXh0LT5yZXN0b3JlKCk7Ci0gICAgcmV0dXJuIGZhbHNlOwor ICAgIHN0YXRpYyBJbWFnZSogc2xpZGVyVHJhY2sgPSBJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3Vy Y2UoImNvcmVfc2xpZGVyX2JnIikubGVha1JlZigpOworICAgIHJldHVybiBwYWludFNsaWRlclRy YWNrUmVjdChvYmplY3QsIGluZm8sIHJlY3QyLCBzbGlkZXJUcmFjayk7CiB9CiAKIGJvb2wgUmVu ZGVyVGhlbWVCbGFja0JlcnJ5OjpwYWludFNsaWRlclRyYWNrUmVjdChSZW5kZXJPYmplY3QqIG9i amVjdCwgY29uc3QgUGFpbnRJbmZvJiBpbmZvLCBjb25zdCBJbnRSZWN0JiByZWN0LCBJbWFnZSog aW5hY3RpdmUpCkBAIC0xMjM1LDUyICsxMTM4LDYgQEAgZG91YmxlIFJlbmRlclRoZW1lQmxhY2tC ZXJyeTo6YW5pbWF0aW9uRHVyYXRpb25Gb3JQcm9ncmVzc0JhcihSZW5kZXJQcm9ncmVzcyogcmUK ICAgICByZXR1cm4gcmVuZGVyUHJvZ3Jlc3MtPmlzRGV0ZXJtaW5hdGUoKSA/IDAuMCA6IDIuMDsK IH0KIAotYm9vbCBSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBhaW50UHJvZ3Jlc3NCYXIoUmVuZGVy T2JqZWN0KiBvYmplY3QsIGNvbnN0IFBhaW50SW5mbyYgaW5mbywgY29uc3QgSW50UmVjdCYgcmVj dCkKLXsKLSAgICBpZiAoIW9iamVjdC0+aXNQcm9ncmVzcygpKQotICAgICAgICByZXR1cm4gdHJ1 ZTsKLQotICAgIFJlbmRlclByb2dyZXNzKiByZW5kZXJQcm9ncmVzcyA9IHRvUmVuZGVyUHJvZ3Jl c3Mob2JqZWN0KTsKLQotICAgIEZsb2F0U2l6ZSBzbWFsbENvcm5lcihzbWFsbFJhZGl1cywgc21h bGxSYWRpdXMpOwotCi0gICAgaW5mby5jb250ZXh0LT5zYXZlKCk7Ci0gICAgaW5mby5jb250ZXh0 LT5zZXRTdHJva2VTdHlsZShTb2xpZFN0cm9rZSk7Ci0gICAgaW5mby5jb250ZXh0LT5zZXRTdHJv a2VUaGlja25lc3MobGluZVdpZHRoKTsKLQotICAgIGluZm8uY29udGV4dC0+c2V0U3Ryb2tlR3Jh ZGllbnQoY3JlYXRlTGluZWFyR3JhZGllbnQocmFuZ2VTbGlkZXJSZWd1bGFyVG9wT3V0bGluZSwg cmFuZ2VTbGlkZXJSZWd1bGFyQm90dG9tT3V0bGluZSwgcmVjdC5tYXhYTWluWUNvcm5lcigpLCBy ZWN0Lm1heFhNYXhZQ29ybmVyKCkpKTsKLSAgICBpbmZvLmNvbnRleHQtPnNldEZpbGxHcmFkaWVu dChjcmVhdGVMaW5lYXJHcmFkaWVudChyYW5nZVNsaWRlclJlZ3VsYXJUb3AsIHJhbmdlU2xpZGVy UmVndWxhckJvdHRvbSwgcmVjdC5tYXhYTWluWUNvcm5lcigpLCByZWN0Lm1heFhNYXhZQ29ybmVy KCkpKTsKLQotICAgIFBhdGggcGF0aDsKLSAgICBwYXRoLmFkZFJvdW5kZWRSZWN0KHJlY3QsIHNt YWxsQ29ybmVyKTsKLSAgICBpbmZvLmNvbnRleHQtPmZpbGxQYXRoKHBhdGgpOwotCi0gICAgSW50 UmVjdCByZWN0MiA9IHJlY3Q7Ci0gICAgcmVjdDIuc2V0WChyZWN0Mi54KCkgKyAxKTsKLSAgICBy ZWN0Mi5zZXRIZWlnaHQocmVjdDIuaGVpZ2h0KCkgLSAyKTsKLSAgICByZWN0Mi5zZXRZKHJlY3Qy LnkoKSArIDEpOwotICAgIGluZm8uY29udGV4dC0+c2V0U3Ryb2tlU3R5bGUoTm9TdHJva2UpOwot ICAgIGluZm8uY29udGV4dC0+c2V0U3Ryb2tlVGhpY2tuZXNzKDApOwotICAgIGlmIChyZW5kZXJQ cm9ncmVzcy0+aXNEZXRlcm1pbmF0ZSgpKSB7Ci0gICAgICAgIHJlY3QyLnNldFdpZHRoKHJlY3Qy LndpZHRoKCkgKiByZW5kZXJQcm9ncmVzcy0+cG9zaXRpb24oKSAtIDIpOwotICAgICAgICBpbmZv LmNvbnRleHQtPnNldEZpbGxHcmFkaWVudChjcmVhdGVMaW5lYXJHcmFkaWVudChwcm9ncmVzc1Jl Z3VsYXJUb3AsIHByb2dyZXNzUmVndWxhckJvdHRvbSwgcmVjdDIubWF4WE1pbllDb3JuZXIoKSwg cmVjdDIubWF4WE1heFlDb3JuZXIoKSkpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIC8vIEFuaW1h dGluZwotICAgICAgICByZWN0Mi5zZXRXaWR0aChyZWN0Mi53aWR0aCgpIC0gMik7Ci0gICAgICAg IFJlZlB0cjxHcmFkaWVudD4gZ3JhZGllbnQgPSBHcmFkaWVudDo6Y3JlYXRlKHJlY3QyLm1pblhN YXhZQ29ybmVyKCksIHJlY3QyLm1heFhNYXhZQ29ybmVyKCkpOwotICAgICAgICBncmFkaWVudC0+ YWRkQ29sb3JTdG9wKDAuMCwgQ29sb3IocHJvZ3Jlc3NSZWd1bGFyQm90dG9tKSk7Ci0gICAgICAg IGdyYWRpZW50LT5hZGRDb2xvclN0b3AocmVuZGVyUHJvZ3Jlc3MtPmFuaW1hdGlvblByb2dyZXNz KCksIENvbG9yKHByb2dyZXNzUmVndWxhclRvcCkpOwotICAgICAgICBncmFkaWVudC0+YWRkQ29s b3JTdG9wKDEuMCwgQ29sb3IocHJvZ3Jlc3NSZWd1bGFyQm90dG9tKSk7Ci0gICAgICAgIGluZm8u Y29udGV4dC0+c2V0RmlsbEdyYWRpZW50KGdyYWRpZW50KTsKLSAgICB9Ci0gICAgUGF0aCBwYXRo MjsKLSAgICBwYXRoMi5hZGRSb3VuZGVkUmVjdChyZWN0Miwgc21hbGxDb3JuZXIpOwotICAgIGlu Zm8uY29udGV4dC0+ZmlsbFBhdGgocGF0aDIpOwotCi0gICAgaW5mby5jb250ZXh0LT5yZXN0b3Jl KCk7Ci0gICAgcmV0dXJuIGZhbHNlOwotfQotCiBDb2xvciBSZW5kZXJUaGVtZUJsYWNrQmVycnk6 OnBsYXRmb3JtQWN0aXZlVGV4dFNlYXJjaEhpZ2hsaWdodENvbG9yKCkgY29uc3QKIHsKICAgICBy ZXR1cm4gQ29sb3IoMjU1LCAxNTAsIDUwKTsgLy8gT3JhbmdlLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVtZUJsYWNrQmVycnkuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvUmVuZGVyVGhlbWVCbGFja0JlcnJ5LmgK aW5kZXggYmRhNjIwODRlNjdjNzEwYWJmNWY0NTlhZjQ5YjQ1MTYwZWFlMjM2ZC4uOTFlZDI3MmE0 NzAxNGE4MTRkYmJjNDFjZmVlZDQyNTcyNTM0YWM4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVtZUJsYWNrQmVycnkuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tCZXJyeS5oCkBA IC04Niw3ICs4Niw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgcGFpbnRNZWRpYVBsYXlC dXR0b24oUmVuZGVyT2JqZWN0KiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOwog ICAgIHZpcnR1YWwgYm9vbCBwYWludE1lZGlhTXV0ZUJ1dHRvbihSZW5kZXJPYmplY3QqLCBjb25z dCBQYWludEluZm8mLCBjb25zdCBJbnRSZWN0Jik7CiAgICAgdmlydHVhbCBib29sIHBhaW50TWVk aWFSZXdpbmRCdXR0b24oUmVuZGVyT2JqZWN0KiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50 UmVjdCYpOwotICAgIHZpcnR1YWwgYm9vbCBwYWludFByb2dyZXNzQmFyKFJlbmRlck9iamVjdCos IGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IEludFJlY3QmKTsKICAgICB2aXJ0dWFsIGRvdWJsZSBh bmltYXRpb25SZXBlYXRJbnRlcnZhbEZvclByb2dyZXNzQmFyKFJlbmRlclByb2dyZXNzKikgY29u c3Q7CiAgICAgdmlydHVhbCBkb3VibGUgYW5pbWF0aW9uRHVyYXRpb25Gb3JQcm9ncmVzc0JhcihS ZW5kZXJQcm9ncmVzcyopIGNvbnN0OwogCkBAIC0xMTEsMTAgKzExMCw2IEBAIHByaXZhdGU6CiAK ICAgICBib29sIHBhaW50VGV4dEZpZWxkT3JUZXh0QXJlYU9yU2VhcmNoRmllbGQoUmVuZGVyT2Jq ZWN0KiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOwogCi0gICAgYm9vbCBwYWlu dFNsaWRlclRyYWNrUmVjdChSZW5kZXJPYmplY3QqLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBJ bnRSZWN0Jik7Ci0KLSAgICBib29sIHBhaW50U2xpZGVyVHJhY2tSZWN0KFJlbmRlck9iamVjdCos IGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IEludFJlY3QmLCBSR0JBMzIsIFJHQkEzMiwgUkdCQTMy LCBSR0JBMzIpOwotCiAgICAgYm9vbCBwYWludFNsaWRlclRyYWNrUmVjdChSZW5kZXJPYmplY3Qq LCBjb25zdCBQYWludEluZm8mLCBjb25zdCBJbnRSZWN0JiwgSW1hZ2UqKTsKIAogICAgIEludFJl Y3QgY29udmVydFRvUGFpbnRpbmdSZWN0KFJlbmRlck9iamVjdCogaW5wdXRSZW5kZXJlciwgY29u c3QgUmVuZGVyT2JqZWN0KiBwYXJ0UmVuZGVyZXIsIExheW91dFJlY3QgcGFydFJlY3QsIGNvbnN0 IEludFJlY3QmIGxvY2FsT2Zmc2V0KSBjb25zdDsK