96458 2012-09-11 19:16:12 -0700 [chromium] Flip Y and swizzle inside compositeAndReadback implementation 2012-09-12 00:01:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aelias aelias aelias alexst cc-bugs danakj enne jamesr webkit.review.bot oldest_to_newest 717823 0 aelias 2012-09-11 19:16:12 -0700 [chromium] Flip Y and swizzle inside compositeAndReadback implementation 717826 1 163497 aelias 2012-09-11 19:23:44 -0700 Created attachment 163497 Patch 717949 2 danakj 2012-09-11 23:21:26 -0700 How come this doesn't require changing DumpRenderTree (since it does flipping too?) 717957 3 aelias 2012-09-11 23:28:05 -0700 DumpRenderTree uses the WebViewImpl call; I have been testing this change by running DumpRenderTree. 717958 4 163497 jamesr 2012-09-11 23:29:28 -0700 Comment on attachment 163497 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=163497&action=review DumpRenderTree uses WebViewImpl, so the total # of flips / swizzles should be the same for the GL path in DRT. > Source/WebCore/platform/graphics/chromium/cc/CCRendererGL.cpp:1177 > + int rowBytes = rect.width() * 4; size_t would be marginally more consistent with other code that does byte addressing (overflow isn't a realistic concern here, but consistency is still nice) 717960 5 danakj 2012-09-11 23:31:25 -0700 (In reply to comment #3) > DumpRenderTree uses the WebViewImpl call; I have been testing this change by running DumpRenderTree. Ah I see, I thought it had some other flip in TestShell somewheres.. guess not! Thanks :) 717962 6 163525 aelias 2012-09-11 23:37:29 -0700 Created attachment 163525 Patch Switched types to size_t 717963 7 163525 webkit.review.bot 2012-09-11 23:40:04 -0700 Comment on attachment 163525 Patch Rejecting attachment 163525 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/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/13822632 717973 8 163525 webkit.review.bot 2012-09-12 00:01:39 -0700 Comment on attachment 163525 Patch Clearing flags on attachment: 163525 Committed r128269: <http://trac.webkit.org/changeset/128269> 717974 9 webkit.review.bot 2012-09-12 00:01:43 -0700 All reviewed patches have been landed. Closing bug. 163497 2012-09-11 19:23:44 -0700 2012-09-11 23:37:27 -0700 Patch bug-96458-20120911192318.patch text/plain 7254 aelias U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MjQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDM0OTJmM2RjY2I1YmUx ZTg5MzlkYjE2NmM2ZGM5NGVjZjVkZmNmOC4uZmQ0MjM3NTRhOTk5Y2IyYjYyZjEyZWYwMGUxOTEw OTEyNTI0OGJiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA5LTExICBBbGV4 YW5kcmUgRWxpYXMgIDxhZWxpYXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0g RmxpcCBZIGFuZCBzd2l6emxlIGluc2lkZSBjb21wb3NpdGVBbmRSZWFkYmFjayBpbXBsZW1lbnRh dGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTY0 NTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDdXJy ZW50bHksIGNvbXBvc2l0ZUFuZFJlYWRiYWNrIEFQSSBhc3N1bWVzIGEgR0wtc3R5bGUgdGV4dHVy ZQorICAgICAgICBhbmQgaXMgY29udmVydGVkIHRvIHRoZSBub3JtYWwgc29mdHdhcmUgZm9ybWF0 IGluIFdlYlZpZXdJbXBsLgorICAgICAgICBGb3IgdGhlIHNvZnR3YXJlIGltcGxlbWVudGF0aW9u LCB0aGlzIEFQSSB3b3VsZCByZXN1bHQgaW4gdHdvCisgICAgICAgIHJlZHVuZGFudCBjb252ZXJz aW9ucy4gIFRoaXMgcGF0Y2ggbWFrZXMgdGhlIGNvbnZlcnNpb24gaW5zaWRlCisgICAgICAgIEND UmVuZGVyZXJHTCBpbnN0ZWFkLiAgSSByb2xsZWQgbXkgb3duIGZvciBsb29wIGFzIEkgZGlkbid0 IGZpbmQgdGhlCisgICAgICAgIGFwcHJvcHJpYXRlIGZ1bmN0aW9uIHdpdGhpbiByYXcgU2tpYS4K KworICAgICAgICBObyBuZXcgdGVzdHMgKGNvdmVyZWQgYnkgZXhpc3RpbmcgbGF5b3V0IHRlc3Rz KS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyZXJH TC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ1JlbmRlcmVyR0w6OmdldEZyYW1lYnVmZmVyUGl4 ZWxzKToKKwogMjAxMi0wOS0xMSAgTWljaGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFwcGxlLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCBmb3IgaHR0cDovL3RyYWMud2Via2l0Lm9y Zy9jaGFuZ2VzZXQvMTI4MjQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDgwMjQ3ZDIz OGRjYmVlYTYxMjNkOGVlMjQxOWIwM2IwMzZhMWNhN2MuLmQxMzRjMzBhOGU1NTY0OTdjYWJhNzg4 NGU4NzVlMDk2MGM3MmEyMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MjIgQEAKKzIwMTItMDktMTEgIEFsZXhhbmRyZSBFbGlhcyAgPGFlbGlhc0BjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgW2Nocm9taXVtXSBGbGlwIFkgYW5kIHN3aXp6bGUgaW5zaWRlIGNvbXBvc2l0 ZUFuZFJlYWRiYWNrIGltcGxlbWVudGF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD05NjQ1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSwgY29tcG9zaXRlQW5kUmVhZGJhY2sgQVBJIGFz c3VtZXMgYSBHTC1zdHlsZSB0ZXh0dXJlCisgICAgICAgIGFuZCBpcyBjb252ZXJ0ZWQgdG8gdGhl IG5vcm1hbCBzb2Z0d2FyZSBmb3JtYXQgaW4gV2ViVmlld0ltcGwuCisgICAgICAgIEZvciB0aGUg c29mdHdhcmUgaW1wbGVtZW50YXRpb24sIHRoaXMgQVBJIHdvdWxkIHJlc3VsdCBpbiB0d28KKyAg ICAgICAgcmVkdW5kYW50IGNvbnZlcnNpb25zLiAgVGhpcyBwYXRjaCBtYWtlcyB0aGUgY29udmVy c2lvbiBpbnNpZGUKKyAgICAgICAgQ0NSZW5kZXJlckdMIGluc3RlYWQuICBJIHJvbGxlZCBteSBv d24gZm9yIGxvb3AgYXMgSSBkaWRuJ3QgZmluZCB0aGUKKyAgICAgICAgYXBwcm9wcmlhdGUgZnVu Y3Rpb24gd2l0aGluIHJhdyBTa2lhLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoY292ZXJlZCBi eSBleGlzdGluZyBsYXlvdXQgdGVzdHMpLgorCisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRvUGl4ZWxSZWFkYmFja1RvQ2FudmFz KToKKwogMjAxMi0wOS0xMSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gIFJvbGxlZCBERVBTLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJlckdMLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVy ZXJHTC5jcHAKaW5kZXggYjkxYjU5YTU3YzdmNDMyZmE1MzVjMmVlMjVjNjg4ZThhNTZmNDM3My4u Nzk2MTc5NTY5OGE4ZmQyNTM1ZmMyZDJkMjQ5NjExNTJlMGJjYTVlMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJlckdMLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1Jl bmRlcmVyR0wuY3BwCkBAIC0xMTYwLDcgKzExNjAsNyBAQCB2b2lkIENDUmVuZGVyZXJHTDo6Z2V0 RnJhbWVidWZmZXJQaXhlbHModm9pZCAqcGl4ZWxzLCBjb25zdCBJbnRSZWN0JiByZWN0KQogICAg ICAgICBHTEMobV9jb250ZXh0LCBtX2NvbnRleHQtPnRleFBhcmFtZXRlcmkoR3JhcGhpY3NDb250 ZXh0M0Q6OlRFWFRVUkVfMkQsIEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFX1dSQVBfUywgR3Jh cGhpY3NDb250ZXh0M0Q6OkNMQU1QX1RPX0VER0UpKTsKICAgICAgICAgR0xDKG1fY29udGV4dCwg bV9jb250ZXh0LT50ZXhQYXJhbWV0ZXJpKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBH cmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV9XUkFQX1QsIEdyYXBoaWNzQ29udGV4dDNEOjpDTEFN UF9UT19FREdFKSk7CiAgICAgICAgIC8vIENvcHkgdGhlIGNvbnRlbnRzIG9mIHRoZSBjdXJyZW50 IChJT1N1cmZhY2UtYmFja2VkKSBmcmFtZWJ1ZmZlciBpbnRvIGEgdGVtcG9yYXJ5IHRleHR1cmUu Ci0gICAgICAgIEdMQyhtX2NvbnRleHQsIG1fY29udGV4dC0+Y29weVRleEltYWdlMkQoR3JhcGhp Y3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIDAsIEdyYXBoaWNzQ29udGV4dDNEOjpSR0JBLCAwLCAw LCByZWN0Lm1heFgoKSwgcmVjdC5tYXhZKCksIDApKTsKKyAgICAgICAgR0xDKG1fY29udGV4dCwg bV9jb250ZXh0LT5jb3B5VGV4SW1hZ2UyRChHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8yRCwg MCwgR3JhcGhpY3NDb250ZXh0M0Q6OlJHQkEsIDAsIDAsIHZpZXdwb3J0U2l6ZSgpLndpZHRoKCks IHZpZXdwb3J0U2l6ZSgpLmhlaWdodCgpLCAwKSk7CiAgICAgICAgIHRlbXBvcmFyeUZCTyA9IG1f Y29udGV4dC0+Y3JlYXRlRnJhbWVidWZmZXIoKTsKICAgICAgICAgLy8gQXR0YWNoIHRoaXMgdGV4 dHVyZSB0byBhbiBGQk8sIGFuZCBwZXJmb3JtIHRoZSByZWFkYmFjayBmcm9tIHRoYXQgRkJPLgog ICAgICAgICBHTEMobV9jb250ZXh0LCBtX2NvbnRleHQtPmJpbmRGcmFtZWJ1ZmZlcihHcmFwaGlj c0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIHRlbXBvcmFyeUZCTykpOwpAQCAtMTE2OSw4ICsxMTY5 LDI1IEBAIHZvaWQgQ0NSZW5kZXJlckdMOjpnZXRGcmFtZWJ1ZmZlclBpeGVscyh2b2lkICpwaXhl bHMsIGNvbnN0IEludFJlY3QmIHJlY3QpCiAgICAgICAgIEFTU0VSVChtX2NvbnRleHQtPmNoZWNr RnJhbWVidWZmZXJTdGF0dXMoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSKSA9PSBHcmFw aGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVJfQ09NUExFVEUpOwogICAgIH0KIAotICAgIEdMQyht X2NvbnRleHQsIG1fY29udGV4dC0+cmVhZFBpeGVscyhyZWN0LngoKSwgcmVjdC55KCksIHJlY3Qu d2lkdGgoKSwgcmVjdC5oZWlnaHQoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBHcmFwaGljc0NvbnRleHQzRDo6UkdCQSwgR3JhcGhpY3NDb250ZXh0M0Q6OlVOU0lHTkVE X0JZVEUsIHBpeGVscykpOworICAgIE93blB0cjx1aW50OF90PiBzcmNQaXhlbHMgPSBhZG9wdFB0 cihuZXcgdWludDhfdFtyZWN0LndpZHRoKCkgKiByZWN0LmhlaWdodCgpICogNF0pOworICAgIEdM QyhtX2NvbnRleHQsIG1fY29udGV4dC0+cmVhZFBpeGVscyhyZWN0LngoKSwgdmlld3BvcnRTaXpl KCkuaGVpZ2h0KCkgLSByZWN0Lm1heFkoKSwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgpLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdyYXBoaWNzQ29udGV4dDNEOjpS R0JBLCBHcmFwaGljc0NvbnRleHQzRDo6VU5TSUdORURfQllURSwgc3JjUGl4ZWxzLmdldCgpKSk7 CisKKyAgICB1aW50OF90KiBkZXN0UGl4ZWxzID0gc3RhdGljX2Nhc3Q8dWludDhfdCo+KHBpeGVs cyk7CisgICAgaW50IHJvd0J5dGVzID0gcmVjdC53aWR0aCgpICogNDsKKyAgICBpbnQgbnVtUm93 cyA9IHJlY3QuaGVpZ2h0KCk7CisgICAgaW50IHRvdGFsQnl0ZXMgPSBudW1Sb3dzICogcm93Qnl0 ZXM7CisgICAgZm9yIChpbnQgZGVzdFkgPSAwOyBkZXN0WSA8IHRvdGFsQnl0ZXM7IGRlc3RZICs9 IHJvd0J5dGVzKSB7CisgICAgICAgIC8vIEZsaXAgWSBheGlzLgorICAgICAgICBpbnQgc3JjWSA9 IHRvdGFsQnl0ZXMgLSBkZXN0WSAtIHJvd0J5dGVzOworICAgICAgICAvLyBTd2l6emxlIEJHUkEg LT4gUkdCQS4KKyAgICAgICAgZm9yIChpbnQgeCA9IDA7IHggPCByb3dCeXRlczsgeCArPSA0KSB7 CisgICAgICAgICAgICBkZXN0UGl4ZWxzW2Rlc3RZICsgKHgrMCldID0gc3JjUGl4ZWxzLmdldCgp W3NyY1kgKyAoeCsyKV07CisgICAgICAgICAgICBkZXN0UGl4ZWxzW2Rlc3RZICsgKHgrMSldID0g c3JjUGl4ZWxzLmdldCgpW3NyY1kgKyAoeCsxKV07CisgICAgICAgICAgICBkZXN0UGl4ZWxzW2Rl c3RZICsgKHgrMildID0gc3JjUGl4ZWxzLmdldCgpW3NyY1kgKyAoeCswKV07CisgICAgICAgICAg ICBkZXN0UGl4ZWxzW2Rlc3RZICsgKHgrMyldID0gc3JjUGl4ZWxzLmdldCgpW3NyY1kgKyAoeCsz KV07CisgICAgICAgIH0KKyAgICB9CiAKICAgICBpZiAoZG9Xb3JrYXJvdW5kKSB7CiAgICAgICAg IC8vIENsZWFuIHVwLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3Bw CmluZGV4IDIzOGIyZjkyMDVlODgwYWVlN2Q4YmFlY2M5MDQ0Zjk3MjEzY2Y2NDEuLmEzNjNmZDhh ZGZlZGI2YmE0ZmI2ZmM4YWI2ZmJjYmExYjc2YmM4NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTE3NDEsMjggKzE3NDEsMTEgQEAgdm9pZCBXZWJW aWV3SW1wbDo6ZG9QaXhlbFJlYWRiYWNrVG9DYW52YXMoV2ViQ2FudmFzKiBjYW52YXMsIGNvbnN0 IEludFJlY3QmIHJlY3QKIHsKICAgICBBU1NFUlQobV9sYXllclRyZWVWaWV3KTsKIAotICAgIFBs YXRmb3JtQ29udGV4dFNraWEgY29udGV4dChjYW52YXMpOwotCi0gICAgLy8gUGxhdGZvcm1HcmFw aGljc0NvbnRleHQgaXMgYWN0dWFsbHkgYSBwb2ludGVyIHRvIFBsYXRmb3JtQ29udGV4dFNraWEK LSAgICBHcmFwaGljc0NvbnRleHQgZ2MocmVpbnRlcnByZXRfY2FzdDxQbGF0Zm9ybUdyYXBoaWNz Q29udGV4dCo+KCZjb250ZXh0KSk7Ci0gICAgaW50IGJpdG1hcEhlaWdodCA9IGNhbnZhcy0+Z2V0 RGV2aWNlKCktPmFjY2Vzc0JpdG1hcChmYWxzZSkuaGVpZ2h0KCk7Ci0KLSAgICAvLyBDb21wdXRl IHJlY3QgdG8gc2FtcGxlIGZyb20gaW52ZXJ0ZWQgR1BVIGJ1ZmZlci4KLSAgICBJbnRSZWN0IGlu dmVydFJlY3QocmVjdC54KCksIGJpdG1hcEhlaWdodCAtIHJlY3QubWF4WSgpLCByZWN0LndpZHRo KCksIHJlY3QuaGVpZ2h0KCkpOwotCi0gICAgT3duUHRyPEltYWdlQnVmZmVyPiBpbWFnZUJ1ZmZl cihJbWFnZUJ1ZmZlcjo6Y3JlYXRlKHJlY3Quc2l6ZSgpKSk7Ci0gICAgUmVmUHRyPFVpbnQ4Q2xh bXBlZEFycmF5PiBwaXhlbEFycmF5KFVpbnQ4Q2xhbXBlZEFycmF5OjpjcmVhdGVVbmluaXRpYWxp emVkKHJlY3Qud2lkdGgoKSAqIHJlY3QuaGVpZ2h0KCkgKiA0KSk7Ci0gICAgaWYgKGltYWdlQnVm ZmVyICYmIHBpeGVsQXJyYXkpIHsKLSAgICAgICAgbV9sYXllclRyZWVWaWV3LT5jb21wb3NpdGVB bmRSZWFkYmFjayhwaXhlbEFycmF5LT5kYXRhKCksIGludmVydFJlY3QpOwotICAgICAgICBpbWFn ZUJ1ZmZlci0+cHV0Qnl0ZUFycmF5KFByZW11bHRpcGxpZWQsIHBpeGVsQXJyYXkuZ2V0KCksIHJl Y3Quc2l6ZSgpLCBJbnRSZWN0KEludFBvaW50KCksIHJlY3Quc2l6ZSgpKSwgSW50UG9pbnQoKSk7 Ci0gICAgICAgIGdjLnNhdmUoKTsKLSAgICAgICAgZ2MudHJhbnNsYXRlKEludFNpemUoMCwgYml0 bWFwSGVpZ2h0KSk7Ci0gICAgICAgIGdjLnNjYWxlKEZsb2F0U2l6ZSgxLjBmLCAtMS4wZikpOwot ICAgICAgICAvLyBVc2UgaW52ZXJ0UmVjdCBpbiBuZXh0IGxpbmUsIHNvIHRoYXQgdHJhbnNmb3Jt IGFib3ZlIGludmVydHMgaXQgYmFjayB0bwotICAgICAgICAvLyBkZXNpcmVkIGRlc3RpbmF0aW9u IHJlY3QuCi0gICAgICAgIGdjLmRyYXdJbWFnZUJ1ZmZlcihpbWFnZUJ1ZmZlci5nZXQoKSwgQ29s b3JTcGFjZURldmljZVJHQiwgaW52ZXJ0UmVjdC5sb2NhdGlvbigpKTsKLSAgICAgICAgZ2MucmVz dG9yZSgpOwotICAgIH0KKyAgICBTa0JpdG1hcCB0YXJnZXQ7CisgICAgdGFyZ2V0LnNldENvbmZp ZyhTa0JpdG1hcDo6a0FSR0JfODg4OF9Db25maWcsIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQo KSwgcmVjdC53aWR0aCgpICogNCk7CisgICAgdGFyZ2V0LmFsbG9jUGl4ZWxzKCk7CisgICAgbV9s YXllclRyZWVWaWV3LT5jb21wb3NpdGVBbmRSZWFkYmFjayh0YXJnZXQuZ2V0UGl4ZWxzKCksIHJl Y3QpOworICAgIGNhbnZhcy0+d3JpdGVQaXhlbHModGFyZ2V0LCByZWN0LngoKSwgcmVjdC55KCkp OwogfQogI2VuZGlmCiAK 163525 2012-09-11 23:37:29 -0700 2012-09-12 00:01:39 -0700 Patch bug-96458-20120911233703.patch text/plain 7269 aelias U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MjQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDM0OTJmM2RjY2I1YmUx ZTg5MzlkYjE2NmM2ZGM5NGVjZjVkZmNmOC4uZmQ0MjM3NTRhOTk5Y2IyYjYyZjEyZWYwMGUxOTEw OTEyNTI0OGJiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA5LTExICBBbGV4 YW5kcmUgRWxpYXMgIDxhZWxpYXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0g RmxpcCBZIGFuZCBzd2l6emxlIGluc2lkZSBjb21wb3NpdGVBbmRSZWFkYmFjayBpbXBsZW1lbnRh dGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTY0 NTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDdXJy ZW50bHksIGNvbXBvc2l0ZUFuZFJlYWRiYWNrIEFQSSBhc3N1bWVzIGEgR0wtc3R5bGUgdGV4dHVy ZQorICAgICAgICBhbmQgaXMgY29udmVydGVkIHRvIHRoZSBub3JtYWwgc29mdHdhcmUgZm9ybWF0 IGluIFdlYlZpZXdJbXBsLgorICAgICAgICBGb3IgdGhlIHNvZnR3YXJlIGltcGxlbWVudGF0aW9u LCB0aGlzIEFQSSB3b3VsZCByZXN1bHQgaW4gdHdvCisgICAgICAgIHJlZHVuZGFudCBjb252ZXJz aW9ucy4gIFRoaXMgcGF0Y2ggbWFrZXMgdGhlIGNvbnZlcnNpb24gaW5zaWRlCisgICAgICAgIEND UmVuZGVyZXJHTCBpbnN0ZWFkLiAgSSByb2xsZWQgbXkgb3duIGZvciBsb29wIGFzIEkgZGlkbid0 IGZpbmQgdGhlCisgICAgICAgIGFwcHJvcHJpYXRlIGZ1bmN0aW9uIHdpdGhpbiByYXcgU2tpYS4K KworICAgICAgICBObyBuZXcgdGVzdHMgKGNvdmVyZWQgYnkgZXhpc3RpbmcgbGF5b3V0IHRlc3Rz KS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyZXJH TC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ1JlbmRlcmVyR0w6OmdldEZyYW1lYnVmZmVyUGl4 ZWxzKToKKwogMjAxMi0wOS0xMSAgTWljaGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFwcGxlLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCBmb3IgaHR0cDovL3RyYWMud2Via2l0Lm9y Zy9jaGFuZ2VzZXQvMTI4MjQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDgwMjQ3ZDIz OGRjYmVlYTYxMjNkOGVlMjQxOWIwM2IwMzZhMWNhN2MuLmQxMzRjMzBhOGU1NTY0OTdjYWJhNzg4 NGU4NzVlMDk2MGM3MmEyMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MjIgQEAKKzIwMTItMDktMTEgIEFsZXhhbmRyZSBFbGlhcyAgPGFlbGlhc0BjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgW2Nocm9taXVtXSBGbGlwIFkgYW5kIHN3aXp6bGUgaW5zaWRlIGNvbXBvc2l0 ZUFuZFJlYWRiYWNrIGltcGxlbWVudGF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD05NjQ1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSwgY29tcG9zaXRlQW5kUmVhZGJhY2sgQVBJIGFz c3VtZXMgYSBHTC1zdHlsZSB0ZXh0dXJlCisgICAgICAgIGFuZCBpcyBjb252ZXJ0ZWQgdG8gdGhl IG5vcm1hbCBzb2Z0d2FyZSBmb3JtYXQgaW4gV2ViVmlld0ltcGwuCisgICAgICAgIEZvciB0aGUg c29mdHdhcmUgaW1wbGVtZW50YXRpb24sIHRoaXMgQVBJIHdvdWxkIHJlc3VsdCBpbiB0d28KKyAg ICAgICAgcmVkdW5kYW50IGNvbnZlcnNpb25zLiAgVGhpcyBwYXRjaCBtYWtlcyB0aGUgY29udmVy c2lvbiBpbnNpZGUKKyAgICAgICAgQ0NSZW5kZXJlckdMIGluc3RlYWQuICBJIHJvbGxlZCBteSBv d24gZm9yIGxvb3AgYXMgSSBkaWRuJ3QgZmluZCB0aGUKKyAgICAgICAgYXBwcm9wcmlhdGUgZnVu Y3Rpb24gd2l0aGluIHJhdyBTa2lhLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoY292ZXJlZCBi eSBleGlzdGluZyBsYXlvdXQgdGVzdHMpLgorCisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRvUGl4ZWxSZWFkYmFja1RvQ2FudmFz KToKKwogMjAxMi0wOS0xMSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gIFJvbGxlZCBERVBTLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJlckdMLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVy ZXJHTC5jcHAKaW5kZXggYjkxYjU5YTU3YzdmNDMyZmE1MzVjMmVlMjVjNjg4ZThhNTZmNDM3My4u ODRkMmMzYTAzYzAxNDI4OTE2ODliNmI5M2FiODgzMDlmZDMxNjllMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJlckdMLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1Jl bmRlcmVyR0wuY3BwCkBAIC0xMTYwLDcgKzExNjAsNyBAQCB2b2lkIENDUmVuZGVyZXJHTDo6Z2V0 RnJhbWVidWZmZXJQaXhlbHModm9pZCAqcGl4ZWxzLCBjb25zdCBJbnRSZWN0JiByZWN0KQogICAg ICAgICBHTEMobV9jb250ZXh0LCBtX2NvbnRleHQtPnRleFBhcmFtZXRlcmkoR3JhcGhpY3NDb250 ZXh0M0Q6OlRFWFRVUkVfMkQsIEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFX1dSQVBfUywgR3Jh cGhpY3NDb250ZXh0M0Q6OkNMQU1QX1RPX0VER0UpKTsKICAgICAgICAgR0xDKG1fY29udGV4dCwg bV9jb250ZXh0LT50ZXhQYXJhbWV0ZXJpKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBH cmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV9XUkFQX1QsIEdyYXBoaWNzQ29udGV4dDNEOjpDTEFN UF9UT19FREdFKSk7CiAgICAgICAgIC8vIENvcHkgdGhlIGNvbnRlbnRzIG9mIHRoZSBjdXJyZW50 IChJT1N1cmZhY2UtYmFja2VkKSBmcmFtZWJ1ZmZlciBpbnRvIGEgdGVtcG9yYXJ5IHRleHR1cmUu Ci0gICAgICAgIEdMQyhtX2NvbnRleHQsIG1fY29udGV4dC0+Y29weVRleEltYWdlMkQoR3JhcGhp Y3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIDAsIEdyYXBoaWNzQ29udGV4dDNEOjpSR0JBLCAwLCAw LCByZWN0Lm1heFgoKSwgcmVjdC5tYXhZKCksIDApKTsKKyAgICAgICAgR0xDKG1fY29udGV4dCwg bV9jb250ZXh0LT5jb3B5VGV4SW1hZ2UyRChHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8yRCwg MCwgR3JhcGhpY3NDb250ZXh0M0Q6OlJHQkEsIDAsIDAsIHZpZXdwb3J0U2l6ZSgpLndpZHRoKCks IHZpZXdwb3J0U2l6ZSgpLmhlaWdodCgpLCAwKSk7CiAgICAgICAgIHRlbXBvcmFyeUZCTyA9IG1f Y29udGV4dC0+Y3JlYXRlRnJhbWVidWZmZXIoKTsKICAgICAgICAgLy8gQXR0YWNoIHRoaXMgdGV4 dHVyZSB0byBhbiBGQk8sIGFuZCBwZXJmb3JtIHRoZSByZWFkYmFjayBmcm9tIHRoYXQgRkJPLgog ICAgICAgICBHTEMobV9jb250ZXh0LCBtX2NvbnRleHQtPmJpbmRGcmFtZWJ1ZmZlcihHcmFwaGlj c0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIHRlbXBvcmFyeUZCTykpOwpAQCAtMTE2OSw4ICsxMTY5 LDI1IEBAIHZvaWQgQ0NSZW5kZXJlckdMOjpnZXRGcmFtZWJ1ZmZlclBpeGVscyh2b2lkICpwaXhl bHMsIGNvbnN0IEludFJlY3QmIHJlY3QpCiAgICAgICAgIEFTU0VSVChtX2NvbnRleHQtPmNoZWNr RnJhbWVidWZmZXJTdGF0dXMoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSKSA9PSBHcmFw aGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVJfQ09NUExFVEUpOwogICAgIH0KIAotICAgIEdMQyht X2NvbnRleHQsIG1fY29udGV4dC0+cmVhZFBpeGVscyhyZWN0LngoKSwgcmVjdC55KCksIHJlY3Qu d2lkdGgoKSwgcmVjdC5oZWlnaHQoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBHcmFwaGljc0NvbnRleHQzRDo6UkdCQSwgR3JhcGhpY3NDb250ZXh0M0Q6OlVOU0lHTkVE X0JZVEUsIHBpeGVscykpOworICAgIE93blB0cjx1aW50OF90PiBzcmNQaXhlbHMgPSBhZG9wdFB0 cihuZXcgdWludDhfdFtyZWN0LndpZHRoKCkgKiByZWN0LmhlaWdodCgpICogNF0pOworICAgIEdM QyhtX2NvbnRleHQsIG1fY29udGV4dC0+cmVhZFBpeGVscyhyZWN0LngoKSwgdmlld3BvcnRTaXpl KCkuaGVpZ2h0KCkgLSByZWN0Lm1heFkoKSwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgpLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdyYXBoaWNzQ29udGV4dDNEOjpS R0JBLCBHcmFwaGljc0NvbnRleHQzRDo6VU5TSUdORURfQllURSwgc3JjUGl4ZWxzLmdldCgpKSk7 CisKKyAgICB1aW50OF90KiBkZXN0UGl4ZWxzID0gc3RhdGljX2Nhc3Q8dWludDhfdCo+KHBpeGVs cyk7CisgICAgc2l6ZV90IHJvd0J5dGVzID0gcmVjdC53aWR0aCgpICogNDsKKyAgICBpbnQgbnVt Um93cyA9IHJlY3QuaGVpZ2h0KCk7CisgICAgc2l6ZV90IHRvdGFsQnl0ZXMgPSBudW1Sb3dzICog cm93Qnl0ZXM7CisgICAgZm9yIChzaXplX3QgZGVzdFkgPSAwOyBkZXN0WSA8IHRvdGFsQnl0ZXM7 IGRlc3RZICs9IHJvd0J5dGVzKSB7CisgICAgICAgIC8vIEZsaXAgWSBheGlzLgorICAgICAgICBz aXplX3Qgc3JjWSA9IHRvdGFsQnl0ZXMgLSBkZXN0WSAtIHJvd0J5dGVzOworICAgICAgICAvLyBT d2l6emxlIEJHUkEgLT4gUkdCQS4KKyAgICAgICAgZm9yIChzaXplX3QgeCA9IDA7IHggPCByb3dC eXRlczsgeCArPSA0KSB7CisgICAgICAgICAgICBkZXN0UGl4ZWxzW2Rlc3RZICsgKHgrMCldID0g c3JjUGl4ZWxzLmdldCgpW3NyY1kgKyAoeCsyKV07CisgICAgICAgICAgICBkZXN0UGl4ZWxzW2Rl c3RZICsgKHgrMSldID0gc3JjUGl4ZWxzLmdldCgpW3NyY1kgKyAoeCsxKV07CisgICAgICAgICAg ICBkZXN0UGl4ZWxzW2Rlc3RZICsgKHgrMildID0gc3JjUGl4ZWxzLmdldCgpW3NyY1kgKyAoeCsw KV07CisgICAgICAgICAgICBkZXN0UGl4ZWxzW2Rlc3RZICsgKHgrMyldID0gc3JjUGl4ZWxzLmdl dCgpW3NyY1kgKyAoeCszKV07CisgICAgICAgIH0KKyAgICB9CiAKICAgICBpZiAoZG9Xb3JrYXJv dW5kKSB7CiAgICAgICAgIC8vIENsZWFuIHVwLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViVmlld0ltcGwuY3BwCmluZGV4IDIzOGIyZjkyMDVlODgwYWVlN2Q4YmFlY2M5MDQ0Zjk3MjEz Y2Y2NDEuLmEzNjNmZDhhZGZlZGI2YmE0ZmI2ZmM4YWI2ZmJjYmExYjc2YmM4NDUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTE3NDEsMjggKzE3NDEs MTEgQEAgdm9pZCBXZWJWaWV3SW1wbDo6ZG9QaXhlbFJlYWRiYWNrVG9DYW52YXMoV2ViQ2FudmFz KiBjYW52YXMsIGNvbnN0IEludFJlY3QmIHJlY3QKIHsKICAgICBBU1NFUlQobV9sYXllclRyZWVW aWV3KTsKIAotICAgIFBsYXRmb3JtQ29udGV4dFNraWEgY29udGV4dChjYW52YXMpOwotCi0gICAg Ly8gUGxhdGZvcm1HcmFwaGljc0NvbnRleHQgaXMgYWN0dWFsbHkgYSBwb2ludGVyIHRvIFBsYXRm b3JtQ29udGV4dFNraWEKLSAgICBHcmFwaGljc0NvbnRleHQgZ2MocmVpbnRlcnByZXRfY2FzdDxQ bGF0Zm9ybUdyYXBoaWNzQ29udGV4dCo+KCZjb250ZXh0KSk7Ci0gICAgaW50IGJpdG1hcEhlaWdo dCA9IGNhbnZhcy0+Z2V0RGV2aWNlKCktPmFjY2Vzc0JpdG1hcChmYWxzZSkuaGVpZ2h0KCk7Ci0K LSAgICAvLyBDb21wdXRlIHJlY3QgdG8gc2FtcGxlIGZyb20gaW52ZXJ0ZWQgR1BVIGJ1ZmZlci4K LSAgICBJbnRSZWN0IGludmVydFJlY3QocmVjdC54KCksIGJpdG1hcEhlaWdodCAtIHJlY3QubWF4 WSgpLCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOwotCi0gICAgT3duUHRyPEltYWdlQnVm ZmVyPiBpbWFnZUJ1ZmZlcihJbWFnZUJ1ZmZlcjo6Y3JlYXRlKHJlY3Quc2l6ZSgpKSk7Ci0gICAg UmVmUHRyPFVpbnQ4Q2xhbXBlZEFycmF5PiBwaXhlbEFycmF5KFVpbnQ4Q2xhbXBlZEFycmF5Ojpj cmVhdGVVbmluaXRpYWxpemVkKHJlY3Qud2lkdGgoKSAqIHJlY3QuaGVpZ2h0KCkgKiA0KSk7Ci0g ICAgaWYgKGltYWdlQnVmZmVyICYmIHBpeGVsQXJyYXkpIHsKLSAgICAgICAgbV9sYXllclRyZWVW aWV3LT5jb21wb3NpdGVBbmRSZWFkYmFjayhwaXhlbEFycmF5LT5kYXRhKCksIGludmVydFJlY3Qp OwotICAgICAgICBpbWFnZUJ1ZmZlci0+cHV0Qnl0ZUFycmF5KFByZW11bHRpcGxpZWQsIHBpeGVs QXJyYXkuZ2V0KCksIHJlY3Quc2l6ZSgpLCBJbnRSZWN0KEludFBvaW50KCksIHJlY3Quc2l6ZSgp KSwgSW50UG9pbnQoKSk7Ci0gICAgICAgIGdjLnNhdmUoKTsKLSAgICAgICAgZ2MudHJhbnNsYXRl KEludFNpemUoMCwgYml0bWFwSGVpZ2h0KSk7Ci0gICAgICAgIGdjLnNjYWxlKEZsb2F0U2l6ZSgx LjBmLCAtMS4wZikpOwotICAgICAgICAvLyBVc2UgaW52ZXJ0UmVjdCBpbiBuZXh0IGxpbmUsIHNv IHRoYXQgdHJhbnNmb3JtIGFib3ZlIGludmVydHMgaXQgYmFjayB0bwotICAgICAgICAvLyBkZXNp cmVkIGRlc3RpbmF0aW9uIHJlY3QuCi0gICAgICAgIGdjLmRyYXdJbWFnZUJ1ZmZlcihpbWFnZUJ1 ZmZlci5nZXQoKSwgQ29sb3JTcGFjZURldmljZVJHQiwgaW52ZXJ0UmVjdC5sb2NhdGlvbigpKTsK LSAgICAgICAgZ2MucmVzdG9yZSgpOwotICAgIH0KKyAgICBTa0JpdG1hcCB0YXJnZXQ7CisgICAg dGFyZ2V0LnNldENvbmZpZyhTa0JpdG1hcDo6a0FSR0JfODg4OF9Db25maWcsIHJlY3Qud2lkdGgo KSwgcmVjdC5oZWlnaHQoKSwgcmVjdC53aWR0aCgpICogNCk7CisgICAgdGFyZ2V0LmFsbG9jUGl4 ZWxzKCk7CisgICAgbV9sYXllclRyZWVWaWV3LT5jb21wb3NpdGVBbmRSZWFkYmFjayh0YXJnZXQu Z2V0UGl4ZWxzKCksIHJlY3QpOworICAgIGNhbnZhcy0+d3JpdGVQaXhlbHModGFyZ2V0LCByZWN0 LngoKSwgcmVjdC55KCkpOwogfQogI2VuZGlmCiAK