32066 2009-12-02 06:35:32 -0800 [Chromium] Add enable geolocation flag to WebCore::Settings for Chromium 2010-01-11 06:46:11 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 32065 32067 33467 1 joth joth ap commit-queue eric sam webkit.review.bot oldest_to_newest 167970 0 joth 2009-12-02 06:35:32 -0800 In the Chromium port, the geolocation implementation will be ready for testing at different times on different platforms. Further, testing can commence before final UI and feature completion. To ease integration, we need run time control of whether geolocation is enabled, to allow testing (e.g. in the dev channel) without requiring a complete rebuild. This flag is not intended to be revealed in the UI. (e.g. on chromium it will be a command line flag available during the development cycle only) When the flag is off, the navigator.geolocation object should not be set, indicating the browser has no geolocation support. The ENABLE(GEOLOCATION) compile time flag is still required to completely compile out support for those platforms that do not require it. 167985 1 44146 joth 2009-12-02 07:36:03 -0800 Created attachment 44146 Patch 1 for Bug 32066 167989 2 webkit.review.bot 2009-12-02 07:39:03 -0800 style-queue ran check-webkit-style on attachment 44146 without any errors. 167998 3 44150 joth 2009-12-02 08:13:14 -0800 Created attachment 44150 Patch 2 for Bug 32066 Updated with comments from colleague 168000 4 webkit.review.bot 2009-12-02 08:15:40 -0800 style-queue ran check-webkit-style on attachment 44150 without any errors. 168334 5 joth 2009-12-03 02:29:43 -0800 Would you be able to look at this Eric, or suggest someone else to? 168408 6 44150 dglazkov 2009-12-03 08:00:24 -0800 Comment on attachment 44150 Patch 2 for Bug 32066 > + , m_geolocationEnabled(true) Is the case for other ports? Do we need to plumb this through for WebKit/mac&win? 168412 7 joth 2009-12-03 08:20:11 -0800 (In reply to comment #6) > (From update of attachment 44150 [details]) > > + , m_geolocationEnabled(true) > > Is the case for other ports? Do we need to plumb this through for > WebKit/mac&win? The intention is in the "normal case" a port either has no support for the feature, so does not define ENABLE_GEOLOCATION, or has full support, in which case this flag can default to true -- i.e. equivalent to the existing situation without the existence of this flag, and without plumbing in calls to it. (It also happens that at the current time no port has ENABLE_GEOLOCATION defined, so plumbing it would have no effect anyway) I'm very happy to explain this in code comments some place, but not sure where is the best location for it? 168452 8 44254 joth 2009-12-03 10:33:30 -0800 Created attachment 44254 Patch 3 for Bug 32066 TODO => FIXME 168455 9 44254 dglazkov 2009-12-03 10:35:52 -0800 Comment on attachment 44254 Patch 3 for Bug 32066 r=me. 168491 10 eric 2009-12-03 11:48:35 -0800 Seems a little strange to have two ways to enable Geolocation, but I'm also not sure I have anything better to suggest. This isn't the first feature for which we have a runtime switch, certainly. 168535 11 44254 commit-queue 2009-12-03 13:54:18 -0800 Comment on attachment 44254 Patch 3 for Bug 32066 Clearing flags on attachment: 44254 Committed r51660: <http://trac.webkit.org/changeset/51660> 168536 12 commit-queue 2009-12-03 13:54:25 -0800 All reviewed patches have been landed. Closing bug. 44146 2009-12-02 07:36:03 -0800 2009-12-02 08:13:14 -0800 Patch 1 for Bug 32066 bug_32066.txt text/plain 9008 joth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTU5OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDktMTItMDIgIEpvbmF0aGFuIERpeG9uICA8am90aEBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QnVnIDMyMDY2IC0gQWRkIGVuYWJsZSBnZW9sb2NhdGlvbiBmbGFnIHRvIFdlYkNvcmU6OlNldHRp bmdzIGZvciBDaHJvbWl1bQorICAgICAgICBBZGRpbmcgcGxhY2Vob2xkZXIgR2VvbG9jYXRpb25T ZXJ2aWNlQ2hyb21pdW0gaW1wbGVtZW50YXRpb24sIGFzIHRoaXMgaXMgcmVxdWlyZWQgdG8gYWxs b3dzCisgICAgICAgIEVOQUJMRV9HRU9MT0NBVElPTiB0byBiZSBkZWZpbmVkIChpbiB0dXJuIHJl cXVpcmVkIGZvciB0ZXN0aW5nKSwgZXZlbiB0aG91Z2ggdGhpcyBwYXRjaCBkb2VzIG5vdAorICAg ICAgICBtYWtlIHRoYXQgdGhlIGRlZmF1bHQganVzdCB5ZXQuCisKKyAgICAgICAgKiBXZWJDb3Jl Lmd5cGk6CisgICAgICAgICogcGFnZS9TZXR0aW5ncy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT ZXR0aW5nczo6U2V0dGluZ3MpOiBBZGQgbmV3IG1fZ2VvbG9jYXRpb25FbmFibGVkIGZsYWcgZGVm YXVsdCB2YWx1ZQorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OnNldEdlb2xvY2F0aW9uRW5h YmxlZCk6IFNldHRlciBmb3IgIG1fZ2VvbG9jYXRpb25FbmFibGVkIGZsYWcKKyAgICAgICAgKiBw YWdlL1NldHRpbmdzLmg6CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6Z2VvbG9jYXRpb25F bmFibGVkKTogIEFkZCBtX2dlb2xvY2F0aW9uRW5hYmxlZCBmbGFnCisgICAgICAgICogcGxhdGZv cm0vY2hyb21pdW0vR2VvbG9jYXRpb25TZXJ2aWNlQ2hyb21pdW0uY3BwOiBBZGRlZC4KKyAgICAg ICAgKFdlYkNvcmU6Okdlb2xvY2F0aW9uU2VydmljZUNocm9taXVtOjpHZW9sb2NhdGlvblNlcnZp Y2VDaHJvbWl1bSk6IFBsYWNlIGhvbGRlciBHZW9sb2NhdGlvblNlcnZpY2VDaHJvbWl1bSkKKyAg ICAgICAgKFdlYkNvcmU6OmNyZWF0ZUdlb2xvY2F0aW9uU2VydmljZSk6IGZhY3RvcnkgZnVuY3Rp b24sIG9ubHkgcmVxdWlyZWQgd2hlbiBFTkFCTEVEKEdFT0xPQ0FUSU9OKSBpcyB0cnVlCisKIDIw MDktMTItMDIgIEFudG9uIE11aGluICA8YW50b25tQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBBZGFtIEJhcnRoLjp3CkluZGV4OiBXZWJDb3JlL1dlYkNvcmUuZ3lwaQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL1dlYkNvcmUuZ3lwaQkocmV2aXNpb24gNTE1OTYpCisrKyBXZWJD b3JlL1dlYkNvcmUuZ3lwaQkod29ya2luZyBjb3B5KQpAQCAtMTg2Myw2ICsxODYzLDcgQEAKICAg ICAgICAgICAgICdwbGF0Zm9ybS9jaHJvbWl1bS9GcmFtZWxlc3NTY3JvbGxWaWV3LmNwcCcsCiAg ICAgICAgICAgICAncGxhdGZvcm0vY2hyb21pdW0vRnJhbWVsZXNzU2Nyb2xsVmlldy5oJywKICAg ICAgICAgICAgICdwbGF0Zm9ybS9jaHJvbWl1bS9GcmFtZWxlc3NTY3JvbGxWaWV3Q2xpZW50Lmgn LAorICAgICAgICAgICAgJ3BsYXRmb3JtL2Nocm9taXVtL0dlb2xvY2F0aW9uU2VydmljZUNocm9t aXVtLmNwcCcsCiAgICAgICAgICAgICAncGxhdGZvcm0vY2hyb21pdW0vS2V5Q29kZUNvbnZlcnNp b24uaCcsCiAgICAgICAgICAgICAncGxhdGZvcm0vY2hyb21pdW0vS2V5Q29kZUNvbnZlcnNpb25H dGsuY3BwJywKICAgICAgICAgICAgICdwbGF0Zm9ybS9jaHJvbWl1bS9LZXlib2FyZENvZGVzUG9z aXguaCcsCkluZGV4OiBXZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAJKHJldmlzaW9uIDUxNTk2KQorKysgV2ViQ29yZS9wYWdl L1NldHRpbmdzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE5LDYgKzExOSw3IEBAIFNldHRpbmdz OjpTZXR0aW5ncyhQYWdlKiBwYWdlKQogICAgICwgbV9zaG93UmVwYWludENvdW50ZXIoZmFsc2Up CiAgICAgLCBtX2V4cGVyaW1lbnRhbE5vdGlmaWNhdGlvbnNFbmFibGVkKGZhbHNlKQogICAgICwg bV93ZWJHTEVuYWJsZWQoZmFsc2UpCisgICAgLCBtX2dlb2xvY2F0aW9uRW5hYmxlZCh0cnVlKQog ewogICAgIC8vIEEgRnJhbWUgbWF5IG5vdCBoYXZlIGJlZW4gY3JlYXRlZCB5ZXQsIHNvIHdlIGlu aXRpYWxpemUgdGhlIEF0b21pY1N0cmluZyAKICAgICAvLyBoYXNoIGJlZm9yZSB0cnlpbmcgdG8g dXNlIGl0LgpAQCAtNTQzLDQgKzU0NCw5IEBAIHZvaWQgU2V0dGluZ3M6OnNldFdlYkdMRW5hYmxl ZChib29sIGVuYWIKICAgICBtX3dlYkdMRW5hYmxlZCA9IGVuYWJsZWQ7CiB9CiAKK3ZvaWQgU2V0 dGluZ3M6OnNldEdlb2xvY2F0aW9uRW5hYmxlZChib29sIGVuYWJsZWQpCit7CisgICAgbV9nZW9s b2NhdGlvbkVuYWJsZWQgPSBlbmFibGVkOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCklu ZGV4OiBXZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2Uv U2V0dGluZ3MuaAkocmV2aXNpb24gNTE1OTYpCisrKyBXZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAko d29ya2luZyBjb3B5KQpAQCAtMjczLDYgKzI3Myw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICAgICAgdm9pZCBzZXRXZWJHTEVuYWJsZWQoYm9vbCk7CiAgICAgICAgIGJvb2wgd2ViR0xFbmFi bGVkKCkgY29uc3QgeyByZXR1cm4gbV93ZWJHTEVuYWJsZWQ7IH0KIAorICAgICAgICB2b2lkIHNl dEdlb2xvY2F0aW9uRW5hYmxlZChib29sKTsKKyAgICAgICAgYm9vbCBnZW9sb2NhdGlvbkVuYWJs ZWQoKSBjb25zdCB7IHJldHVybiBtX2dlb2xvY2F0aW9uRW5hYmxlZDsgfQorCiAgICAgcHJpdmF0 ZToKICAgICAgICAgUGFnZSogbV9wYWdlOwogICAgICAgICAKQEAgLTM0Miw2ICszNDUsNyBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGJvb2wgbV9zaG93UmVwYWludENvdW50ZXIgOiAx OwogICAgICAgICBib29sIG1fZXhwZXJpbWVudGFsTm90aWZpY2F0aW9uc0VuYWJsZWQgOiAxOwog ICAgICAgICBib29sIG1fd2ViR0xFbmFibGVkIDogMTsKKyAgICAgICAgYm9vbCBtX2dlb2xvY2F0 aW9uRW5hYmxlZCA6IDE7CiAKICNpZiBVU0UoU0FGQVJJX1RIRU1FKQogICAgICAgICBzdGF0aWMg Ym9vbCBnU2hvdWxkUGFpbnROYXRpdmVDb250cm9sczsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0v Y2hyb21pdW0vR2VvbG9jYXRpb25TZXJ2aWNlQ2hyb21pdW0uY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vR2VvbG9jYXRpb25TZXJ2aWNlQ2hyb21pdW0uY3BwCShy ZXZpc2lvbiAwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9HZW9sb2NhdGlvblNlcnZp Y2VDaHJvbWl1bS5jcHAJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNTUgQEAKKy8qCisgKiBDb3B5 cmlnaHQgKGMpIDIwMDgsIDIwMDksIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisg KiAKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQorICogbWV0OgorICogCisgKiAgICAg KiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNv cHlyaWdodAorICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyLgorICogICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3Jt IG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorICogaW4gdGhlIGRv Y3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorICog ZGlzdHJpYnV0aW9uLgorICogICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBu b3IgdGhlIG5hbWVzIG9mIGl0cworICogY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9y c2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyAqIHRoaXMgc29mdHdhcmUgd2l0 aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisgKiAKKyAqIFRISVMgU09G VFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRP UlMKKyAqICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5D TFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9G IE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQT1NF IEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisgKiBPV05F UiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5D SURFTlRBTCwKKyAqIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VT IChJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNU SVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAorICogREFUQSwgT1IgUFJPRklU UzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisg KiBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklM SVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklT SU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4g SUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2lu Y2x1ZGUgImNvbmZpZy5oIgorI2luY2x1ZGUgIkdlb2xvY2F0aW9uU2VydmljZS5oIgorCituYW1l c3BhY2UgV2ViQ29yZSB7CisKK2NsYXNzIEdlb2xvY2F0aW9uU2VydmljZUNocm9taXVtIDogcHVi bGljIEdlb2xvY2F0aW9uU2VydmljZSB7CitwdWJsaWM6CisgICAgR2VvbG9jYXRpb25TZXJ2aWNl Q2hyb21pdW0oR2VvbG9jYXRpb25TZXJ2aWNlQ2xpZW50KiBjKQorICAgICAgICA6IEdlb2xvY2F0 aW9uU2VydmljZShjKSB7fQorCisgICAgLy8gVE9ETzogSW1wbGVtZW50LiBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzIwNjgKK307CisKKy8vIFRoaXMgZ3VhcmQgaXMg dGhlIGNvdW50ZXJwYXJ0IG9mIHRoZSBvbmUgaW4gV2ViQ29yZS9wbGF0Zm9ybS9HZW9sb2NhdGlv blNlcnZpY2UuY3BwCisjaWYgRU5BQkxFKEdFT0xPQ0FUSU9OKQorc3RhdGljIEdlb2xvY2F0aW9u U2VydmljZSogY3JlYXRlR2VvbG9jYXRpb25TZXJ2aWNlKEdlb2xvY2F0aW9uU2VydmljZUNsaWVu dCogYykKK3sKKyAgICByZXR1cm4gbmV3IEdlb2xvY2F0aW9uU2VydmljZUNocm9taXVtKGMpOwor Cit9CisKK0dlb2xvY2F0aW9uU2VydmljZTo6RmFjdG9yeUZ1bmN0aW9uKiBHZW9sb2NhdGlvblNl cnZpY2U6OnNfZmFjdG9yeUZ1bmN0aW9uID0gJmNyZWF0ZUdlb2xvY2F0aW9uU2VydmljZTsKKyNl bmRpZgorCit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9u IDUxNTk5KQorKysgV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDE2IEBACisyMDA5LTEyLTAyICBKb25hdGhhbiBEaXhvbiAgPGpvdGhAY2hyb21pdW0u b3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1 ZyAzMjA2NiAtIEFkZCBlbmFibGUgZ2VvbG9jYXRpb24gZmxhZyB0byBXZWJDb3JlOjpTZXR0aW5n cyBmb3IgQ2hyb21pdW0KKyAgICAgICAgQWRkIHRoZSBwbHVtYmluZyB0byBtYXAgV2ViU2V0dGlu Z3MgdGhyb3VnaCB0byBXZWJDb3JlOjpTZXR0aW5ncworCisgICAgICAgICogZmVhdHVyZXMuZ3lw aToKKyAgICAgICAgKiBwdWJsaWMvV2ViU2V0dGluZ3MuaDogQWRkIHNldEdlb2xvY2F0aW9uRW5h YmxlZCBBUEkgdG8gaW50ZXJmYWNlCisgICAgICAgICogc3JjL1dlYlNldHRpbmdzSW1wbC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlNldHRpbmdzSW1wbDo6c2V0R2VvbG9jYXRpb25FbmFibGVk KTogQ2FsbHMgdGhyb3VnaCB0byBXZWJDb3JlOjpTZXR0aW5nczo6c2V0R2VvbG9jYXRpb25FbmFi bGVkCisgICAgICAgICogc3JjL1dlYlNldHRpbmdzSW1wbC5oOiBBZGQgc2V0R2VvbG9jYXRpb25F bmFibGVkIGludGVyZmFjZSBmdW5jdGlvbgorCiAyMDA5LTEyLTAyICBBbnRvbiBNdWhpbiAgPGFu dG9ubUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KSW5k ZXg6IFdlYktpdC9jaHJvbWl1bS9mZWF0dXJlcy5neXBpCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9j aHJvbWl1bS9mZWF0dXJlcy5neXBpCShyZXZpc2lvbiA1MTU5NikKKysrIFdlYktpdC9jaHJvbWl1 bS9mZWF0dXJlcy5neXBpCSh3b3JraW5nIGNvcHkpCkBAIC00Niw2ICs0Niw3IEBACiAgICAgICAg ICdFTkFCTEVfT0ZGTElORV9XRUJfQVBQTElDQVRJT05TPTEnLAogICAgICAgICAnRU5BQkxFX0RB U0hCT0FSRF9TVVBQT1JUPTAnLAogICAgICAgICAnRU5BQkxFX0RPTV9TVE9SQUdFPTEnLAorICAg ICAgICAnRU5BQkxFX0dFT0xPQ0FUSU9OPTEnLAogICAgICAgICAnRU5BQkxFX0pBVkFTQ1JJUFRf REVCVUdHRVI9MCcsCiAgICAgICAgICdFTkFCTEVfSlNDX01VTFRJUExFX1RIUkVBRFM9MCcsCiAg ICAgICAgICdFTkFCTEVfSUNPTkRBVEFCQVNFPTAnLApJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJTZXR0aW5ncy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViU2V0dGluZ3MuaAkocmV2aXNpb24gNTE1OTYpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYlNldHRpbmdzLmgJKHdvcmtpbmcgY29weSkKQEAgLTgwLDYgKzgwLDcgQEAgcHVibGljOgog ICAgIHZpcnR1YWwgdm9pZCBzZXRUZXh0RGlyZWN0aW9uU3VibWVudUluY2x1c2lvbkJlaGF2aW9y TmV2ZXJJbmNsdWRlZCgpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0T2ZmbGluZVdlYkFwcGxp Y2F0aW9uQ2FjaGVFbmFibGVkKGJvb2wpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0RXhwZXJp bWVudGFsV2ViR0xFbmFibGVkKGJvb2wpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0R2VvbG9j YXRpb25FbmFibGVkKGJvb2wpID0gMDsKIAogcHJvdGVjdGVkOgogICAgIH5XZWJTZXR0aW5ncygp IHsgfQpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmNwcAkocmV2aXNp b24gNTE1OTYpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTI0OSw0ICsyNDksOSBAQCB2b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0 RXhwZXJpbWVudGFsV2ViCiAgICAgbV9zZXR0aW5ncy0+c2V0V2ViR0xFbmFibGVkKGVuYWJsZWQp OwogfQogCit2b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0R2VvbG9jYXRpb25FbmFibGVkKGJvb2wg ZW5hYmxlZCkKK3sKKyAgICBtX3NldHRpbmdzLT5zZXRHZW9sb2NhdGlvbkVuYWJsZWQoZW5hYmxl ZCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJTZXR0aW5nc0ltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dl YlNldHRpbmdzSW1wbC5oCShyZXZpc2lvbiA1MTU5NikKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMv V2ViU2V0dGluZ3NJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTgyLDYgKzgyLDcgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgdm9pZCBzZXRUZXh0RGlyZWN0aW9uU3VibWVudUluY2x1c2lvbkJlaGF2 aW9yTmV2ZXJJbmNsdWRlZCgpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRPZmZsaW5lV2ViQXBwbGlj YXRpb25DYWNoZUVuYWJsZWQoYm9vbCk7CiAgICAgdmlydHVhbCB2b2lkIHNldEV4cGVyaW1lbnRh bFdlYkdMRW5hYmxlZChib29sKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0R2VvbG9jYXRpb25FbmFi bGVkKGJvb2wpOwogCiBwcml2YXRlOgogICAgIFdlYkNvcmU6OlNldHRpbmdzKiBtX3NldHRpbmdz Owo= 44150 2009-12-02 08:13:14 -0800 2009-12-03 10:33:30 -0800 Patch 2 for Bug 32066 bug_32066.txt text/plain 9433 joth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTU5OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMDktMTItMDIgIEpvbmF0aGFuIERpeG9uICA8am90aEBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QnVnIDMyMDY2IC0gQWRkIGVuYWJsZSBnZW9sb2NhdGlvbiBmbGFnIHRvIFdlYkNvcmU6OlNldHRp bmdzIGZvciBDaHJvbWl1bQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MzIwNjYKKworICAgICAgICBBZGRzIGdlb2xvY2F0aW9uRW5hYmxlZCBpbiBTZXR0 aW5ncyBmb3IgcnVudGltZSBjb250cm9sIG9mIGdlb2xvY2FpdG9uIGZlYXR1cmVzLiBUaGlzIGRl ZmF1bHRzIHRvIE9OCisgICAgICAgIGFzIGl0IGlzIGludGVuZGVkIGFzIGEgZGV2ZWxvcG1lbnQg YW5kIHRlc3RpbmcgYWlkLCBub3QgYSB1c2VyIGNvbnRyb2wuIFRvIGNvbXBsZXRlbHkgcmVtb3Zl IGdlb2xvY2F0aW9uCisgICAgICAgIGZyb20gYSBnaXZlbiBwb3J0LCB0aGUgY29tcGlsZSB0aW1l IEVOQUJMRV9HRU9MT0NBVElPTiBzaG91bGQgc3RpbGwgYmUgdXNlZC4KKyAgICAgICAgQWRkaW5n IHBsYWNlaG9sZGVyIEdlb2xvY2F0aW9uU2VydmljZUNocm9taXVtIGltcGxlbWVudGF0aW9uLCBh cyB0aGlzIGlzIHJlcXVpcmVkIHRvIGFsbG93cworICAgICAgICBFTkFCTEVfR0VPTE9DQVRJT04g dG8gYmUgZGVmaW5lZCAoaW4gdHVybiByZXF1aXJlZCBmb3IgdGVzdGluZyksIGV2ZW4gdGhvdWdo IHRoaXMgcGF0Y2ggZG9lcyBub3QKKyAgICAgICAgbWFrZSB0aGF0IHRoZSBkZWZhdWx0IGp1c3Qg eWV0LgorCisgICAgICAgICogV2ViQ29yZS5neXBpOgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3Mu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OlNldHRpbmdzKTogQWRkIG5ldyBtX2dl b2xvY2F0aW9uRW5hYmxlZCBmbGFnIGRlZmF1bHQgdmFsdWUKKyAgICAgICAgKFdlYkNvcmU6OlNl dHRpbmdzOjpzZXRHZW9sb2NhdGlvbkVuYWJsZWQpOiBTZXR0ZXIgZm9yICBtX2dlb2xvY2F0aW9u RW5hYmxlZCBmbGFnCisgICAgICAgICogcGFnZS9TZXR0aW5ncy5oOgorICAgICAgICAoV2ViQ29y ZTo6U2V0dGluZ3M6Omdlb2xvY2F0aW9uRW5hYmxlZCk6ICBBZGQgbV9nZW9sb2NhdGlvbkVuYWJs ZWQgZmxhZworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL0dlb2xvY2F0aW9uU2VydmljZUNo cm9taXVtLmNwcDogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpHZW9sb2NhdGlvblNlcnZpY2VD aHJvbWl1bTo6R2VvbG9jYXRpb25TZXJ2aWNlQ2hyb21pdW0pOiBQbGFjZSBob2xkZXIgR2VvbG9j YXRpb25TZXJ2aWNlQ2hyb21pdW0pCisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVHZW9sb2NhdGlv blNlcnZpY2UpOiBmYWN0b3J5IGZ1bmN0aW9uLCBvbmx5IHJlcXVpcmVkIHdoZW4gRU5BQkxFRChH RU9MT0NBVElPTikgaXMgdHJ1ZQorCiAyMDA5LTEyLTAyICBBbnRvbiBNdWhpbiAgPGFudG9ubUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC46dwpJbmRleDog V2ViQ29yZS9XZWJDb3JlLmd5cGkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3JlLmd5cGkJ KHJldmlzaW9uIDUxNTk2KQorKysgV2ViQ29yZS9XZWJDb3JlLmd5cGkJKHdvcmtpbmcgY29weSkK QEAgLTE4NjMsNiArMTg2Myw3IEBACiAgICAgICAgICAgICAncGxhdGZvcm0vY2hyb21pdW0vRnJh bWVsZXNzU2Nyb2xsVmlldy5jcHAnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2Nocm9taXVtL0Zy YW1lbGVzc1Njcm9sbFZpZXcuaCcsCiAgICAgICAgICAgICAncGxhdGZvcm0vY2hyb21pdW0vRnJh bWVsZXNzU2Nyb2xsVmlld0NsaWVudC5oJywKKyAgICAgICAgICAgICdwbGF0Zm9ybS9jaHJvbWl1 bS9HZW9sb2NhdGlvblNlcnZpY2VDaHJvbWl1bS5jcHAnLAogICAgICAgICAgICAgJ3BsYXRmb3Jt L2Nocm9taXVtL0tleUNvZGVDb252ZXJzaW9uLmgnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2No cm9taXVtL0tleUNvZGVDb252ZXJzaW9uR3RrLmNwcCcsCiAgICAgICAgICAgICAncGxhdGZvcm0v Y2hyb21pdW0vS2V5Ym9hcmRDb2Rlc1Bvc2l4LmgnLApJbmRleDogV2ViQ29yZS9wYWdlL1NldHRp bmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCShyZXZpc2lv biA1MTU5NikKKysrIFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTExOSw2ICsxMTksNyBAQCBTZXR0aW5nczo6U2V0dGluZ3MoUGFnZSogcGFnZSkKICAgICAsIG1f c2hvd1JlcGFpbnRDb3VudGVyKGZhbHNlKQogICAgICwgbV9leHBlcmltZW50YWxOb3RpZmljYXRp b25zRW5hYmxlZChmYWxzZSkKICAgICAsIG1fd2ViR0xFbmFibGVkKGZhbHNlKQorICAgICwgbV9n ZW9sb2NhdGlvbkVuYWJsZWQodHJ1ZSkKIHsKICAgICAvLyBBIEZyYW1lIG1heSBub3QgaGF2ZSBi ZWVuIGNyZWF0ZWQgeWV0LCBzbyB3ZSBpbml0aWFsaXplIHRoZSBBdG9taWNTdHJpbmcgCiAgICAg Ly8gaGFzaCBiZWZvcmUgdHJ5aW5nIHRvIHVzZSBpdC4KQEAgLTU0Myw0ICs1NDQsOSBAQCB2b2lk IFNldHRpbmdzOjpzZXRXZWJHTEVuYWJsZWQoYm9vbCBlbmFiCiAgICAgbV93ZWJHTEVuYWJsZWQg PSBlbmFibGVkOwogfQogCit2b2lkIFNldHRpbmdzOjpzZXRHZW9sb2NhdGlvbkVuYWJsZWQoYm9v bCBlbmFibGVkKQoreworICAgIG1fZ2VvbG9jYXRpb25FbmFibGVkID0gZW5hYmxlZDsKK30KKwog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgJKHJldmlzaW9uIDUxNTk2KQorKysg V2ViQ29yZS9wYWdlL1NldHRpbmdzLmgJKHdvcmtpbmcgY29weSkKQEAgLTI3Myw2ICsyNzMsOSBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgc2V0V2ViR0xFbmFibGVkKGJvb2wp OwogICAgICAgICBib29sIHdlYkdMRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fd2ViR0xFbmFi bGVkOyB9CiAKKyAgICAgICAgdm9pZCBzZXRHZW9sb2NhdGlvbkVuYWJsZWQoYm9vbCk7CisgICAg ICAgIGJvb2wgZ2VvbG9jYXRpb25FbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9nZW9sb2NhdGlv bkVuYWJsZWQ7IH0KKwogICAgIHByaXZhdGU6CiAgICAgICAgIFBhZ2UqIG1fcGFnZTsKICAgICAg ICAgCkBAIC0zNDIsNiArMzQ1LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29s IG1fc2hvd1JlcGFpbnRDb3VudGVyIDogMTsKICAgICAgICAgYm9vbCBtX2V4cGVyaW1lbnRhbE5v dGlmaWNhdGlvbnNFbmFibGVkIDogMTsKICAgICAgICAgYm9vbCBtX3dlYkdMRW5hYmxlZCA6IDE7 CisgICAgICAgIGJvb2wgbV9nZW9sb2NhdGlvbkVuYWJsZWQgOiAxOwogCiAjaWYgVVNFKFNBRkFS SV9USEVNRSkKICAgICAgICAgc3RhdGljIGJvb2wgZ1Nob3VsZFBhaW50TmF0aXZlQ29udHJvbHM7 CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0dlb2xvY2F0aW9uU2VydmljZUNocm9t aXVtLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0dlb2xvY2F0 aW9uU2VydmljZUNocm9taXVtLmNwcAkocmV2aXNpb24gMCkKKysrIFdlYkNvcmUvcGxhdGZvcm0v Y2hyb21pdW0vR2VvbG9jYXRpb25TZXJ2aWNlQ2hyb21pdW0uY3BwCShyZXZpc2lvbiAwKQpAQCAt MCwwICsxLDU1IEBACisvKgorICogQ29weXJpZ2h0IChjKSAyMDA5LCBHb29nbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgorICogCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAq IG1ldDoKKyAqIAorICogICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3Qg cmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqICAgICAqIFJlZGlzdHJpYnV0 aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUKKyAqIGNvcHlyaWdo dCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2Ns YWltZXIKKyAqIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJv dmlkZWQgd2l0aCB0aGUKKyAqIGRpc3RyaWJ1dGlvbi4KKyAqICAgICAqIE5laXRoZXIgdGhlIG5h bWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyAqIGNvbnRyaWJ1dG9ycyBt YXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCisg KiB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9u LgorICogCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9M REVSUyBBTkQgQ09OVFJJQlVUT1JTCisgKiAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBM SUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgVEhFIElN UExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCisgKiBB IFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhF IENPUFlSSUdIVAorICogT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisgKiBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENP TlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVEIFRPLCBQ Uk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwK KyAqIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBD QVVTRUQgQU5EIE9OIEFOWQorICogVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05U UkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNF IE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBU SElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJHZW9sb2NhdGlv blNlcnZpY2UuaCIKKworbmFtZXNwYWNlIFdlYkNvcmUgeworCitjbGFzcyBHZW9sb2NhdGlvblNl cnZpY2VDaHJvbWl1bSA6IHB1YmxpYyBHZW9sb2NhdGlvblNlcnZpY2UgeworcHVibGljOgorICAg IEdlb2xvY2F0aW9uU2VydmljZUNocm9taXVtKEdlb2xvY2F0aW9uU2VydmljZUNsaWVudCogYykK KyAgICAgICAgOiBHZW9sb2NhdGlvblNlcnZpY2UoYykKKyAgICB7CisgICAgfQorICAgIC8vIFRP RE86IEltcGxlbWVudC4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMy MDY4Cit9OworCisvLyBUaGlzIGd1YXJkIGlzIHRoZSBjb3VudGVycGFydCBvZiB0aGUgb25lIGlu IFdlYkNvcmUvcGxhdGZvcm0vR2VvbG9jYXRpb25TZXJ2aWNlLmNwcAorI2lmIEVOQUJMRShHRU9M T0NBVElPTikKK3N0YXRpYyBHZW9sb2NhdGlvblNlcnZpY2UqIGNyZWF0ZUdlb2xvY2F0aW9uU2Vy dmljZShHZW9sb2NhdGlvblNlcnZpY2VDbGllbnQqIGMpCit7CisgICAgcmV0dXJuIG5ldyBHZW9s b2NhdGlvblNlcnZpY2VDaHJvbWl1bShjKTsKK30KKworR2VvbG9jYXRpb25TZXJ2aWNlOjpGYWN0 b3J5RnVuY3Rpb24qIEdlb2xvY2F0aW9uU2VydmljZTo6c19mYWN0b3J5RnVuY3Rpb24gPSAmY3Jl YXRlR2VvbG9jYXRpb25TZXJ2aWNlOworI2VuZGlmCisKK30gLy8gbmFtZXNwYWNlIFdlYkNvcmUK SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTE1OTkpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMDktMTItMDIgIEpvbmF0 aGFuIERpeG9uICA8am90aEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQnVnIDMyMDY2IC0gQWRkIGVuYWJsZSBnZW9sb2NhdGlv biBmbGFnIHRvIFdlYkNvcmU6OlNldHRpbmdzIGZvciBDaHJvbWl1bQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzIwNjYKKworICAgICAgICBBZGQgdGhl IHBsdW1iaW5nIHRvIG1hcCBXZWJTZXR0aW5ncyB0aHJvdWdoIHRvIFdlYkNvcmU6OlNldHRpbmdz CisKKyAgICAgICAgKiBmZWF0dXJlcy5neXBpOgorICAgICAgICAqIHB1YmxpYy9XZWJTZXR0aW5n cy5oOiBBZGQgc2V0R2VvbG9jYXRpb25FbmFibGVkIEFQSSB0byBpbnRlcmZhY2UKKyAgICAgICAg KiBzcmMvV2ViU2V0dGluZ3NJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViU2V0dGluZ3NJ bXBsOjpzZXRHZW9sb2NhdGlvbkVuYWJsZWQpOiBDYWxscyB0aHJvdWdoIHRvIFdlYkNvcmU6OlNl dHRpbmdzOjpzZXRHZW9sb2NhdGlvbkVuYWJsZWQKKyAgICAgICAgKiBzcmMvV2ViU2V0dGluZ3NJ bXBsLmg6IEFkZCBzZXRHZW9sb2NhdGlvbkVuYWJsZWQgaW50ZXJmYWNlIGZ1bmN0aW9uCisKIDIw MDktMTItMDIgIEFudG9uIE11aGluICA8YW50b25tQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL2ZlYXR1cmVzLmd5 cGkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL2ZlYXR1cmVzLmd5cGkJKHJldmlzaW9u IDUxNTk2KQorKysgV2ViS2l0L2Nocm9taXVtL2ZlYXR1cmVzLmd5cGkJKHdvcmtpbmcgY29weSkK QEAgLTQ2LDYgKzQ2LDcgQEAKICAgICAgICAgJ0VOQUJMRV9PRkZMSU5FX1dFQl9BUFBMSUNBVElP TlM9MScsCiAgICAgICAgICdFTkFCTEVfREFTSEJPQVJEX1NVUFBPUlQ9MCcsCiAgICAgICAgICdF TkFCTEVfRE9NX1NUT1JBR0U9MScsCisgICAgICAgICdFTkFCTEVfR0VPTE9DQVRJT049MScsCiAg ICAgICAgICdFTkFCTEVfSkFWQVNDUklQVF9ERUJVR0dFUj0wJywKICAgICAgICAgJ0VOQUJMRV9K U0NfTVVMVElQTEVfVEhSRUFEUz0wJywKICAgICAgICAgJ0VOQUJMRV9JQ09OREFUQUJBU0U9MCcs CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlNldHRpbmdzLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJTZXR0aW5ncy5oCShyZXZpc2lvbiA1MTU5NikK KysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViU2V0dGluZ3MuaAkod29ya2luZyBjb3B5KQpA QCAtODAsNiArODAsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldFRleHREaXJlY3Rp b25TdWJtZW51SW5jbHVzaW9uQmVoYXZpb3JOZXZlckluY2x1ZGVkKCkgPSAwOwogICAgIHZpcnR1 YWwgdm9pZCBzZXRPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQoYm9vbCkgPSAwOwog ICAgIHZpcnR1YWwgdm9pZCBzZXRFeHBlcmltZW50YWxXZWJHTEVuYWJsZWQoYm9vbCkgPSAwOwor ICAgIHZpcnR1YWwgdm9pZCBzZXRHZW9sb2NhdGlvbkVuYWJsZWQoYm9vbCkgPSAwOwogCiBwcm90 ZWN0ZWQ6CiAgICAgfldlYlNldHRpbmdzKCkgeyB9CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlNldHRpbmdzSW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJTZXR0aW5nc0ltcGwuY3BwCShyZXZpc2lvbiA1MTU5NikKKysrIFdlYktpdC9jaHJvbWl1bS9z cmMvV2ViU2V0dGluZ3NJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQ5LDQgKzI0OSw5IEBA IHZvaWQgV2ViU2V0dGluZ3NJbXBsOjpzZXRFeHBlcmltZW50YWxXZWIKICAgICBtX3NldHRpbmdz LT5zZXRXZWJHTEVuYWJsZWQoZW5hYmxlZCk7CiB9CiAKK3ZvaWQgV2ViU2V0dGluZ3NJbXBsOjpz ZXRHZW9sb2NhdGlvbkVuYWJsZWQoYm9vbCBlbmFibGVkKQoreworICAgIG1fc2V0dGluZ3MtPnNl dEdlb2xvY2F0aW9uRW5hYmxlZChlbmFibGVkKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0 CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmgJKHJldmlzaW9uIDUxNTk2 KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuaAkod29ya2luZyBjb3B5 KQpAQCAtODIsNiArODIsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldFRleHREaXJl Y3Rpb25TdWJtZW51SW5jbHVzaW9uQmVoYXZpb3JOZXZlckluY2x1ZGVkKCk7CiAgICAgdmlydHVh bCB2b2lkIHNldE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZChib29sKTsKICAgICB2 aXJ0dWFsIHZvaWQgc2V0RXhwZXJpbWVudGFsV2ViR0xFbmFibGVkKGJvb2wpOworICAgIHZpcnR1 YWwgdm9pZCBzZXRHZW9sb2NhdGlvbkVuYWJsZWQoYm9vbCk7CiAKIHByaXZhdGU6CiAgICAgV2Vi Q29yZTo6U2V0dGluZ3MqIG1fc2V0dGluZ3M7Cg== 44254 2009-12-03 10:33:30 -0800 2009-12-03 13:54:18 -0800 Patch 3 for Bug 32066 bug_32066.txt text/plain 9434 joth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTU5OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMDktMTItMDIgIEpvbmF0aGFuIERpeG9uICA8am90aEBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QnVnIDMyMDY2IC0gQWRkIGVuYWJsZSBnZW9sb2NhdGlvbiBmbGFnIHRvIFdlYkNvcmU6OlNldHRp bmdzIGZvciBDaHJvbWl1bQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MzIwNjYKKworICAgICAgICBBZGRzIGdlb2xvY2F0aW9uRW5hYmxlZCBpbiBTZXR0 aW5ncyBmb3IgcnVudGltZSBjb250cm9sIG9mIGdlb2xvY2FpdG9uIGZlYXR1cmVzLiBUaGlzIGRl ZmF1bHRzIHRvIE9OCisgICAgICAgIGFzIGl0IGlzIGludGVuZGVkIGFzIGEgZGV2ZWxvcG1lbnQg YW5kIHRlc3RpbmcgYWlkLCBub3QgYSB1c2VyIGNvbnRyb2wuIFRvIGNvbXBsZXRlbHkgcmVtb3Zl IGdlb2xvY2F0aW9uCisgICAgICAgIGZyb20gYSBnaXZlbiBwb3J0LCB0aGUgY29tcGlsZSB0aW1l IEVOQUJMRV9HRU9MT0NBVElPTiBzaG91bGQgc3RpbGwgYmUgdXNlZC4KKyAgICAgICAgQWRkaW5n IHBsYWNlaG9sZGVyIEdlb2xvY2F0aW9uU2VydmljZUNocm9taXVtIGltcGxlbWVudGF0aW9uLCBh cyB0aGlzIGlzIHJlcXVpcmVkIHRvIGFsbG93cworICAgICAgICBFTkFCTEVfR0VPTE9DQVRJT04g dG8gYmUgZGVmaW5lZCAoaW4gdHVybiByZXF1aXJlZCBmb3IgdGVzdGluZyksIGV2ZW4gdGhvdWdo IHRoaXMgcGF0Y2ggZG9lcyBub3QKKyAgICAgICAgbWFrZSB0aGF0IHRoZSBkZWZhdWx0IGp1c3Qg eWV0LgorCisgICAgICAgICogV2ViQ29yZS5neXBpOgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3Mu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OlNldHRpbmdzKTogQWRkIG5ldyBtX2dl b2xvY2F0aW9uRW5hYmxlZCBmbGFnIGRlZmF1bHQgdmFsdWUKKyAgICAgICAgKFdlYkNvcmU6OlNl dHRpbmdzOjpzZXRHZW9sb2NhdGlvbkVuYWJsZWQpOiBTZXR0ZXIgZm9yICBtX2dlb2xvY2F0aW9u RW5hYmxlZCBmbGFnCisgICAgICAgICogcGFnZS9TZXR0aW5ncy5oOgorICAgICAgICAoV2ViQ29y ZTo6U2V0dGluZ3M6Omdlb2xvY2F0aW9uRW5hYmxlZCk6ICBBZGQgbV9nZW9sb2NhdGlvbkVuYWJs ZWQgZmxhZworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL0dlb2xvY2F0aW9uU2VydmljZUNo cm9taXVtLmNwcDogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpHZW9sb2NhdGlvblNlcnZpY2VD aHJvbWl1bTo6R2VvbG9jYXRpb25TZXJ2aWNlQ2hyb21pdW0pOiBQbGFjZSBob2xkZXIgR2VvbG9j YXRpb25TZXJ2aWNlQ2hyb21pdW0pCisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVHZW9sb2NhdGlv blNlcnZpY2UpOiBmYWN0b3J5IGZ1bmN0aW9uLCBvbmx5IHJlcXVpcmVkIHdoZW4gRU5BQkxFRChH RU9MT0NBVElPTikgaXMgdHJ1ZQorCiAyMDA5LTEyLTAyICBBbnRvbiBNdWhpbiAgPGFudG9ubUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC46dwpJbmRleDog V2ViQ29yZS9XZWJDb3JlLmd5cGkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3JlLmd5cGkJ KHJldmlzaW9uIDUxNTk2KQorKysgV2ViQ29yZS9XZWJDb3JlLmd5cGkJKHdvcmtpbmcgY29weSkK QEAgLTE4NjMsNiArMTg2Myw3IEBACiAgICAgICAgICAgICAncGxhdGZvcm0vY2hyb21pdW0vRnJh bWVsZXNzU2Nyb2xsVmlldy5jcHAnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2Nocm9taXVtL0Zy YW1lbGVzc1Njcm9sbFZpZXcuaCcsCiAgICAgICAgICAgICAncGxhdGZvcm0vY2hyb21pdW0vRnJh bWVsZXNzU2Nyb2xsVmlld0NsaWVudC5oJywKKyAgICAgICAgICAgICdwbGF0Zm9ybS9jaHJvbWl1 bS9HZW9sb2NhdGlvblNlcnZpY2VDaHJvbWl1bS5jcHAnLAogICAgICAgICAgICAgJ3BsYXRmb3Jt L2Nocm9taXVtL0tleUNvZGVDb252ZXJzaW9uLmgnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2No cm9taXVtL0tleUNvZGVDb252ZXJzaW9uR3RrLmNwcCcsCiAgICAgICAgICAgICAncGxhdGZvcm0v Y2hyb21pdW0vS2V5Ym9hcmRDb2Rlc1Bvc2l4LmgnLApJbmRleDogV2ViQ29yZS9wYWdlL1NldHRp bmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCShyZXZpc2lv biA1MTU5NikKKysrIFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTExOSw2ICsxMTksNyBAQCBTZXR0aW5nczo6U2V0dGluZ3MoUGFnZSogcGFnZSkKICAgICAsIG1f c2hvd1JlcGFpbnRDb3VudGVyKGZhbHNlKQogICAgICwgbV9leHBlcmltZW50YWxOb3RpZmljYXRp b25zRW5hYmxlZChmYWxzZSkKICAgICAsIG1fd2ViR0xFbmFibGVkKGZhbHNlKQorICAgICwgbV9n ZW9sb2NhdGlvbkVuYWJsZWQodHJ1ZSkKIHsKICAgICAvLyBBIEZyYW1lIG1heSBub3QgaGF2ZSBi ZWVuIGNyZWF0ZWQgeWV0LCBzbyB3ZSBpbml0aWFsaXplIHRoZSBBdG9taWNTdHJpbmcgCiAgICAg Ly8gaGFzaCBiZWZvcmUgdHJ5aW5nIHRvIHVzZSBpdC4KQEAgLTU0Myw0ICs1NDQsOSBAQCB2b2lk IFNldHRpbmdzOjpzZXRXZWJHTEVuYWJsZWQoYm9vbCBlbmFiCiAgICAgbV93ZWJHTEVuYWJsZWQg PSBlbmFibGVkOwogfQogCit2b2lkIFNldHRpbmdzOjpzZXRHZW9sb2NhdGlvbkVuYWJsZWQoYm9v bCBlbmFibGVkKQoreworICAgIG1fZ2VvbG9jYXRpb25FbmFibGVkID0gZW5hYmxlZDsKK30KKwog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgJKHJldmlzaW9uIDUxNTk2KQorKysg V2ViQ29yZS9wYWdlL1NldHRpbmdzLmgJKHdvcmtpbmcgY29weSkKQEAgLTI3Myw2ICsyNzMsOSBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgc2V0V2ViR0xFbmFibGVkKGJvb2wp OwogICAgICAgICBib29sIHdlYkdMRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fd2ViR0xFbmFi bGVkOyB9CiAKKyAgICAgICAgdm9pZCBzZXRHZW9sb2NhdGlvbkVuYWJsZWQoYm9vbCk7CisgICAg ICAgIGJvb2wgZ2VvbG9jYXRpb25FbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9nZW9sb2NhdGlv bkVuYWJsZWQ7IH0KKwogICAgIHByaXZhdGU6CiAgICAgICAgIFBhZ2UqIG1fcGFnZTsKICAgICAg ICAgCkBAIC0zNDIsNiArMzQ1LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29s IG1fc2hvd1JlcGFpbnRDb3VudGVyIDogMTsKICAgICAgICAgYm9vbCBtX2V4cGVyaW1lbnRhbE5v dGlmaWNhdGlvbnNFbmFibGVkIDogMTsKICAgICAgICAgYm9vbCBtX3dlYkdMRW5hYmxlZCA6IDE7 CisgICAgICAgIGJvb2wgbV9nZW9sb2NhdGlvbkVuYWJsZWQgOiAxOwogCiAjaWYgVVNFKFNBRkFS SV9USEVNRSkKICAgICAgICAgc3RhdGljIGJvb2wgZ1Nob3VsZFBhaW50TmF0aXZlQ29udHJvbHM7 CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0dlb2xvY2F0aW9uU2VydmljZUNocm9t aXVtLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0dlb2xvY2F0 aW9uU2VydmljZUNocm9taXVtLmNwcAkocmV2aXNpb24gMCkKKysrIFdlYkNvcmUvcGxhdGZvcm0v Y2hyb21pdW0vR2VvbG9jYXRpb25TZXJ2aWNlQ2hyb21pdW0uY3BwCShyZXZpc2lvbiAwKQpAQCAt MCwwICsxLDU1IEBACisvKgorICogQ29weXJpZ2h0IChjKSAyMDA5LCBHb29nbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgorICogCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAq IG1ldDoKKyAqIAorICogICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3Qg cmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqICAgICAqIFJlZGlzdHJpYnV0 aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUKKyAqIGNvcHlyaWdo dCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2Ns YWltZXIKKyAqIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJv dmlkZWQgd2l0aCB0aGUKKyAqIGRpc3RyaWJ1dGlvbi4KKyAqICAgICAqIE5laXRoZXIgdGhlIG5h bWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyAqIGNvbnRyaWJ1dG9ycyBt YXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCisg KiB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9u LgorICogCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9M REVSUyBBTkQgQ09OVFJJQlVUT1JTCisgKiAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBM SUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgVEhFIElN UExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCisgKiBB IFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhF IENPUFlSSUdIVAorICogT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisgKiBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENP TlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVEIFRPLCBQ Uk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwK KyAqIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBD QVVTRUQgQU5EIE9OIEFOWQorICogVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05U UkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNF IE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBU SElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJHZW9sb2NhdGlv blNlcnZpY2UuaCIKKworbmFtZXNwYWNlIFdlYkNvcmUgeworCitjbGFzcyBHZW9sb2NhdGlvblNl cnZpY2VDaHJvbWl1bSA6IHB1YmxpYyBHZW9sb2NhdGlvblNlcnZpY2UgeworcHVibGljOgorICAg IEdlb2xvY2F0aW9uU2VydmljZUNocm9taXVtKEdlb2xvY2F0aW9uU2VydmljZUNsaWVudCogYykK KyAgICAgICAgOiBHZW9sb2NhdGlvblNlcnZpY2UoYykKKyAgICB7CisgICAgfQorICAgIC8vIEZJ WE1FOiBJbXBsZW1lbnQuIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z MjA2OAorfTsKKworLy8gVGhpcyBndWFyZCBpcyB0aGUgY291bnRlcnBhcnQgb2YgdGhlIG9uZSBp biBXZWJDb3JlL3BsYXRmb3JtL0dlb2xvY2F0aW9uU2VydmljZS5jcHAKKyNpZiBFTkFCTEUoR0VP TE9DQVRJT04pCitzdGF0aWMgR2VvbG9jYXRpb25TZXJ2aWNlKiBjcmVhdGVHZW9sb2NhdGlvblNl cnZpY2UoR2VvbG9jYXRpb25TZXJ2aWNlQ2xpZW50KiBjKQoreworICAgIHJldHVybiBuZXcgR2Vv bG9jYXRpb25TZXJ2aWNlQ2hyb21pdW0oYyk7Cit9CisKK0dlb2xvY2F0aW9uU2VydmljZTo6RmFj dG9yeUZ1bmN0aW9uKiBHZW9sb2NhdGlvblNlcnZpY2U6OnNfZmFjdG9yeUZ1bmN0aW9uID0gJmNy ZWF0ZUdlb2xvY2F0aW9uU2VydmljZTsKKyNlbmRpZgorCit9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUxNTk5KQorKysgV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDA5LTEyLTAyICBKb25h dGhhbiBEaXhvbiAgPGpvdGhAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAzMjA2NiAtIEFkZCBlbmFibGUgZ2VvbG9jYXRp b24gZmxhZyB0byBXZWJDb3JlOjpTZXR0aW5ncyBmb3IgQ2hyb21pdW0KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyMDY2CisKKyAgICAgICAgQWRkIHRo ZSBwbHVtYmluZyB0byBtYXAgV2ViU2V0dGluZ3MgdGhyb3VnaCB0byBXZWJDb3JlOjpTZXR0aW5n cworCisgICAgICAgICogZmVhdHVyZXMuZ3lwaToKKyAgICAgICAgKiBwdWJsaWMvV2ViU2V0dGlu Z3MuaDogQWRkIHNldEdlb2xvY2F0aW9uRW5hYmxlZCBBUEkgdG8gaW50ZXJmYWNlCisgICAgICAg ICogc3JjL1dlYlNldHRpbmdzSW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlNldHRpbmdz SW1wbDo6c2V0R2VvbG9jYXRpb25FbmFibGVkKTogQ2FsbHMgdGhyb3VnaCB0byBXZWJDb3JlOjpT ZXR0aW5nczo6c2V0R2VvbG9jYXRpb25FbmFibGVkCisgICAgICAgICogc3JjL1dlYlNldHRpbmdz SW1wbC5oOiBBZGQgc2V0R2VvbG9jYXRpb25FbmFibGVkIGludGVyZmFjZSBmdW5jdGlvbgorCiAy MDA5LTEyLTAyICBBbnRvbiBNdWhpbiAgPGFudG9ubUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9mZWF0dXJlcy5n eXBpCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9mZWF0dXJlcy5neXBpCShyZXZpc2lv biA1MTU5NikKKysrIFdlYktpdC9jaHJvbWl1bS9mZWF0dXJlcy5neXBpCSh3b3JraW5nIGNvcHkp CkBAIC00Niw2ICs0Niw3IEBACiAgICAgICAgICdFTkFCTEVfT0ZGTElORV9XRUJfQVBQTElDQVRJ T05TPTEnLAogICAgICAgICAnRU5BQkxFX0RBU0hCT0FSRF9TVVBQT1JUPTAnLAogICAgICAgICAn RU5BQkxFX0RPTV9TVE9SQUdFPTEnLAorICAgICAgICAnRU5BQkxFX0dFT0xPQ0FUSU9OPTEnLAog ICAgICAgICAnRU5BQkxFX0pBVkFTQ1JJUFRfREVCVUdHRVI9MCcsCiAgICAgICAgICdFTkFCTEVf SlNDX01VTFRJUExFX1RIUkVBRFM9MCcsCiAgICAgICAgICdFTkFCTEVfSUNPTkRBVEFCQVNFPTAn LApJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJTZXR0aW5ncy5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViU2V0dGluZ3MuaAkocmV2aXNpb24gNTE1OTYp CisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlNldHRpbmdzLmgJKHdvcmtpbmcgY29weSkK QEAgLTgwLDYgKzgwLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzZXRUZXh0RGlyZWN0 aW9uU3VibWVudUluY2x1c2lvbkJlaGF2aW9yTmV2ZXJJbmNsdWRlZCgpID0gMDsKICAgICB2aXJ0 dWFsIHZvaWQgc2V0T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKGJvb2wpID0gMDsK ICAgICB2aXJ0dWFsIHZvaWQgc2V0RXhwZXJpbWVudGFsV2ViR0xFbmFibGVkKGJvb2wpID0gMDsK KyAgICB2aXJ0dWFsIHZvaWQgc2V0R2VvbG9jYXRpb25FbmFibGVkKGJvb2wpID0gMDsKIAogcHJv dGVjdGVkOgogICAgIH5XZWJTZXR0aW5ncygpIHsgfQpJbmRleDogV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJTZXR0aW5nc0ltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMv V2ViU2V0dGluZ3NJbXBsLmNwcAkocmV2aXNpb24gNTE1OTYpCisrKyBXZWJLaXQvY2hyb21pdW0v c3JjL1dlYlNldHRpbmdzSW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI0OSw0ICsyNDksOSBA QCB2b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0RXhwZXJpbWVudGFsV2ViCiAgICAgbV9zZXR0aW5n cy0+c2V0V2ViR0xFbmFibGVkKGVuYWJsZWQpOwogfQogCit2b2lkIFdlYlNldHRpbmdzSW1wbDo6 c2V0R2VvbG9jYXRpb25FbmFibGVkKGJvb2wgZW5hYmxlZCkKK3sKKyAgICBtX3NldHRpbmdzLT5z ZXRHZW9sb2NhdGlvbkVuYWJsZWQoZW5hYmxlZCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktp dApJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5oCShyZXZpc2lvbiA1MTU5 NikKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmgJKHdvcmtpbmcgY29w eSkKQEAgLTgyLDYgKzgyLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzZXRUZXh0RGly ZWN0aW9uU3VibWVudUluY2x1c2lvbkJlaGF2aW9yTmV2ZXJJbmNsdWRlZCgpOwogICAgIHZpcnR1 YWwgdm9pZCBzZXRPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQoYm9vbCk7CiAgICAg dmlydHVhbCB2b2lkIHNldEV4cGVyaW1lbnRhbFdlYkdMRW5hYmxlZChib29sKTsKKyAgICB2aXJ0 dWFsIHZvaWQgc2V0R2VvbG9jYXRpb25FbmFibGVkKGJvb2wpOwogCiBwcml2YXRlOgogICAgIFdl YkNvcmU6OlNldHRpbmdzKiBtX3NldHRpbmdzOwo=