64611 2011-07-15 11:49:25 -0700 Find indicator should take scale factor into account 2011-07-16 21:31:41 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andersca andersca darin dbates oldest_to_newest 437866 0 andersca 2011-07-15 11:49:25 -0700 Find indicator should take scale factor into account 437867 1 101016 andersca 2011-07-15 11:51:49 -0700 Created attachment 101016 Patch 437888 2 andersca 2011-07-15 12:10:59 -0700 Committed r91085: <http://trac.webkit.org/changeset/91085> 438061 3 darin 2011-07-15 16:55:11 -0700 <rdar://problem/9709365> 438244 4 dbates 2011-07-16 21:31:41 -0700 For reference, this change broke the Qt Linux Release bot since it made use of the scale factor overloaded ShareableBitmap::paint() method (implemented for CG in <http://trac.webkit.org/changeset/90198>). Qt Linux Release bot stdio: <http://build.webkit.org/builders/Qt%20Linux%20Release/builds/35470/steps/compile-webkit/logs/stdio> I committed a stub implementation for the Qt WebKit2 port in <http://trac.webkit.org/changeset/91162>. See bug #64663 for more details. Other WebKit2 ports are most likely also affected by the lack of an implementation for the scale factor variant of ShareableBitmap::paint(). Will file bugs for these ports and land stub implementations for now. 101016 2011-07-15 11:51:49 -0700 2011-07-15 13:29:52 -0700 Patch bug-64611-20110715115150.patch text/plain 11317 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxMDgyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzcgQEAKKzIwMTEtMDctMTUgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBGaW5kIGluZGljYXRvciBz aG91bGQgdGFrZSBzY2FsZSBmYWN0b3IgaW50byBhY2NvdW50CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDYxMQorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vOTc2MTAyMD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9GaW5kSW5kaWNhdG9yLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Rmlu ZEluZGljYXRvcjo6Y3JlYXRlKToKKyAgICAgICAgKFdlYktpdDo6RmluZEluZGljYXRvcjo6Rmlu ZEluZGljYXRvcik6CisgICAgICAgIEtlZXAgdHJhY2sgb2YgdGhlIHNjYWxlIGZhY3RvciBvZiB0 aGUgZmluZCBpbmRpY2F0b3IgYml0bWFwLgorCisgICAgICAgIChXZWJLaXQ6OkZpbmRJbmRpY2F0 b3I6OmRyYXcpOgorICAgICAgICBQYXNzIHRoZSBzY2FsZSBmYWN0b3IgdG8gU2hhcmVhYmxlQml0 bWFwOjpkcmF3LgorCisgICAgICAgICogVUlQcm9jZXNzL0ZpbmRJbmRpY2F0b3IuaDoKKyAgICAg ICAgQWRkIHNjYWxlIGZhY3RvciBtZW1iZXIgdmFyaWFibGUuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzZXRG aW5kSW5kaWNhdG9yKToKKyAgICAgICAgVGhpcyBub3cgdGFrZXMgdGhlIGNvbnRlbnQgaW1hZ2Ug c2NhbGUgZmFjdG9yLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdl cy5pbjoKKyAgICAgICAgQWRkIHRoZSBzY2FsZSBmYWN0b3IuCisKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpGaW5kQ29u dHJvbGxlcjo6dXBkYXRlRmluZEluZGljYXRvcik6CisgICAgICAgIFNpemUgdGhlIGJhY2tpbmcg c3RvcmUgY29ycmVjdGx5LCBhbmQgYXBwbHkgdGhlIHNjYWxlIGZhY3RvciB0bworICAgICAgICB0 aGUgZ3JhcGhpY3MgY29udGV4dC4KKworICAgICAgICAoV2ViS2l0OjpGaW5kQ29udHJvbGxlcjo6 aGlkZUZpbmRJbmRpY2F0b3IpOgorICAgICAgICBQYXNzIHRoZSBzY2FsZSBmYWN0b3IgYWxvbmcu CisKIDIwMTEtMDctMTUgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgog CiAgICAgICAgIEJ1aWxkIGZpeGVzIGZvciBXZWJLaXQyLiBFbnN1cmUgdGhhdCBhbGwgZ2VuZXJh dGVkIHNvdXJjZXMgYXJlCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRmluZEluZGlj YXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0ZpbmRJbmRp Y2F0b3IuY3BwCShyZXZpc2lvbiA5MTA3NykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9G aW5kSW5kaWNhdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzcsMTkgKzc3LDIwIEBAIHN0YXRp YyBjb25zdCBpbnQgZ3JhZGllbnRMaWdodEFscGhhID0gMjUKIAogbmFtZXNwYWNlIFdlYktpdCB7 CiAKLVBhc3NSZWZQdHI8RmluZEluZGljYXRvcj4gRmluZEluZGljYXRvcjo6Y3JlYXRlKGNvbnN0 IEZsb2F0UmVjdCYgc2VsZWN0aW9uUmVjdEluV2luZG93Q29vcmRpbmF0ZXMsIGNvbnN0IFZlY3Rv cjxGbG9hdFJlY3Q+JiB0ZXh0UmVjdHNJblNlbGVjdGlvblJlY3RDb29yZGluYXRlcywgY29uc3Qg U2hhcmVhYmxlQml0bWFwOjpIYW5kbGUmIGNvbnRlbnRJbWFnZUhhbmRsZSkKK1Bhc3NSZWZQdHI8 RmluZEluZGljYXRvcj4gRmluZEluZGljYXRvcjo6Y3JlYXRlKGNvbnN0IEZsb2F0UmVjdCYgc2Vs ZWN0aW9uUmVjdEluV2luZG93Q29vcmRpbmF0ZXMsIGNvbnN0IFZlY3RvcjxGbG9hdFJlY3Q+JiB0 ZXh0UmVjdHNJblNlbGVjdGlvblJlY3RDb29yZGluYXRlcywgZmxvYXQgY29udGVudEltYWdlU2Nh bGVGYWN0b3IsIGNvbnN0IFNoYXJlYWJsZUJpdG1hcDo6SGFuZGxlJiBjb250ZW50SW1hZ2VIYW5k bGUpCiB7CiAgICAgUmVmUHRyPFNoYXJlYWJsZUJpdG1hcD4gY29udGVudEltYWdlID0gU2hhcmVh YmxlQml0bWFwOjpjcmVhdGUoY29udGVudEltYWdlSGFuZGxlKTsKICAgICBpZiAoIWNvbnRlbnRJ bWFnZSkKICAgICAgICAgcmV0dXJuIDA7Ci0gICAgQVNTRVJUKGNvbnRlbnRJbWFnZS0+c2l6ZSgp ID09IGVuY2xvc2luZ0ludFJlY3Qoc2VsZWN0aW9uUmVjdEluV2luZG93Q29vcmRpbmF0ZXMpLnNp emUoKSk7CisgICAgQVNTRVJUKGNvbnRlbnRJbWFnZVNjYWxlRmFjdG9yICE9IDEgfHwgY29udGVu dEltYWdlLT5zaXplKCkgPT0gZW5jbG9zaW5nSW50UmVjdChzZWxlY3Rpb25SZWN0SW5XaW5kb3dD b29yZGluYXRlcykuc2l6ZSgpKTsKIAotICAgIHJldHVybiBhZG9wdFJlZihuZXcgRmluZEluZGlj YXRvcihzZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRlcywgdGV4dFJlY3RzSW5TZWxlY3Rp b25SZWN0Q29vcmRpbmF0ZXMsIGNvbnRlbnRJbWFnZS5yZWxlYXNlKCkpKTsKKyAgICByZXR1cm4g YWRvcHRSZWYobmV3IEZpbmRJbmRpY2F0b3Ioc2VsZWN0aW9uUmVjdEluV2luZG93Q29vcmRpbmF0 ZXMsIHRleHRSZWN0c0luU2VsZWN0aW9uUmVjdENvb3JkaW5hdGVzLCBjb250ZW50SW1hZ2VTY2Fs ZUZhY3RvciwgY29udGVudEltYWdlLnJlbGVhc2UoKSkpOwogfQogCi1GaW5kSW5kaWNhdG9yOjpG aW5kSW5kaWNhdG9yKGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgc2VsZWN0aW9uUmVjdEluV2lu ZG93Q29vcmRpbmF0ZXMsIGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpGbG9hdFJlY3Q+JiB0ZXh0UmVj dHNJblNlbGVjdGlvblJlY3RDb29yZGluYXRlcywgUGFzc1JlZlB0cjxTaGFyZWFibGVCaXRtYXA+ IGNvbnRlbnRJbWFnZSkKK0ZpbmRJbmRpY2F0b3I6OkZpbmRJbmRpY2F0b3IoY29uc3QgV2ViQ29y ZTo6RmxvYXRSZWN0JiBzZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRlcywgY29uc3QgVmVj dG9yPFdlYkNvcmU6OkZsb2F0UmVjdD4mIHRleHRSZWN0c0luU2VsZWN0aW9uUmVjdENvb3JkaW5h dGVzLCBmbG9hdCBjb250ZW50SW1hZ2VTY2FsZUZhY3RvciwgUGFzc1JlZlB0cjxTaGFyZWFibGVC aXRtYXA+IGNvbnRlbnRJbWFnZSkKICAgICA6IG1fc2VsZWN0aW9uUmVjdEluV2luZG93Q29vcmRp bmF0ZXMoc2VsZWN0aW9uUmVjdEluV2luZG93Q29vcmRpbmF0ZXMpCiAgICAgLCBtX3RleHRSZWN0 c0luU2VsZWN0aW9uUmVjdENvb3JkaW5hdGVzKHRleHRSZWN0c0luU2VsZWN0aW9uUmVjdENvb3Jk aW5hdGVzKQorICAgICwgbV9jb250ZW50SW1hZ2VTY2FsZUZhY3Rvcihjb250ZW50SW1hZ2VTY2Fs ZUZhY3RvcikKICAgICAsIG1fY29udGVudEltYWdlKGNvbnRlbnRJbWFnZSkKIHsKIH0KQEAgLTE3 MSw3ICsxNzIsNyBAQCB2b2lkIEZpbmRJbmRpY2F0b3I6OmRyYXcoR3JhcGhpY3NDb250ZXh0CiAg ICAgICAgIHsKICAgICAgICAgICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZl cihncmFwaGljc0NvbnRleHQpOwogICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnRyYW5zbGF0 ZShGbG9hdFNpemUocm91bmRmKGxlZnRCb3JkZXJUaGlja25lc3MpLCByb3VuZGYodG9wQm9yZGVy VGhpY2tuZXNzKSkpOwotICAgICAgICAgICAgbV9jb250ZW50SW1hZ2UtPnBhaW50KGdyYXBoaWNz Q29udGV4dCwgSW50UG9pbnQoMCwgMCksIG1fY29udGVudEltYWdlLT5ib3VuZHMoKSk7CisgICAg ICAgICAgICBtX2NvbnRlbnRJbWFnZS0+cGFpbnQoZ3JhcGhpY3NDb250ZXh0LCBtX2NvbnRlbnRJ bWFnZVNjYWxlRmFjdG9yLCBJbnRQb2ludCgwLCAwKSwgbV9jb250ZW50SW1hZ2UtPmJvdW5kcygp KTsKICAgICAgICAgfQogICAgIH0KIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9G aW5kSW5kaWNhdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Zp bmRJbmRpY2F0b3IuaAkocmV2aXNpb24gOTEwNzcpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvRmluZEluZGljYXRvci5oCSh3b3JraW5nIGNvcHkpCkBAIC00MCw3ICs0MCw3IEBAIG5hbWVz cGFjZSBXZWJLaXQgewogCiBjbGFzcyBGaW5kSW5kaWNhdG9yIDogcHVibGljIFJlZkNvdW50ZWQ8 RmluZEluZGljYXRvcj4gewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPEZpbmRJbmRp Y2F0b3I+IGNyZWF0ZShjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHNlbGVjdGlvblJlY3RJbldp bmRvd0Nvb3JkaW5hdGVzLCBjb25zdCBWZWN0b3I8V2ViQ29yZTo6RmxvYXRSZWN0PiYgdGV4dFJl Y3RzSW5TZWxlY3Rpb25SZWN0Q29vcmRpbmF0ZXMsIGNvbnN0IFNoYXJlYWJsZUJpdG1hcDo6SGFu ZGxlJiBjb250ZW50SW1hZ2VIYW5kbGUpOworICAgIHN0YXRpYyBQYXNzUmVmUHRyPEZpbmRJbmRp Y2F0b3I+IGNyZWF0ZShjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHNlbGVjdGlvblJlY3RJbldp bmRvd0Nvb3JkaW5hdGVzLCBjb25zdCBWZWN0b3I8V2ViQ29yZTo6RmxvYXRSZWN0PiYgdGV4dFJl Y3RzSW5TZWxlY3Rpb25SZWN0Q29vcmRpbmF0ZXMsIGZsb2F0IGNvbnRlbnRJbWFnZVNjYWxlRmFj dG9yLCBjb25zdCBTaGFyZWFibGVCaXRtYXA6OkhhbmRsZSYgY29udGVudEltYWdlSGFuZGxlKTsK ICAgICB+RmluZEluZGljYXRvcigpOwogCiAgICAgV2ViQ29yZTo6RmxvYXRSZWN0IHNlbGVjdGlv blJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzKCkgY29uc3QgeyByZXR1cm4gbV9zZWxlY3Rpb25SZWN0 SW5XaW5kb3dDb29yZGluYXRlczsgfQpAQCAtNTMsMTAgKzUzLDExIEBAIHB1YmxpYzoKICAgICB2 b2lkIGRyYXcoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0JiwgY29uc3QgV2ViQ29yZTo6SW50UmVj dCYgZGlydHlSZWN0KTsKIAogcHJpdmF0ZToKLSAgICBGaW5kSW5kaWNhdG9yKGNvbnN0IFdlYkNv cmU6OkZsb2F0UmVjdCYgc2VsZWN0aW9uUmVjdCwgY29uc3QgVmVjdG9yPFdlYkNvcmU6OkZsb2F0 UmVjdD4mIHRleHRSZWN0cywgUGFzc1JlZlB0cjxTaGFyZWFibGVCaXRtYXA+IGNvbnRlbnRJbWFn ZSk7CisgICAgRmluZEluZGljYXRvcihjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHNlbGVjdGlv blJlY3QsIGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpGbG9hdFJlY3Q+JiB0ZXh0UmVjdHMsIGZsb2F0 IGNvbnRlbnRJbWFnZVNjYWxlRmFjdG9yLCBQYXNzUmVmUHRyPFNoYXJlYWJsZUJpdG1hcD4gY29u dGVudEltYWdlKTsKIAogICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBtX3NlbGVjdGlvblJlY3RJbldp bmRvd0Nvb3JkaW5hdGVzOwogICAgIFZlY3RvcjxXZWJDb3JlOjpGbG9hdFJlY3Q+IG1fdGV4dFJl Y3RzSW5TZWxlY3Rpb25SZWN0Q29vcmRpbmF0ZXM7CisgICAgZmxvYXQgbV9jb250ZW50SW1hZ2VT Y2FsZUZhY3RvcjsKICAgICBSZWZQdHI8U2hhcmVhYmxlQml0bWFwPiBtX2NvbnRlbnRJbWFnZTsK IH07CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShy ZXZpc2lvbiA5MTA3NykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzM1LDkgKzIzMzUsOSBAQCB2b2lkIFdlYlBhZ2VQcm94 eTo6ZGlkQ291bnRTdHJpbmdNYXRjaGVzCiAgICAgbV9maW5kQ2xpZW50LmRpZENvdW50U3RyaW5n TWF0Y2hlcyh0aGlzLCBzdHJpbmcsIG1hdGNoQ291bnQpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94 eTo6c2V0RmluZEluZGljYXRvcihjb25zdCBGbG9hdFJlY3QmIHNlbGVjdGlvblJlY3RJbldpbmRv d0Nvb3JkaW5hdGVzLCBjb25zdCBWZWN0b3I8RmxvYXRSZWN0PiYgdGV4dFJlY3RzSW5TZWxlY3Rp b25SZWN0Q29vcmRpbmF0ZXMsIGNvbnN0IFNoYXJlYWJsZUJpdG1hcDo6SGFuZGxlJiBjb250ZW50 SW1hZ2VIYW5kbGUsIGJvb2wgZmFkZU91dCkKK3ZvaWQgV2ViUGFnZVByb3h5OjpzZXRGaW5kSW5k aWNhdG9yKGNvbnN0IEZsb2F0UmVjdCYgc2VsZWN0aW9uUmVjdEluV2luZG93Q29vcmRpbmF0ZXMs IGNvbnN0IFZlY3RvcjxGbG9hdFJlY3Q+JiB0ZXh0UmVjdHNJblNlbGVjdGlvblJlY3RDb29yZGlu YXRlcywgZmxvYXQgY29udGVudEltYWdlU2NhbGVGYWN0b3IsIGNvbnN0IFNoYXJlYWJsZUJpdG1h cDo6SGFuZGxlJiBjb250ZW50SW1hZ2VIYW5kbGUsIGJvb2wgZmFkZU91dCkKIHsKLSAgICBSZWZQ dHI8RmluZEluZGljYXRvcj4gZmluZEluZGljYXRvciA9IEZpbmRJbmRpY2F0b3I6OmNyZWF0ZShz ZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRlcywgdGV4dFJlY3RzSW5TZWxlY3Rpb25SZWN0 Q29vcmRpbmF0ZXMsIGNvbnRlbnRJbWFnZUhhbmRsZSk7CisgICAgUmVmUHRyPEZpbmRJbmRpY2F0 b3I+IGZpbmRJbmRpY2F0b3IgPSBGaW5kSW5kaWNhdG9yOjpjcmVhdGUoc2VsZWN0aW9uUmVjdElu V2luZG93Q29vcmRpbmF0ZXMsIHRleHRSZWN0c0luU2VsZWN0aW9uUmVjdENvb3JkaW5hdGVzLCBj b250ZW50SW1hZ2VTY2FsZUZhY3RvciwgY29udGVudEltYWdlSGFuZGxlKTsKICAgICBtX3BhZ2VD bGllbnQtPnNldEZpbmRJbmRpY2F0b3IoZmluZEluZGljYXRvci5yZWxlYXNlKCksIGZhZGVPdXQp OwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZp c2lvbiA5MTA3NykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAko d29ya2luZyBjb3B5KQpAQCAtNDE2LDcgKzQxNiw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGhpZGVG aW5kVUkoKTsKICAgICB2b2lkIGNvdW50U3RyaW5nTWF0Y2hlcyhjb25zdCBTdHJpbmcmLCBGaW5k T3B0aW9ucywgdW5zaWduZWQgbWF4TWF0Y2hDb3VudCk7CiAgICAgdm9pZCBkaWRDb3VudFN0cmlu Z01hdGNoZXMoY29uc3QgU3RyaW5nJiwgdWludDMyX3QgbWF0Y2hDb3VudCk7Ci0gICAgdm9pZCBz ZXRGaW5kSW5kaWNhdG9yKGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgc2VsZWN0aW9uUmVjdElu V2luZG93Q29vcmRpbmF0ZXMsIGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpGbG9hdFJlY3Q+JiB0ZXh0 UmVjdHNJblNlbGVjdGlvblJlY3RDb29yZGluYXRlcywgY29uc3QgU2hhcmVhYmxlQml0bWFwOjpI YW5kbGUmIGNvbnRlbnRJbWFnZUhhbmRsZSwgYm9vbCBmYWRlT3V0KTsKKyAgICB2b2lkIHNldEZp bmRJbmRpY2F0b3IoY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiBzZWxlY3Rpb25SZWN0SW5XaW5k b3dDb29yZGluYXRlcywgY29uc3QgVmVjdG9yPFdlYkNvcmU6OkZsb2F0UmVjdD4mIHRleHRSZWN0 c0luU2VsZWN0aW9uUmVjdENvb3JkaW5hdGVzLCBmbG9hdCBjb250ZW50SW1hZ2VTY2FsZUZhY3Rv ciwgY29uc3QgU2hhcmVhYmxlQml0bWFwOjpIYW5kbGUmIGNvbnRlbnRJbWFnZUhhbmRsZSwgYm9v bCBmYWRlT3V0KTsKICAgICB2b2lkIGRpZEZpbmRTdHJpbmcoY29uc3QgU3RyaW5nJiwgdWludDMy X3QgbWF0Y2hDb3VudCk7CiAgICAgdm9pZCBkaWRGYWlsVG9GaW5kU3RyaW5nKGNvbnN0IFN0cmlu ZyYpOwogI2lmIFBMQVRGT1JNKFdJTikKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgkocmV2aXNpb24gOTEwNzcpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCSh3b3JraW5nIGNv cHkpCkBAIC0xNjQsNyArMTY0LDcgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZVByb3h5IHsKIAogICAg ICMgRmluZCBtZXNzYWdlcwogICAgIERpZENvdW50U3RyaW5nTWF0Y2hlcyhXVEY6OlN0cmluZyBz dHJpbmcsIHVpbnQzMl90IG1hdGNoQ291bnQpCi0gICAgU2V0RmluZEluZGljYXRvcihXZWJDb3Jl OjpGbG9hdFJlY3Qgc2VsZWN0aW9uUmVjdCwgVmVjdG9yPFdlYkNvcmU6OkZsb2F0UmVjdD4gdGV4 dFJlY3RzLCBXZWJLaXQ6OlNoYXJlYWJsZUJpdG1hcDo6SGFuZGxlIGNvbnRlbnRJbWFnZUhhbmRs ZSwgYm9vbCBmYWRlT3V0KQorICAgIFNldEZpbmRJbmRpY2F0b3IoV2ViQ29yZTo6RmxvYXRSZWN0 IHNlbGVjdGlvblJlY3QsIFZlY3RvcjxXZWJDb3JlOjpGbG9hdFJlY3Q+IHRleHRSZWN0cywgZmxv YXQgY29udGVudEltYWdlU2NhbGVGYWN0b3IsIFdlYktpdDo6U2hhcmVhYmxlQml0bWFwOjpIYW5k bGUgY29udGVudEltYWdlSGFuZGxlLCBib29sIGZhZGVPdXQpCiAgICAgRGlkRmluZFN0cmluZyhX VEY6OlN0cmluZyBzdHJpbmcsIHVpbnQzMl90IG1hdGNoQ291bnQpCiAgICAgRGlkRmFpbFRvRmlu ZFN0cmluZyhXVEY6OlN0cmluZyBzdHJpbmcpCiAjaWYgUExBVEZPUk0oV0lOKQpJbmRleDogU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIu Y3BwCShyZXZpc2lvbiA5MTA3NykKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9GaW5kQ29udHJvbGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3NSwxMiArMTc1LDE2IEBA IGJvb2wgRmluZENvbnRyb2xsZXI6OnVwZGF0ZUZpbmRJbmRpY2F0b3IKICAgICBWZWN0b3I8Rmxv YXRSZWN0PiB0ZXh0UmVjdHM7CiAgICAgc2VsZWN0ZWRGcmFtZS0+c2VsZWN0aW9uKCktPmdldENs aXBwZWRWaXNpYmxlVGV4dFJlY3RhbmdsZXModGV4dFJlY3RzKTsKIAorICAgIEludFNpemUgYmFj a2luZ1N0b3JlU2l6ZSA9IHNlbGVjdGlvblJlY3Quc2l6ZSgpOworICAgIGJhY2tpbmdTdG9yZVNp emUuc2NhbGUobV93ZWJQYWdlLT51c2VyU3BhY2VTY2FsZUZhY3RvcigpKTsKKwogICAgIC8vIENy ZWF0ZSBhIGJhY2tpbmcgc3RvcmUgYW5kIHBhaW50IHRoZSBmaW5kIGluZGljYXRvciB0ZXh0IGlu dG8gaXQuCi0gICAgUmVmUHRyPFNoYXJlYWJsZUJpdG1hcD4gZmluZEluZGljYXRvclRleHRCYWNr aW5nU3RvcmUgPSBTaGFyZWFibGVCaXRtYXA6OmNyZWF0ZVNoYXJlYWJsZShzZWxlY3Rpb25SZWN0 LnNpemUoKSwgU2hhcmVhYmxlQml0bWFwOjpTdXBwb3J0c0FscGhhKTsKKyAgICBSZWZQdHI8U2hh cmVhYmxlQml0bWFwPiBmaW5kSW5kaWNhdG9yVGV4dEJhY2tpbmdTdG9yZSA9IFNoYXJlYWJsZUJp dG1hcDo6Y3JlYXRlU2hhcmVhYmxlKGJhY2tpbmdTdG9yZVNpemUsIFNoYXJlYWJsZUJpdG1hcDo6 U3VwcG9ydHNBbHBoYSk7CiAgICAgaWYgKCFmaW5kSW5kaWNhdG9yVGV4dEJhY2tpbmdTdG9yZSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIAogICAgIE93blB0cjxHcmFwaGljc0NvbnRleHQ+ IGdyYXBoaWNzQ29udGV4dCA9IGZpbmRJbmRpY2F0b3JUZXh0QmFja2luZ1N0b3JlLT5jcmVhdGVH cmFwaGljc0NvbnRleHQoKTsKKyAgICBncmFwaGljc0NvbnRleHQtPnNjYWxlKEZsb2F0U2l6ZSht X3dlYlBhZ2UtPnVzZXJTcGFjZVNjYWxlRmFjdG9yKCksIG1fd2ViUGFnZS0+dXNlclNwYWNlU2Nh bGVGYWN0b3IoKSkpOwogCiAgICAgSW50UmVjdCBwYWludFJlY3QgPSBzZWxlY3Rpb25SZWN0Owog ICAgIHBhaW50UmVjdC5tb3ZlKHNlbGVjdGVkRnJhbWUtPnZpZXcoKS0+ZnJhbWVSZWN0KCkueCgp LCBzZWxlY3RlZEZyYW1lLT52aWV3KCktPmZyYW1lUmVjdCgpLnkoKSk7CkBAIC0yMDcsNyArMjEx LDcgQEAgYm9vbCBGaW5kQ29udHJvbGxlcjo6dXBkYXRlRmluZEluZGljYXRvcgogICAgICAgICB0 ZXh0UmVjdHNJblNlbGVjdGlvblJlY3RDb29yZGluYXRlcy5hcHBlbmQodGV4dFJlY3RJblNlbGVj dGlvblJlY3RDb29yZGluYXRlcyk7CiAgICAgfSAgICAgICAgICAgIAogICAgIAotICAgIG1fd2Vi UGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTZXRGaW5kSW5kaWNhdG9yKHNlbGVj dGlvblJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzLCB0ZXh0UmVjdHNJblNlbGVjdGlvblJlY3RDb29y ZGluYXRlcywgaGFuZGxlLCAhaXNTaG93aW5nT3ZlcmxheSkpOworICAgIG1fd2ViUGFnZS0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTZXRGaW5kSW5kaWNhdG9yKHNlbGVjdGlvblJlY3RJ bldpbmRvd0Nvb3JkaW5hdGVzLCB0ZXh0UmVjdHNJblNlbGVjdGlvblJlY3RDb29yZGluYXRlcywg bV93ZWJQYWdlLT51c2VyU3BhY2VTY2FsZUZhY3RvcigpLCBoYW5kbGUsICFpc1Nob3dpbmdPdmVy bGF5KSk7CiAgICAgbV9pc1Nob3dpbmdGaW5kSW5kaWNhdG9yID0gdHJ1ZTsKIAogICAgIHJldHVy biB0cnVlOwpAQCAtMjE5LDcgKzIyMyw3IEBAIHZvaWQgRmluZENvbnRyb2xsZXI6OmhpZGVGaW5k SW5kaWNhdG9yKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgU2hhcmVhYmxlQml0bWFwOjpIYW5k bGUgaGFuZGxlOwotICAgIG1fd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpT ZXRGaW5kSW5kaWNhdG9yKEZsb2F0UmVjdCgpLCBWZWN0b3I8RmxvYXRSZWN0PigpLCBoYW5kbGUs IGZhbHNlKSk7CisgICAgbV93ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNl dEZpbmRJbmRpY2F0b3IoRmxvYXRSZWN0KCksIFZlY3RvcjxGbG9hdFJlY3Q+KCksIG1fd2ViUGFn ZS0+dXNlclNwYWNlU2NhbGVGYWN0b3IoKSwgaGFuZGxlLCBmYWxzZSkpOwogICAgIG1faXNTaG93 aW5nRmluZEluZGljYXRvciA9IGZhbHNlOwogfQogCg==