47024 2010-10-01 15:48:35 -0700 Update Angle interface from 100 to 101 for chromium --in-process-webgl 2010-10-06 08:48:47 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 zmo alokp commit-queue enne kbr senorblanco webkit.review.bot zmo oldest_to_newest 288534 0 zmo 2010-10-01 15:48:35 -0700 Need to have support for Angle 100 and 101 at the same time until Chromium DEPS roll angle to 101. The code that's been affected is in ${WebKitRoot}/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp functions angleCreateCompilers angleValidateShaderSource() 289219 1 69701 alokp 2010-10-04 15:32:36 -0700 Created attachment 69701 proposed patch 289221 2 webkit.review.bot 2010-10-04 15:33:42 -0700 Attachment 69701 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp:1423: One space before end of line comments [whitespace/comments] [5] WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp:1446: One space before end of line comments [whitespace/comments] [5] WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp:1490: One space before end of line comments [whitespace/comments] [5] Total errors found: 3 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 289247 3 69708 alokp 2010-10-04 15:58:31 -0700 Created attachment 69708 proposed patch Fixed style issues. 289266 4 69708 kbr 2010-10-04 16:15:33 -0700 Comment on attachment 69708 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=69708&action=review This generally looks good. One minor formatting comment; please fix and submit a new patch. Also, please file a bug about updating the version of ANGLE checked in to WebKit. It would be really helpful if you could update that version as well so that Safari and Chromium stay in sync. > WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp:1426 > + &resources.MaxVertexUniformVectors); There's no 80-column limit in the WebKit coding style. I think these looked cleaner as one-line expressions. Please re-format them. 289715 5 69805 alokp 2010-10-05 10:23:17 -0700 Created attachment 69805 proposed patch Fixed formatting as suggested. 289770 6 69805 kbr 2010-10-05 11:25:23 -0700 Comment on attachment 69805 proposed patch Looks good to me. 289833 7 69805 commit-queue 2010-10-05 13:17:36 -0700 Comment on attachment 69805 proposed patch Clearing flags on attachment: 69805 Committed r69139: <http://trac.webkit.org/changeset/69139> 289834 8 commit-queue 2010-10-05 13:17:42 -0700 All reviewed patches have been landed. Closing bug. 290329 9 senorblanco 2010-10-06 08:48:47 -0700 *** Bug 47116 has been marked as a duplicate of this bug. *** 69701 2010-10-04 15:32:36 -0700 2010-10-04 15:58:31 -0700 proposed patch anglev101.txt text/plain 4081 alokp SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjkwNDIpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMTAtMDQgIEFsb2sg UHJpeWFkYXJzaGkgIDxhbG9rcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3VwcG9ydGVkIEFOR0xFIFNIX1ZFUlNJT04gPiAx MDAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3MDI0 CisKKyAgICAgICAgKiBzcmMvV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGw6OmFuZ2xlQ3Jl YXRlQ29tcGlsZXJzKToKKyAgICAgICAgKFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0REZWZh dWx0SW1wbDo6YW5nbGVWYWxpZGF0ZVNoYWRlclNvdXJjZSk6CisKIDIwMTAtMTAtMDQgIEFkYW0g QmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBB ZGxlci4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViR3JhcGhpY3NDb250ZXh0M0REZWZh dWx0SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJHcmFwaGlj c0NvbnRleHQzRERlZmF1bHRJbXBsLmNwcAkocmV2aXNpb24gNjkwMzgpCisrKyBXZWJLaXQvY2hy b21pdW0vc3JjL1dlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGwuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xNDE0LDI5ICsxNDE0LDM2IEBAIGJvb2wgV2ViR3JhcGhpY3NDb250ZXh0M0REZWZh dWx0SW1wbDo6YW4KICAgICBpZiAoIVNoSW5pdGlhbGl6ZSgpKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKLSAgICBUQnVpbHRJblJlc291cmNlIHJlc291cmNlOwotICAgIHJlc291cmNlLk1heFZl cnRleEF0dHJpYnMgPSAwOwotICAgIGdldEludGVnZXJ2KEdMX01BWF9WRVJURVhfQVRUUklCUywg JnJlc291cmNlLk1heFZlcnRleEF0dHJpYnMpOwotICAgIHJlc291cmNlLk1heFZlcnRleFVuaWZv cm1WZWN0b3JzID0gMDsKKyNpZiBkZWZpbmVkKFNIX1ZFUlNJT04pICYmIChTSF9WRVJTSU9OID4g MTAwKQorICAgIFNoQnVpbHRJblJlc291cmNlcyByZXNvdXJjZXM7CisgICAgU2hJbml0QnVpbHRJ blJlc291cmNlcygmcmVzb3VyY2VzKTsKKyNlbHNlCisgICAgVEJ1aWx0SW5SZXNvdXJjZSByZXNv dXJjZXM7CisgICAgU2hJbml0QnVpbHRJblJlc291cmNlKCZyZXNvdXJjZXMpOworI2VuZGlmICAv LyBTSF9WRVJTSU9OCisgICAgZ2V0SW50ZWdlcnYoR0xfTUFYX1ZFUlRFWF9BVFRSSUJTLCAmcmVz b3VyY2VzLk1heFZlcnRleEF0dHJpYnMpOwogICAgIGdldEludGVnZXJ2KE1BWF9WRVJURVhfVU5J Rk9STV9WRUNUT1JTLAotICAgICAgICAgICAgICAgICZyZXNvdXJjZS5NYXhWZXJ0ZXhVbmlmb3Jt VmVjdG9ycyk7Ci0gICAgcmVzb3VyY2UuTWF4VmFyeWluZ1ZlY3RvcnMgPSAwOworICAgICAgICAg ICAgICAgICZyZXNvdXJjZXMuTWF4VmVydGV4VW5pZm9ybVZlY3RvcnMpOwogICAgIGdldEludGVn ZXJ2KE1BWF9WQVJZSU5HX1ZFQ1RPUlMsCi0gICAgICAgICAgICAgICAgJnJlc291cmNlLk1heFZh cnlpbmdWZWN0b3JzKTsKLSAgICByZXNvdXJjZS5NYXhWZXJ0ZXhUZXh0dXJlSW1hZ2VVbml0cyA9 IDA7Ci0gICAgZ2V0SW50ZWdlcnYoR0xfTUFYX1ZFUlRFWF9URVhUVVJFX0lNQUdFX1VOSVRTLCAm cmVzb3VyY2UuTWF4VmVydGV4VGV4dHVyZUltYWdlVW5pdHMpOwotICAgIHJlc291cmNlLk1heENv bWJpbmVkVGV4dHVyZUltYWdlVW5pdHMgPSAwOwotICAgIGdldEludGVnZXJ2KEdMX01BWF9DT01C SU5FRF9URVhUVVJFX0lNQUdFX1VOSVRTLCAmcmVzb3VyY2UuTWF4Q29tYmluZWRUZXh0dXJlSW1h Z2VVbml0cyk7Ci0gICAgcmVzb3VyY2UuTWF4VGV4dHVyZUltYWdlVW5pdHMgPSAwOwotICAgIGdl dEludGVnZXJ2KEdMX01BWF9URVhUVVJFX0lNQUdFX1VOSVRTLCAmcmVzb3VyY2UuTWF4VGV4dHVy ZUltYWdlVW5pdHMpOwotICAgIHJlc291cmNlLk1heEZyYWdtZW50VW5pZm9ybVZlY3RvcnMgPSAw OworICAgICAgICAgICAgICAgICZyZXNvdXJjZXMuTWF4VmFyeWluZ1ZlY3RvcnMpOworICAgIGdl dEludGVnZXJ2KEdMX01BWF9WRVJURVhfVEVYVFVSRV9JTUFHRV9VTklUUywKKyAgICAgICAgICAg ICAgICAmcmVzb3VyY2VzLk1heFZlcnRleFRleHR1cmVJbWFnZVVuaXRzKTsKKyAgICBnZXRJbnRl Z2VydihHTF9NQVhfQ09NQklORURfVEVYVFVSRV9JTUFHRV9VTklUUywKKyAgICAgICAgICAgICAg ICAmcmVzb3VyY2VzLk1heENvbWJpbmVkVGV4dHVyZUltYWdlVW5pdHMpOworICAgIGdldEludGVn ZXJ2KEdMX01BWF9URVhUVVJFX0lNQUdFX1VOSVRTLAorICAgICAgICAgICAgICAgICZyZXNvdXJj ZXMuTWF4VGV4dHVyZUltYWdlVW5pdHMpOwogICAgIGdldEludGVnZXJ2KE1BWF9GUkFHTUVOVF9V TklGT1JNX1ZFQ1RPUlMsCi0gICAgICAgICAgICAgICAgJnJlc291cmNlLk1heEZyYWdtZW50VW5p Zm9ybVZlY3RvcnMpOworICAgICAgICAgICAgICAgICZyZXNvdXJjZXMuTWF4RnJhZ21lbnRVbmlm b3JtVmVjdG9ycyk7CiAgICAgLy8gQWx3YXlzIHNldCB0byAxIGZvciBPcGVuR0wgRVMuCi0gICAg cmVzb3VyY2UuTWF4RHJhd0J1ZmZlcnMgPSAxOworICAgIHJlc291cmNlcy5NYXhEcmF3QnVmZmVy cyA9IDE7CiAKLSAgICBtX2ZyYWdtZW50Q29tcGlsZXIgPSBTaENvbnN0cnVjdENvbXBpbGVyKEVT aExhbmdGcmFnbWVudCwgRVNoU3BlY1dlYkdMLCAmcmVzb3VyY2UpOwotICAgIG1fdmVydGV4Q29t cGlsZXIgPSBTaENvbnN0cnVjdENvbXBpbGVyKEVTaExhbmdWZXJ0ZXgsIEVTaFNwZWNXZWJHTCwg JnJlc291cmNlKTsKKyNpZiBkZWZpbmVkKFNIX1ZFUlNJT04pICYmIChTSF9WRVJTSU9OID4gMTAw KQorICAgIG1fZnJhZ21lbnRDb21waWxlciA9IFNoQ29uc3RydWN0Q29tcGlsZXIoU0hfRlJBR01F TlRfU0hBREVSLCBTSF9XRUJHTF9TUEVDLCAmcmVzb3VyY2VzKTsKKyAgICBtX3ZlcnRleENvbXBp bGVyID0gU2hDb25zdHJ1Y3RDb21waWxlcihTSF9WRVJURVhfU0hBREVSLCBTSF9XRUJHTF9TUEVD LCAmcmVzb3VyY2VzKTsKKyNlbHNlCisgICAgbV9mcmFnbWVudENvbXBpbGVyID0gU2hDb25zdHJ1 Y3RDb21waWxlcihFU2hMYW5nRnJhZ21lbnQsIEVTaFNwZWNXZWJHTCwgJnJlc291cmNlcyk7Cisg ICAgbV92ZXJ0ZXhDb21waWxlciA9IFNoQ29uc3RydWN0Q29tcGlsZXIoRVNoTGFuZ1ZlcnRleCwg RVNoU3BlY1dlYkdMLCAmcmVzb3VyY2VzKTsKKyNlbmRpZiAgLy8gU0hfVkVSU0lPTgogICAgIHJl dHVybiAobV9mcmFnbWVudENvbXBpbGVyICYmIG1fdmVydGV4Q29tcGlsZXIpOwogfQogCkBAIC0x NDc2LDcgKzE0ODMsMTEgQEAgYm9vbCBXZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsOjph bgogICAgIGlmICghY29tcGlsZXIpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorI2lmIGRlZmlu ZWQoU0hfVkVSU0lPTikgJiYgKFNIX1ZFUlNJT04gPiAxMDApCisgICAgaWYgKCFTaENvbXBpbGUo Y29tcGlsZXIsICZlbnRyeS5zb3VyY2UsIDEsIFNIX09CSkVDVF9DT0RFKSkgeworI2Vsc2UKICAg ICBpZiAoIVNoQ29tcGlsZShjb21waWxlciwgJmVudHJ5LnNvdXJjZSwgMSwgRVNoT3B0T2JqZWN0 Q29kZSkpIHsKKyNlbmRpZiAgLy8gU0hfVkVSU0lPTgogICAgICAgICBpbnQgbG9nU2l6ZSA9IDA7 CiAgICAgICAgIFNoR2V0SW5mbyhjb21waWxlciwgU0hfSU5GT19MT0dfTEVOR1RILCAmbG9nU2l6 ZSk7CiAgICAgICAgIGlmIChsb2dTaXplID4gMSAmJiB0cnlGYXN0TWFsbG9jKGxvZ1NpemUgKiBz aXplb2YoY2hhcikpLmdldFZhbHVlKGVudHJ5LmxvZykpCg== 69708 2010-10-04 15:58:31 -0700 2010-10-05 10:23:17 -0700 proposed patch anglev101.txt text/plain 4078 alokp SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjkwNDIpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMTAtMDQgIEFsb2sg UHJpeWFkYXJzaGkgIDxhbG9rcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3VwcG9ydGVkIEFOR0xFIFNIX1ZFUlNJT04gPiAx MDAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3MDI0 CisKKyAgICAgICAgKiBzcmMvV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGw6OmFuZ2xlQ3Jl YXRlQ29tcGlsZXJzKToKKyAgICAgICAgKFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0REZWZh dWx0SW1wbDo6YW5nbGVWYWxpZGF0ZVNoYWRlclNvdXJjZSk6CisKIDIwMTAtMTAtMDQgIEFkYW0g QmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBB ZGxlci4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViR3JhcGhpY3NDb250ZXh0M0REZWZh dWx0SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJHcmFwaGlj c0NvbnRleHQzRERlZmF1bHRJbXBsLmNwcAkocmV2aXNpb24gNjkwMzgpCisrKyBXZWJLaXQvY2hy b21pdW0vc3JjL1dlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGwuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xNDE0LDI5ICsxNDE0LDM2IEBAIGJvb2wgV2ViR3JhcGhpY3NDb250ZXh0M0REZWZh dWx0SW1wbDo6YW4KICAgICBpZiAoIVNoSW5pdGlhbGl6ZSgpKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKLSAgICBUQnVpbHRJblJlc291cmNlIHJlc291cmNlOwotICAgIHJlc291cmNlLk1heFZl cnRleEF0dHJpYnMgPSAwOwotICAgIGdldEludGVnZXJ2KEdMX01BWF9WRVJURVhfQVRUUklCUywg JnJlc291cmNlLk1heFZlcnRleEF0dHJpYnMpOwotICAgIHJlc291cmNlLk1heFZlcnRleFVuaWZv cm1WZWN0b3JzID0gMDsKKyNpZiBkZWZpbmVkKFNIX1ZFUlNJT04pICYmIChTSF9WRVJTSU9OID4g MTAwKQorICAgIFNoQnVpbHRJblJlc291cmNlcyByZXNvdXJjZXM7CisgICAgU2hJbml0QnVpbHRJ blJlc291cmNlcygmcmVzb3VyY2VzKTsKKyNlbHNlCisgICAgVEJ1aWx0SW5SZXNvdXJjZSByZXNv dXJjZXM7CisgICAgU2hJbml0QnVpbHRJblJlc291cmNlKCZyZXNvdXJjZXMpOworI2VuZGlmIC8v IFNIX1ZFUlNJT04KKyAgICBnZXRJbnRlZ2VydihHTF9NQVhfVkVSVEVYX0FUVFJJQlMsICZyZXNv dXJjZXMuTWF4VmVydGV4QXR0cmlicyk7CiAgICAgZ2V0SW50ZWdlcnYoTUFYX1ZFUlRFWF9VTklG T1JNX1ZFQ1RPUlMsCi0gICAgICAgICAgICAgICAgJnJlc291cmNlLk1heFZlcnRleFVuaWZvcm1W ZWN0b3JzKTsKLSAgICByZXNvdXJjZS5NYXhWYXJ5aW5nVmVjdG9ycyA9IDA7CisgICAgICAgICAg ICAgICAgJnJlc291cmNlcy5NYXhWZXJ0ZXhVbmlmb3JtVmVjdG9ycyk7CiAgICAgZ2V0SW50ZWdl cnYoTUFYX1ZBUllJTkdfVkVDVE9SUywKLSAgICAgICAgICAgICAgICAmcmVzb3VyY2UuTWF4VmFy eWluZ1ZlY3RvcnMpOwotICAgIHJlc291cmNlLk1heFZlcnRleFRleHR1cmVJbWFnZVVuaXRzID0g MDsKLSAgICBnZXRJbnRlZ2VydihHTF9NQVhfVkVSVEVYX1RFWFRVUkVfSU1BR0VfVU5JVFMsICZy ZXNvdXJjZS5NYXhWZXJ0ZXhUZXh0dXJlSW1hZ2VVbml0cyk7Ci0gICAgcmVzb3VyY2UuTWF4Q29t YmluZWRUZXh0dXJlSW1hZ2VVbml0cyA9IDA7Ci0gICAgZ2V0SW50ZWdlcnYoR0xfTUFYX0NPTUJJ TkVEX1RFWFRVUkVfSU1BR0VfVU5JVFMsICZyZXNvdXJjZS5NYXhDb21iaW5lZFRleHR1cmVJbWFn ZVVuaXRzKTsKLSAgICByZXNvdXJjZS5NYXhUZXh0dXJlSW1hZ2VVbml0cyA9IDA7Ci0gICAgZ2V0 SW50ZWdlcnYoR0xfTUFYX1RFWFRVUkVfSU1BR0VfVU5JVFMsICZyZXNvdXJjZS5NYXhUZXh0dXJl SW1hZ2VVbml0cyk7Ci0gICAgcmVzb3VyY2UuTWF4RnJhZ21lbnRVbmlmb3JtVmVjdG9ycyA9IDA7 CisgICAgICAgICAgICAgICAgJnJlc291cmNlcy5NYXhWYXJ5aW5nVmVjdG9ycyk7CisgICAgZ2V0 SW50ZWdlcnYoR0xfTUFYX1ZFUlRFWF9URVhUVVJFX0lNQUdFX1VOSVRTLAorICAgICAgICAgICAg ICAgICZyZXNvdXJjZXMuTWF4VmVydGV4VGV4dHVyZUltYWdlVW5pdHMpOworICAgIGdldEludGVn ZXJ2KEdMX01BWF9DT01CSU5FRF9URVhUVVJFX0lNQUdFX1VOSVRTLAorICAgICAgICAgICAgICAg ICZyZXNvdXJjZXMuTWF4Q29tYmluZWRUZXh0dXJlSW1hZ2VVbml0cyk7CisgICAgZ2V0SW50ZWdl cnYoR0xfTUFYX1RFWFRVUkVfSU1BR0VfVU5JVFMsCisgICAgICAgICAgICAgICAgJnJlc291cmNl cy5NYXhUZXh0dXJlSW1hZ2VVbml0cyk7CiAgICAgZ2V0SW50ZWdlcnYoTUFYX0ZSQUdNRU5UX1VO SUZPUk1fVkVDVE9SUywKLSAgICAgICAgICAgICAgICAmcmVzb3VyY2UuTWF4RnJhZ21lbnRVbmlm b3JtVmVjdG9ycyk7CisgICAgICAgICAgICAgICAgJnJlc291cmNlcy5NYXhGcmFnbWVudFVuaWZv cm1WZWN0b3JzKTsKICAgICAvLyBBbHdheXMgc2V0IHRvIDEgZm9yIE9wZW5HTCBFUy4KLSAgICBy ZXNvdXJjZS5NYXhEcmF3QnVmZmVycyA9IDE7CisgICAgcmVzb3VyY2VzLk1heERyYXdCdWZmZXJz ID0gMTsKIAotICAgIG1fZnJhZ21lbnRDb21waWxlciA9IFNoQ29uc3RydWN0Q29tcGlsZXIoRVNo TGFuZ0ZyYWdtZW50LCBFU2hTcGVjV2ViR0wsICZyZXNvdXJjZSk7Ci0gICAgbV92ZXJ0ZXhDb21w aWxlciA9IFNoQ29uc3RydWN0Q29tcGlsZXIoRVNoTGFuZ1ZlcnRleCwgRVNoU3BlY1dlYkdMLCAm cmVzb3VyY2UpOworI2lmIGRlZmluZWQoU0hfVkVSU0lPTikgJiYgKFNIX1ZFUlNJT04gPiAxMDAp CisgICAgbV9mcmFnbWVudENvbXBpbGVyID0gU2hDb25zdHJ1Y3RDb21waWxlcihTSF9GUkFHTUVO VF9TSEFERVIsIFNIX1dFQkdMX1NQRUMsICZyZXNvdXJjZXMpOworICAgIG1fdmVydGV4Q29tcGls ZXIgPSBTaENvbnN0cnVjdENvbXBpbGVyKFNIX1ZFUlRFWF9TSEFERVIsIFNIX1dFQkdMX1NQRUMs ICZyZXNvdXJjZXMpOworI2Vsc2UKKyAgICBtX2ZyYWdtZW50Q29tcGlsZXIgPSBTaENvbnN0cnVj dENvbXBpbGVyKEVTaExhbmdGcmFnbWVudCwgRVNoU3BlY1dlYkdMLCAmcmVzb3VyY2VzKTsKKyAg ICBtX3ZlcnRleENvbXBpbGVyID0gU2hDb25zdHJ1Y3RDb21waWxlcihFU2hMYW5nVmVydGV4LCBF U2hTcGVjV2ViR0wsICZyZXNvdXJjZXMpOworI2VuZGlmIC8vIFNIX1ZFUlNJT04KICAgICByZXR1 cm4gKG1fZnJhZ21lbnRDb21waWxlciAmJiBtX3ZlcnRleENvbXBpbGVyKTsKIH0KIApAQCAtMTQ3 Niw3ICsxNDgzLDExIEBAIGJvb2wgV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbDo6YW4K ICAgICBpZiAoIWNvbXBpbGVyKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyNpZiBkZWZpbmVk KFNIX1ZFUlNJT04pICYmIChTSF9WRVJTSU9OID4gMTAwKQorICAgIGlmICghU2hDb21waWxlKGNv bXBpbGVyLCAmZW50cnkuc291cmNlLCAxLCBTSF9PQkpFQ1RfQ09ERSkpIHsKKyNlbHNlCiAgICAg aWYgKCFTaENvbXBpbGUoY29tcGlsZXIsICZlbnRyeS5zb3VyY2UsIDEsIEVTaE9wdE9iamVjdENv ZGUpKSB7CisjZW5kaWYgLy8gU0hfVkVSU0lPTgogICAgICAgICBpbnQgbG9nU2l6ZSA9IDA7CiAg ICAgICAgIFNoR2V0SW5mbyhjb21waWxlciwgU0hfSU5GT19MT0dfTEVOR1RILCAmbG9nU2l6ZSk7 CiAgICAgICAgIGlmIChsb2dTaXplID4gMSAmJiB0cnlGYXN0TWFsbG9jKGxvZ1NpemUgKiBzaXpl b2YoY2hhcikpLmdldFZhbHVlKGVudHJ5LmxvZykpCg== 69805 2010-10-05 10:23:17 -0700 2010-10-05 13:17:36 -0700 proposed patch anglev101.txt text/plain 4110 alokp SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjkxMjMpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMTAtMDUgIEFsb2sg UHJpeWFkYXJzaGkgIDxhbG9rcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3VwcG9ydGVkIEFOR0xFIFNIX1ZFUlNJT04gPiAx MDAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3MDI0 CisKKyAgICAgICAgKiBzcmMvV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGw6OmFuZ2xlQ3Jl YXRlQ29tcGlsZXJzKToKKyAgICAgICAgKFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0REZWZh dWx0SW1wbDo6YW5nbGVWYWxpZGF0ZVNoYWRlclNvdXJjZSk6CisKIDIwMTAtMTAtMDQgIEplcmVt eSBPcmxvdyAgPGpvcmxvd0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTmF0 ZSBDaGFwaW4uCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkdyYXBoaWNzQ29udGV4dDNE RGVmYXVsdEltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViR3Jh cGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5jcHAJKHJldmlzaW9uIDY5MTIxKQorKysgV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTQxNCwyOSArMTQxNCwzMCBAQCBib29sIFdlYkdyYXBoaWNzQ29udGV4dDNE RGVmYXVsdEltcGw6OmFuCiAgICAgaWYgKCFTaEluaXRpYWxpemUoKSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCi0gICAgVEJ1aWx0SW5SZXNvdXJjZSByZXNvdXJjZTsKLSAgICByZXNvdXJjZS5N YXhWZXJ0ZXhBdHRyaWJzID0gMDsKLSAgICBnZXRJbnRlZ2VydihHTF9NQVhfVkVSVEVYX0FUVFJJ QlMsICZyZXNvdXJjZS5NYXhWZXJ0ZXhBdHRyaWJzKTsKLSAgICByZXNvdXJjZS5NYXhWZXJ0ZXhV bmlmb3JtVmVjdG9ycyA9IDA7Ci0gICAgZ2V0SW50ZWdlcnYoTUFYX1ZFUlRFWF9VTklGT1JNX1ZF Q1RPUlMsCi0gICAgICAgICAgICAgICAgJnJlc291cmNlLk1heFZlcnRleFVuaWZvcm1WZWN0b3Jz KTsKLSAgICByZXNvdXJjZS5NYXhWYXJ5aW5nVmVjdG9ycyA9IDA7Ci0gICAgZ2V0SW50ZWdlcnYo TUFYX1ZBUllJTkdfVkVDVE9SUywKLSAgICAgICAgICAgICAgICAmcmVzb3VyY2UuTWF4VmFyeWlu Z1ZlY3RvcnMpOwotICAgIHJlc291cmNlLk1heFZlcnRleFRleHR1cmVJbWFnZVVuaXRzID0gMDsK LSAgICBnZXRJbnRlZ2VydihHTF9NQVhfVkVSVEVYX1RFWFRVUkVfSU1BR0VfVU5JVFMsICZyZXNv dXJjZS5NYXhWZXJ0ZXhUZXh0dXJlSW1hZ2VVbml0cyk7Ci0gICAgcmVzb3VyY2UuTWF4Q29tYmlu ZWRUZXh0dXJlSW1hZ2VVbml0cyA9IDA7Ci0gICAgZ2V0SW50ZWdlcnYoR0xfTUFYX0NPTUJJTkVE X1RFWFRVUkVfSU1BR0VfVU5JVFMsICZyZXNvdXJjZS5NYXhDb21iaW5lZFRleHR1cmVJbWFnZVVu aXRzKTsKLSAgICByZXNvdXJjZS5NYXhUZXh0dXJlSW1hZ2VVbml0cyA9IDA7Ci0gICAgZ2V0SW50 ZWdlcnYoR0xfTUFYX1RFWFRVUkVfSU1BR0VfVU5JVFMsICZyZXNvdXJjZS5NYXhUZXh0dXJlSW1h Z2VVbml0cyk7Ci0gICAgcmVzb3VyY2UuTWF4RnJhZ21lbnRVbmlmb3JtVmVjdG9ycyA9IDA7Ci0g ICAgZ2V0SW50ZWdlcnYoTUFYX0ZSQUdNRU5UX1VOSUZPUk1fVkVDVE9SUywKLSAgICAgICAgICAg ICAgICAmcmVzb3VyY2UuTWF4RnJhZ21lbnRVbmlmb3JtVmVjdG9ycyk7CisjaWYgZGVmaW5lZChT SF9WRVJTSU9OKSAmJiAoU0hfVkVSU0lPTiA+IDEwMCkKKyAgICBTaEJ1aWx0SW5SZXNvdXJjZXMg cmVzb3VyY2VzOworICAgIFNoSW5pdEJ1aWx0SW5SZXNvdXJjZXMoJnJlc291cmNlcyk7CisjZWxz ZQorICAgIFRCdWlsdEluUmVzb3VyY2UgcmVzb3VyY2VzOworICAgIFNoSW5pdEJ1aWx0SW5SZXNv dXJjZSgmcmVzb3VyY2VzKTsKKyNlbmRpZiAvLyBTSF9WRVJTSU9OCisgICAgZ2V0SW50ZWdlcnYo R0xfTUFYX1ZFUlRFWF9BVFRSSUJTLCAmcmVzb3VyY2VzLk1heFZlcnRleEF0dHJpYnMpOworICAg IGdldEludGVnZXJ2KE1BWF9WRVJURVhfVU5JRk9STV9WRUNUT1JTLCAmcmVzb3VyY2VzLk1heFZl cnRleFVuaWZvcm1WZWN0b3JzKTsKKyAgICBnZXRJbnRlZ2VydihNQVhfVkFSWUlOR19WRUNUT1JT LCAmcmVzb3VyY2VzLk1heFZhcnlpbmdWZWN0b3JzKTsKKyAgICBnZXRJbnRlZ2VydihHTF9NQVhf VkVSVEVYX1RFWFRVUkVfSU1BR0VfVU5JVFMsICZyZXNvdXJjZXMuTWF4VmVydGV4VGV4dHVyZUlt YWdlVW5pdHMpOworICAgIGdldEludGVnZXJ2KEdMX01BWF9DT01CSU5FRF9URVhUVVJFX0lNQUdF X1VOSVRTLCAmcmVzb3VyY2VzLk1heENvbWJpbmVkVGV4dHVyZUltYWdlVW5pdHMpOworICAgIGdl dEludGVnZXJ2KEdMX01BWF9URVhUVVJFX0lNQUdFX1VOSVRTLCAmcmVzb3VyY2VzLk1heFRleHR1 cmVJbWFnZVVuaXRzKTsKKyAgICBnZXRJbnRlZ2VydihNQVhfRlJBR01FTlRfVU5JRk9STV9WRUNU T1JTLCAmcmVzb3VyY2VzLk1heEZyYWdtZW50VW5pZm9ybVZlY3RvcnMpOwogICAgIC8vIEFsd2F5 cyBzZXQgdG8gMSBmb3IgT3BlbkdMIEVTLgotICAgIHJlc291cmNlLk1heERyYXdCdWZmZXJzID0g MTsKKyAgICByZXNvdXJjZXMuTWF4RHJhd0J1ZmZlcnMgPSAxOwogCi0gICAgbV9mcmFnbWVudENv bXBpbGVyID0gU2hDb25zdHJ1Y3RDb21waWxlcihFU2hMYW5nRnJhZ21lbnQsIEVTaFNwZWNXZWJH TCwgJnJlc291cmNlKTsKLSAgICBtX3ZlcnRleENvbXBpbGVyID0gU2hDb25zdHJ1Y3RDb21waWxl cihFU2hMYW5nVmVydGV4LCBFU2hTcGVjV2ViR0wsICZyZXNvdXJjZSk7CisjaWYgZGVmaW5lZChT SF9WRVJTSU9OKSAmJiAoU0hfVkVSU0lPTiA+IDEwMCkKKyAgICBtX2ZyYWdtZW50Q29tcGlsZXIg PSBTaENvbnN0cnVjdENvbXBpbGVyKFNIX0ZSQUdNRU5UX1NIQURFUiwgU0hfV0VCR0xfU1BFQywg JnJlc291cmNlcyk7CisgICAgbV92ZXJ0ZXhDb21waWxlciA9IFNoQ29uc3RydWN0Q29tcGlsZXIo U0hfVkVSVEVYX1NIQURFUiwgU0hfV0VCR0xfU1BFQywgJnJlc291cmNlcyk7CisjZWxzZQorICAg IG1fZnJhZ21lbnRDb21waWxlciA9IFNoQ29uc3RydWN0Q29tcGlsZXIoRVNoTGFuZ0ZyYWdtZW50 LCBFU2hTcGVjV2ViR0wsICZyZXNvdXJjZXMpOworICAgIG1fdmVydGV4Q29tcGlsZXIgPSBTaENv bnN0cnVjdENvbXBpbGVyKEVTaExhbmdWZXJ0ZXgsIEVTaFNwZWNXZWJHTCwgJnJlc291cmNlcyk7 CisjZW5kaWYgLy8gU0hfVkVSU0lPTgogICAgIHJldHVybiAobV9mcmFnbWVudENvbXBpbGVyICYm IG1fdmVydGV4Q29tcGlsZXIpOwogfQogCkBAIC0xNDc2LDcgKzE0NzcsMTEgQEAgYm9vbCBXZWJH cmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsOjphbgogICAgIGlmICghY29tcGlsZXIpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKIAorI2lmIGRlZmluZWQoU0hfVkVSU0lPTikgJiYgKFNIX1ZFUlNJ T04gPiAxMDApCisgICAgaWYgKCFTaENvbXBpbGUoY29tcGlsZXIsICZlbnRyeS5zb3VyY2UsIDEs IFNIX09CSkVDVF9DT0RFKSkgeworI2Vsc2UKICAgICBpZiAoIVNoQ29tcGlsZShjb21waWxlciwg JmVudHJ5LnNvdXJjZSwgMSwgRVNoT3B0T2JqZWN0Q29kZSkpIHsKKyNlbmRpZiAvLyBTSF9WRVJT SU9OCiAgICAgICAgIGludCBsb2dTaXplID0gMDsKICAgICAgICAgU2hHZXRJbmZvKGNvbXBpbGVy LCBTSF9JTkZPX0xPR19MRU5HVEgsICZsb2dTaXplKTsKICAgICAgICAgaWYgKGxvZ1NpemUgPiAx ICYmIHRyeUZhc3RNYWxsb2MobG9nU2l6ZSAqIHNpemVvZihjaGFyKSkuZ2V0VmFsdWUoZW50cnku bG9nKSkK