65737 2011-08-04 18:42:44 -0700 Remove LegacyDefaultOptionalArguments flag from canvas IDL files 2011-08-04 22:21:33 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 pilgrim bashi abarth bashi webkit.review.bot oldest_to_newest 446960 0 pilgrim 2011-08-04 18:42:44 -0700 As discussed in IRC, we are migrating our IDL files away from the interface-level "LegacyDefaultOptionalArguments" flag and onto argument-level [Optional] or [Optional=CallWithDefaultValue] flags. This patch migrates the remaining canvas-related IDL files. It does not change any behavior, i.e. it does not make any arguments required that were previously optional, nor vice-versa. All existing tests pass. 446966 1 103021 pilgrim 2011-08-04 18:57:30 -0700 Created attachment 103021 Patch 446969 2 103021 abarth 2011-08-04 19:00:38 -0700 Comment on attachment 103021 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103021&action=review > Source/WebCore/html/canvas/OESVertexArrayObject.idl:38 > - [StrictTypeChecking] void deleteVertexArrayOES(in WebGLVertexArrayObjectOES arrayObject); > - [StrictTypeChecking] boolean isVertexArrayOES(in WebGLVertexArrayObjectOES arrayObject); > - [StrictTypeChecking] void bindVertexArrayOES(in WebGLVertexArrayObjectOES arrayObject) raises(DOMException); > + [StrictTypeChecking] void deleteVertexArrayOES(in [Optional=CallWithDefaultValue] WebGLVertexArrayObjectOES arrayObject); > + [StrictTypeChecking] boolean isVertexArrayOES(in [Optional=CallWithDefaultValue] WebGLVertexArrayObjectOES arrayObject); > + [StrictTypeChecking] void bindVertexArrayOES(in [Optional=CallWithDefaultValue] WebGLVertexArrayObjectOES arrayObject) raises(DOMException); Is there any bad interaction between StrictTypeChecking and CallWithDefaultValue? 446972 3 pilgrim 2011-08-04 19:12:11 -0700 (In reply to comment #2) > (From update of attachment 103021 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=103021&action=review > > > Source/WebCore/html/canvas/OESVertexArrayObject.idl:38 > > - [StrictTypeChecking] void deleteVertexArrayOES(in WebGLVertexArrayObjectOES arrayObject); > > - [StrictTypeChecking] boolean isVertexArrayOES(in WebGLVertexArrayObjectOES arrayObject); > > - [StrictTypeChecking] void bindVertexArrayOES(in WebGLVertexArrayObjectOES arrayObject) raises(DOMException); > > + [StrictTypeChecking] void deleteVertexArrayOES(in [Optional=CallWithDefaultValue] WebGLVertexArrayObjectOES arrayObject); > > + [StrictTypeChecking] boolean isVertexArrayOES(in [Optional=CallWithDefaultValue] WebGLVertexArrayObjectOES arrayObject); > > + [StrictTypeChecking] void bindVertexArrayOES(in [Optional=CallWithDefaultValue] WebGLVertexArrayObjectOES arrayObject) raises(DOMException); > > Is there any bad interaction between StrictTypeChecking and CallWithDefaultValue? No. StrictTypeChecking adds some additional type checking after the function declaration is constructed. See line 936 of Source/WebCore/bindings/scripts/CodeGeneratorV8.pm for details. It does not interact with [Optional=CallWithDefaultValue]. 446974 4 103021 abarth 2011-08-04 19:17:30 -0700 Comment on attachment 103021 Patch So what happens if you don't supply the argument? It throws a different sort of exception? 446991 5 103021 webkit.review.bot 2011-08-04 20:50:31 -0700 Comment on attachment 103021 Patch Clearing flags on attachment: 103021 Committed r92443: <http://trac.webkit.org/changeset/92443> 446992 6 webkit.review.bot 2011-08-04 20:50:37 -0700 All reviewed patches have been landed. Closing bug. 447024 7 103035 bashi 2011-08-04 22:17:20 -0700 Created attachment 103035 Patch V1(fix mac build failure) 447029 8 103035 bashi 2011-08-04 22:21:33 -0700 Comment on attachment 103035 Patch V1(fix mac build failure) Sorry I uploaded the patch to wrong bug id. Please ignore it. 103021 2011-08-04 18:57:30 -0700 2011-08-04 22:17:10 -0700 Patch bug-65737-20110804215742.patch text/plain 10563 pilgrim SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkyNDQwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDgtMDQgIE1hcmsgUGls Z3JpbSAgPHBpbGdyaW1AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJlbW92ZSBMZWdhY3lEZWZh dWx0T3B0aW9uYWxBcmd1bWVudHMgZmxhZyBmcm9tIGNhbnZhcyBJREwgZmlsZXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1NzM3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBhbGwg ZXhpc3RpbmcgdGVzdHMgcGFzcy4KKworICAgICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc0dyYWRp ZW50LmlkbDoKKyAgICAgICAgKiBodG1sL2NhbnZhcy9GbG9hdDMyQXJyYXkuaWRsOgorICAgICAg ICAqIGh0bWwvY2FudmFzL0Zsb2F0NjRBcnJheS5pZGw6CisgICAgICAgICogaHRtbC9jYW52YXMv SW50MTZBcnJheS5pZGw6CisgICAgICAgICogaHRtbC9jYW52YXMvSW50MzJBcnJheS5pZGw6Cisg ICAgICAgICogaHRtbC9jYW52YXMvSW50OEFycmF5LmlkbDoKKyAgICAgICAgKiBodG1sL2NhbnZh cy9PRVNWZXJ0ZXhBcnJheU9iamVjdC5pZGw6CisgICAgICAgICogaHRtbC9jYW52YXMvVWludDE2 QXJyYXkuaWRsOgorICAgICAgICAqIGh0bWwvY2FudmFzL1VpbnQzMkFycmF5LmlkbDoKKyAgICAg ICAgKiBodG1sL2NhbnZhcy9VaW50OEFycmF5LmlkbDoKKwogMjAxMS0wOC0wNCAgU2NvdHQgR3Jh aGFtICA8c2NvdHRtZ0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQmFkIGludGVyYWN0aW9uIGJl dHdlZW4gZG9jdW1lbnQgZGVzdHJ1Y3Rpb24gYW5kIHVubG9hZCBldmVudHMKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc0dyYWRpZW50LmlkbAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNHcmFkaWVudC5pZGwJKHJldmlzaW9uIDky MzQyKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzR3JhZGllbnQuaWRsCSh3 b3JraW5nIGNvcHkpCkBAIC0yNiwxMiArMjYsMTIgQEAKIG1vZHVsZSBodG1sIHsKIAogICAgIGlu dGVyZmFjZSBbCi0gICAgICAgIExlZ2FjeURlZmF1bHRPcHRpb25hbEFyZ3VtZW50cywKICAgICAg ICAgSW50ZXJmYWNlVVVJRD1iYjExMDhlYS02YjhjLTRhMDgtODk0YS0yMTg2Mjg2MzBjZGIsCiAg ICAgICAgIEltcGxlbWVudGF0aW9uVVVJRD1hMjk0MmFlNi0yNzMxLTQyODYtOThjYy05ZDVlNzll MjBkZTEKICAgICBdIENhbnZhc0dyYWRpZW50IHsKIAotICAgICAgICB2b2lkIGFkZENvbG9yU3Rv cChpbiBmbG9hdCBvZmZzZXQsIGluIERPTVN0cmluZyBjb2xvcikKKyAgICAgICAgdm9pZCBhZGRD b2xvclN0b3AoaW4gW09wdGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBmbG9hdCBvZmZzZXQs IAorICAgICAgICAgICAgICAgICAgICAgICAgICBpbiBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0 VmFsdWVdIERPTVN0cmluZyBjb2xvcikKICAgICAgICAgICAgIHJhaXNlcyAoRE9NRXhjZXB0aW9u KTsKIAogICAgIH07CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9GbG9hdDMyQXJy YXkuaWRsCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0Zsb2F0MzJB cnJheS5pZGwJKHJldmlzaW9uIDkyMzQyKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMv RmxvYXQzMkFycmF5LmlkbAkod29ya2luZyBjb3B5KQpAQCAtMjYsNyArMjYsNiBAQAogCiBtb2R1 bGUgaHRtbCB7CiAgICAgaW50ZXJmYWNlIFsKLSAgICAgICAgTGVnYWN5RGVmYXVsdE9wdGlvbmFs QXJndW1lbnRzLAogICAgICAgICBDYW5CZUNvbnN0cnVjdGVkLAogICAgICAgICBDdXN0b21Db25z dHJ1Y3RGdW5jdGlvbiwKICAgICAgICAgVjhDdXN0b21Db25zdHJ1Y3RvciwKQEAgLTQwLDcgKzM5 LDggQEAgbW9kdWxlIGh0bWwgewogICAgICAgICBjb25zdCB1bnNpZ25lZCBpbnQgQllURVNfUEVS X0VMRU1FTlQgPSA0OwogCiAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSB1bnNpZ25lZCBsb25n IGxlbmd0aDsKLSAgICAgICAgRmxvYXQzMkFycmF5IHN1YmFycmF5KGluIGxvbmcgc3RhcnQsIGlu IFtPcHRpb25hbF0gbG9uZyBlbmQpOworICAgICAgICBGbG9hdDMyQXJyYXkgc3ViYXJyYXkoaW4g W09wdGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBsb25nIHN0YXJ0LCAKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGluIFtPcHRpb25hbF0gbG9uZyBlbmQpOwogCiAgICAgICAgIC8v IHZvaWQgc2V0KGluIEZsb2F0MzJBcnJheSBhcnJheSwgW09wdGlvbmFsXSBpbiB1bnNpZ25lZCBs b25nIG9mZnNldCk7CiAgICAgICAgIC8vIHZvaWQgc2V0KGluIHNlcXVlbmNlPGxvbmc+IGFycmF5 LCBbT3B0aW9uYWxdIGluIHVuc2lnbmVkIGxvbmcgb2Zmc2V0KTsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2h0bWwvY2FudmFzL0Zsb2F0NjRBcnJheS5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvaHRtbC9jYW52YXMvRmxvYXQ2NEFycmF5LmlkbAkocmV2aXNpb24gOTIzNDIpCisrKyBT b3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9GbG9hdDY0QXJyYXkuaWRsCSh3b3JraW5nIGNvcHkp CkBAIC0yNiw3ICsyNiw2IEBACiAKIG1vZHVsZSBodG1sIHsKICAgICBpbnRlcmZhY2UgWwotICAg ICAgICBMZWdhY3lEZWZhdWx0T3B0aW9uYWxBcmd1bWVudHMsCiAgICAgICAgIENhbkJlQ29uc3Ry dWN0ZWQsCiAgICAgICAgIEN1c3RvbUNvbnN0cnVjdEZ1bmN0aW9uLAogICAgICAgICBWOEN1c3Rv bUNvbnN0cnVjdG9yLApAQCAtNDAsNyArMzksOCBAQCBtb2R1bGUgaHRtbCB7CiAgICAgICAgIGNv bnN0IHVuc2lnbmVkIGludCBCWVRFU19QRVJfRUxFTUVOVCA9IDg7CiAKICAgICAgICAgcmVhZG9u bHkgYXR0cmlidXRlIHVuc2lnbmVkIGxvbmcgbGVuZ3RoOwotICAgICAgICBGbG9hdDY0QXJyYXkg c3ViYXJyYXkoaW4gbG9uZyBzdGFydCwgaW4gW09wdGlvbmFsXSBsb25nIGVuZCk7CisgICAgICAg IEZsb2F0NjRBcnJheSBzdWJhcnJheShpbiBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVd IGxvbmcgc3RhcnQsIAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW4gW09wdGlvbmFs XSBsb25nIGVuZCk7CiAKICAgICAgICAgLy8gdm9pZCBzZXQoaW4gRmxvYXQ2NEFycmF5IGFycmF5 LCBbT3B0aW9uYWxdIGluIHVuc2lnbmVkIGxvbmcgb2Zmc2V0KTsKICAgICAgICAgLy8gdm9pZCBz ZXQoaW4gc2VxdWVuY2U8bG9uZz4gYXJyYXksIFtPcHRpb25hbF0gaW4gdW5zaWduZWQgbG9uZyBv ZmZzZXQpOwpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvSW50OEFycmF5LmlkbAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9JbnQ4QXJyYXkuaWRsCShy ZXZpc2lvbiA5MjM0MikKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0ludDhBcnJheS5p ZGwJKHdvcmtpbmcgY29weSkKQEAgLTI2LDcgKzI2LDYgQEAKIAogbW9kdWxlIGh0bWwgewogICAg IGludGVyZmFjZSBbCi0gICAgICAgIExlZ2FjeURlZmF1bHRPcHRpb25hbEFyZ3VtZW50cywKICAg ICAgICAgQ2FuQmVDb25zdHJ1Y3RlZCwKICAgICAgICAgQ3VzdG9tQ29uc3RydWN0RnVuY3Rpb24s CiAgICAgICAgIFY4Q3VzdG9tQ29uc3RydWN0b3IsCkBAIC00MCw3ICszOSw4IEBAIG1vZHVsZSBo dG1sIHsKICAgICAgICAgY29uc3QgdW5zaWduZWQgaW50IEJZVEVTX1BFUl9FTEVNRU5UID0gMTsK IAogICAgICAgICByZWFkb25seSBhdHRyaWJ1dGUgdW5zaWduZWQgbG9uZyBsZW5ndGg7Ci0gICAg ICAgIEludDhBcnJheSBzdWJhcnJheShpbiBsb25nIHN0YXJ0LCBpbiBbT3B0aW9uYWxdIGxvbmcg ZW5kKTsKKyAgICAgICAgSW50OEFycmF5IHN1YmFycmF5KGluIFtPcHRpb25hbD1DYWxsV2l0aERl ZmF1bHRWYWx1ZV0gbG9uZyBzdGFydCwgCisgICAgICAgICAgICAgICAgICAgICAgICAgICBpbiBb T3B0aW9uYWxdIGxvbmcgZW5kKTsKIAogICAgICAgICAvLyB2b2lkIHNldChpbiBJbnQ4QXJyYXkg YXJyYXksIFtPcHRpb25hbF0gaW4gdW5zaWduZWQgbG9uZyBvZmZzZXQpOwogICAgICAgICAvLyB2 b2lkIHNldChpbiBzZXF1ZW5jZTxsb25nPiBhcnJheSwgW09wdGlvbmFsXSBpbiB1bnNpZ25lZCBs b25nIG9mZnNldCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9JbnQxNkFycmF5 LmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9JbnQxNkFycmF5 LmlkbAkocmV2aXNpb24gOTIzNDIpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9JbnQx NkFycmF5LmlkbAkod29ya2luZyBjb3B5KQpAQCAtMjUsNyArMjUsNiBAQAogCiBtb2R1bGUgaHRt bCB7CiAgICAgaW50ZXJmYWNlIFsKLSAgICAgICAgTGVnYWN5RGVmYXVsdE9wdGlvbmFsQXJndW1l bnRzLAogICAgICAgICBDYW5CZUNvbnN0cnVjdGVkLAogICAgICAgICBDdXN0b21Db25zdHJ1Y3RG dW5jdGlvbiwKICAgICAgICAgVjhDdXN0b21Db25zdHJ1Y3RvciwKQEAgLTM5LDcgKzM4LDggQEAg bW9kdWxlIGh0bWwgewogICAgICAgICBjb25zdCB1bnNpZ25lZCBpbnQgQllURVNfUEVSX0VMRU1F TlQgPSAyOwogCiAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSB1bnNpZ25lZCBsb25nIGxlbmd0 aDsKLSAgICAgICAgSW50MTZBcnJheSBzdWJhcnJheShpbiBsb25nIHN0YXJ0LCBpbiBbT3B0aW9u YWxdIGxvbmcgZW5kKTsKKyAgICAgICAgSW50MTZBcnJheSBzdWJhcnJheShpbiBbT3B0aW9uYWw9 Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIGxvbmcgc3RhcnQsIAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGluIFtPcHRpb25hbF0gbG9uZyBlbmQpOwogCiAgICAgICAgIC8vIHZvaWQgc2V0KGlu IEludDE2QXJyYXkgYXJyYXksIFtPcHRpb25hbF0gaW4gdW5zaWduZWQgbG9uZyBvZmZzZXQpOwog ICAgICAgICAvLyB2b2lkIHNldChpbiBzZXF1ZW5jZTxsb25nPiBhcnJheSwgW09wdGlvbmFsXSBp biB1bnNpZ25lZCBsb25nIG9mZnNldCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZh cy9JbnQzMkFycmF5LmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZh cy9JbnQzMkFycmF5LmlkbAkocmV2aXNpb24gOTIzNDIpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1s L2NhbnZhcy9JbnQzMkFycmF5LmlkbAkod29ya2luZyBjb3B5KQpAQCAtMjYsNyArMjYsNiBAQAog CiBtb2R1bGUgaHRtbCB7CiAgICAgaW50ZXJmYWNlIFsKLSAgICAgICAgTGVnYWN5RGVmYXVsdE9w dGlvbmFsQXJndW1lbnRzLAogICAgICAgICBDYW5CZUNvbnN0cnVjdGVkLAogICAgICAgICBDdXN0 b21Db25zdHJ1Y3RGdW5jdGlvbiwKICAgICAgICAgVjhDdXN0b21Db25zdHJ1Y3RvciwKQEAgLTQw LDcgKzM5LDggQEAgbW9kdWxlIGh0bWwgewogICAgICAgICBjb25zdCB1bnNpZ25lZCBpbnQgQllU RVNfUEVSX0VMRU1FTlQgPSA0OwogCiAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSB1bnNpZ25l ZCBsb25nIGxlbmd0aDsKLSAgICAgICAgSW50MzJBcnJheSBzdWJhcnJheShpbiBsb25nIHN0YXJ0 LCBpbiBbT3B0aW9uYWxdIGxvbmcgZW5kKTsKKyAgICAgICAgSW50MzJBcnJheSBzdWJhcnJheShp biBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIGxvbmcgc3RhcnQsIAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGluIFtPcHRpb25hbF0gbG9uZyBlbmQpOwogCiAgICAgICAgIC8v IHZvaWQgc2V0KGluIEludDMyQXJyYXkgYXJyYXksIFtPcHRpb25hbF0gaW4gdW5zaWduZWQgbG9u ZyBvZmZzZXQpOwogICAgICAgICAvLyB2b2lkIHNldChpbiBzZXF1ZW5jZTxsb25nPiBhcnJheSwg W09wdGlvbmFsXSBpbiB1bnNpZ25lZCBsb25nIG9mZnNldCk7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9odG1sL2NhbnZhcy9PRVNWZXJ0ZXhBcnJheU9iamVjdC5pZGwKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvT0VTVmVydGV4QXJyYXlPYmplY3QuaWRsCShyZXZpc2lv biA5MjM0MikKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL09FU1ZlcnRleEFycmF5T2Jq ZWN0LmlkbAkod29ya2luZyBjb3B5KQpAQCAtMjYsNyArMjYsNiBAQAogbW9kdWxlIGh0bWwgewog ICAgIGludGVyZmFjZSBbCiAgICAgICAgIENvbmRpdGlvbmFsPVdFQkdMLCAKLSAgICAgICAgTGVn YWN5RGVmYXVsdE9wdGlvbmFsQXJndW1lbnRzLAogICAgICAgICBHZW5lcmF0ZUlzUmVhY2hhYmxl PUltcGxDb250ZXh0LAogICAgICAgICBPbWl0Q29uc3RydWN0b3IsIAogICAgICAgICBEb250Q2hl Y2tFbnVtcwpAQCAtMzQsOCArMzMsOCBAQCBtb2R1bGUgaHRtbCB7CiAgICAgICAgIGNvbnN0IHVu c2lnbmVkIGludCBWRVJURVhfQVJSQVlfQklORElOR19PRVMgPSAweDg1QjU7CiAgICAgICAgIAog ICAgICAgICBbU3RyaWN0VHlwZUNoZWNraW5nXSBXZWJHTFZlcnRleEFycmF5T2JqZWN0T0VTIGNy ZWF0ZVZlcnRleEFycmF5T0VTKCk7Ci0gICAgICAgIFtTdHJpY3RUeXBlQ2hlY2tpbmddIHZvaWQg ICAgICAgICBkZWxldGVWZXJ0ZXhBcnJheU9FUyhpbiBXZWJHTFZlcnRleEFycmF5T2JqZWN0T0VT IGFycmF5T2JqZWN0KTsKLSAgICAgICAgW1N0cmljdFR5cGVDaGVja2luZ10gYm9vbGVhbiAgICAg IGlzVmVydGV4QXJyYXlPRVMoaW4gV2ViR0xWZXJ0ZXhBcnJheU9iamVjdE9FUyBhcnJheU9iamVj dCk7Ci0gICAgICAgIFtTdHJpY3RUeXBlQ2hlY2tpbmddIHZvaWQgICAgICAgICBiaW5kVmVydGV4 QXJyYXlPRVMoaW4gV2ViR0xWZXJ0ZXhBcnJheU9iamVjdE9FUyBhcnJheU9iamVjdCkgcmFpc2Vz KERPTUV4Y2VwdGlvbik7CisgICAgICAgIFtTdHJpY3RUeXBlQ2hlY2tpbmddIHZvaWQgICAgICAg ICBkZWxldGVWZXJ0ZXhBcnJheU9FUyhpbiBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVd IFdlYkdMVmVydGV4QXJyYXlPYmplY3RPRVMgYXJyYXlPYmplY3QpOworICAgICAgICBbU3RyaWN0 VHlwZUNoZWNraW5nXSBib29sZWFuICAgICAgaXNWZXJ0ZXhBcnJheU9FUyhpbiBbT3B0aW9uYWw9 Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIFdlYkdMVmVydGV4QXJyYXlPYmplY3RPRVMgYXJyYXlPYmpl Y3QpOworICAgICAgICBbU3RyaWN0VHlwZUNoZWNraW5nXSB2b2lkICAgICAgICAgYmluZFZlcnRl eEFycmF5T0VTKGluIFtPcHRpb25hbD1DYWxsV2l0aERlZmF1bHRWYWx1ZV0gV2ViR0xWZXJ0ZXhB cnJheU9iamVjdE9FUyBhcnJheU9iamVjdCkgcmFpc2VzKERPTUV4Y2VwdGlvbik7CiAgICAgfTsK IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1VpbnQ4QXJyYXkuaWRsCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1VpbnQ4QXJyYXkuaWRsCShyZXZp c2lvbiA5MjM0MikKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1VpbnQ4QXJyYXkuaWRs CSh3b3JraW5nIGNvcHkpCkBAIC0yNiw3ICsyNiw2IEBACiAKIG1vZHVsZSBodG1sIHsKICAgICBp bnRlcmZhY2UgWwotICAgICAgICBMZWdhY3lEZWZhdWx0T3B0aW9uYWxBcmd1bWVudHMsCiAgICAg ICAgIENhbkJlQ29uc3RydWN0ZWQsCiAgICAgICAgIEN1c3RvbUNvbnN0cnVjdEZ1bmN0aW9uLAog ICAgICAgICBWOEN1c3RvbUNvbnN0cnVjdG9yLApAQCAtNDAsNyArMzksNyBAQCBtb2R1bGUgaHRt bCB7CiAgICAgICAgIGNvbnN0IHVuc2lnbmVkIGludCBCWVRFU19QRVJfRUxFTUVOVCA9IDE7CiAK ICAgICAgICAgcmVhZG9ubHkgYXR0cmlidXRlIHVuc2lnbmVkIGxvbmcgbGVuZ3RoOwotICAgICAg ICBVaW50OEFycmF5IHN1YmFycmF5KGluIGxvbmcgc3RhcnQsIGluIFtPcHRpb25hbF0gbG9uZyBl bmQpOworICAgICAgICBVaW50OEFycmF5IHN1YmFycmF5KGluIFtPcHRpb25hbD1DYWxsV2l0aERl ZmF1bHRWYWx1ZV0gbG9uZyBzdGFydCwgaW4gW09wdGlvbmFsXSBsb25nIGVuZCk7CiAKICAgICAg ICAgLy8gdm9pZCBzZXQoaW4gVWludDhBcnJheSBhcnJheSwgW09wdGlvbmFsXSBpbiB1bnNpZ25l ZCBsb25nIG9mZnNldCk7CiAgICAgICAgIC8vIHZvaWQgc2V0KGluIHNlcXVlbmNlPGxvbmc+IGFy cmF5LCBbT3B0aW9uYWxdIGluIHVuc2lnbmVkIGxvbmcgb2Zmc2V0KTsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2h0bWwvY2FudmFzL1VpbnQxNkFycmF5LmlkbAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9odG1sL2NhbnZhcy9VaW50MTZBcnJheS5pZGwJKHJldmlzaW9uIDkyMzQyKQorKysg U291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvVWludDE2QXJyYXkuaWRsCSh3b3JraW5nIGNvcHkp CkBAIC0yNiw3ICsyNiw2IEBACiAKIG1vZHVsZSBodG1sIHsKICAgICBpbnRlcmZhY2UgWwotICAg ICAgICBMZWdhY3lEZWZhdWx0T3B0aW9uYWxBcmd1bWVudHMsCiAgICAgICAgIENhbkJlQ29uc3Ry dWN0ZWQsCiAgICAgICAgIEN1c3RvbUNvbnN0cnVjdEZ1bmN0aW9uLAogICAgICAgICBWOEN1c3Rv bUNvbnN0cnVjdG9yLApAQCAtNDAsNyArMzksNyBAQCBtb2R1bGUgaHRtbCB7CiAgICAgICAgIGNv bnN0IHVuc2lnbmVkIGludCBCWVRFU19QRVJfRUxFTUVOVCA9IDI7CiAKICAgICAgICAgcmVhZG9u bHkgYXR0cmlidXRlIHVuc2lnbmVkIGxvbmcgbGVuZ3RoOwotICAgICAgICBVaW50MTZBcnJheSBz dWJhcnJheShpbiBsb25nIHN0YXJ0LCBpbiBbT3B0aW9uYWxdIGxvbmcgZW5kKTsKKyAgICAgICAg VWludDE2QXJyYXkgc3ViYXJyYXkoaW4gW09wdGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBs b25nIHN0YXJ0LCBpbiBbT3B0aW9uYWxdIGxvbmcgZW5kKTsKIAogICAgICAgICAvLyB2b2lkIHNl dChpbiBVaW50MTZBcnJheSBhcnJheSwgW09wdGlvbmFsXSBpbiB1bnNpZ25lZCBsb25nIG9mZnNl dCk7CiAgICAgICAgIC8vIHZvaWQgc2V0KGluIHNlcXVlbmNlPGxvbmc+IGFycmF5LCBbT3B0aW9u YWxdIGluIHVuc2lnbmVkIGxvbmcgb2Zmc2V0KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwv Y2FudmFzL1VpbnQzMkFycmF5LmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1s L2NhbnZhcy9VaW50MzJBcnJheS5pZGwJKHJldmlzaW9uIDkyMzQyKQorKysgU291cmNlL1dlYkNv cmUvaHRtbC9jYW52YXMvVWludDMyQXJyYXkuaWRsCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw3ICsy Niw2IEBACiAKIG1vZHVsZSBodG1sIHsKICAgICBpbnRlcmZhY2UgWwotICAgICAgICBMZWdhY3lE ZWZhdWx0T3B0aW9uYWxBcmd1bWVudHMsCiAgICAgICAgIENhbkJlQ29uc3RydWN0ZWQsCiAgICAg ICAgIEN1c3RvbUNvbnN0cnVjdEZ1bmN0aW9uLAogICAgICAgICBWOEN1c3RvbUNvbnN0cnVjdG9y LApAQCAtNDAsNyArMzksNyBAQCBtb2R1bGUgaHRtbCB7CiAgICAgICAgIGNvbnN0IHVuc2lnbmVk IGludCBCWVRFU19QRVJfRUxFTUVOVCA9IDQ7CiAKICAgICAgICAgcmVhZG9ubHkgYXR0cmlidXRl IHVuc2lnbmVkIGxvbmcgbGVuZ3RoOwotICAgICAgICBVaW50MzJBcnJheSBzdWJhcnJheShpbiBs b25nIHN0YXJ0LCBpbiBbT3B0aW9uYWxdIGxvbmcgZW5kKTsKKyAgICAgICAgVWludDMyQXJyYXkg c3ViYXJyYXkoaW4gW09wdGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBsb25nIHN0YXJ0LCBp biBbT3B0aW9uYWxdIGxvbmcgZW5kKTsKIAogICAgICAgICAvLyB2b2lkIHNldChpbiBVaW50MzJB cnJheSBhcnJheSwgW09wdGlvbmFsXSBpbiB1bnNpZ25lZCBsb25nIG9mZnNldCk7CiAgICAgICAg IC8vIHZvaWQgc2V0KGluIHNlcXVlbmNlPGxvbmc+IGFycmF5LCBbT3B0aW9uYWxdIGluIHVuc2ln bmVkIGxvbmcgb2Zmc2V0KTsK 103035 2011-08-04 22:17:20 -0700 2011-08-04 22:21:33 -0700 Patch V1(fix mac build failure) bug-65737-20110805141718.patch text/plain 3853 bashi U3VidmVyc2lvbiBSZXZpc2lvbjogOTI0NDMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjNjUxNDAwM2M4Y2JjNWFmOGI3ZDU1 MzhhNjk3ODZiYTA5Njc2M2UzLi5mYWIwNWFlNzE4MmU4NzE0MDZmODU1YjM3YzdlNTZlODU5ZDRj OTgyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDgtMDQgIEtlbmljaGkgSXNoaWJhc2hp ICA8YmFzaGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIE1pc2hhbmRsaW5nIHRyYWlsaW5nIGJh Y2tzbGFzaCBpbiBzdHlsZSBhdHRyaWJ1dGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTY1NzM5CisKKyAgICAgICAgQWRkcyBhIHRlc3QgZm9yIHBhcnNp bmcgY3NzIGRlY2xhcmF0aW9uIHdpdGggdHJhaWxpbmcgYmFja3NsYXNoLgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9jc3MvZGVjbGFyYXRp b24td2l0aC10cmFpbGluZy1iYWNrc2xhc2gtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAg KiBmYXN0L2Nzcy9kZWNsYXJhdGlvbi13aXRoLXRyYWlsaW5nLWJhY2tzbGFzaC5odG1sOiBBZGRl ZC4KKwogMjAxMS0wOC0wNCAgU2NvdHQgR3JhaGFtICA8c2NvdHRtZ0BjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgQmFkIGludGVyYWN0aW9uIGJldHdlZW4gZG9jdW1lbnQgZGVzdHJ1Y3Rpb24gYW5k IHVubG9hZCBldmVudHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2RlY2xhcmF0 aW9uLXdpdGgtdHJhaWxpbmctYmFja3NsYXNoLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zh c3QvY3NzL2RlY2xhcmF0aW9uLXdpdGgtdHJhaWxpbmctYmFja3NsYXNoLWV4cGVjdGVkLnR4dApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi5jNDc0M2M3NTcwYTM5YTg3M2NkY2JiZjYzZDA3N2QzZDFiNjQxNjkxCi0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZGVjbGFyYXRpb24td2l0aC10cmFp bGluZy1iYWNrc2xhc2gtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMyBAQAorVGhpcyBwYWdlIGNo ZWNrcyB0aGF0IGFuIENTUyBkZWNsYXJhdGlvbiB3aXRoIHRyYWlsaW5nIGJhY2tzbGFzaCBpcyBw YXJzZWQgY29ycmVjdGx5LgorCitQQVNTCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nz cy9kZWNsYXJhdGlvbi13aXRoLXRyYWlsaW5nLWJhY2tzbGFzaC5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9jc3MvZGVjbGFyYXRpb24td2l0aC10cmFpbGluZy1iYWNrc2xhc2guaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi4xM2IyZTk3ZWU1MWEyYmI0NDY3MmFlMzQzMmUyMDcxNDA1NzRmNzNiCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZGVjbGFyYXRpb24td2l0aC10cmFpbGluZy1i YWNrc2xhc2guaHRtbApAQCAtMCwwICsxLDExIEBACis8cD5UaGlzIHBhZ2UgY2hlY2tzIHRoYXQg YW4gQ1NTIGRlY2xhcmF0aW9uIHdpdGggdHJhaWxpbmcgYmFja3NsYXNoIGlzIHBhcnNlZCBjb3Jy ZWN0bHkuPC9wPgorPGRpdiBpZD0id2l0aEJhY2tzbGFzaCIgc3R5bGU9ImZvbnQtZmFtaWx5OiBc Ij48L2Rpdj4KKzxkaXYgaWQ9IndpdGhvdXRCYWNrc2xhc2giPjwvZGl2PgorPGRpdiBpZD0icmVz dWx0Ij48L2Rpdj4KKzxzY3JpcHQ+CitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQor ICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKK3ZhciB3aXRoQmFja3NsYXNo ID0gd2luZG93LmdldENvbXB1dGVkU3R5bGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3dpdGhC YWNrc2xhc2gnKSlbJ2ZvbnQtZmFtaWx5J107Cit2YXIgd2l0aG91dEJhY2tzbGFzaCA9IHdpbmRv dy5nZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd3aXRob3V0QmFja3Ns YXNoJykpWydmb250LWZhbWlseSddOworZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Jlc3VsdCcp LmlubmVySFRNTCA9IHdpdGhCYWNrc2xhc2ggPT0gd2l0aG91dEJhY2tzbGFzaCA/ICdQQVNTJyA6 ICdGQUlMJzsKKzwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n IGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDA0OTZmMzUxY2M0ZTU3NDNjNmNhNjQy MjcxYjczOGYwY2RiZDVjNjQuLmFhZTI0NDU4YzEyMjU2MDc4MDU1ZDBkMWQ1MGZiNTRkZThkMGQw MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTI5NCw2ICsyOTQsMjAgQEAKIAogMjAxMS0wOC0wNCAgS2VuaWNo aSBJc2hpYmFzaGkgIDxiYXNoaUBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgTWlzaGFuZGxpbmcg dHJhaWxpbmcgYmFja3NsYXNoIGluIHN0eWxlIGF0dHJpYnV0ZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjU3MzkKKworICAgICAgICBSZW1vdmVzIHRy YWlsaW5nIGJhY2tzbGFzaCBpZiBpdCBleGlzdHMuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogZmFzdC9jc3MvZGVjbGFyYXRpb24td2l0aC10 cmFpbGluZy1iYWNrc2xhc2guaHRtbAorCisgICAgICAgICogY3NzL0NTU1BhcnNlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlRGVjbGFyYXRpb24pOiBSZW1vdmVzIHRy YWlsaW5nIGJhY2tzbGFzaCBpbiB0aGUgc3RyaW5nIGlmIGl0IGV4aXN0cy4KKworMjAxMS0wOC0w NCAgS2VuaWNoaSBJc2hpYmFzaGkgIDxiYXNoaUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgW0No cm9taXVtXSBSZWR1Y2UgbWVtb3J5IGNvbnN1bXB0aW9uIG9mIEhhcmZidXp6RmFjZQogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjU2ODgKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9j c3MvQ1NTUGFyc2VyLmNwcAppbmRleCA1ZDhmZGU0YjU3OGQ1M2YxYTA5OGEwZGY5YmE2YmRiOWVl Yjg3NDZlLi4xN2QxYzE4MDk4M2ExOWY4MTM0MDIyZjBmODA4ZDQ4ZjBiMTk4NTM5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTUGFyc2VyLmNwcApAQCAtNTU2LDcgKzU1NiwxMCBAQCBib29sIENTU1BhcnNlcjo6 cGFyc2VEZWNsYXJhdGlvbihDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbiogZGVjbGFyYXRpb24s IGNvbnN0CiAgICAgICAgIG1faW5TdHlsZVJ1bGVPckRlY2xhcmF0aW9uID0gdHJ1ZTsKICAgICB9 CiAKLSAgICBzZXR1cFBhcnNlcigiQC13ZWJraXQtZGVjbHN7Iiwgc3RyaW5nLCAifSAiKTsKKyAg ICBpZiAoc3RyaW5nLmxlbmd0aCgpID4gMCAmJiBzdHJpbmdbc3RyaW5nLmxlbmd0aCgpIC0gMV0g PT0gJ1xcJykKKyAgICAgICAgc2V0dXBQYXJzZXIoIkAtd2Via2l0LWRlY2xzeyIsIHN0cmluZy5z dWJzdHJpbmcoMCwgc3RyaW5nLmxlbmd0aCgpIC0gMSksICJ9ICIpOworICAgIGVsc2UKKyAgICAg ICAgc2V0dXBQYXJzZXIoIkAtd2Via2l0LWRlY2xzeyIsIHN0cmluZywgIn0gIik7CiAgICAgY3Nz eXlwYXJzZSh0aGlzKTsKICAgICBtX3J1bGUgPSAwOwogCg==