81349 2012-03-16 07:04:42 -0700 [Qt] The background is visible for tiles inside the contents area which are not ready 2012-03-18 12:28:38 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kenneth noam abecsi hausmann menard noam webkit.review.bot zoltan oldest_to_newest 580487 0 kenneth 2012-03-16 07:04:42 -0700 SSIA 580608 1 132305 noam 2012-03-16 09:58:19 -0700 Created attachment 132305 Patch 581443 2 132305 hausmann 2012-03-18 03:50:34 -0700 Comment on attachment 132305 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=132305&action=review > Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:175 > + if (m_contentsNode) Same in this patch, the if () isn't needed :) 581460 3 132493 noam 2012-03-18 09:41:07 -0700 Created attachment 132493 Patch for landing 581462 4 132493 webkit.review.bot 2012-03-18 09:46:39 -0700 Comment on attachment 132493 Patch for landing Rejecting attachment 132493 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 ERROR: /mnt/git/webkit-commit-queue/Source/WebKit2/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/11980275 581474 5 132498 noam 2012-03-18 11:43:26 -0700 Created attachment 132498 Patch 581483 6 132498 webkit.review.bot 2012-03-18 12:28:34 -0700 Comment on attachment 132498 Patch Clearing flags on attachment: 132498 Committed r111136: <http://trac.webkit.org/changeset/111136> 581484 7 webkit.review.bot 2012-03-18 12:28:38 -0700 All reviewed patches have been landed. Closing bug. 132305 2012-03-16 09:58:19 -0700 2012-03-18 09:41:02 -0700 Patch bug-81349-20120316095817.patch text/plain 4794 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTExMDExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGQ2MDljZTlkZWIzMzMz MjgxMTVlMjljNWJlMWIyNmNmYmI5OGE3YS4uNjhkM2QyZTZlZmUxYzM2NTI5NmYzMDMxNWIzMjUw YmRjZDQ5YmQ1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTAzLTE2ICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XSBU aGUgYmFja2dyb3VuZCBpcyB2aXNpYmxlIGZvciB0aWxlcyBpbnNpZGUgdGhlIGNvbnRlbnRzIGFy ZWEgd2hpY2ggYXJlIG5vdCByZWFkeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODEzNDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBTcGxpdCBQYWdlUHJveHlOb2RlIHRvIEJhY2tncm91bmRTR05vZGUgYW5k IENvbnRlbnRzU0dOb2RlLgorICAgICAgICBCYWNrZ3JvdW5kU0dOb2RlIHBhaW50cyBhIHNvbGlk IGJhY2tncm91bmQsIGVpdGhlciB3aGl0ZSBvciB0cmFuc3BhcmVudAorICAgICAgICAoZGVwZW5k aW5nIG9uIGRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kIGZsYWcpLgorCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNwcDoKKyAgICAgICAgKENvbnRlbnRzU0dOb2Rl KToKKyAgICAgICAgKENvbnRlbnRzU0dOb2RlOjpDb250ZW50c1NHTm9kZSk6CisgICAgICAgIChD b250ZW50c1NHTm9kZTo6Y2hhbmdlZFN0YXRlcyk6CisgICAgICAgIChDb250ZW50c1NHTm9kZTo6 fkNvbnRlbnRzU0dOb2RlKToKKyAgICAgICAgKEJhY2tncm91bmRTR05vZGUpOgorICAgICAgICAo QmFja2dyb3VuZFNHTm9kZTo6QmFja2dyb3VuZFNHTm9kZSk6CisgICAgICAgIChCYWNrZ3JvdW5k U0dOb2RlOjpjb250ZW50c05vZGUpOgorICAgICAgICAoUVF1aWNrV2ViUGFnZTo6dXBkYXRlUGFp bnROb2RlKToKKwogMjAxMi0wMy0xNiAgRGludSBKYWNvYiAgPGRpbnUuamFjb2JAbm9raWEuY29t PgogCiAgICAgICAgIFtRdF1bV0syXSBCdWlsZCBmYWlsdXJlIHdoZW4gdXNpbmcgLS1uby10b3Vj aC1ldmVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1 aWNrd2VicGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dl YnBhZ2UuY3BwCmluZGV4IDkyOTNjOTcyZjc3ZTQ5YmIzMmY2NmFlMjFiNWJlYWYwYjFlMDg4MzYu LjE5ZTM4ODE0ZDhmOTAxNWU5N2QzNjExNTA5Njc4OTRhZWVjMDRhYTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZS5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNwcApAQCAtMzEsNiAr MzEsNyBAQAogI2luY2x1ZGUgPFF0UXVpY2svUVF1aWNrQ2FudmFzPgogI2luY2x1ZGUgPFF0UXVp Y2svUVNHR2VvbWV0cnlOb2RlPgogI2luY2x1ZGUgPFF0UXVpY2svUVNHTWF0ZXJpYWw+CisjaW5j bHVkZSA8UXRRdWljay9RU0dTaW1wbGVSZWN0Tm9kZT4KICNpbmNsdWRlIDxwcml2YXRlL3FzZ3Jl bmRlcm5vZGVfcC5oPgogCiBRUXVpY2tXZWJQYWdlOjpRUXVpY2tXZWJQYWdlKFFRdWlja1dlYlZp ZXcqIHZpZXdwb3J0SXRlbSkKQEAgLTgwLDggKzgxLDkgQEAgdm9pZCBRUXVpY2tXZWJQYWdlUHJp dmF0ZTo6cGFpbnQoUVBhaW50ZXIqIHBhaW50ZXIpCiAgICAgICAgIHdlYlBhZ2VQcm94eS0+ZHJh d2luZ0FyZWEoKS0+cGFpbnRMYXllclRyZWUocGFpbnRlcik7CiB9CiAKLXN0cnVjdCBQYWdlUHJv eHlOb2RlIDogcHVibGljIFFTR1JlbmRlck5vZGUgewotICAgIFBhZ2VQcm94eU5vZGUoUGFzc1Jl ZlB0cjxXZWJMYXllclRyZWVSZW5kZXJlcj4gcmVuZGVyZXIpCitjbGFzcyBDb250ZW50c1NHTm9k ZSA6IHB1YmxpYyBRU0dSZW5kZXJOb2RlIHsKK3B1YmxpYzoKKyAgICBDb250ZW50c1NHTm9kZShQ YXNzUmVmUHRyPFdlYkxheWVyVHJlZVJlbmRlcmVyPiByZW5kZXJlcikKICAgICAgICAgOiBtX3Jl bmRlcmVyKHJlbmRlcmVyKQogICAgICAgICAsIG1fc2NhbGUoMSkKICAgICB7CkBAIC0xMDQsNyAr MTA2LDcgQEAgc3RydWN0IFBhZ2VQcm94eU5vZGUgOiBwdWJsaWMgUVNHUmVuZGVyTm9kZSB7CiAg ICAgICAgIGxheWVyVHJlZVJlbmRlcmVyKCktPnBhaW50VG9DdXJyZW50R0xDb250ZXh0KHJlbmRl ck1hdHJpeCwgaW5oZXJpdGVkT3BhY2l0eSgpLCBjbGlwUmVjdCgpKTsKICAgICB9CiAKLSAgICB+ UGFnZVByb3h5Tm9kZSgpCisgICAgfkNvbnRlbnRzU0dOb2RlKCkKICAgICB7CiAgICAgICAgIGxh eWVyVHJlZVJlbmRlcmVyKCktPnB1cmdlR0xSZXNvdXJjZXMoKTsKICAgICB9CkBAIC0xNTgsNiAr MTYwLDMwIEBAIHByaXZhdGU6CiAgICAgZmxvYXQgbV9zY2FsZTsKIH07CiAKK2NsYXNzIEJhY2tn cm91bmRTR05vZGUgOiBwdWJsaWMgUVNHU2ltcGxlUmVjdE5vZGUgeworcHVibGljOgorICAgIEJh Y2tncm91bmRTR05vZGUoKQorICAgICAgICA6IG1fY29udGVudHNOb2RlKDApCisgICAgeworICAg IH0KKworICAgIENvbnRlbnRzU0dOb2RlKiBjb250ZW50c05vZGUoUGFzc1JlZlB0cjxXZWJMYXll clRyZWVSZW5kZXJlcj4gcmVuZGVyZXIpCisgICAgeworICAgICAgICBpZiAobV9jb250ZW50c05v ZGUgJiYgbV9jb250ZW50c05vZGUtPmxheWVyVHJlZVJlbmRlcmVyKCkgPT0gcmVuZGVyZXIpCisg ICAgICAgICAgICByZXR1cm4gbV9jb250ZW50c05vZGU7CisKKyAgICAgICAgaWYgKG1fY29udGVu dHNOb2RlKQorICAgICAgICAgICAgZGVsZXRlIG1fY29udGVudHNOb2RlOworCisgICAgICAgIG1f Y29udGVudHNOb2RlID0gbmV3IENvbnRlbnRzU0dOb2RlKHJlbmRlcmVyKTsKKyAgICAgICAgYXBw ZW5kQ2hpbGROb2RlKG1fY29udGVudHNOb2RlKTsKKyAgICAgICAgcmV0dXJuIG1fY29udGVudHNO b2RlOworICAgIH0KKworcHJpdmF0ZToKKyAgICBDb250ZW50c1NHTm9kZSogbV9jb250ZW50c05v ZGU7Cit9OworCiBRU0dOb2RlKiBRUXVpY2tXZWJQYWdlOjp1cGRhdGVQYWludE5vZGUoUVNHTm9k ZSogb2xkTm9kZSwgVXBkYXRlUGFpbnROb2RlRGF0YSopCiB7CiAgICAgaWYgKCFkLT53ZWJQYWdl UHJveHktPmRyYXdpbmdBcmVhKCkpCkBAIC0xNjYsMjMgKzE5MiwyMCBAQCBRU0dOb2RlKiBRUXVp Y2tXZWJQYWdlOjp1cGRhdGVQYWludE5vZGUoUVNHTm9kZSogb2xkTm9kZSwgVXBkYXRlUGFpbnRO b2RlRGF0YSopCiAgICAgTGF5ZXJUcmVlSG9zdFByb3h5KiBsYXllclRyZWVIb3N0UHJveHkgPSBk LT53ZWJQYWdlUHJveHktPmRyYXdpbmdBcmVhKCktPmxheWVyVHJlZUhvc3RQcm94eSgpOwogICAg IFdlYkxheWVyVHJlZVJlbmRlcmVyKiByZW5kZXJlciA9IGxheWVyVHJlZUhvc3RQcm94eS0+bGF5 ZXJUcmVlUmVuZGVyZXIoKTsKIAotICAgIFBhZ2VQcm94eU5vZGUqIG5vZGUgPSBzdGF0aWNfY2Fz dDxQYWdlUHJveHlOb2RlKj4ob2xkTm9kZSk7Ci0KLSAgICBpZiAobm9kZSAmJiBub2RlLT5sYXll clRyZWVSZW5kZXJlcigpICE9IHJlbmRlcmVyKSB7Ci0gICAgICAgIC8vIFRoaXMgbWVhbnMgdGhh dCBMYXllclRyZWVIb3N0UHJveHkgd2FzIGRlbGV0ZWQgYW5kIHJlY3JlYXRlZCB3aGlsZSBvbGQg cGFpbnQgbm9kZSBzdXJ2aXZlZC4KLSAgICAgICAgLy8gVGhpcyBjb3VsZCBoYXBwZW4gaWYgd2Vi IHByb2Nlc3MgaGF2ZSBjcmFzaGVkLiBJbiB0aGlzIGNhc2Ugd2UgaGF2ZSB0byByZWNyZWF0ZSBw YWludCBub2RlLgotICAgICAgICBkZWxldGUgbm9kZTsKLSAgICAgICAgbm9kZSA9IDA7Ci0gICAg fQotCisgICAgQmFja2dyb3VuZFNHTm9kZSogYmFja2dyb3VuZE5vZGUgPSBzdGF0aWNfY2FzdDxC YWNrZ3JvdW5kU0dOb2RlKj4ob2xkTm9kZSk7CisgICAgaWYgKCFiYWNrZ3JvdW5kTm9kZSkKKyAg ICAgICAgYmFja2dyb3VuZE5vZGUgPSBuZXcgQmFja2dyb3VuZFNHTm9kZSgpOworICAgIENvbnRl bnRzU0dOb2RlKiBjb250ZW50c05vZGUgPSBiYWNrZ3JvdW5kTm9kZS0+Y29udGVudHNOb2RlKHJl bmRlcmVyKTsKICAgICByZW5kZXJlci0+c3luY1JlbW90ZUNvbnRlbnQoKTsKIAotICAgIGlmICgh bm9kZSkKLSAgICAgICAgbm9kZSA9IG5ldyBQYWdlUHJveHlOb2RlKHJlbmRlcmVyKTsKKyAgICBj b250ZW50c05vZGUtPnNldFNjYWxlKGQtPmNvbnRlbnRzU2NhbGUpOwogCi0gICAgbm9kZS0+c2V0 U2NhbGUoZC0+Y29udGVudHNTY2FsZSk7CisgICAgUUNvbG9yIGJhY2tncm91bmRDb2xvciA9IGQt PndlYlBhZ2VQcm94eS0+ZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoKSA/IFF0Ojp0cmFuc3Bh cmVudCA6IFF0Ojp3aGl0ZTsKKyAgICBRUmVjdEYgYmFja2dyb3VuZFJlY3QoMCwgMCwgZC0+Y29u dGVudHNTaXplLndpZHRoKCkgKiBkLT5jb250ZW50c1NjYWxlLCBkLT5jb250ZW50c1NpemUuaGVp Z2h0KCkgKiBkLT5jb250ZW50c1NjYWxlKTsKKyAgICBiYWNrZ3JvdW5kTm9kZS0+c2V0Q29sb3Io YmFja2dyb3VuZENvbG9yKTsKKyAgICBiYWNrZ3JvdW5kTm9kZS0+c2V0UmVjdChiYWNrZ3JvdW5k UmVjdCk7CiAKLSAgICByZXR1cm4gbm9kZTsKKyAgICByZXR1cm4gYmFja2dyb3VuZE5vZGU7CiB9 CiAKIFF0V2ViUGFnZUV2ZW50SGFuZGxlciogUVF1aWNrV2ViUGFnZTo6ZXZlbnRIYW5kbGVyKCkg Y29uc3QK 132493 2012-03-18 09:41:07 -0700 2012-03-18 11:43:26 -0700 Patch for landing bug-81349-20120318094105.patch text/plain 4761 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTExMDExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGQ2MDljZTlkZWIzMzMz MjgxMTVlMjljNWJlMWIyNmNmYmI5OGE3YS4uNjhkM2QyZTZlZmUxYzM2NTI5NmYzMDMxNWIzMjUw YmRjZDQ5YmQ1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTAzLTE2ICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XSBU aGUgYmFja2dyb3VuZCBpcyB2aXNpYmxlIGZvciB0aWxlcyBpbnNpZGUgdGhlIGNvbnRlbnRzIGFy ZWEgd2hpY2ggYXJlIG5vdCByZWFkeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODEzNDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBTcGxpdCBQYWdlUHJveHlOb2RlIHRvIEJhY2tncm91bmRTR05vZGUgYW5k IENvbnRlbnRzU0dOb2RlLgorICAgICAgICBCYWNrZ3JvdW5kU0dOb2RlIHBhaW50cyBhIHNvbGlk IGJhY2tncm91bmQsIGVpdGhlciB3aGl0ZSBvciB0cmFuc3BhcmVudAorICAgICAgICAoZGVwZW5k aW5nIG9uIGRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kIGZsYWcpLgorCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNwcDoKKyAgICAgICAgKENvbnRlbnRzU0dOb2Rl KToKKyAgICAgICAgKENvbnRlbnRzU0dOb2RlOjpDb250ZW50c1NHTm9kZSk6CisgICAgICAgIChD b250ZW50c1NHTm9kZTo6Y2hhbmdlZFN0YXRlcyk6CisgICAgICAgIChDb250ZW50c1NHTm9kZTo6 fkNvbnRlbnRzU0dOb2RlKToKKyAgICAgICAgKEJhY2tncm91bmRTR05vZGUpOgorICAgICAgICAo QmFja2dyb3VuZFNHTm9kZTo6QmFja2dyb3VuZFNHTm9kZSk6CisgICAgICAgIChCYWNrZ3JvdW5k U0dOb2RlOjpjb250ZW50c05vZGUpOgorICAgICAgICAoUVF1aWNrV2ViUGFnZTo6dXBkYXRlUGFp bnROb2RlKToKKwogMjAxMi0wMy0xNiAgRGludSBKYWNvYiAgPGRpbnUuamFjb2JAbm9raWEuY29t PgogCiAgICAgICAgIFtRdF1bV0syXSBCdWlsZCBmYWlsdXJlIHdoZW4gdXNpbmcgLS1uby10b3Vj aC1ldmVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1 aWNrd2VicGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dl YnBhZ2UuY3BwCmluZGV4IDkyOTNjOTcyZjc3ZTQ5YmIzMmY2NmFlMjFiNWJlYWYwYjFlMDg4MzYu LjE3MDZkMDQwMjM5YzdmMDE2YzkwYzE5NWJhMTBkNGNmZmE1ZTMxZjQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZS5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNwcApAQCAtMzEsNiAr MzEsNyBAQAogI2luY2x1ZGUgPFF0UXVpY2svUVF1aWNrQ2FudmFzPgogI2luY2x1ZGUgPFF0UXVp Y2svUVNHR2VvbWV0cnlOb2RlPgogI2luY2x1ZGUgPFF0UXVpY2svUVNHTWF0ZXJpYWw+CisjaW5j bHVkZSA8UXRRdWljay9RU0dTaW1wbGVSZWN0Tm9kZT4KICNpbmNsdWRlIDxwcml2YXRlL3FzZ3Jl bmRlcm5vZGVfcC5oPgogCiBRUXVpY2tXZWJQYWdlOjpRUXVpY2tXZWJQYWdlKFFRdWlja1dlYlZp ZXcqIHZpZXdwb3J0SXRlbSkKQEAgLTgwLDggKzgxLDkgQEAgdm9pZCBRUXVpY2tXZWJQYWdlUHJp dmF0ZTo6cGFpbnQoUVBhaW50ZXIqIHBhaW50ZXIpCiAgICAgICAgIHdlYlBhZ2VQcm94eS0+ZHJh d2luZ0FyZWEoKS0+cGFpbnRMYXllclRyZWUocGFpbnRlcik7CiB9CiAKLXN0cnVjdCBQYWdlUHJv eHlOb2RlIDogcHVibGljIFFTR1JlbmRlck5vZGUgewotICAgIFBhZ2VQcm94eU5vZGUoUGFzc1Jl ZlB0cjxXZWJMYXllclRyZWVSZW5kZXJlcj4gcmVuZGVyZXIpCitjbGFzcyBDb250ZW50c1NHTm9k ZSA6IHB1YmxpYyBRU0dSZW5kZXJOb2RlIHsKK3B1YmxpYzoKKyAgICBDb250ZW50c1NHTm9kZShQ YXNzUmVmUHRyPFdlYkxheWVyVHJlZVJlbmRlcmVyPiByZW5kZXJlcikKICAgICAgICAgOiBtX3Jl bmRlcmVyKHJlbmRlcmVyKQogICAgICAgICAsIG1fc2NhbGUoMSkKICAgICB7CkBAIC0xMDQsNyAr MTA2LDcgQEAgc3RydWN0IFBhZ2VQcm94eU5vZGUgOiBwdWJsaWMgUVNHUmVuZGVyTm9kZSB7CiAg ICAgICAgIGxheWVyVHJlZVJlbmRlcmVyKCktPnBhaW50VG9DdXJyZW50R0xDb250ZXh0KHJlbmRl ck1hdHJpeCwgaW5oZXJpdGVkT3BhY2l0eSgpLCBjbGlwUmVjdCgpKTsKICAgICB9CiAKLSAgICB+ UGFnZVByb3h5Tm9kZSgpCisgICAgfkNvbnRlbnRzU0dOb2RlKCkKICAgICB7CiAgICAgICAgIGxh eWVyVHJlZVJlbmRlcmVyKCktPnB1cmdlR0xSZXNvdXJjZXMoKTsKICAgICB9CkBAIC0xNTgsNiAr MTYwLDI5IEBAIHByaXZhdGU6CiAgICAgZmxvYXQgbV9zY2FsZTsKIH07CiAKK2NsYXNzIEJhY2tn cm91bmRTR05vZGUgOiBwdWJsaWMgUVNHU2ltcGxlUmVjdE5vZGUgeworcHVibGljOgorICAgIEJh Y2tncm91bmRTR05vZGUoKQorICAgICAgICA6IG1fY29udGVudHNOb2RlKDApCisgICAgeworICAg IH0KKworICAgIENvbnRlbnRzU0dOb2RlKiBjb250ZW50c05vZGUoUGFzc1JlZlB0cjxXZWJMYXll clRyZWVSZW5kZXJlcj4gcmVuZGVyZXIpCisgICAgeworICAgICAgICBpZiAobV9jb250ZW50c05v ZGUgJiYgbV9jb250ZW50c05vZGUtPmxheWVyVHJlZVJlbmRlcmVyKCkgPT0gcmVuZGVyZXIpCisg ICAgICAgICAgICByZXR1cm4gbV9jb250ZW50c05vZGU7CisKKyAgICAgICAgZGVsZXRlIG1fY29u dGVudHNOb2RlOworCisgICAgICAgIG1fY29udGVudHNOb2RlID0gbmV3IENvbnRlbnRzU0dOb2Rl KHJlbmRlcmVyKTsKKyAgICAgICAgYXBwZW5kQ2hpbGROb2RlKG1fY29udGVudHNOb2RlKTsKKyAg ICAgICAgcmV0dXJuIG1fY29udGVudHNOb2RlOworICAgIH0KKworcHJpdmF0ZToKKyAgICBDb250 ZW50c1NHTm9kZSogbV9jb250ZW50c05vZGU7Cit9OworCiBRU0dOb2RlKiBRUXVpY2tXZWJQYWdl Ojp1cGRhdGVQYWludE5vZGUoUVNHTm9kZSogb2xkTm9kZSwgVXBkYXRlUGFpbnROb2RlRGF0YSop CiB7CiAgICAgaWYgKCFkLT53ZWJQYWdlUHJveHktPmRyYXdpbmdBcmVhKCkpCkBAIC0xNjYsMjMg KzE5MSwyMCBAQCBRU0dOb2RlKiBRUXVpY2tXZWJQYWdlOjp1cGRhdGVQYWludE5vZGUoUVNHTm9k ZSogb2xkTm9kZSwgVXBkYXRlUGFpbnROb2RlRGF0YSopCiAgICAgTGF5ZXJUcmVlSG9zdFByb3h5 KiBsYXllclRyZWVIb3N0UHJveHkgPSBkLT53ZWJQYWdlUHJveHktPmRyYXdpbmdBcmVhKCktPmxh eWVyVHJlZUhvc3RQcm94eSgpOwogICAgIFdlYkxheWVyVHJlZVJlbmRlcmVyKiByZW5kZXJlciA9 IGxheWVyVHJlZUhvc3RQcm94eS0+bGF5ZXJUcmVlUmVuZGVyZXIoKTsKIAotICAgIFBhZ2VQcm94 eU5vZGUqIG5vZGUgPSBzdGF0aWNfY2FzdDxQYWdlUHJveHlOb2RlKj4ob2xkTm9kZSk7Ci0KLSAg ICBpZiAobm9kZSAmJiBub2RlLT5sYXllclRyZWVSZW5kZXJlcigpICE9IHJlbmRlcmVyKSB7Ci0g ICAgICAgIC8vIFRoaXMgbWVhbnMgdGhhdCBMYXllclRyZWVIb3N0UHJveHkgd2FzIGRlbGV0ZWQg YW5kIHJlY3JlYXRlZCB3aGlsZSBvbGQgcGFpbnQgbm9kZSBzdXJ2aXZlZC4KLSAgICAgICAgLy8g VGhpcyBjb3VsZCBoYXBwZW4gaWYgd2ViIHByb2Nlc3MgaGF2ZSBjcmFzaGVkLiBJbiB0aGlzIGNh c2Ugd2UgaGF2ZSB0byByZWNyZWF0ZSBwYWludCBub2RlLgotICAgICAgICBkZWxldGUgbm9kZTsK LSAgICAgICAgbm9kZSA9IDA7Ci0gICAgfQotCisgICAgQmFja2dyb3VuZFNHTm9kZSogYmFja2dy b3VuZE5vZGUgPSBzdGF0aWNfY2FzdDxCYWNrZ3JvdW5kU0dOb2RlKj4ob2xkTm9kZSk7CisgICAg aWYgKCFiYWNrZ3JvdW5kTm9kZSkKKyAgICAgICAgYmFja2dyb3VuZE5vZGUgPSBuZXcgQmFja2dy b3VuZFNHTm9kZSgpOworICAgIENvbnRlbnRzU0dOb2RlKiBjb250ZW50c05vZGUgPSBiYWNrZ3Jv dW5kTm9kZS0+Y29udGVudHNOb2RlKHJlbmRlcmVyKTsKICAgICByZW5kZXJlci0+c3luY1JlbW90 ZUNvbnRlbnQoKTsKIAotICAgIGlmICghbm9kZSkKLSAgICAgICAgbm9kZSA9IG5ldyBQYWdlUHJv eHlOb2RlKHJlbmRlcmVyKTsKKyAgICBjb250ZW50c05vZGUtPnNldFNjYWxlKGQtPmNvbnRlbnRz U2NhbGUpOwogCi0gICAgbm9kZS0+c2V0U2NhbGUoZC0+Y29udGVudHNTY2FsZSk7CisgICAgUUNv bG9yIGJhY2tncm91bmRDb2xvciA9IGQtPndlYlBhZ2VQcm94eS0+ZHJhd3NUcmFuc3BhcmVudEJh Y2tncm91bmQoKSA/IFF0Ojp0cmFuc3BhcmVudCA6IFF0Ojp3aGl0ZTsKKyAgICBRUmVjdEYgYmFj a2dyb3VuZFJlY3QoMCwgMCwgZC0+Y29udGVudHNTaXplLndpZHRoKCkgKiBkLT5jb250ZW50c1Nj YWxlLCBkLT5jb250ZW50c1NpemUuaGVpZ2h0KCkgKiBkLT5jb250ZW50c1NjYWxlKTsKKyAgICBi YWNrZ3JvdW5kTm9kZS0+c2V0Q29sb3IoYmFja2dyb3VuZENvbG9yKTsKKyAgICBiYWNrZ3JvdW5k Tm9kZS0+c2V0UmVjdChiYWNrZ3JvdW5kUmVjdCk7CiAKLSAgICByZXR1cm4gbm9kZTsKKyAgICBy ZXR1cm4gYmFja2dyb3VuZE5vZGU7CiB9CiAKIFF0V2ViUGFnZUV2ZW50SGFuZGxlciogUVF1aWNr V2ViUGFnZTo6ZXZlbnRIYW5kbGVyKCkgY29uc3QK 132498 2012-03-18 11:43:26 -0700 2012-03-18 12:28:34 -0700 Patch patch1.diff text/plain 4601 noam ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4ZDYwOWNlLi42OGQzZDJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTItMDMtMTYgIE5vJ2FtIFJvc2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNv bT4KKworICAgICAgICBbUXRdIFRoZSBiYWNrZ3JvdW5kIGlzIHZpc2libGUgZm9yIHRpbGVzIGlu c2lkZSB0aGUgY29udGVudHMgYXJlYSB3aGljaCBhcmUgbm90IHJlYWR5CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTM0OQorCisgICAgICAgIFJldmll d2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgorCisgICAgICAgIFNwbGl0IFBhZ2VQcm94eU5vZGUgdG8g QmFja2dyb3VuZFNHTm9kZSBhbmQgQ29udGVudHNTR05vZGUuCisgICAgICAgIEJhY2tncm91bmRT R05vZGUgcGFpbnRzIGEgc29saWQgYmFja2dyb3VuZCwgZWl0aGVyIHdoaXRlIG9yIHRyYW5zcGFy ZW50CisgICAgICAgIChkZXBlbmRpbmcgb24gZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQgZmxh ZykuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2UuY3BwOgorICAg ICAgICAoQ29udGVudHNTR05vZGUpOgorICAgICAgICAoQ29udGVudHNTR05vZGU6OkNvbnRlbnRz U0dOb2RlKToKKyAgICAgICAgKENvbnRlbnRzU0dOb2RlOjpjaGFuZ2VkU3RhdGVzKToKKyAgICAg ICAgKENvbnRlbnRzU0dOb2RlOjp+Q29udGVudHNTR05vZGUpOgorICAgICAgICAoQmFja2dyb3Vu ZFNHTm9kZSk6CisgICAgICAgIChCYWNrZ3JvdW5kU0dOb2RlOjpCYWNrZ3JvdW5kU0dOb2RlKToK KyAgICAgICAgKEJhY2tncm91bmRTR05vZGU6OmNvbnRlbnRzTm9kZSk6CisgICAgICAgIChRUXVp Y2tXZWJQYWdlOjp1cGRhdGVQYWludE5vZGUpOgorCiAyMDEyLTAzLTE2ICBEaW51IEphY29iICA8 ZGludS5qYWNvYkBub2tpYS5jb20+CiAKICAgICAgICAgW1F0XVtXSzJdIEJ1aWxkIGZhaWx1cmUg d2hlbiB1c2luZyAtLW5vLXRvdWNoLWV2ZW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZS5jcHAKaW5kZXggOTI5M2M5Ny4uMTcwNmQwNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2UuY3Bw CkBAIC0zMSw2ICszMSw3IEBACiAjaW5jbHVkZSA8UXRRdWljay9RUXVpY2tDYW52YXM+CiAjaW5j bHVkZSA8UXRRdWljay9RU0dHZW9tZXRyeU5vZGU+CiAjaW5jbHVkZSA8UXRRdWljay9RU0dNYXRl cmlhbD4KKyNpbmNsdWRlIDxRdFF1aWNrL1FTR1NpbXBsZVJlY3ROb2RlPgogI2luY2x1ZGUgPHBy aXZhdGUvcXNncmVuZGVybm9kZV9wLmg+CiAKIFFRdWlja1dlYlBhZ2U6OlFRdWlja1dlYlBhZ2Uo UVF1aWNrV2ViVmlldyogdmlld3BvcnRJdGVtKQpAQCAtODAsOCArODEsOSBAQCB2b2lkIFFRdWlj a1dlYlBhZ2VQcml2YXRlOjpwYWludChRUGFpbnRlciogcGFpbnRlcikKICAgICAgICAgd2ViUGFn ZVByb3h5LT5kcmF3aW5nQXJlYSgpLT5wYWludExheWVyVHJlZShwYWludGVyKTsKIH0KIAotc3Ry dWN0IFBhZ2VQcm94eU5vZGUgOiBwdWJsaWMgUVNHUmVuZGVyTm9kZSB7Ci0gICAgUGFnZVByb3h5 Tm9kZShQYXNzUmVmUHRyPFdlYkxheWVyVHJlZVJlbmRlcmVyPiByZW5kZXJlcikKK2NsYXNzIENv bnRlbnRzU0dOb2RlIDogcHVibGljIFFTR1JlbmRlck5vZGUgeworcHVibGljOgorICAgIENvbnRl bnRzU0dOb2RlKFBhc3NSZWZQdHI8V2ViTGF5ZXJUcmVlUmVuZGVyZXI+IHJlbmRlcmVyKQogICAg ICAgICA6IG1fcmVuZGVyZXIocmVuZGVyZXIpCiAgICAgICAgICwgbV9zY2FsZSgxKQogICAgIHsK QEAgLTEwNCw3ICsxMDYsNyBAQCBzdHJ1Y3QgUGFnZVByb3h5Tm9kZSA6IHB1YmxpYyBRU0dSZW5k ZXJOb2RlIHsKICAgICAgICAgbGF5ZXJUcmVlUmVuZGVyZXIoKS0+cGFpbnRUb0N1cnJlbnRHTENv bnRleHQocmVuZGVyTWF0cml4LCBpbmhlcml0ZWRPcGFjaXR5KCksIGNsaXBSZWN0KCkpOwogICAg IH0KIAotICAgIH5QYWdlUHJveHlOb2RlKCkKKyAgICB+Q29udGVudHNTR05vZGUoKQogICAgIHsK ICAgICAgICAgbGF5ZXJUcmVlUmVuZGVyZXIoKS0+cHVyZ2VHTFJlc291cmNlcygpOwogICAgIH0K QEAgLTE1OCw2ICsxNjAsMjkgQEAgcHJpdmF0ZToKICAgICBmbG9hdCBtX3NjYWxlOwogfTsKIAor Y2xhc3MgQmFja2dyb3VuZFNHTm9kZSA6IHB1YmxpYyBRU0dTaW1wbGVSZWN0Tm9kZSB7CitwdWJs aWM6CisgICAgQmFja2dyb3VuZFNHTm9kZSgpCisgICAgICAgIDogbV9jb250ZW50c05vZGUoMCkK KyAgICB7CisgICAgfQorCisgICAgQ29udGVudHNTR05vZGUqIGNvbnRlbnRzTm9kZShQYXNzUmVm UHRyPFdlYkxheWVyVHJlZVJlbmRlcmVyPiByZW5kZXJlcikKKyAgICB7CisgICAgICAgIGlmICht X2NvbnRlbnRzTm9kZSAmJiBtX2NvbnRlbnRzTm9kZS0+bGF5ZXJUcmVlUmVuZGVyZXIoKSA9PSBy ZW5kZXJlcikKKyAgICAgICAgICAgIHJldHVybiBtX2NvbnRlbnRzTm9kZTsKKworICAgICAgICBk ZWxldGUgbV9jb250ZW50c05vZGU7CisKKyAgICAgICAgbV9jb250ZW50c05vZGUgPSBuZXcgQ29u dGVudHNTR05vZGUocmVuZGVyZXIpOworICAgICAgICBhcHBlbmRDaGlsZE5vZGUobV9jb250ZW50 c05vZGUpOworICAgICAgICByZXR1cm4gbV9jb250ZW50c05vZGU7CisgICAgfQorCitwcml2YXRl OgorICAgIENvbnRlbnRzU0dOb2RlKiBtX2NvbnRlbnRzTm9kZTsKK307CisKIFFTR05vZGUqIFFR dWlja1dlYlBhZ2U6OnVwZGF0ZVBhaW50Tm9kZShRU0dOb2RlKiBvbGROb2RlLCBVcGRhdGVQYWlu dE5vZGVEYXRhKikKIHsKICAgICBpZiAoIWQtPndlYlBhZ2VQcm94eS0+ZHJhd2luZ0FyZWEoKSkK QEAgLTE2NiwyMyArMTkxLDIwIEBAIFFTR05vZGUqIFFRdWlja1dlYlBhZ2U6OnVwZGF0ZVBhaW50 Tm9kZShRU0dOb2RlKiBvbGROb2RlLCBVcGRhdGVQYWludE5vZGVEYXRhKikKICAgICBMYXllclRy ZWVIb3N0UHJveHkqIGxheWVyVHJlZUhvc3RQcm94eSA9IGQtPndlYlBhZ2VQcm94eS0+ZHJhd2lu Z0FyZWEoKS0+bGF5ZXJUcmVlSG9zdFByb3h5KCk7CiAgICAgV2ViTGF5ZXJUcmVlUmVuZGVyZXIq IHJlbmRlcmVyID0gbGF5ZXJUcmVlSG9zdFByb3h5LT5sYXllclRyZWVSZW5kZXJlcigpOwogCi0g ICAgUGFnZVByb3h5Tm9kZSogbm9kZSA9IHN0YXRpY19jYXN0PFBhZ2VQcm94eU5vZGUqPihvbGRO b2RlKTsKLQotICAgIGlmIChub2RlICYmIG5vZGUtPmxheWVyVHJlZVJlbmRlcmVyKCkgIT0gcmVu ZGVyZXIpIHsKLSAgICAgICAgLy8gVGhpcyBtZWFucyB0aGF0IExheWVyVHJlZUhvc3RQcm94eSB3 YXMgZGVsZXRlZCBhbmQgcmVjcmVhdGVkIHdoaWxlIG9sZCBwYWludCBub2RlIHN1cnZpdmVkLgot ICAgICAgICAvLyBUaGlzIGNvdWxkIGhhcHBlbiBpZiB3ZWIgcHJvY2VzcyBoYXZlIGNyYXNoZWQu IEluIHRoaXMgY2FzZSB3ZSBoYXZlIHRvIHJlY3JlYXRlIHBhaW50IG5vZGUuCi0gICAgICAgIGRl bGV0ZSBub2RlOwotICAgICAgICBub2RlID0gMDsKLSAgICB9Ci0KKyAgICBCYWNrZ3JvdW5kU0dO b2RlKiBiYWNrZ3JvdW5kTm9kZSA9IHN0YXRpY19jYXN0PEJhY2tncm91bmRTR05vZGUqPihvbGRO b2RlKTsKKyAgICBpZiAoIWJhY2tncm91bmROb2RlKQorICAgICAgICBiYWNrZ3JvdW5kTm9kZSA9 IG5ldyBCYWNrZ3JvdW5kU0dOb2RlKCk7CisgICAgQ29udGVudHNTR05vZGUqIGNvbnRlbnRzTm9k ZSA9IGJhY2tncm91bmROb2RlLT5jb250ZW50c05vZGUocmVuZGVyZXIpOwogICAgIHJlbmRlcmVy LT5zeW5jUmVtb3RlQ29udGVudCgpOwogCi0gICAgaWYgKCFub2RlKQotICAgICAgICBub2RlID0g bmV3IFBhZ2VQcm94eU5vZGUocmVuZGVyZXIpOworICAgIGNvbnRlbnRzTm9kZS0+c2V0U2NhbGUo ZC0+Y29udGVudHNTY2FsZSk7CiAKLSAgICBub2RlLT5zZXRTY2FsZShkLT5jb250ZW50c1NjYWxl KTsKKyAgICBRQ29sb3IgYmFja2dyb3VuZENvbG9yID0gZC0+d2ViUGFnZVByb3h5LT5kcmF3c1Ry YW5zcGFyZW50QmFja2dyb3VuZCgpID8gUXQ6OnRyYW5zcGFyZW50IDogUXQ6OndoaXRlOworICAg IFFSZWN0RiBiYWNrZ3JvdW5kUmVjdCgwLCAwLCBkLT5jb250ZW50c1NpemUud2lkdGgoKSAqIGQt PmNvbnRlbnRzU2NhbGUsIGQtPmNvbnRlbnRzU2l6ZS5oZWlnaHQoKSAqIGQtPmNvbnRlbnRzU2Nh bGUpOworICAgIGJhY2tncm91bmROb2RlLT5zZXRDb2xvcihiYWNrZ3JvdW5kQ29sb3IpOworICAg IGJhY2tncm91bmROb2RlLT5zZXRSZWN0KGJhY2tncm91bmRSZWN0KTsKIAotICAgIHJldHVybiBu b2RlOworICAgIHJldHVybiBiYWNrZ3JvdW5kTm9kZTsKIH0KIAogUXRXZWJQYWdlRXZlbnRIYW5k bGVyKiBRUXVpY2tXZWJQYWdlOjpldmVudEhhbmRsZXIoKSBjb25zdAo=