36026 2010-03-11 12:01:16 -0800 [v8] Add V8 bindings for DOMFormData 2010-03-15 10:37:55 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 36024 1 jianli jianli dglazkov dimich japhet webkit.review.bot oldest_to_newest 198725 0 jianli 2010-03-11 12:01:16 -0800 Need to add V8 bindings for DOMFormData. 198728 1 50526 jianli 2010-03-11 12:05:06 -0800 Created attachment 50526 Proposed Patch 198729 2 jianli 2010-03-11 12:06:58 -0800 This patch depends on the patch for 36024. The chromium builder might show broken due to that patch 36024 is not landed. I will check in this patch immediately after landing patch for 36024. 198730 3 webkit.review.bot 2010-03-11 12:08:08 -0800 Attachment 50526 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp:38: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 198732 4 50528 jianli 2010-03-11 12:10:53 -0800 Created attachment 50528 Fix style error 198734 5 webkit.review.bot 2010-03-11 12:12:15 -0800 Attachment 50526 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/642025 198741 6 webkit.review.bot 2010-03-11 12:30:32 -0800 Attachment 50528 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/623019 198843 7 50528 japhet 2010-03-11 16:48:25 -0800 Comment on attachment 50528 Fix style error Looks good in general. However, I don't see DOMFormData.idl anywhere. I assume that's why the EWS failed to build? A couple additional minor things: > diff --git a/WebCore/bindings/v8/DOMObjectsInclude.h b/WebCore/bindings/v8/DOMObjectsInclude.h > index cd8443a..fd1a875 100644 > --- a/WebCore/bindings/v8/DOMObjectsInclude.h > +++ b/WebCore/bindings/v8/DOMObjectsInclude.h > @@ -82,6 +82,7 @@ > #include "DocumentType.h" > #include "DocumentFragment.h" > #include "DOMCoreException.h" > +#include "DOMFormData.h" > #include "DOMImplementation.h" > #include "DOMParser.h" > #include "DOMSelection.h" I deleted this file today, since it wasn't getting much use. Feel free to revert this part of the change. > diff --git a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp > index b626499..76ad172 100644 > --- a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp > +++ b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp > @@ -94,6 +94,7 @@ > #include "bindings/V8DocumentFragment.cpp" > #include "bindings/V8DocumentType.cpp" > #include "bindings/V8DOMCoreException.cpp" > +#include "bindings/V8DOMFormData.cpp" > #include "bindings/V8DOMImplementation.cpp" > #include "bindings/V8DOMParser.cpp" > #include "bindings/V8DOMSelection.cpp" This file is current unused and about to be deleted as well. 198848 8 jianli 2010-03-11 16:57:02 -0800 The idl is in the patch for bug 36024. 198851 9 50562 jianli 2010-03-11 17:04:39 -0800 Created attachment 50562 Proposed Patch Revert changes done to the removed file and the file to be removed. 198853 10 webkit.review.bot 2010-03-11 17:11:08 -0800 Attachment 50562 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/588032 198861 11 50562 japhet 2010-03-11 17:35:57 -0800 Comment on attachment 50562 Proposed Patch Excellent, thanks for the clarification. 199714 12 jianli 2010-03-15 10:37:55 -0700 Committed as http://trac.webkit.org/changeset/56004. 50526 2010-03-11 12:05:06 -0800 2010-03-11 12:10:53 -0800 Proposed Patch 36026 text/plain 7398 jianli ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MGRjZGVkNi4uNTgyYWUyZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wMy0xMSAgSmlhbiBMaSAgPGpp YW5saUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW3Y4XSBBZGQgVjggYmluZGluZ3MgZm9yIERPTUZvcm1EYXRhLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzYwMjYKKworICAgICAg ICBUZXN0OiBodHRwL3Rlc3RzL2xvY2FsL3NlbmQtZm9ybS1kYXRhLmh0bWwKKworICAgICAgICAq IFdlYkNvcmUuZ3lwaToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9ET01PYmplY3RzSW5jbHVkZS5o OgorICAgICAgICAqIGJpbmRpbmdzL3Y4L0Rlcml2ZWRTb3VyY2VzQWxsSW5PbmUuY3BwOgorICAg ICAgICAqIGJpbmRpbmdzL3Y4L1Y4SW5kZXguaDoKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0 b20vVjhET01Gb3JtRGF0YUN1c3RvbS5jcHA6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6VjhE T01Gb3JtRGF0YTo6YXBwZW5kQ2FsbGJhY2spOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3Rv bS9WOFhNTEh0dHBSZXF1ZXN0Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4WE1MSHR0 cFJlcXVlc3Q6OnNlbmRDYWxsYmFjayk6CisKIDIwMTAtMDMtMTAgIEppYW4gTGkgIDxqaWFubGlA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERtaXRyeSBUaXRvdi4KZGlmZiAt LWdpdCBhL1dlYkNvcmUvV2ViQ29yZS5neXBpIGIvV2ViQ29yZS9XZWJDb3JlLmd5cGkKaW5kZXgg ZTBlYzA5ZC4uYzAxOGZjNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9XZWJDb3JlLmd5cGkKKysrIGIv V2ViQ29yZS9XZWJDb3JlLmd5cGkKQEAgLTEwNiw2ICsxMDYsNyBAQAogICAgICAgICAgICAgJ2h0 bWwvY2FudmFzL1dlYkdMVGV4dHVyZS5pZGwnLAogICAgICAgICAgICAgJ2h0bWwvRGF0YUdyaWRD b2x1bW4uaWRsJywKICAgICAgICAgICAgICdodG1sL0RhdGFHcmlkQ29sdW1uTGlzdC5pZGwnLAor ICAgICAgICAgICAgJ2h0bWwvRE9NRm9ybURhdGEuaWRsJywKICAgICAgICAgICAgICdodG1sL0Zp bGUuaWRsJywKICAgICAgICAgICAgICdodG1sL0ZpbGVMaXN0LmlkbCcsCiAgICAgICAgICAgICAn aHRtbC9IVE1MQWxsQ29sbGVjdGlvbi5pZGwnLApAQCAtNzE3LDYgKzcxOCw3IEBACiAgICAgICAg ICAgICAnYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGF0YUdyaWRDb2x1bW5MaXN0Q3VzdG9tLmNwcCcs CiAgICAgICAgICAgICAnYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGVkaWNhdGVkV29ya2VyQ29udGV4 dEN1c3RvbS5jcHAnLAogICAgICAgICAgICAgJ2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERvY3VtZW50 TG9jYXRpb25DdXN0b20uY3BwJywKKyAgICAgICAgICAgICdiaW5kaW5ncy92OC9jdXN0b20vVjhE T01Gb3JtRGF0YUN1c3RvbS5jcHAnLAogICAgICAgICAgICAgJ2JpbmRpbmdzL3Y4L2N1c3RvbS9W OERPTVNlbGVjdGlvbkN1c3RvbS5jcHAnLAogICAgICAgICAgICAgJ2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOERPTVdpbmRvd0N1c3RvbS5jcHAnLAogICAgICAgICAgICAgJ2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOERvY3VtZW50Q3VzdG9tLmNwcCcsCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L0RPTU9iamVjdHNJbmNsdWRlLmggYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTU9iamVjdHNJbmNs dWRlLmgKaW5kZXggY2Q4NDQzYS4uZmQxYTg3NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5n cy92OC9ET01PYmplY3RzSW5jbHVkZS5oCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvRE9NT2Jq ZWN0c0luY2x1ZGUuaApAQCAtODIsNiArODIsNyBAQAogI2luY2x1ZGUgIkRvY3VtZW50VHlwZS5o IgogI2luY2x1ZGUgIkRvY3VtZW50RnJhZ21lbnQuaCIKICNpbmNsdWRlICJET01Db3JlRXhjZXB0 aW9uLmgiCisjaW5jbHVkZSAiRE9NRm9ybURhdGEuaCIKICNpbmNsdWRlICJET01JbXBsZW1lbnRh dGlvbi5oIgogI2luY2x1ZGUgIkRPTVBhcnNlci5oIgogI2luY2x1ZGUgIkRPTVNlbGVjdGlvbi5o IgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9EZXJpdmVkU291cmNlc0FsbEluT25l LmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvRGVyaXZlZFNvdXJjZXNBbGxJbk9uZS5jcHAKaW5k ZXggYjYyNjQ5OS4uNzZhZDE3MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9EZXJp dmVkU291cmNlc0FsbEluT25lLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L0Rlcml2ZWRT b3VyY2VzQWxsSW5PbmUuY3BwCkBAIC05NCw2ICs5NCw3IEBACiAjaW5jbHVkZSAiYmluZGluZ3Mv VjhEb2N1bWVudEZyYWdtZW50LmNwcCIKICNpbmNsdWRlICJiaW5kaW5ncy9WOERvY3VtZW50VHlw ZS5jcHAiCiAjaW5jbHVkZSAiYmluZGluZ3MvVjhET01Db3JlRXhjZXB0aW9uLmNwcCIKKyNpbmNs dWRlICJiaW5kaW5ncy9WOERPTUZvcm1EYXRhLmNwcCIKICNpbmNsdWRlICJiaW5kaW5ncy9WOERP TUltcGxlbWVudGF0aW9uLmNwcCIKICNpbmNsdWRlICJiaW5kaW5ncy9WOERPTVBhcnNlci5jcHAi CiAjaW5jbHVkZSAiYmluZGluZ3MvVjhET01TZWxlY3Rpb24uY3BwIgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9iaW5kaW5ncy92OC9WOEluZGV4LmggYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4SW5kZXgu aAppbmRleCA5NjlhNDk1Li5mZjlmMmQ4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1Y4SW5kZXguaAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4SW5kZXguaApAQCAtMzYzLDYg KzM2Myw3IEBAIHN0YXRpYyBjb25zdCBpbnQgdjhEZWZhdWx0V3JhcHBlckludGVybmFsRmllbGRD b3VudCA9IDI7CiAgICAgVihDU1NWQVJJQUJMRVNERUNMQVJBVElPTiwgQ1NTVmFyaWFibGVzRGVj bGFyYXRpb24pICAgICAgICAgICAgICAgICBcCiAgICAgVihDU1NWQVJJQUJMRVNSVUxFLCBDU1NW YXJpYWJsZXNSdWxlKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgVihET01D T1JFRVhDRVBUSU9OLCBET01Db3JlRXhjZXB0aW9uKSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBcCisgICAgVihET01GT1JNREFUQSwgRE9NRm9ybURhdGEpICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgVihET01JTVBMRU1FTlRBVElPTiwgRE9NSW1w bGVtZW50YXRpb24pICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgVihET01QQVJT RVIsIERPTVBhcnNlcikgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBcCiAgICAgVihET01TRUxFQ1RJT04sIERPTVNlbGVjdGlvbikgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBcCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1 c3RvbS9WOERPTUZvcm1EYXRhQ3VzdG9tLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9t L1Y4RE9NRm9ybURhdGFDdXN0b20uY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAuLjhhMzkzMzIKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOERPTUZvcm1EYXRhQ3VzdG9tLmNwcApAQCAtMCwwICsxLDY1IEBACisvKgorICogQ29weXJp Z2h0IChDKSAyMDEwIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisgKiBtZXQ6CisgKgorICogICAgICogUmVkaXN0cmli dXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAq IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4KKyAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJv ZHVjZSB0aGUgYWJvdmUKKyAqIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyAqIGluIHRoZSBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyAqIGRpc3RyaWJ1dGlv bi4KKyAqICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1l cyBvZiBpdHMKKyAqIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21v dGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCisgKiB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lm aWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJP VklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyAqICJBUyBJ UyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQg Tk9UCisgKiBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJ TElUWSBBTkQgRklUTkVTUyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJ TUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisgKiBPV05FUiBPUiBDT05UUklC VVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyAq IFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcs IEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMg T1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAorICogREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5F U1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisgKiBUSEVPUlkgT0Yg TElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JU CisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBX QVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBP RiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1ZGUgImNvbmZp Zy5oIgorI2luY2x1ZGUgIlY4RE9NRm9ybURhdGEuaCIKKworI2luY2x1ZGUgIkRPTUZvcm1EYXRh LmgiCisjaW5jbHVkZSAiVjhCaW5kaW5nLmgiCisjaW5jbHVkZSAiVjhCbG9iLmgiCisjaW5jbHVk ZSAiVjhQcm94eS5oIgorI2luY2x1ZGUgIlY4VXRpbGl0aWVzLmgiCisKK25hbWVzcGFjZSBXZWJD b3JlIHsKKwordjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4RE9NRm9ybURhdGE6OmFwcGVuZENhbGxi YWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MpCit7CisgICAgSU5DX1NUQVRTKCJET00uRm9y bURhdGEuYXBwZW5kKCkiKTsKKyAgICAKKyAgICBpZiAoYXJncy5MZW5ndGgoKSA8IDIpCisgICAg ICAgIHJldHVybiB0aHJvd0Vycm9yKCJOb3QgZW5vdWdoIGFyZ3VtZW50cyIsIFY4UHJveHk6OlN5 bnRheEVycm9yKTsKKworICAgIERPTUZvcm1EYXRhKiBkb21Gb3JtRGF0YSA9IFY4RE9NRm9ybURh dGE6OnRvTmF0aXZlKGFyZ3MuSG9sZGVyKCkpOworCisgICAgU3RyaW5nIG5hbWUgPSB0b1dlYkNv cmVTdHJpbmdXaXRoTnVsbENoZWNrKGFyZ3NbMF0pOworCisgICAgdjg6OkhhbmRsZTx2ODo6VmFs dWU+IGFyZyA9IGFyZ3NbMV07CisgICAgaWYgKFY4QmxvYjo6SGFzSW5zdGFuY2UoYXJnKSkgewor ICAgICAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IG9iamVjdCA9IHY4OjpIYW5kbGU8djg6Ok9i amVjdD46OkNhc3QoYXJnKTsKKyAgICAgICAgQmxvYiogYmxvYiA9IFY4QmxvYjo6dG9OYXRpdmUo b2JqZWN0KTsKKyAgICAgICAgQVNTRVJUKGJsb2IpOworICAgICAgICBkb21Gb3JtRGF0YS0+YXBw ZW5kKG5hbWUsIGJsb2IpOworICAgIH0gZWxzZQorICAgICAgICBkb21Gb3JtRGF0YS0+YXBwZW5k KG5hbWUsIHRvV2ViQ29yZVN0cmluZ1dpdGhOdWxsQ2hlY2soYXJnKSk7CisKKyAgICByZXR1cm4g djg6OlVuZGVmaW5lZCgpOworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQg YS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFhNTEh0dHBSZXF1ZXN0Q3VzdG9tLmNwcCBi L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4WE1MSHR0cFJlcXVlc3RDdXN0b20uY3BwCmlu ZGV4IGRjZTJkMjEuLjI1ZDYwZjIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4WE1MSHR0cFJlcXVlc3RDdXN0b20uY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3Mvdjgv Y3VzdG9tL1Y4WE1MSHR0cFJlcXVlc3RDdXN0b20uY3BwCkBAIC0zNSw2ICszNSw3IEBACiAjaW5j bHVkZSAiVjhCaW5kaW5nLmgiCiAjaW5jbHVkZSAiVjhCbG9iLmgiCiAjaW5jbHVkZSAiVjhEb2N1 bWVudC5oIgorI2luY2x1ZGUgIlY4RE9NRm9ybURhdGEuaCIKICNpbmNsdWRlICJWOEhUTUxEb2N1 bWVudC5oIgogI2luY2x1ZGUgIlY4UHJveHkuaCIKICNpbmNsdWRlICJWOFV0aWxpdGllcy5oIgpA QCAtMTIzLDYgKzEyNCwxMSBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhYTUxIdHRwUmVxdWVz dDo6c2VuZENhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MpCiAgICAgICAgICAgICBC bG9iKiBibG9iID0gVjhCbG9iOjp0b05hdGl2ZShvYmplY3QpOwogICAgICAgICAgICAgQVNTRVJU KGJsb2IpOwogICAgICAgICAgICAgeG1sSHR0cFJlcXVlc3QtPnNlbmQoYmxvYiwgZWMpOworICAg ICAgICB9IGVsc2UgaWYgKFY4RE9NRm9ybURhdGE6Okhhc0luc3RhbmNlKGFyZykpIHsKKyAgICAg ICAgICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gb2JqZWN0ID0gdjg6OkhhbmRsZTx2ODo6T2Jq ZWN0Pjo6Q2FzdChhcmcpOworICAgICAgICAgICAgRE9NRm9ybURhdGEqIGRvbUZvcm1EYXRhID0g VjhET01Gb3JtRGF0YTo6dG9OYXRpdmUob2JqZWN0KTsKKyAgICAgICAgICAgIEFTU0VSVChkb21G b3JtRGF0YSk7CisgICAgICAgICAgICB4bWxIdHRwUmVxdWVzdC0+c2VuZChkb21Gb3JtRGF0YSwg ZWMpOwogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIHhtbEh0dHBSZXF1ZXN0LT5zZW5kKHRv V2ViQ29yZVN0cmluZ1dpdGhOdWxsQ2hlY2soYXJnKSwgZWMpOwogICAgIH0K 50528 2010-03-11 12:10:53 -0800 2010-03-11 17:04:39 -0800 Fix style error 36026_2 text/plain 7392 jianli ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MGRjZGVkNi4uNTgyYWUyZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wMy0xMSAgSmlhbiBMaSAgPGpp YW5saUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW3Y4XSBBZGQgVjggYmluZGluZ3MgZm9yIERPTUZvcm1EYXRhLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzYwMjYKKworICAgICAg ICBUZXN0OiBodHRwL3Rlc3RzL2xvY2FsL3NlbmQtZm9ybS1kYXRhLmh0bWwKKworICAgICAgICAq IFdlYkNvcmUuZ3lwaToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9ET01PYmplY3RzSW5jbHVkZS5o OgorICAgICAgICAqIGJpbmRpbmdzL3Y4L0Rlcml2ZWRTb3VyY2VzQWxsSW5PbmUuY3BwOgorICAg ICAgICAqIGJpbmRpbmdzL3Y4L1Y4SW5kZXguaDoKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0 b20vVjhET01Gb3JtRGF0YUN1c3RvbS5jcHA6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6VjhE T01Gb3JtRGF0YTo6YXBwZW5kQ2FsbGJhY2spOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3Rv bS9WOFhNTEh0dHBSZXF1ZXN0Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4WE1MSHR0 cFJlcXVlc3Q6OnNlbmRDYWxsYmFjayk6CisKIDIwMTAtMDMtMTAgIEppYW4gTGkgIDxqaWFubGlA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERtaXRyeSBUaXRvdi4KZGlmZiAt LWdpdCBhL1dlYkNvcmUvV2ViQ29yZS5neXBpIGIvV2ViQ29yZS9XZWJDb3JlLmd5cGkKaW5kZXgg ZTBlYzA5ZC4uYzAxOGZjNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9XZWJDb3JlLmd5cGkKKysrIGIv V2ViQ29yZS9XZWJDb3JlLmd5cGkKQEAgLTEwNiw2ICsxMDYsNyBAQAogICAgICAgICAgICAgJ2h0 bWwvY2FudmFzL1dlYkdMVGV4dHVyZS5pZGwnLAogICAgICAgICAgICAgJ2h0bWwvRGF0YUdyaWRD b2x1bW4uaWRsJywKICAgICAgICAgICAgICdodG1sL0RhdGFHcmlkQ29sdW1uTGlzdC5pZGwnLAor ICAgICAgICAgICAgJ2h0bWwvRE9NRm9ybURhdGEuaWRsJywKICAgICAgICAgICAgICdodG1sL0Zp bGUuaWRsJywKICAgICAgICAgICAgICdodG1sL0ZpbGVMaXN0LmlkbCcsCiAgICAgICAgICAgICAn aHRtbC9IVE1MQWxsQ29sbGVjdGlvbi5pZGwnLApAQCAtNzE3LDYgKzcxOCw3IEBACiAgICAgICAg ICAgICAnYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGF0YUdyaWRDb2x1bW5MaXN0Q3VzdG9tLmNwcCcs CiAgICAgICAgICAgICAnYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGVkaWNhdGVkV29ya2VyQ29udGV4 dEN1c3RvbS5jcHAnLAogICAgICAgICAgICAgJ2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERvY3VtZW50 TG9jYXRpb25DdXN0b20uY3BwJywKKyAgICAgICAgICAgICdiaW5kaW5ncy92OC9jdXN0b20vVjhE T01Gb3JtRGF0YUN1c3RvbS5jcHAnLAogICAgICAgICAgICAgJ2JpbmRpbmdzL3Y4L2N1c3RvbS9W OERPTVNlbGVjdGlvbkN1c3RvbS5jcHAnLAogICAgICAgICAgICAgJ2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOERPTVdpbmRvd0N1c3RvbS5jcHAnLAogICAgICAgICAgICAgJ2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOERvY3VtZW50Q3VzdG9tLmNwcCcsCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L0RPTU9iamVjdHNJbmNsdWRlLmggYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTU9iamVjdHNJbmNs dWRlLmgKaW5kZXggY2Q4NDQzYS4uZmQxYTg3NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5n cy92OC9ET01PYmplY3RzSW5jbHVkZS5oCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvRE9NT2Jq ZWN0c0luY2x1ZGUuaApAQCAtODIsNiArODIsNyBAQAogI2luY2x1ZGUgIkRvY3VtZW50VHlwZS5o IgogI2luY2x1ZGUgIkRvY3VtZW50RnJhZ21lbnQuaCIKICNpbmNsdWRlICJET01Db3JlRXhjZXB0 aW9uLmgiCisjaW5jbHVkZSAiRE9NRm9ybURhdGEuaCIKICNpbmNsdWRlICJET01JbXBsZW1lbnRh dGlvbi5oIgogI2luY2x1ZGUgIkRPTVBhcnNlci5oIgogI2luY2x1ZGUgIkRPTVNlbGVjdGlvbi5o IgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9EZXJpdmVkU291cmNlc0FsbEluT25l LmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvRGVyaXZlZFNvdXJjZXNBbGxJbk9uZS5jcHAKaW5k ZXggYjYyNjQ5OS4uNzZhZDE3MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9EZXJp dmVkU291cmNlc0FsbEluT25lLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L0Rlcml2ZWRT b3VyY2VzQWxsSW5PbmUuY3BwCkBAIC05NCw2ICs5NCw3IEBACiAjaW5jbHVkZSAiYmluZGluZ3Mv VjhEb2N1bWVudEZyYWdtZW50LmNwcCIKICNpbmNsdWRlICJiaW5kaW5ncy9WOERvY3VtZW50VHlw ZS5jcHAiCiAjaW5jbHVkZSAiYmluZGluZ3MvVjhET01Db3JlRXhjZXB0aW9uLmNwcCIKKyNpbmNs dWRlICJiaW5kaW5ncy9WOERPTUZvcm1EYXRhLmNwcCIKICNpbmNsdWRlICJiaW5kaW5ncy9WOERP TUltcGxlbWVudGF0aW9uLmNwcCIKICNpbmNsdWRlICJiaW5kaW5ncy9WOERPTVBhcnNlci5jcHAi CiAjaW5jbHVkZSAiYmluZGluZ3MvVjhET01TZWxlY3Rpb24uY3BwIgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9iaW5kaW5ncy92OC9WOEluZGV4LmggYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4SW5kZXgu aAppbmRleCA5NjlhNDk1Li5mZjlmMmQ4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1Y4SW5kZXguaAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4SW5kZXguaApAQCAtMzYzLDYg KzM2Myw3IEBAIHN0YXRpYyBjb25zdCBpbnQgdjhEZWZhdWx0V3JhcHBlckludGVybmFsRmllbGRD b3VudCA9IDI7CiAgICAgVihDU1NWQVJJQUJMRVNERUNMQVJBVElPTiwgQ1NTVmFyaWFibGVzRGVj bGFyYXRpb24pICAgICAgICAgICAgICAgICBcCiAgICAgVihDU1NWQVJJQUJMRVNSVUxFLCBDU1NW YXJpYWJsZXNSdWxlKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgVihET01D T1JFRVhDRVBUSU9OLCBET01Db3JlRXhjZXB0aW9uKSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBcCisgICAgVihET01GT1JNREFUQSwgRE9NRm9ybURhdGEpICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgVihET01JTVBMRU1FTlRBVElPTiwgRE9NSW1w bGVtZW50YXRpb24pICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgVihET01QQVJT RVIsIERPTVBhcnNlcikgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBcCiAgICAgVihET01TRUxFQ1RJT04sIERPTVNlbGVjdGlvbikgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBcCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1 c3RvbS9WOERPTUZvcm1EYXRhQ3VzdG9tLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9t L1Y4RE9NRm9ybURhdGFDdXN0b20uY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAuLjhhMzkzMzIKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOERPTUZvcm1EYXRhQ3VzdG9tLmNwcApAQCAtMCwwICsxLDY1IEBACisvKgorICogQ29weXJp Z2h0IChDKSAyMDEwIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisgKiBtZXQ6CisgKgorICogICAgICogUmVkaXN0cmli dXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAq IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4KKyAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJv ZHVjZSB0aGUgYWJvdmUKKyAqIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyAqIGluIHRoZSBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyAqIGRpc3RyaWJ1dGlv bi4KKyAqICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1l cyBvZiBpdHMKKyAqIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21v dGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCisgKiB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lm aWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJP VklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyAqICJBUyBJ UyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQg Tk9UCisgKiBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJ TElUWSBBTkQgRklUTkVTUyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJ TUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisgKiBPV05FUiBPUiBDT05UUklC VVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyAq IFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcs IEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMg T1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAorICogREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5F U1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisgKiBUSEVPUlkgT0Yg TElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JU CisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBX QVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBP RiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1ZGUgImNvbmZp Zy5oIgorI2luY2x1ZGUgIlY4RE9NRm9ybURhdGEuaCIKKworI2luY2x1ZGUgIkRPTUZvcm1EYXRh LmgiCisjaW5jbHVkZSAiVjhCaW5kaW5nLmgiCisjaW5jbHVkZSAiVjhCbG9iLmgiCisjaW5jbHVk ZSAiVjhQcm94eS5oIgorI2luY2x1ZGUgIlY4VXRpbGl0aWVzLmgiCisKK25hbWVzcGFjZSBXZWJD b3JlIHsKKwordjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4RE9NRm9ybURhdGE6OmFwcGVuZENhbGxi YWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MpCit7CisgICAgSU5DX1NUQVRTKCJET00uRm9y bURhdGEuYXBwZW5kKCkiKTsKKyAgICAKKyAgICBpZiAoYXJncy5MZW5ndGgoKSA8IDIpCisgICAg ICAgIHJldHVybiB0aHJvd0Vycm9yKCJOb3QgZW5vdWdoIGFyZ3VtZW50cyIsIFY4UHJveHk6OlN5 bnRheEVycm9yKTsKKworICAgIERPTUZvcm1EYXRhKiBkb21Gb3JtRGF0YSA9IFY4RE9NRm9ybURh dGE6OnRvTmF0aXZlKGFyZ3MuSG9sZGVyKCkpOworCisgICAgU3RyaW5nIG5hbWUgPSB0b1dlYkNv cmVTdHJpbmdXaXRoTnVsbENoZWNrKGFyZ3NbMF0pOworCisgICAgdjg6OkhhbmRsZTx2ODo6VmFs dWU+IGFyZyA9IGFyZ3NbMV07CisgICAgaWYgKFY4QmxvYjo6SGFzSW5zdGFuY2UoYXJnKSkgewor ICAgICAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IG9iamVjdCA9IHY4OjpIYW5kbGU8djg6Ok9i amVjdD46OkNhc3QoYXJnKTsKKyAgICAgICAgQmxvYiogYmxvYiA9IFY4QmxvYjo6dG9OYXRpdmUo b2JqZWN0KTsKKyAgICAgICAgQVNTRVJUKGJsb2IpOworICAgICAgICBkb21Gb3JtRGF0YS0+YXBw ZW5kKG5hbWUsIGJsb2IpOworICAgIH0gZWxzZQorICAgICAgICBkb21Gb3JtRGF0YS0+YXBwZW5k KG5hbWUsIHRvV2ViQ29yZVN0cmluZ1dpdGhOdWxsQ2hlY2soYXJnKSk7CisKKyAgICByZXR1cm4g djg6OlVuZGVmaW5lZCgpOworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQg YS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFhNTEh0dHBSZXF1ZXN0Q3VzdG9tLmNwcCBi L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4WE1MSHR0cFJlcXVlc3RDdXN0b20uY3BwCmlu ZGV4IGRjZTJkMjEuLmRmZjM3ZjcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4WE1MSHR0cFJlcXVlc3RDdXN0b20uY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3Mvdjgv Y3VzdG9tL1Y4WE1MSHR0cFJlcXVlc3RDdXN0b20uY3BwCkBAIC0zNCw2ICszNCw3IEBACiAjaW5j bHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJWOEJpbmRpbmcuaCIKICNpbmNsdWRlICJWOEJsb2Iu aCIKKyNpbmNsdWRlICJWOERPTUZvcm1EYXRhLmgiCiAjaW5jbHVkZSAiVjhEb2N1bWVudC5oIgog I2luY2x1ZGUgIlY4SFRNTERvY3VtZW50LmgiCiAjaW5jbHVkZSAiVjhQcm94eS5oIgpAQCAtMTIz LDYgKzEyNCwxMSBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhYTUxIdHRwUmVxdWVzdDo6c2Vu ZENhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MpCiAgICAgICAgICAgICBCbG9iKiBi bG9iID0gVjhCbG9iOjp0b05hdGl2ZShvYmplY3QpOwogICAgICAgICAgICAgQVNTRVJUKGJsb2Ip OwogICAgICAgICAgICAgeG1sSHR0cFJlcXVlc3QtPnNlbmQoYmxvYiwgZWMpOworICAgICAgICB9 IGVsc2UgaWYgKFY4RE9NRm9ybURhdGE6Okhhc0luc3RhbmNlKGFyZykpIHsKKyAgICAgICAgICAg IHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gb2JqZWN0ID0gdjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6 Q2FzdChhcmcpOworICAgICAgICAgICAgRE9NRm9ybURhdGEqIGRvbUZvcm1EYXRhID0gVjhET01G b3JtRGF0YTo6dG9OYXRpdmUob2JqZWN0KTsKKyAgICAgICAgICAgIEFTU0VSVChkb21Gb3JtRGF0 YSk7CisgICAgICAgICAgICB4bWxIdHRwUmVxdWVzdC0+c2VuZChkb21Gb3JtRGF0YSwgZWMpOwog ICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIHhtbEh0dHBSZXF1ZXN0LT5zZW5kKHRvV2ViQ29y ZVN0cmluZ1dpdGhOdWxsQ2hlY2soYXJnKSwgZWMpOwogICAgIH0K 50562 2010-03-11 17:04:39 -0800 2010-03-11 17:35:57 -0800 Proposed Patch 36026_3 text/plain 6309 jianli ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YmZiMzk5Ni4uMGJiNzFlMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wMy0xMSAgSmlhbiBMaSAgPGpp YW5saUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW3Y4XSBBZGQgVjggYmluZGluZ3MgZm9yIERPTUZvcm1EYXRhLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzYwMjYKKworICAgICAg ICBUZXN0OiBodHRwL3Rlc3RzL2xvY2FsL3NlbmQtZm9ybS1kYXRhLmh0bWwKKworICAgICAgICAq IFdlYkNvcmUuZ3lwaToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOEluZGV4Lmg6CisgICAgICAg ICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NRm9ybURhdGFDdXN0b20uY3BwOiBBZGRlZC4KKyAg ICAgICAgKFdlYkNvcmU6OlY4RE9NRm9ybURhdGE6OmFwcGVuZENhbGxiYWNrKToKKyAgICAgICAg KiBiaW5kaW5ncy92OC9jdXN0b20vVjhYTUxIdHRwUmVxdWVzdEN1c3RvbS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpWOFhNTEh0dHBSZXF1ZXN0OjpzZW5kQ2FsbGJhY2spOgorCiAyMDEwLTAzLTEx ICBNYXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGlt IEhhdGNoZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL1dlYkNvcmUuZ3lwaSBiL1dlYkNvcmUvV2Vi Q29yZS5neXBpCmluZGV4IDJjOGUzZWEuLmRkNjdlODUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvV2Vi Q29yZS5neXBpCisrKyBiL1dlYkNvcmUvV2ViQ29yZS5neXBpCkBAIC0xMDYsNiArMTA2LDcgQEAK ICAgICAgICAgICAgICdodG1sL2NhbnZhcy9XZWJHTFRleHR1cmUuaWRsJywKICAgICAgICAgICAg ICdodG1sL0RhdGFHcmlkQ29sdW1uLmlkbCcsCiAgICAgICAgICAgICAnaHRtbC9EYXRhR3JpZENv bHVtbkxpc3QuaWRsJywKKyAgICAgICAgICAgICdodG1sL0RPTUZvcm1EYXRhLmlkbCcsCiAgICAg ICAgICAgICAnaHRtbC9GaWxlLmlkbCcsCiAgICAgICAgICAgICAnaHRtbC9GaWxlTGlzdC5pZGwn LAogICAgICAgICAgICAgJ2h0bWwvSFRNTEFsbENvbGxlY3Rpb24uaWRsJywKQEAgLTcxOSw2ICs3 MjAsNyBAQAogICAgICAgICAgICAgJ2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERhdGFHcmlkQ29sdW1u TGlzdEN1c3RvbS5jcHAnLAogICAgICAgICAgICAgJ2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERlZGlj YXRlZFdvcmtlckNvbnRleHRDdXN0b20uY3BwJywKICAgICAgICAgICAgICdiaW5kaW5ncy92OC9j dXN0b20vVjhEb2N1bWVudExvY2F0aW9uQ3VzdG9tLmNwcCcsCisgICAgICAgICAgICAnYmluZGlu Z3MvdjgvY3VzdG9tL1Y4RE9NRm9ybURhdGFDdXN0b20uY3BwJywKICAgICAgICAgICAgICdiaW5k aW5ncy92OC9jdXN0b20vVjhET01TZWxlY3Rpb25DdXN0b20uY3BwJywKICAgICAgICAgICAgICdi aW5kaW5ncy92OC9jdXN0b20vVjhET01XaW5kb3dDdXN0b20uY3BwJywKICAgICAgICAgICAgICdi aW5kaW5ncy92OC9jdXN0b20vVjhEb2N1bWVudEN1c3RvbS5jcHAnLApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9iaW5kaW5ncy92OC9WOEluZGV4LmggYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4SW5kZXgu aAppbmRleCA5NjlhNDk1Li5mZjlmMmQ4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1Y4SW5kZXguaAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4SW5kZXguaApAQCAtMzYzLDYg KzM2Myw3IEBAIHN0YXRpYyBjb25zdCBpbnQgdjhEZWZhdWx0V3JhcHBlckludGVybmFsRmllbGRD b3VudCA9IDI7CiAgICAgVihDU1NWQVJJQUJMRVNERUNMQVJBVElPTiwgQ1NTVmFyaWFibGVzRGVj bGFyYXRpb24pICAgICAgICAgICAgICAgICBcCiAgICAgVihDU1NWQVJJQUJMRVNSVUxFLCBDU1NW YXJpYWJsZXNSdWxlKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgVihET01D T1JFRVhDRVBUSU9OLCBET01Db3JlRXhjZXB0aW9uKSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBcCisgICAgVihET01GT1JNREFUQSwgRE9NRm9ybURhdGEpICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgVihET01JTVBMRU1FTlRBVElPTiwgRE9NSW1w bGVtZW50YXRpb24pICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgVihET01QQVJT RVIsIERPTVBhcnNlcikgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBcCiAgICAgVihET01TRUxFQ1RJT04sIERPTVNlbGVjdGlvbikgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBcCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1 c3RvbS9WOERPTUZvcm1EYXRhQ3VzdG9tLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9t L1Y4RE9NRm9ybURhdGFDdXN0b20uY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAuLjhhMzkzMzIKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOERPTUZvcm1EYXRhQ3VzdG9tLmNwcApAQCAtMCwwICsxLDY1IEBACisvKgorICogQ29weXJp Z2h0IChDKSAyMDEwIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisgKiBtZXQ6CisgKgorICogICAgICogUmVkaXN0cmli dXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAq IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4KKyAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJv ZHVjZSB0aGUgYWJvdmUKKyAqIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyAqIGluIHRoZSBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyAqIGRpc3RyaWJ1dGlv bi4KKyAqICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1l cyBvZiBpdHMKKyAqIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21v dGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCisgKiB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lm aWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJP VklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyAqICJBUyBJ UyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQg Tk9UCisgKiBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJ TElUWSBBTkQgRklUTkVTUyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJ TUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisgKiBPV05FUiBPUiBDT05UUklC VVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyAq IFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcs IEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMg T1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAorICogREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5F U1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisgKiBUSEVPUlkgT0Yg TElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JU CisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBX QVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBP RiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1ZGUgImNvbmZp Zy5oIgorI2luY2x1ZGUgIlY4RE9NRm9ybURhdGEuaCIKKworI2luY2x1ZGUgIkRPTUZvcm1EYXRh LmgiCisjaW5jbHVkZSAiVjhCaW5kaW5nLmgiCisjaW5jbHVkZSAiVjhCbG9iLmgiCisjaW5jbHVk ZSAiVjhQcm94eS5oIgorI2luY2x1ZGUgIlY4VXRpbGl0aWVzLmgiCisKK25hbWVzcGFjZSBXZWJD b3JlIHsKKwordjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4RE9NRm9ybURhdGE6OmFwcGVuZENhbGxi YWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MpCit7CisgICAgSU5DX1NUQVRTKCJET00uRm9y bURhdGEuYXBwZW5kKCkiKTsKKyAgICAKKyAgICBpZiAoYXJncy5MZW5ndGgoKSA8IDIpCisgICAg ICAgIHJldHVybiB0aHJvd0Vycm9yKCJOb3QgZW5vdWdoIGFyZ3VtZW50cyIsIFY4UHJveHk6OlN5 bnRheEVycm9yKTsKKworICAgIERPTUZvcm1EYXRhKiBkb21Gb3JtRGF0YSA9IFY4RE9NRm9ybURh dGE6OnRvTmF0aXZlKGFyZ3MuSG9sZGVyKCkpOworCisgICAgU3RyaW5nIG5hbWUgPSB0b1dlYkNv cmVTdHJpbmdXaXRoTnVsbENoZWNrKGFyZ3NbMF0pOworCisgICAgdjg6OkhhbmRsZTx2ODo6VmFs dWU+IGFyZyA9IGFyZ3NbMV07CisgICAgaWYgKFY4QmxvYjo6SGFzSW5zdGFuY2UoYXJnKSkgewor ICAgICAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IG9iamVjdCA9IHY4OjpIYW5kbGU8djg6Ok9i amVjdD46OkNhc3QoYXJnKTsKKyAgICAgICAgQmxvYiogYmxvYiA9IFY4QmxvYjo6dG9OYXRpdmUo b2JqZWN0KTsKKyAgICAgICAgQVNTRVJUKGJsb2IpOworICAgICAgICBkb21Gb3JtRGF0YS0+YXBw ZW5kKG5hbWUsIGJsb2IpOworICAgIH0gZWxzZQorICAgICAgICBkb21Gb3JtRGF0YS0+YXBwZW5k KG5hbWUsIHRvV2ViQ29yZVN0cmluZ1dpdGhOdWxsQ2hlY2soYXJnKSk7CisKKyAgICByZXR1cm4g djg6OlVuZGVmaW5lZCgpOworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQg YS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFhNTEh0dHBSZXF1ZXN0Q3VzdG9tLmNwcCBi L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4WE1MSHR0cFJlcXVlc3RDdXN0b20uY3BwCmlu ZGV4IGRjZTJkMjEuLmRmZjM3ZjcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4WE1MSHR0cFJlcXVlc3RDdXN0b20uY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3Mvdjgv Y3VzdG9tL1Y4WE1MSHR0cFJlcXVlc3RDdXN0b20uY3BwCkBAIC0zNCw2ICszNCw3IEBACiAjaW5j bHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJWOEJpbmRpbmcuaCIKICNpbmNsdWRlICJWOEJsb2Iu aCIKKyNpbmNsdWRlICJWOERPTUZvcm1EYXRhLmgiCiAjaW5jbHVkZSAiVjhEb2N1bWVudC5oIgog I2luY2x1ZGUgIlY4SFRNTERvY3VtZW50LmgiCiAjaW5jbHVkZSAiVjhQcm94eS5oIgpAQCAtMTIz LDYgKzEyNCwxMSBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhYTUxIdHRwUmVxdWVzdDo6c2Vu ZENhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MpCiAgICAgICAgICAgICBCbG9iKiBi bG9iID0gVjhCbG9iOjp0b05hdGl2ZShvYmplY3QpOwogICAgICAgICAgICAgQVNTRVJUKGJsb2Ip OwogICAgICAgICAgICAgeG1sSHR0cFJlcXVlc3QtPnNlbmQoYmxvYiwgZWMpOworICAgICAgICB9 IGVsc2UgaWYgKFY4RE9NRm9ybURhdGE6Okhhc0luc3RhbmNlKGFyZykpIHsKKyAgICAgICAgICAg IHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gb2JqZWN0ID0gdjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6 Q2FzdChhcmcpOworICAgICAgICAgICAgRE9NRm9ybURhdGEqIGRvbUZvcm1EYXRhID0gVjhET01G b3JtRGF0YTo6dG9OYXRpdmUob2JqZWN0KTsKKyAgICAgICAgICAgIEFTU0VSVChkb21Gb3JtRGF0 YSk7CisgICAgICAgICAgICB4bWxIdHRwUmVxdWVzdC0+c2VuZChkb21Gb3JtRGF0YSwgZWMpOwog ICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIHhtbEh0dHBSZXF1ZXN0LT5zZW5kKHRvV2ViQ29y ZVN0cmluZ1dpdGhOdWxsQ2hlY2soYXJnKSwgZWMpOwogICAgIH0K