24593 2009-03-13 16:31:58 -0700 Minor renaming in Chromium port's ResourceRequest.h 2009-03-13 17:54:30 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 jam dimich oldest_to_newest 113733 0 jam 2009-03-13 16:31:58 -0700 This is part of http://codereview.chromium.org/46026. 113736 1 28612 jam 2009-03-13 16:35:25 -0700 Created attachment 28612 Patch 113737 2 28612 fishd 2009-03-13 16:45:50 -0700 Comment on attachment 28612 Patch >Index: WebCore/ChangeLog ... >+2009-03-13 jabdelmalek <set EMAIL_ADDRESS environment variable> nit: need to add your email address. also good to put your full name. you can set the env vars REAL_NAME and EMAIL_ADDRESS to make this automatic next time you run prepare-ChangeLog. >+ Reviewed by NOBODY (OOPS!). >+ >+ https://bugs.webkit.org/show_bug.cgi?id=24593 >+ >+ Added requestorID so we can track the request to its WebView without using frame (which was removed). >+ nit: tabs need to be replaced with spaces >Index: WebCore/platform/network/chromium/ResourceRequest.h ... >+ , m_requestorID(0) >+ , m_requestorPid(0) webkit style would make this m_requestorPID, but even better (I think) would be to go with m_requestorProcessID. that way it is not as visually confusing with m_requestorID. verbose names is consistent with webkit style ;-) 113738 3 28613 jam 2009-03-13 17:07:14 -0700 Created attachment 28613 updated per comments 113743 4 28613 fishd 2009-03-13 17:13:53 -0700 Comment on attachment 28613 updated per comments >Index: WebCore/platform/network/chromium/ResourceRequest.h >+ // Te process id of the process from which this request originated. In Te -> The 113745 5 28616 jam 2009-03-13 17:35:45 -0700 Created attachment 28616 fixed spelling mistake 113746 6 dimich 2009-03-13 17:54:30 -0700 Landed: http://trac.webkit.org/changeset/41694 28612 2009-03-13 16:35:25 -0700 2009-03-13 17:14:02 -0700 Patch resourcerequest text/plain 5027 jam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MTY5MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDktMDMtMTMgIGphYmRlbG1hbGVrICA8c2V0IEVNQUlMX0FERFJF U1MgZW52aXJvbm1lbnQgdmFyaWFibGU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKwkJaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0NTkz CisKKwkJQWRkZWQgcmVxdWVzdG9ySUQgc28gd2UgY2FuIHRyYWNrIHRoZSByZXF1ZXN0IHRvIGl0 cyBXZWJWaWV3IHdpdGhvdXQgdXNpbmcgZnJhbWUgKHdoaWNoIHdhcyByZW1vdmVkKS4KKworICAg ICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1ZXN0Lmg6CisgICAg ICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OlJlc291cmNlUmVxdWVzdCk6CisgICAgICAg IChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OnJlcXVlc3RvcklEKToKKyAgICAgICAgKFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdDo6c2V0UmVxdWVzdG9ySUQpOgorICAgICAgICAoV2ViQ29yZTo6 UmVzb3VyY2VSZXF1ZXN0OjpzZXRUYXJnZXRUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291 cmNlUmVxdWVzdDo6cG9saWN5VVJMKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVz dDo6c2V0UG9saWN5VVJMKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6cmVx dWVzdG9yUGlkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6c2V0UmVxdWVz dG9yUGlkKToKKwogMjAwOS0wMy0xMyAgTWlrZSBCZWxzaGUgIDxtaWtlQGJlbHNoZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlcXVlc3QuaAkocmV2aXNp b24gNDE2NjMpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VS ZXF1ZXN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDE2ICs0NywxNiBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKICAgICAgICAgUmVzb3VyY2VSZXF1ZXN0KGNvbnN0IFN0cmluZyYgdXJsKSAKICAg ICAgICAgICAgIDogUmVzb3VyY2VSZXF1ZXN0QmFzZShLVVJMKHVybCksIFVzZVByb3RvY29sQ2Fj aGVQb2xpY3kpCi0gICAgICAgICAgICAsIG1fZnJhbWUoMCkKLSAgICAgICAgICAgICwgbV9vcmln aW5QaWQoMCkKKyAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JJRCgwKQorICAgICAgICAgICAgLCBt X3JlcXVlc3RvclBpZCgwKQogICAgICAgICAgICAgLCBtX3RhcmdldFR5cGUoVGFyZ2V0SXNTdWJS ZXNvdXJjZSkKICAgICAgICAgewogICAgICAgICB9CiAKICAgICAgICAgUmVzb3VyY2VSZXF1ZXN0 KGNvbnN0IEtVUkwmIHVybCwgY29uc3QgQ1N0cmluZyYgc2VjdXJpdHlJbmZvKSAKICAgICAgICAg ICAgIDogUmVzb3VyY2VSZXF1ZXN0QmFzZSh1cmwsIFVzZVByb3RvY29sQ2FjaGVQb2xpY3kpCi0g ICAgICAgICAgICAsIG1fZnJhbWUoMCkKLSAgICAgICAgICAgICwgbV9vcmlnaW5QaWQoMCkKKyAg ICAgICAgICAgICwgbV9yZXF1ZXN0b3JJRCgwKQorICAgICAgICAgICAgLCBtX3JlcXVlc3RvclBp ZCgwKQogICAgICAgICAgICAgLCBtX3RhcmdldFR5cGUoVGFyZ2V0SXNTdWJSZXNvdXJjZSkKICAg ICAgICAgICAgICwgbV9zZWN1cml0eUluZm8oc2VjdXJpdHlJbmZvKQogICAgICAgICB7CkBAIC02 NCwxNiArNjQsMTYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIFJlc291cmNlUmVx dWVzdChjb25zdCBLVVJMJiB1cmwpIAogICAgICAgICAgICAgOiBSZXNvdXJjZVJlcXVlc3RCYXNl KHVybCwgVXNlUHJvdG9jb2xDYWNoZVBvbGljeSkKLSAgICAgICAgICAgICwgbV9mcmFtZSgwKQot ICAgICAgICAgICAgLCBtX29yaWdpblBpZCgwKQorICAgICAgICAgICAgLCBtX3JlcXVlc3RvcklE KDApCisgICAgICAgICAgICAsIG1fcmVxdWVzdG9yUGlkKDApCiAgICAgICAgICAgICAsIG1fdGFy Z2V0VHlwZShUYXJnZXRJc1N1YlJlc291cmNlKQogICAgICAgICB7CiAgICAgICAgIH0KIAogICAg ICAgICBSZXNvdXJjZVJlcXVlc3QoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHJlZmVy cmVyLCBSZXNvdXJjZVJlcXVlc3RDYWNoZVBvbGljeSBwb2xpY3kgPSBVc2VQcm90b2NvbENhY2hl UG9saWN5KSAKICAgICAgICAgICAgIDogUmVzb3VyY2VSZXF1ZXN0QmFzZSh1cmwsIHBvbGljeSkK LSAgICAgICAgICAgICwgbV9mcmFtZSgwKQotICAgICAgICAgICAgLCBtX29yaWdpblBpZCgwKQor ICAgICAgICAgICAgLCBtX3JlcXVlc3RvcklEKDApCisgICAgICAgICAgICAsIG1fcmVxdWVzdG9y UGlkKDApCiAgICAgICAgICAgICAsIG1fdGFyZ2V0VHlwZShUYXJnZXRJc1N1YlJlc291cmNlKQog ICAgICAgICB7CiAgICAgICAgICAgICBzZXRIVFRQUmVmZXJyZXIocmVmZXJyZXIpOwpAQCAtODEs MjYgKzgxLDMwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgCiAgICAgICAgIFJlc291 cmNlUmVxdWVzdCgpCiAgICAgICAgICAgICA6IFJlc291cmNlUmVxdWVzdEJhc2UoS1VSTCgpLCBV c2VQcm90b2NvbENhY2hlUG9saWN5KQotICAgICAgICAgICAgLCBtX2ZyYW1lKDApCi0gICAgICAg ICAgICAsIG1fb3JpZ2luUGlkKDApCisgICAgICAgICAgICAsIG1fcmVxdWVzdG9ySUQoMCkKKyAg ICAgICAgICAgICwgbV9yZXF1ZXN0b3JQaWQoMCkKICAgICAgICAgICAgICwgbV90YXJnZXRUeXBl KFRhcmdldElzU3ViUmVzb3VyY2UpCiAgICAgICAgIHsKICAgICAgICAgfQogCi0gICAgICAgIC8v IFByb3ZpZGVzIGNvbnRleHQgZm9yIHRoZSByZXNvdXJjZSByZXF1ZXN0LgotICAgICAgICBGcmFt ZSogZnJhbWUoKSBjb25zdCB7IHJldHVybiBtX2ZyYW1lOyB9Ci0gICAgICAgIHZvaWQgc2V0RnJh bWUoRnJhbWUqIGZyYW1lKSB7IG1fZnJhbWUgPSBmcmFtZTsgfQorICAgICAgICAvLyBBbGxvd3Mg dGhlIHJlcXVlc3QgdG8gYmUgbWF0Y2hlZCB1cCB3aXRoIGl0cyByZXF1ZXN0b3IuCisgICAgICAg IGludCByZXF1ZXN0b3JJRCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVxdWVzdG9ySUQ7IH0KKyAgICAg ICAgdm9pZCBzZXRSZXF1ZXN0b3JJRChpbnQgcmVxdWVzdG9ySUQpIHsgbV9yZXF1ZXN0b3JJRCA9 IHJlcXVlc3RvcklEOyB9CiAKICAgICAgICAgLy8gV2hhdCB0aGlzIHJlcXVlc3QgaXMgZm9yLgot ICAgICAgICB2b2lkIHNldFRhcmdldFR5cGUoVGFyZ2V0VHlwZSB0eXBlKSB7IG1fdGFyZ2V0VHlw ZSA9IHR5cGU7IH0KICAgICAgICAgVGFyZ2V0VHlwZSB0YXJnZXRUeXBlKCkgY29uc3QgeyByZXR1 cm4gbV90YXJnZXRUeXBlOyB9Ci0gICAgICAgIAotICAgICAgICAvLyBUaGUgb3JpZ2luIHBpZCBp cyB0aGUgcHJvY2VzcyBpZCBvZiB0aGUgcHJvY2VzcyBmcm9tIHdoaWNoIHRoaXMKKyAgICAgICAg dm9pZCBzZXRUYXJnZXRUeXBlKFRhcmdldFR5cGUgdHlwZSkgeyBtX3RhcmdldFR5cGUgPSB0eXBl OyB9CisKKyAgICAgICAgLy8gVGhlIGRvY3VtZW50J3MgcG9saWN5IGJhc2UgdXJsLgorICAgICAg ICBLVVJMIHBvbGljeVVSTCgpIGNvbnN0IHsgcmV0dXJuIG1fcG9saWN5VVJMOyB9CisgICAgICAg IHZvaWQgc2V0UG9saWN5VVJMKGNvbnN0IEtVUkwmIHBvbGljeVVSTCkgeyBtX3BvbGljeVVSTCA9 IHBvbGljeVVSTDsgfQorCisgICAgICAgIC8vIFRoZSByZXF1ZXN0b3IgcGlkIGlzIHRoZSBwcm9j ZXNzIGlkIG9mIHRoZSBwcm9jZXNzIGZyb20gd2hpY2ggdGhpcwogICAgICAgICAvLyByZXF1ZXN0 IG9yaWdpbmF0ZWQuIEluIHRoZSBjYXNlIG9mIG91dC1vZi1wcm9jZXNzIHBsdWdpbnMsIHRoaXMK ICAgICAgICAgLy8gYWxsb3dzIHRvIGxpbmsgYmFjayB0aGUgcmVxdWVzdCB0byB0aGUgcGx1Z2lu IHByb2Nlc3MgKGFzIGl0IGlzCiAgICAgICAgIC8vIHByb2Nlc3NlZCB0aHJvdWdoIGEgcmVuZGVy IHZpZXcgcHJvY2VzcykuCi0gICAgICAgIGludCBvcmlnaW5QaWQoKSBjb25zdCB7IHJldHVybiBt X29yaWdpblBpZDsgfQotICAgICAgICB2b2lkIHNldE9yaWdpblBpZChpbnQgb3JpZ2luUGlkKSB7 IG1fb3JpZ2luUGlkID0gb3JpZ2luUGlkOyB9CisgICAgICAgIGludCByZXF1ZXN0b3JQaWQoKSBj b25zdCB7IHJldHVybiBtX3JlcXVlc3RvclBpZDsgfQorICAgICAgICB2b2lkIHNldFJlcXVlc3Rv clBpZChpbnQgcmVxdWVzdG9yUGlkKSB7IG1fcmVxdWVzdG9yUGlkID0gcmVxdWVzdG9yUGlkOyB9 CiAKICAgICAgICAgLy8gT3BhcXVlIGJ1ZmZlciB0aGF0IGRlc2NyaWJlcyB0aGUgc2VjdXJpdHkg c3RhdGUgKGluY2x1ZGluZyBTU0wKICAgICAgICAgLy8gY29ubmVjdGlvbiBzdGF0ZSkgZm9yIHRo ZSByZXNvdXJjZSB0aGF0IHNob3VsZCBiZSByZXBvcnRlZCB3aGVuIHRoZQpAQCAtMTE3LDEwICsx MjEsMTEgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIGRvVXBkYXRlUGxhdGZv cm1SZXF1ZXN0KCkge30KICAgICAgICAgdm9pZCBkb1VwZGF0ZVJlc291cmNlUmVxdWVzdCgpIHt9 CiAKLSAgICAgICAgRnJhbWUqIG1fZnJhbWU7Ci0gICAgICAgIGludCBtX29yaWdpblBpZDsKKyAg ICAgICAgaW50IG1fcmVxdWVzdG9ySUQ7CisgICAgICAgIGludCBtX3JlcXVlc3RvclBpZDsKICAg ICAgICAgVGFyZ2V0VHlwZSBtX3RhcmdldFR5cGU7CiAgICAgICAgIENTdHJpbmcgbV9zZWN1cml0 eUluZm87CisgICAgICAgIEtVUkwgbV9wb2xpY3lVUkw7CiAgICAgfTsKIAogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQo= 28613 2009-03-13 17:07:14 -0700 2009-03-13 17:13:53 -0700 updated per comments resourcerequest text/plain 5277 jam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MTY5MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDktMDMtMTMgIEpvaG4gQWJkLUVsLU1hbGVrICA8amFtQGdvb2ds ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0NTkzCisKKyAgICAgICAg QWRkZWQgcmVxdWVzdG9ySUQgc28gd2UgY2FuIHRyYWNrIHRoZSByZXF1ZXN0IHRvIGl0cyBXZWJW aWV3IHdpdGhvdXQgdXNpbmcgZnJhbWUgKHdoaWNoIHdhcyByZW1vdmVkKS4KKworICAgICAgICAq IHBsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1ZXN0Lmg6CisgICAgICAgIChX ZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OlJlc291cmNlUmVxdWVzdCk6CisgICAgICAgIChXZWJD b3JlOjpSZXNvdXJjZVJlcXVlc3Q6OnJlcXVlc3RvcklEKToKKyAgICAgICAgKFdlYkNvcmU6OlJl c291cmNlUmVxdWVzdDo6c2V0UmVxdWVzdG9ySUQpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3Vy Y2VSZXF1ZXN0OjpzZXRUYXJnZXRUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdDo6cG9saWN5VVJMKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6c2V0 UG9saWN5VVJMKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6cmVxdWVzdG9y UGlkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6c2V0UmVxdWVzdG9yUGlk KToKKwogMjAwOS0wMy0xMyAgTWlrZSBCZWxzaGUgIDxtaWtlQGJlbHNoZS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlcXVlc3QuaAkocmV2aXNpb24gNDE2 NjMpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1ZXN0 LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDE2ICs0NywxNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKICAgICAgICAgUmVzb3VyY2VSZXF1ZXN0KGNvbnN0IFN0cmluZyYgdXJsKSAKICAgICAgICAg ICAgIDogUmVzb3VyY2VSZXF1ZXN0QmFzZShLVVJMKHVybCksIFVzZVByb3RvY29sQ2FjaGVQb2xp Y3kpCi0gICAgICAgICAgICAsIG1fZnJhbWUoMCkKLSAgICAgICAgICAgICwgbV9vcmlnaW5QaWQo MCkKKyAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JJRCgwKQorICAgICAgICAgICAgLCBtX3JlcXVl c3RvclByb2Nlc3NJRCgwKQogICAgICAgICAgICAgLCBtX3RhcmdldFR5cGUoVGFyZ2V0SXNTdWJS ZXNvdXJjZSkKICAgICAgICAgewogICAgICAgICB9CiAKICAgICAgICAgUmVzb3VyY2VSZXF1ZXN0 KGNvbnN0IEtVUkwmIHVybCwgY29uc3QgQ1N0cmluZyYgc2VjdXJpdHlJbmZvKSAKICAgICAgICAg ICAgIDogUmVzb3VyY2VSZXF1ZXN0QmFzZSh1cmwsIFVzZVByb3RvY29sQ2FjaGVQb2xpY3kpCi0g ICAgICAgICAgICAsIG1fZnJhbWUoMCkKLSAgICAgICAgICAgICwgbV9vcmlnaW5QaWQoMCkKKyAg ICAgICAgICAgICwgbV9yZXF1ZXN0b3JJRCgwKQorICAgICAgICAgICAgLCBtX3JlcXVlc3RvclBy b2Nlc3NJRCgwKQogICAgICAgICAgICAgLCBtX3RhcmdldFR5cGUoVGFyZ2V0SXNTdWJSZXNvdXJj ZSkKICAgICAgICAgICAgICwgbV9zZWN1cml0eUluZm8oc2VjdXJpdHlJbmZvKQogICAgICAgICB7 CkBAIC02NCwxNiArNjQsMTYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIFJlc291 cmNlUmVxdWVzdChjb25zdCBLVVJMJiB1cmwpIAogICAgICAgICAgICAgOiBSZXNvdXJjZVJlcXVl c3RCYXNlKHVybCwgVXNlUHJvdG9jb2xDYWNoZVBvbGljeSkKLSAgICAgICAgICAgICwgbV9mcmFt ZSgwKQotICAgICAgICAgICAgLCBtX29yaWdpblBpZCgwKQorICAgICAgICAgICAgLCBtX3JlcXVl c3RvcklEKDApCisgICAgICAgICAgICAsIG1fcmVxdWVzdG9yUHJvY2Vzc0lEKDApCiAgICAgICAg ICAgICAsIG1fdGFyZ2V0VHlwZShUYXJnZXRJc1N1YlJlc291cmNlKQogICAgICAgICB7CiAgICAg ICAgIH0KIAogICAgICAgICBSZXNvdXJjZVJlcXVlc3QoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBT dHJpbmcmIHJlZmVycmVyLCBSZXNvdXJjZVJlcXVlc3RDYWNoZVBvbGljeSBwb2xpY3kgPSBVc2VQ cm90b2NvbENhY2hlUG9saWN5KSAKICAgICAgICAgICAgIDogUmVzb3VyY2VSZXF1ZXN0QmFzZSh1 cmwsIHBvbGljeSkKLSAgICAgICAgICAgICwgbV9mcmFtZSgwKQotICAgICAgICAgICAgLCBtX29y aWdpblBpZCgwKQorICAgICAgICAgICAgLCBtX3JlcXVlc3RvcklEKDApCisgICAgICAgICAgICAs IG1fcmVxdWVzdG9yUHJvY2Vzc0lEKDApCiAgICAgICAgICAgICAsIG1fdGFyZ2V0VHlwZShUYXJn ZXRJc1N1YlJlc291cmNlKQogICAgICAgICB7CiAgICAgICAgICAgICBzZXRIVFRQUmVmZXJyZXIo cmVmZXJyZXIpOwpAQCAtODEsMjYgKzgxLDMwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAg ICAgCiAgICAgICAgIFJlc291cmNlUmVxdWVzdCgpCiAgICAgICAgICAgICA6IFJlc291cmNlUmVx dWVzdEJhc2UoS1VSTCgpLCBVc2VQcm90b2NvbENhY2hlUG9saWN5KQotICAgICAgICAgICAgLCBt X2ZyYW1lKDApCi0gICAgICAgICAgICAsIG1fb3JpZ2luUGlkKDApCisgICAgICAgICAgICAsIG1f cmVxdWVzdG9ySUQoMCkKKyAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JQcm9jZXNzSUQoMCkKICAg ICAgICAgICAgICwgbV90YXJnZXRUeXBlKFRhcmdldElzU3ViUmVzb3VyY2UpCiAgICAgICAgIHsK ICAgICAgICAgfQogCi0gICAgICAgIC8vIFByb3ZpZGVzIGNvbnRleHQgZm9yIHRoZSByZXNvdXJj ZSByZXF1ZXN0LgotICAgICAgICBGcmFtZSogZnJhbWUoKSBjb25zdCB7IHJldHVybiBtX2ZyYW1l OyB9Ci0gICAgICAgIHZvaWQgc2V0RnJhbWUoRnJhbWUqIGZyYW1lKSB7IG1fZnJhbWUgPSBmcmFt ZTsgfQorICAgICAgICAvLyBBbGxvd3MgdGhlIHJlcXVlc3QgdG8gYmUgbWF0Y2hlZCB1cCB3aXRo IGl0cyByZXF1ZXN0b3IuCisgICAgICAgIGludCByZXF1ZXN0b3JJRCgpIGNvbnN0IHsgcmV0dXJu IG1fcmVxdWVzdG9ySUQ7IH0KKyAgICAgICAgdm9pZCBzZXRSZXF1ZXN0b3JJRChpbnQgcmVxdWVz dG9ySUQpIHsgbV9yZXF1ZXN0b3JJRCA9IHJlcXVlc3RvcklEOyB9CiAKICAgICAgICAgLy8gV2hh dCB0aGlzIHJlcXVlc3QgaXMgZm9yLgotICAgICAgICB2b2lkIHNldFRhcmdldFR5cGUoVGFyZ2V0 VHlwZSB0eXBlKSB7IG1fdGFyZ2V0VHlwZSA9IHR5cGU7IH0KICAgICAgICAgVGFyZ2V0VHlwZSB0 YXJnZXRUeXBlKCkgY29uc3QgeyByZXR1cm4gbV90YXJnZXRUeXBlOyB9Ci0gICAgICAgIAotICAg ICAgICAvLyBUaGUgb3JpZ2luIHBpZCBpcyB0aGUgcHJvY2VzcyBpZCBvZiB0aGUgcHJvY2VzcyBm cm9tIHdoaWNoIHRoaXMKLSAgICAgICAgLy8gcmVxdWVzdCBvcmlnaW5hdGVkLiBJbiB0aGUgY2Fz ZSBvZiBvdXQtb2YtcHJvY2VzcyBwbHVnaW5zLCB0aGlzCi0gICAgICAgIC8vIGFsbG93cyB0byBs aW5rIGJhY2sgdGhlIHJlcXVlc3QgdG8gdGhlIHBsdWdpbiBwcm9jZXNzIChhcyBpdCBpcwotICAg ICAgICAvLyBwcm9jZXNzZWQgdGhyb3VnaCBhIHJlbmRlciB2aWV3IHByb2Nlc3MpLgotICAgICAg ICBpbnQgb3JpZ2luUGlkKCkgY29uc3QgeyByZXR1cm4gbV9vcmlnaW5QaWQ7IH0KLSAgICAgICAg dm9pZCBzZXRPcmlnaW5QaWQoaW50IG9yaWdpblBpZCkgeyBtX29yaWdpblBpZCA9IG9yaWdpblBp ZDsgfQorICAgICAgICB2b2lkIHNldFRhcmdldFR5cGUoVGFyZ2V0VHlwZSB0eXBlKSB7IG1fdGFy Z2V0VHlwZSA9IHR5cGU7IH0KKworICAgICAgICAvLyBUaGUgZG9jdW1lbnQncyBwb2xpY3kgYmFz ZSB1cmwuCisgICAgICAgIEtVUkwgcG9saWN5VVJMKCkgY29uc3QgeyByZXR1cm4gbV9wb2xpY3lV Ukw7IH0KKyAgICAgICAgdm9pZCBzZXRQb2xpY3lVUkwoY29uc3QgS1VSTCYgcG9saWN5VVJMKSB7 IG1fcG9saWN5VVJMID0gcG9saWN5VVJMOyB9CisKKyAgICAgICAgLy8gVGUgcHJvY2VzcyBpZCBv ZiB0aGUgcHJvY2VzcyBmcm9tIHdoaWNoIHRoaXMgcmVxdWVzdCBvcmlnaW5hdGVkLiBJbgorICAg ICAgICAvLyB0aGUgY2FzZSBvZiBvdXQtb2YtcHJvY2VzcyBwbHVnaW5zLCB0aGlzIGFsbG93cyB0 byBsaW5rIGJhY2sgdGhlCisgICAgICAgIC8vIHJlcXVlc3QgdG8gdGhlIHBsdWdpbiBwcm9jZXNz IChhcyBpdCBpcyBwcm9jZXNzZWQgdGhyb3VnaCBhIHJlbmRlcgorICAgICAgICAvLyB2aWV3IHBy b2Nlc3MpLgorICAgICAgICBpbnQgcmVxdWVzdG9yUHJvY2Vzc0lEKCkgY29uc3QgeyByZXR1cm4g bV9yZXF1ZXN0b3JQcm9jZXNzSUQ7IH0KKyAgICAgICAgdm9pZCBzZXRSZXF1ZXN0b3JQcm9jZXNz SUQoaW50IHJlcXVlc3RvclByb2Nlc3NJRCkgeyBtX3JlcXVlc3RvclByb2Nlc3NJRCA9IHJlcXVl c3RvclByb2Nlc3NJRDsgfQogCiAgICAgICAgIC8vIE9wYXF1ZSBidWZmZXIgdGhhdCBkZXNjcmli ZXMgdGhlIHNlY3VyaXR5IHN0YXRlIChpbmNsdWRpbmcgU1NMCiAgICAgICAgIC8vIGNvbm5lY3Rp b24gc3RhdGUpIGZvciB0aGUgcmVzb3VyY2UgdGhhdCBzaG91bGQgYmUgcmVwb3J0ZWQgd2hlbiB0 aGUKQEAgLTExNywxMCArMTIxLDExIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9p ZCBkb1VwZGF0ZVBsYXRmb3JtUmVxdWVzdCgpIHt9CiAgICAgICAgIHZvaWQgZG9VcGRhdGVSZXNv dXJjZVJlcXVlc3QoKSB7fQogCi0gICAgICAgIEZyYW1lKiBtX2ZyYW1lOwotICAgICAgICBpbnQg bV9vcmlnaW5QaWQ7CisgICAgICAgIGludCBtX3JlcXVlc3RvcklEOworICAgICAgICBpbnQgbV9y ZXF1ZXN0b3JQcm9jZXNzSUQ7CiAgICAgICAgIFRhcmdldFR5cGUgbV90YXJnZXRUeXBlOwogICAg ICAgICBDU3RyaW5nIG1fc2VjdXJpdHlJbmZvOworICAgICAgICBLVVJMIG1fcG9saWN5VVJMOwog ICAgIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 28616 2009-03-13 17:35:45 -0700 2009-03-13 17:35:45 -0700 fixed spelling mistake resourcerequest text/plain 5278 jam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MTY5MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDktMDMtMTMgIEpvaG4gQWJkLUVsLU1hbGVrICA8amFtQGdvb2ds ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0NTkzCisKKyAgICAgICAg QWRkZWQgcmVxdWVzdG9ySUQgc28gd2UgY2FuIHRyYWNrIHRoZSByZXF1ZXN0IHRvIGl0cyBXZWJW aWV3IHdpdGhvdXQgdXNpbmcgZnJhbWUgKHdoaWNoIHdhcyByZW1vdmVkKS4KKworICAgICAgICAq IHBsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1ZXN0Lmg6CisgICAgICAgIChX ZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OlJlc291cmNlUmVxdWVzdCk6CisgICAgICAgIChXZWJD b3JlOjpSZXNvdXJjZVJlcXVlc3Q6OnJlcXVlc3RvcklEKToKKyAgICAgICAgKFdlYkNvcmU6OlJl c291cmNlUmVxdWVzdDo6c2V0UmVxdWVzdG9ySUQpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3Vy Y2VSZXF1ZXN0OjpzZXRUYXJnZXRUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdDo6cG9saWN5VVJMKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6c2V0 UG9saWN5VVJMKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6cmVxdWVzdG9y UGlkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6c2V0UmVxdWVzdG9yUGlk KToKKwogMjAwOS0wMy0xMyAgTWlrZSBCZWxzaGUgIDxtaWtlQGJlbHNoZS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlcXVlc3QuaAkocmV2aXNpb24gNDE2 NjMpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1ZXN0 LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDE2ICs0NywxNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKICAgICAgICAgUmVzb3VyY2VSZXF1ZXN0KGNvbnN0IFN0cmluZyYgdXJsKSAKICAgICAgICAg ICAgIDogUmVzb3VyY2VSZXF1ZXN0QmFzZShLVVJMKHVybCksIFVzZVByb3RvY29sQ2FjaGVQb2xp Y3kpCi0gICAgICAgICAgICAsIG1fZnJhbWUoMCkKLSAgICAgICAgICAgICwgbV9vcmlnaW5QaWQo MCkKKyAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JJRCgwKQorICAgICAgICAgICAgLCBtX3JlcXVl c3RvclByb2Nlc3NJRCgwKQogICAgICAgICAgICAgLCBtX3RhcmdldFR5cGUoVGFyZ2V0SXNTdWJS ZXNvdXJjZSkKICAgICAgICAgewogICAgICAgICB9CiAKICAgICAgICAgUmVzb3VyY2VSZXF1ZXN0 KGNvbnN0IEtVUkwmIHVybCwgY29uc3QgQ1N0cmluZyYgc2VjdXJpdHlJbmZvKSAKICAgICAgICAg ICAgIDogUmVzb3VyY2VSZXF1ZXN0QmFzZSh1cmwsIFVzZVByb3RvY29sQ2FjaGVQb2xpY3kpCi0g ICAgICAgICAgICAsIG1fZnJhbWUoMCkKLSAgICAgICAgICAgICwgbV9vcmlnaW5QaWQoMCkKKyAg ICAgICAgICAgICwgbV9yZXF1ZXN0b3JJRCgwKQorICAgICAgICAgICAgLCBtX3JlcXVlc3RvclBy b2Nlc3NJRCgwKQogICAgICAgICAgICAgLCBtX3RhcmdldFR5cGUoVGFyZ2V0SXNTdWJSZXNvdXJj ZSkKICAgICAgICAgICAgICwgbV9zZWN1cml0eUluZm8oc2VjdXJpdHlJbmZvKQogICAgICAgICB7 CkBAIC02NCwxNiArNjQsMTYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIFJlc291 cmNlUmVxdWVzdChjb25zdCBLVVJMJiB1cmwpIAogICAgICAgICAgICAgOiBSZXNvdXJjZVJlcXVl c3RCYXNlKHVybCwgVXNlUHJvdG9jb2xDYWNoZVBvbGljeSkKLSAgICAgICAgICAgICwgbV9mcmFt ZSgwKQotICAgICAgICAgICAgLCBtX29yaWdpblBpZCgwKQorICAgICAgICAgICAgLCBtX3JlcXVl c3RvcklEKDApCisgICAgICAgICAgICAsIG1fcmVxdWVzdG9yUHJvY2Vzc0lEKDApCiAgICAgICAg ICAgICAsIG1fdGFyZ2V0VHlwZShUYXJnZXRJc1N1YlJlc291cmNlKQogICAgICAgICB7CiAgICAg ICAgIH0KIAogICAgICAgICBSZXNvdXJjZVJlcXVlc3QoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBT dHJpbmcmIHJlZmVycmVyLCBSZXNvdXJjZVJlcXVlc3RDYWNoZVBvbGljeSBwb2xpY3kgPSBVc2VQ cm90b2NvbENhY2hlUG9saWN5KSAKICAgICAgICAgICAgIDogUmVzb3VyY2VSZXF1ZXN0QmFzZSh1 cmwsIHBvbGljeSkKLSAgICAgICAgICAgICwgbV9mcmFtZSgwKQotICAgICAgICAgICAgLCBtX29y aWdpblBpZCgwKQorICAgICAgICAgICAgLCBtX3JlcXVlc3RvcklEKDApCisgICAgICAgICAgICAs IG1fcmVxdWVzdG9yUHJvY2Vzc0lEKDApCiAgICAgICAgICAgICAsIG1fdGFyZ2V0VHlwZShUYXJn ZXRJc1N1YlJlc291cmNlKQogICAgICAgICB7CiAgICAgICAgICAgICBzZXRIVFRQUmVmZXJyZXIo cmVmZXJyZXIpOwpAQCAtODEsMjYgKzgxLDMwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAg ICAgCiAgICAgICAgIFJlc291cmNlUmVxdWVzdCgpCiAgICAgICAgICAgICA6IFJlc291cmNlUmVx dWVzdEJhc2UoS1VSTCgpLCBVc2VQcm90b2NvbENhY2hlUG9saWN5KQotICAgICAgICAgICAgLCBt X2ZyYW1lKDApCi0gICAgICAgICAgICAsIG1fb3JpZ2luUGlkKDApCisgICAgICAgICAgICAsIG1f cmVxdWVzdG9ySUQoMCkKKyAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JQcm9jZXNzSUQoMCkKICAg ICAgICAgICAgICwgbV90YXJnZXRUeXBlKFRhcmdldElzU3ViUmVzb3VyY2UpCiAgICAgICAgIHsK ICAgICAgICAgfQogCi0gICAgICAgIC8vIFByb3ZpZGVzIGNvbnRleHQgZm9yIHRoZSByZXNvdXJj ZSByZXF1ZXN0LgotICAgICAgICBGcmFtZSogZnJhbWUoKSBjb25zdCB7IHJldHVybiBtX2ZyYW1l OyB9Ci0gICAgICAgIHZvaWQgc2V0RnJhbWUoRnJhbWUqIGZyYW1lKSB7IG1fZnJhbWUgPSBmcmFt ZTsgfQorICAgICAgICAvLyBBbGxvd3MgdGhlIHJlcXVlc3QgdG8gYmUgbWF0Y2hlZCB1cCB3aXRo IGl0cyByZXF1ZXN0b3IuCisgICAgICAgIGludCByZXF1ZXN0b3JJRCgpIGNvbnN0IHsgcmV0dXJu IG1fcmVxdWVzdG9ySUQ7IH0KKyAgICAgICAgdm9pZCBzZXRSZXF1ZXN0b3JJRChpbnQgcmVxdWVz dG9ySUQpIHsgbV9yZXF1ZXN0b3JJRCA9IHJlcXVlc3RvcklEOyB9CiAKICAgICAgICAgLy8gV2hh dCB0aGlzIHJlcXVlc3QgaXMgZm9yLgotICAgICAgICB2b2lkIHNldFRhcmdldFR5cGUoVGFyZ2V0 VHlwZSB0eXBlKSB7IG1fdGFyZ2V0VHlwZSA9IHR5cGU7IH0KICAgICAgICAgVGFyZ2V0VHlwZSB0 YXJnZXRUeXBlKCkgY29uc3QgeyByZXR1cm4gbV90YXJnZXRUeXBlOyB9Ci0gICAgICAgIAotICAg ICAgICAvLyBUaGUgb3JpZ2luIHBpZCBpcyB0aGUgcHJvY2VzcyBpZCBvZiB0aGUgcHJvY2VzcyBm cm9tIHdoaWNoIHRoaXMKLSAgICAgICAgLy8gcmVxdWVzdCBvcmlnaW5hdGVkLiBJbiB0aGUgY2Fz ZSBvZiBvdXQtb2YtcHJvY2VzcyBwbHVnaW5zLCB0aGlzCi0gICAgICAgIC8vIGFsbG93cyB0byBs aW5rIGJhY2sgdGhlIHJlcXVlc3QgdG8gdGhlIHBsdWdpbiBwcm9jZXNzIChhcyBpdCBpcwotICAg ICAgICAvLyBwcm9jZXNzZWQgdGhyb3VnaCBhIHJlbmRlciB2aWV3IHByb2Nlc3MpLgotICAgICAg ICBpbnQgb3JpZ2luUGlkKCkgY29uc3QgeyByZXR1cm4gbV9vcmlnaW5QaWQ7IH0KLSAgICAgICAg dm9pZCBzZXRPcmlnaW5QaWQoaW50IG9yaWdpblBpZCkgeyBtX29yaWdpblBpZCA9IG9yaWdpblBp ZDsgfQorICAgICAgICB2b2lkIHNldFRhcmdldFR5cGUoVGFyZ2V0VHlwZSB0eXBlKSB7IG1fdGFy Z2V0VHlwZSA9IHR5cGU7IH0KKworICAgICAgICAvLyBUaGUgZG9jdW1lbnQncyBwb2xpY3kgYmFz ZSB1cmwuCisgICAgICAgIEtVUkwgcG9saWN5VVJMKCkgY29uc3QgeyByZXR1cm4gbV9wb2xpY3lV Ukw7IH0KKyAgICAgICAgdm9pZCBzZXRQb2xpY3lVUkwoY29uc3QgS1VSTCYgcG9saWN5VVJMKSB7 IG1fcG9saWN5VVJMID0gcG9saWN5VVJMOyB9CisKKyAgICAgICAgLy8gVGhlIHByb2Nlc3MgaWQg b2YgdGhlIHByb2Nlc3MgZnJvbSB3aGljaCB0aGlzIHJlcXVlc3Qgb3JpZ2luYXRlZC4gSW4KKyAg ICAgICAgLy8gdGhlIGNhc2Ugb2Ygb3V0LW9mLXByb2Nlc3MgcGx1Z2lucywgdGhpcyBhbGxvd3Mg dG8gbGluayBiYWNrIHRoZQorICAgICAgICAvLyByZXF1ZXN0IHRvIHRoZSBwbHVnaW4gcHJvY2Vz cyAoYXMgaXQgaXMgcHJvY2Vzc2VkIHRocm91Z2ggYSByZW5kZXIKKyAgICAgICAgLy8gdmlldyBw cm9jZXNzKS4KKyAgICAgICAgaW50IHJlcXVlc3RvclByb2Nlc3NJRCgpIGNvbnN0IHsgcmV0dXJu IG1fcmVxdWVzdG9yUHJvY2Vzc0lEOyB9CisgICAgICAgIHZvaWQgc2V0UmVxdWVzdG9yUHJvY2Vz c0lEKGludCByZXF1ZXN0b3JQcm9jZXNzSUQpIHsgbV9yZXF1ZXN0b3JQcm9jZXNzSUQgPSByZXF1 ZXN0b3JQcm9jZXNzSUQ7IH0KIAogICAgICAgICAvLyBPcGFxdWUgYnVmZmVyIHRoYXQgZGVzY3Jp YmVzIHRoZSBzZWN1cml0eSBzdGF0ZSAoaW5jbHVkaW5nIFNTTAogICAgICAgICAvLyBjb25uZWN0 aW9uIHN0YXRlKSBmb3IgdGhlIHJlc291cmNlIHRoYXQgc2hvdWxkIGJlIHJlcG9ydGVkIHdoZW4g dGhlCkBAIC0xMTcsMTAgKzEyMSwxMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZv aWQgZG9VcGRhdGVQbGF0Zm9ybVJlcXVlc3QoKSB7fQogICAgICAgICB2b2lkIGRvVXBkYXRlUmVz b3VyY2VSZXF1ZXN0KCkge30KIAotICAgICAgICBGcmFtZSogbV9mcmFtZTsKLSAgICAgICAgaW50 IG1fb3JpZ2luUGlkOworICAgICAgICBpbnQgbV9yZXF1ZXN0b3JJRDsKKyAgICAgICAgaW50IG1f cmVxdWVzdG9yUHJvY2Vzc0lEOwogICAgICAgICBUYXJnZXRUeXBlIG1fdGFyZ2V0VHlwZTsKICAg ICAgICAgQ1N0cmluZyBtX3NlY3VyaXR5SW5mbzsKKyAgICAgICAgS1VSTCBtX3BvbGljeVVSTDsK ICAgICB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg==