13631 2007-05-08 19:50:38 -0700 Page Cache should support pages with frames 2009-09-03 16:57:48 -0700 1 1 1 Unclassified WebKit Page Loading 523.x (Safari 3) All All RESOLVED FIXED InRadar P2 Normal --- 4123 20806 1 beidson beidson ap emacemac7 koivisto michael oldest_to_newest 10667 0 beidson 2007-05-08 19:50:38 -0700 The back/forward cache needs to work with pages that have frames <rdar://problem/4886592> 140905 1 beidson 2009-08-17 17:22:36 -0700 Back to working on this lately. It will be coming in baby steps, trying to make the code a little more sane as we get closer to flipping the switch. 140911 2 35002 beidson 2009-08-17 17:25:25 -0700 Created attachment 35002 Refactor related code out of DocumentLoader and enhance logging 140952 3 35002 eric 2009-08-17 18:13:51 -0700 Comment on attachment 35002 Refactor related code out of DocumentLoader and enhance logging It's now possible to test the page cache (with the setting override stuff). Dumi (I think?) added the first page-cache test the other day. Seems we should add one for this change too. 140959 4 beidson 2009-08-17 18:24:32 -0700 If he added page cache layout tests, that's great. In this situation, I wish you could've told me *where* he added these, because I personally don't have time to watch all the commits go by on a day to day basis and don't know where to look. Regardless, since this patch is a pure refactoring and has zero change in behavior, testing the change in behavior for regressions is a non-starter. I did run the layout tests and there were no new failures. Putting back up for review. 140960 5 35002 beidson 2009-08-17 18:25:14 -0700 Comment on attachment 35002 Refactor related code out of DocumentLoader and enhance logging Layout test not possible, zero behavior change. Putting back up for review. 140962 6 beidson 2009-08-17 18:28:38 -0700 Sam Weinig reviewed this over my shoulder. 140968 7 beidson 2009-08-17 18:38:55 -0700 This cleanup landed in r47407. 143931 8 beidson 2009-09-01 10:30:43 -0700 Updated Radar URL: <rdar://problem/3541409> 143944 9 38871 beidson 2009-09-01 10:58:29 -0700 Created attachment 38871 Cleanup and scaffolding - no change in behavior 143949 10 beidson 2009-09-01 11:14:31 -0700 Landed in http://trac.webkit.org/changeset/47943 144236 11 38928 beidson 2009-09-02 09:40:10 -0700 Created attachment 38928 A next step - more of the handling of the "CachedFrame tree" Again, this doesn't change current behavior, and is just another step in landing my work piece-by-piece. 144264 12 beidson 2009-09-02 12:33:26 -0700 This morning's patch landed in http://trac.webkit.org/changeset/47985 More coming... 144279 13 beidson 2009-09-02 13:17:19 -0700 http://trac.webkit.org/changeset/47989 is related to this work, as well. 144326 14 38944 beidson 2009-09-02 16:09:54 -0700 Created attachment 38944 Another step - getting close! 144339 15 beidson 2009-09-02 17:08:24 -0700 http://trac.webkit.org/changeset/47999 144344 16 38951 beidson 2009-09-02 17:19:12 -0700 Created attachment 38951 Almost there... 144347 17 38951 darin 2009-09-02 17:26:17 -0700 Comment on attachment 38951 Almost there... Should use an enum instead of adding a new bool argument. It's true that in one place the argument is a boolean expression, not a constant, but I still think that these confusing functions can be made less so with enums. In fact, I think you could combine the sendUnload and sendPagehide bool arguments into a single enum if you name the values carefully. 144353 18 38955 beidson 2009-09-02 17:38:52 -0700 Created attachment 38955 Address Darin's comments 144357 19 beidson 2009-09-02 17:56:00 -0700 Landed in http://trac.webkit.org/changeset/48001 I'll flip the switch sometime tomorrow, after I get a chance to update and build on Windows. 144629 20 beidson 2009-09-03 16:10:55 -0700 The patch was reviewed over my shoulder, so it's not in the list, but: http://trac.webkit.org/changeset/48034 144640 21 39019 beidson 2009-09-03 16:39:13 -0700 Created attachment 39019 Enable back/forward cache for pages with frames (along with some layout tests) 144643 22 beidson 2009-09-03 16:57:48 -0700 Landed in http://trac.webkit.org/changeset/48036 35002 2009-08-17 17:25:25 -0700 2009-08-17 18:28:24 -0700 Refactor related code out of DocumentLoader and enhance logging patch.txt text/plain 8639 beidson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NzM5OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzAgQEAKKzIwMDktMDgtMTcgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNv bWUgY2xlYW51cCB0b3dhcmRzIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzYzMQorICAgICAgICBQYWdlIENhY2hlIHNob3VsZCBzdXBwb3J0IHBhZ2VzIHdpdGggZnJh bWVzCisKKyAgICAgICAgLSBSZS1mYWN0b3IgYWxsIHJlbWFpbmluZyBwYWdlIGNhY2hlIGNvZGUg b3V0IG9mIERvY3VtZW50TG9hZGVyLCBhcyBDYWNoZWRQYWdlL0NhY2hlRnJhbWUgbG9hZHMKKyAg ICAgICAgICBhcmUgc29sZWx5IHRoZSByZXNwb25zaWJpbGl0eSBvZiBGcmFtZUxvYWRlci4KKyAg ICAgICAgLSBFbmhhbmNlIHNvbWUgcGFnZSBjYWNoZSByZWxhdGVkIExvZ2dpbmcgdG8gaGVscCBk ZXZlbG9wbWVudC4KKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRpZENvbW1pdExvYWQp OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6aWRlbnRpZmllckZvcklu aXRpYWxSZXF1ZXN0KToKKworICAgICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6RG9jdW1lbnRMb2FkZXIpOgorICAgICAg ICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5oOgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9h ZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpGcmFtZUxvYWRlcik6Cisg ICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y29tbWl0UHJvdmlzaW9uYWxMb2FkKToKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjb250aW51ZUxvYWRBZnRlcldpbGxTdWJtaXRG b3JtKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpsb2FkUHJvdmlzaW9uYWxJdGVt RnJvbUNhY2hlZFBhZ2UpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5oOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmlzTG9hZGluZ0Zyb21DYWNoZWRQYWdlKToKKwogMjAw OS0wOC0xNyAgQmVuamFtaW4gQyBNZXllciAgPGJlbmphbWluLm1leWVyQHRvcmNobW9iaWxlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiA0NzM2OSkKKysrIFdlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03 MjYsNyArNzI2LDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRDb21taXRMb2FkKAog ICAgICAgICBpZiAod2luZG93VmlzaWJsZSgpKSB7CiAgICAgICAgICAgICByZXNldFNjcmlwdE9i amVjdHMoKTsKIAotICAgICAgICAgICAgaWYgKCFsb2FkZXItPmlzTG9hZGluZ0Zyb21DYWNoZWRQ YWdlKCkpIHsKKyAgICAgICAgICAgIGlmICghbG9hZGVyLT5mcmFtZUxvYWRlcigpLT5pc0xvYWRp bmdGcm9tQ2FjaGVkUGFnZSgpKSB7CiAgICAgICAgICAgICAgICAgQVNTRVJUKG1fbWFpblJlc291 cmNlICYmIG1fbWFpblJlc291cmNlLT5pc1NhbWVMb2FkZXIobG9hZGVyKSk7CiAgICAgICAgICAg ICAgICAgLy8gV2UgZG9uJ3QgYWRkIHRoZSBtYWluIHJlc291cmNlIHVudGlsIGl0cyBsb2FkIGlz IGNvbW1pdHRlZC4gVGhpcyBpcwogICAgICAgICAgICAgICAgIC8vIG5lZWRlZCB0byBrZWVwIHRo ZSBsb2FkIGZvciBhIHVzZXItZW50ZXJlZCBVUkwgZnJvbSBzaG93aW5nIHVwIGluIHRoZQpAQCAt ODYwLDcgKzg2MCw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6aWRlbnRpZmllckZvckkK IAogICAgIGFkZFJlc291cmNlKHJlc291cmNlLmdldCgpKTsKIAotICAgIGlmICh3aW5kb3dWaXNp YmxlKCkgJiYgbG9hZGVyLT5pc0xvYWRpbmdGcm9tQ2FjaGVkUGFnZSgpICYmIHJlc291cmNlID09 IG1fbWFpblJlc291cmNlKQorICAgIGlmICh3aW5kb3dWaXNpYmxlKCkgJiYgbG9hZGVyLT5mcmFt ZUxvYWRlcigpLT5pc0xvYWRpbmdGcm9tQ2FjaGVkUGFnZSgpICYmIHJlc291cmNlID09IG1fbWFp blJlc291cmNlKQogICAgICAgICByZXNvdXJjZS0+Y3JlYXRlU2NyaXB0T2JqZWN0KG1fZnJvbnRl bmQuZ2V0KCkpOwogfQogCkluZGV4OiBXZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCShyZXZpc2lv biA0NzM2OSkKKysrIFdlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTQ0LDcgKzE0NCw2IEBAIERvY3VtZW50TG9hZGVyOjpEb2N1bWVudExvYWRlcihj b25zdCBSZXMKICAgICAsIG1fZ290Rmlyc3RCeXRlKGZhbHNlKQogICAgICwgbV9wcmltYXJ5TG9h ZENvbXBsZXRlKGZhbHNlKQogICAgICwgbV9pc0NsaWVudFJlZGlyZWN0KGZhbHNlKQotICAgICwg bV9sb2FkaW5nRnJvbUNhY2hlZFBhZ2UoZmFsc2UpCiAgICAgLCBtX3N0b3BSZWNvcmRpbmdSZXNw b25zZXMoZmFsc2UpCiAgICAgLCBtX3N1YnN0aXR1dGVSZXNvdXJjZURlbGl2ZXJ5VGltZXIodGhp cywgJkRvY3VtZW50TG9hZGVyOjpzdWJzdGl0dXRlUmVzb3VyY2VEZWxpdmVyeVRpbWVyRmlyZWQp CiAgICAgLCBtX2RpZENyZWF0ZUdsb2JhbEhpc3RvcnlFbnRyeShmYWxzZSkKQEAgLTY4NywxNiAr Njg2LDYgQEAgYm9vbCBEb2N1bWVudExvYWRlcjo6dXJsRm9ySGlzdG9yeVJlZmxlYwogICAgIHJl dHVybiBtX3N1YnN0aXR1dGVEYXRhLmlzVmFsaWQoKSB8fCBtX3Jlc3BvbnNlLmh0dHBTdGF0dXND b2RlKCkgPj0gNDAwOwogfQogCi12b2lkIERvY3VtZW50TG9hZGVyOjpsb2FkRnJvbUNhY2hlZFBh Z2UoUGFzc1JlZlB0cjxDYWNoZWRQYWdlPiBjYWNoZWRQYWdlKQotewotICAgIExPRyhQYWdlQ2Fj aGUsICJXZWJDb3JlUGFnZUNhY2hlOiBEb2N1bWVudExvYWRlciAlcCBsb2FkaW5nIGZyb20gY2Fj aGVkIHBhZ2UgJXAiLCB0aGlzLCBjYWNoZWRQYWdlLmdldCgpKTsKLSAgICAKLSAgICBwcmVwYXJl Rm9yTG9hZFN0YXJ0KCk7Ci0gICAgc2V0TG9hZGluZ0Zyb21DYWNoZWRQYWdlKHRydWUpOwotICAg IHNldENvbW1pdHRlZCh0cnVlKTsKLSAgICBmcmFtZUxvYWRlcigpLT5jb21taXRQcm92aXNpb25h bExvYWQoY2FjaGVkUGFnZSk7Ci19Ci0KIGNvbnN0IEtVUkwmIERvY3VtZW50TG9hZGVyOjpvcmln aW5hbFVSTCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fb3JpZ2luYWxSZXF1ZXN0Q29weS51cmwo KTsKSW5kZXg6IFdlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAkocmV2aXNpb24gNDczNjkpCisrKyBXZWJD b3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC00Miw3ICs0Miw2 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBjbGFzcyBBcmNoaXZlOwogICAgIGNsYXNzIEFy Y2hpdmVSZXNvdXJjZTsKICAgICBjbGFzcyBBcmNoaXZlUmVzb3VyY2VDb2xsZWN0aW9uOwotICAg IGNsYXNzIENhY2hlZFBhZ2U7CiAgICAgY2xhc3MgRnJhbWU7CiAgICAgY2xhc3MgRnJhbWVMb2Fk ZXI7CiAgICAgY2xhc3MgTWFpblJlc291cmNlTG9hZGVyOwpAQCAtMTcwLDEwICsxNjksNiBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGJvb2wgZGlkQ3JlYXRlR2xvYmFsSGlzdG9yeUVu dHJ5KCkgY29uc3QgeyByZXR1cm4gbV9kaWRDcmVhdGVHbG9iYWxIaXN0b3J5RW50cnk7IH0KICAg ICAgICAgdm9pZCBzZXREaWRDcmVhdGVHbG9iYWxIaXN0b3J5RW50cnkoYm9vbCBkaWRDcmVhdGVH bG9iYWxIaXN0b3J5RW50cnkpIHsgbV9kaWRDcmVhdGVHbG9iYWxIaXN0b3J5RW50cnkgPSBkaWRD cmVhdGVHbG9iYWxIaXN0b3J5RW50cnk7IH0KICAgICAgICAgCi0gICAgICAgIHZvaWQgbG9hZEZy b21DYWNoZWRQYWdlKFBhc3NSZWZQdHI8Q2FjaGVkUGFnZT4pOwotICAgICAgICB2b2lkIHNldExv YWRpbmdGcm9tQ2FjaGVkUGFnZShib29sIGxvYWRpbmcpIHsgbV9sb2FkaW5nRnJvbUNhY2hlZFBh Z2UgPSBsb2FkaW5nOyB9Ci0gICAgICAgIGJvb2wgaXNMb2FkaW5nRnJvbUNhY2hlZFBhZ2UoKSBj b25zdCB7IHJldHVybiBtX2xvYWRpbmdGcm9tQ2FjaGVkUGFnZTsgfQotICAgICAgICAKICAgICAg ICAgdm9pZCBzZXREZWZlcnNMb2FkaW5nKGJvb2wpOwogCiAgICAgICAgIGJvb2wgc3RhcnRMb2Fk aW5nTWFpblJlc291cmNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcik7CkBAIC0yNjAsNyArMjU1 LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIG1fZ290Rmlyc3RCeXRlOwog ICAgICAgICBib29sIG1fcHJpbWFyeUxvYWRDb21wbGV0ZTsKICAgICAgICAgYm9vbCBtX2lzQ2xp ZW50UmVkaXJlY3Q7Ci0gICAgICAgIGJvb2wgbV9sb2FkaW5nRnJvbUNhY2hlZFBhZ2U7CiAKICAg ICAgICAgU3RyaW5nIG1fcGFnZVRpdGxlOwogCkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShy ZXZpc2lvbiA0NzM2OSkKKysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjY3LDYgKzI2Nyw3IEBAIEZyYW1lTG9hZGVyOjpGcmFtZUxvYWRlcihGcmFt ZSogZnJhbWUsIEYKICAgICAsIG1faXNEaXNwbGF5aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoZmFs c2UpCiAgICAgLCBtX2NvbW1pdHRlZEZpcnN0UmVhbERvY3VtZW50TG9hZChmYWxzZSkKICAgICAs IG1fZGlkUGVyZm9ybUZpcnN0TmF2aWdhdGlvbihmYWxzZSkKKyAgICAsIG1fbG9hZGluZ0Zyb21D YWNoZWRQYWdlKGZhbHNlKQogI2lmbmRlZiBOREVCVUcKICAgICAsIG1fZGlkRGlzcGF0Y2hEaWRD b21taXRMb2FkKGZhbHNlKQogI2VuZGlmCkBAIC0yODA4LDcgKzI4MDksOCBAQCB2b2lkIEZyYW1l TG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQoCiAgICAgUmVmUHRyPENhY2hlZFBhZ2U+IGNh Y2hlZFBhZ2UgPSBwcnBDYWNoZWRQYWdlOwogICAgIFJlZlB0cjxEb2N1bWVudExvYWRlcj4gcGRs ID0gbV9wcm92aXNpb25hbERvY3VtZW50TG9hZGVyOwogCi0gICAgTE9HKExvYWRpbmcsICJXZWJD b3JlTG9hZGluZyAlczogQWJvdXQgdG8gY29tbWl0IHByb3Zpc2lvbmFsIGxvYWQgZnJvbSBwcmV2 aW91cyBVUkwgJXMiLCBtX2ZyYW1lLT50cmVlKCktPm5hbWUoKS5zdHJpbmcoKS51dGY4KCkuZGF0 YSgpLCBtX1VSTC5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKKyAgICBMT0coUGFnZUNhY2hlLCAi V2ViQ29yZUxvYWRpbmcgJXM6IEFib3V0IHRvIGNvbW1pdCBwcm92aXNpb25hbCBsb2FkIGZyb20g cHJldmlvdXMgVVJMICclcycgdG8gbmV3IFVSTCAnJXMnIiwgbV9mcmFtZS0+dHJlZSgpLT5uYW1l KCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgbV9VUkwuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSwg CisgICAgICAgIHBkbCA/IHBkbC0+dXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSA6ICI8bm8g cHJvdmlzaW9uYWwgRG9jdW1lbnRMb2FkZXI+Iik7CiAKICAgICAvLyBDaGVjayB0byBzZWUgaWYg d2UgbmVlZCB0byBjYWNoZSB0aGUgcGFnZSB3ZSBhcmUgbmF2aWdhdGluZyBhd2F5IGZyb20gaW50 byB0aGUgYmFjay9mb3J3YXJkIGNhY2hlLgogICAgIC8vIFdlIGFyZSBkb2luZyB0aGlzIGhlcmUg YmVjYXVzZSB3ZSBrbm93IGZvciBzdXJlIHRoYXQgYSBuZXcgcGFnZSBpcyBhYm91dCB0byBiZSBs b2FkZWQuCkBAIC0yODQ5LDcgKzI4NTEsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpjb21taXRQcm92 aXNpb25hbExvYWQoCiAgICAgaWYgKG1fbG9hZFR5cGUgPT0gRnJhbWVMb2FkVHlwZVN0YW5kYXJk ICYmIG1fZG9jdW1lbnRMb2FkZXItPmlzQ2xpZW50UmVkaXJlY3QoKSkKICAgICAgICAgdXBkYXRl SGlzdG9yeUZvckNsaWVudFJlZGlyZWN0KCk7CiAKLSAgICBpZiAobV9kb2N1bWVudExvYWRlci0+ aXNMb2FkaW5nRnJvbUNhY2hlZFBhZ2UoKSkgeworICAgIGlmIChtX2xvYWRpbmdGcm9tQ2FjaGVk UGFnZSkgewogICAgICAgICBtX2ZyYW1lLT5kb2N1bWVudCgpLT5kb2N1bWVudERpZEJlY29tZUFj dGl2ZSgpOwogICAgICAgICAKICAgICAgICAgLy8gRm9yY2UgYSBsYXlvdXQgdG8gdXBkYXRlIHZp ZXcgc2l6ZSBhbmQgdGhlcmVieSB1cGRhdGUgc2Nyb2xsYmFycy4KQEAgLTM0MTYsNyArMzQxOCw3 IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNvbnRpbnVlTG9hZEFmdGVyV2lsbFMKICAgICBpZiAoYWN0 aXZlRG9jTG9hZGVyICYmIGFjdGl2ZURvY0xvYWRlci0+aXNMb2FkaW5nTWFpblJlc291cmNlKCkp CiAgICAgICAgIHJldHVybjsKIAotICAgIG1fcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlci0+c2V0 TG9hZGluZ0Zyb21DYWNoZWRQYWdlKGZhbHNlKTsKKyAgICBtX2xvYWRpbmdGcm9tQ2FjaGVkUGFn ZSA9IGZhbHNlOwogCiAgICAgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyID0gMDsKIApAQCAtNDE5 OSw3ICs0MjAxLDE3IEBAIGJvb2wgRnJhbWVMb2FkZXI6OmxvYWRQcm92aXNpb25hbEl0ZW1Gcm8K ICAgICBSZWZQdHI8Q2FjaGVkUGFnZT4gY2FjaGVkUGFnZSA9IHBhZ2VDYWNoZSgpLT5nZXQobV9w cm92aXNpb25hbEhpc3RvcnlJdGVtLmdldCgpKTsKICAgICBpZiAoIWNhY2hlZFBhZ2UgfHwgIWNh Y2hlZFBhZ2UtPmRvY3VtZW50KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBwcm92aXNp b25hbERvY3VtZW50TG9hZGVyKCktPmxvYWRGcm9tQ2FjaGVkUGFnZShjYWNoZWRQYWdlLnJlbGVh c2UoKSk7CisKKyAgICBEb2N1bWVudExvYWRlciAqcHJvdmlzaW9uYWxMb2FkZXIgPSBwcm92aXNp b25hbERvY3VtZW50TG9hZGVyKCk7CisgICAgTE9HKFBhZ2VDYWNoZSwgIldlYkNvcmVQYWdlQ2Fj aGU6IEZyYW1lTG9hZGVyICVwIGxvYWRpbmcgcHJvdmlzaW9uYWwgRG9jdW1lbnRMb2FkZXIgJXAg d2l0aCBVUkwgJyVzJyBmcm9tIENhY2hlZFBhZ2UgJXAiLCB0aGlzLCBwcm92aXNpb25hbExvYWRl ciwgcHJvdmlzaW9uYWxMb2FkZXItPnVybCgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCksIGNhY2hl ZFBhZ2UuZ2V0KCkpOworICAgIAorICAgIHByb3Zpc2lvbmFsTG9hZGVyLT5wcmVwYXJlRm9yTG9h ZFN0YXJ0KCk7CisKKyAgICBtX2xvYWRpbmdGcm9tQ2FjaGVkUGFnZSA9IHRydWU7CisKKyAgICBw cm92aXNpb25hbExvYWRlci0+c2V0Q29tbWl0dGVkKHRydWUpOworICAgIGNvbW1pdFByb3Zpc2lv bmFsTG9hZChjYWNoZWRQYWdlKTsKKyAgICAKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApJbmRleDog V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5oCShyZXZpc2lvbiA0NzM2OSkKKysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1l TG9hZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTM0NSw2ICszNDUsNyBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgICAgIHZvaWQgc2V0VGl0bGUoY29uc3QgU3RyaW5nJik7CiAKICAgICAgICAg dm9pZCBjb21taXRQcm92aXNpb25hbExvYWQoUGFzc1JlZlB0cjxDYWNoZWRQYWdlPik7CisgICAg ICAgIGJvb2wgaXNMb2FkaW5nRnJvbUNhY2hlZFBhZ2UoKSBjb25zdCB7IHJldHVybiBtX2xvYWRp bmdGcm9tQ2FjaGVkUGFnZTsgfQogCiAgICAgICAgIHZvaWQgZ29Ub0l0ZW0oSGlzdG9yeUl0ZW0q LCBGcmFtZUxvYWRUeXBlKTsKICAgICAgICAgdm9pZCBzYXZlRG9jdW1lbnRBbmRTY3JvbGxTdGF0 ZSgpOwpAQCAtNjE3LDYgKzYxOCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgUmVm UHRyPEhpc3RvcnlJdGVtPiBtX3Byb3Zpc2lvbmFsSGlzdG9yeUl0ZW07CiAgICAgICAgIAogICAg ICAgICBib29sIG1fZGlkUGVyZm9ybUZpcnN0TmF2aWdhdGlvbjsKKyAgICAgICAgYm9vbCBtX2xv YWRpbmdGcm9tQ2FjaGVkUGFnZTsKICAgICAgICAgCiAjaWZuZGVmIE5ERUJVRwogICAgICAgICBi b29sIG1fZGlkRGlzcGF0Y2hEaWRDb21taXRMb2FkOwo= 38871 2009-09-01 10:58:29 -0700 2009-09-01 10:59:54 -0700 Cleanup and scaffolding - no change in behavior patch.txt text/plain 10214 beidson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0Nzk0MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDQgQEAKKzIwMDktMDktMDEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBh Z2UgQ2FjaGUgc2hvdWxkIHN1cHBvcnQgcGFnZXMgd2l0aCBmcmFtZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjMxCisKKyAgICAgICAgVGhpbmdz IGxlYXJuZWQgaW4gdGhlIGZ1bGwgdGFzayB0aGF0IHRoaXMgcGF0Y2ggYWRkcmVzc2VzOgorICAg ICAgICAtIFRoZSBub3Rpb25zIG9mIGNsZWFyaW5nIGEgQ2FjaGVkRnJhbWUgYW5kIGRlc3Ryb3lp bmcgYSBDYWNoZWRGcmFtZSB3ZXJlIHR3byBjb25jZXB0cyB0aGF0IAorICAgICAgICAgIG5lZWRl ZCB0byBiZSBtYW5hZ2VkIHNlcGFyYXRlbHkuCisgICAgICAgIC0gT25jZSB3ZSBzdGFydCByZXN0 b3JpbmcgcGFnZXMgd2l0aCBtdWx0aXBsZSBDYWNoZWRGcmFtZXMsIHdlJ2xsIGhhdmUgdG8gYmUg Y2FsbGluZworICAgICAgICAgIEZyYW1lTG9hZGVyOjpvcGVuKENhY2hlZEZyYW1lJikgbXVsdGlw bGUgdGltZXMgd2l0aCBkaWZmZXJlbnQgQ2FjaGVkRnJhbWVzLCBhbmQgdGhpcyBwcm9jZXNzCisg ICAgICAgICAgd2lsbCBiZSBndWlkZWQgYnkgdGhlIENhY2hlZEZyYW1lcyB0aGVtc2VsdmVzLgor CisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE5vIGNoYW5nZSBpbiBiZWhhdmlvciwgY3VycmVudCBs YXlvdXQgdGVzdHMgcGFzcykKKyAgICAgICAgCisgICAgICAgICogaGlzdG9yeS9DYWNoZWRGcmFt ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRGcmFtZTo6Q2FjaGVkRnJhbWUpOgorICAg ICAgICAoV2ViQ29yZTo6Q2FjaGVkRnJhbWU6On5DYWNoZWRGcmFtZSk6CisgICAgICAgIChXZWJD b3JlOjpDYWNoZWRGcmFtZTo6Y2xlYXIpOiBPbmx5IGNsZWFyIHBvaW50ZXJzIG91dC4KKyAgICAg ICAgKFdlYkNvcmU6OkNhY2hlZEZyYW1lOjpkZXN0cm95KTogUGVyZm9ybSB0aGUgZGVzdHJ1Y3Rp dmUgY2xlYW51cCB3b3JrIGhlcmUgLSBUaGluZ3MgdGhhdCBzaG91bGRuJ3QKKyAgICAgICAgICBv Y2N1ciBzaW1wbHkgYnkgbmF2aWdhdGluZyBiYWNrIHRvIGEgcGFnZSB3aXRoIGEgQ2FjaGVkRnJh bWUuCisgICAgICAgICogaGlzdG9yeS9DYWNoZWRGcmFtZS5oOgorCisgICAgICAgICogaGlzdG9y eS9DYWNoZWRQYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFBhZ2U6On5DYWNoZWRQ YWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFBhZ2U6OnJlc3RvcmUpOiBDYWxsIGNsZWFy KCkgYWZ0ZXIgcmVzdG9yaW5nLgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUGFnZTo6Y2xlYXIp OgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUGFnZTo6ZGVzdHJveSk6CisgICAgICAgICogaGlz dG9yeS9DYWNoZWRQYWdlLmg6CisKKyAgICAgICAgKiBoaXN0b3J5L1BhZ2VDYWNoZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpQYWdlQ2FjaGU6OnJlbGVhc2VBdXRvcmVsZWFzZWRQYWdlc05vdyk6 IGRlc3Ryb3koKSBDYWNoZWRQYWdlcyB0aGF0IGFyZSBiZWluZyBwcnVuZWQsCisgICAgICAgICAg aW5zdGVhZCBvZiBjbGVhcmluZyB0aGVtLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExv YWQpOiBMZXQgdGhlIENhY2hlZFBhZ2UgY2xlYXIoKSBpdHNlbGYgYWZ0ZXIgcmVzdG9yaW5nLgor ICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6Om9wZW4pOiBEb24ndCA6Om9wZW4oKSB0aGUg Q2FjaGVkRnJhbWUsIGFzIHRoZSBDYWNoZWRQYWdlIGRvZXMgdGhhdCBub3cuCisgICAgICAgICog bG9hZGVyL0ZyYW1lTG9hZGVyLmg6ICBBZGQgdGhlIGZyaWVuZGluZyBzbyBDYWNoZWRQYWdlIGFu ZCBDYWNoZWRGcmFtZSBjYW4gYmV0dGVyIGd1aWRlIHRoZSBwcm9jZXNzLgorICAgICAgICAgIEV2 ZW4gdGhvdWdoIENhY2hlZEZyYW1lOjpyZXN0b3JlKCkgaXNuJ3QgdXNlZCBmb3Igbm93LCBpdCB3 aWxsIGJlIHNvb24uCisKIDIwMDktMDktMDEgIEZ1bWl0b3NoaSBVa2FpICA8dWthaUBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KSW5kZXg6IFdlYkNvcmUv aGlzdG9yeS9DYWNoZWRGcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9oaXN0b3J5L0Nh Y2hlZEZyYW1lLmNwcAkocmV2aXNpb24gNDc5MzQpCisrKyBXZWJDb3JlL2hpc3RvcnkvQ2FjaGVk RnJhbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MCw3ICs4MCw3IEBAIENhY2hlZEZyYW1lOjpD YWNoZWRGcmFtZShGcmFtZSogZnJhbWUpCiAgICAgZm9yIChGcmFtZSogY2hpbGQgPSBmcmFtZS0+ dHJlZSgpLT5maXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT50cmVlKCktPm5leHRT aWJsaW5nKCkpCiAgICAgICAgIG1fY2hpbGRGcmFtZXMuYXBwZW5kKENhY2hlZEZyYW1lOjpjcmVh dGUoY2hpbGQpKTsKIAotICAgIExPRyhQYWdlQ2FjaGUsICJGaW5pc2hlZCBjcmVhdGluZyBDYWNo ZWRGcmFtZSB3aXRoIHVybCAlcyBhbmQgZG9jdW1lbnRsb2FkZXIgJXBcbiIsIG1fdXJsLnN0cmlu ZygpLnV0ZjgoKS5kYXRhKCksIG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCkpOworICAgIExPRyhQYWdl Q2FjaGUsICJGaW5pc2hlZCBjcmVhdGluZyBDYWNoZWRGcmFtZSBmb3IgbWFpbiBmcmFtZSB1cmwg JyVzJyBhbmQgRG9jdW1lbnRMb2FkZXIgJXBcbiIsIG1fdXJsLnN0cmluZygpLnV0ZjgoKS5kYXRh KCksIG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCkpOwogfQogCiBDYWNoZWRGcmFtZTo6fkNhY2hlZEZy YW1lKCkKQEAgLTg4LDggKzg4LDggQEAgQ2FjaGVkRnJhbWU6On5DYWNoZWRGcmFtZSgpCiAjaWZu ZGVmIE5ERUJVRwogICAgIGNhY2hlZEZyYW1lQ291bnRlcigpLmRlY3JlbWVudCgpOwogI2VuZGlm Ci0KLSAgICBjbGVhcigpOworICAgIC8vIENhY2hlZEZyYW1lcyBzaG91bGQgYWx3YXlzIGhhdmUg aGFkIGRlc3Ryb3koKSBjYWxsZWQgYnkgdGhlaXIgcGFyZW50IENhY2hlZFBhZ2UKKyAgICBBU1NF UlQoIW1fZG9jdW1lbnQpOwogfQogCiB2b2lkIENhY2hlZEZyYW1lOjpyZXN0b3JlKCkKQEAgLTEy MCwzNyArMTIwLDUwIEBAIHZvaWQgQ2FjaGVkRnJhbWU6OmNsZWFyKCkKICAgICBpZiAoIW1fZG9j dW1lbnQpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChtX2NhY2hlZEZyYW1lUGxhdGZvcm1E YXRhKQotICAgICAgICBtX2NhY2hlZEZyYW1lUGxhdGZvcm1EYXRhLT5jbGVhcigpOwotICAgICAg ICAKKyAgICAvLyBjbGVhcigpIHNob3VsZCBvbmx5IGJlIGNhbGxlZCBmb3IgRnJhbWVzIHJlcHJl c2VudGluZyBkb2N1bWVudHMgdGhhdCBhcmUgbm8gbG9uZ2VyIGluIHRoZSBwYWdlIGNhY2hlLgor ICAgIC8vIFRoaXMgbWVhbnMgdGhlIENhY2hlZEZyYW1lIGhhcyBiZWVuOgorICAgIC8vIDEgLSBT dWNjZXNzZnVsbHkgcmVzdG9yZSgpJ2QgYnkgZ29pbmcgYmFjay9mb3J3YXJkLgorICAgIC8vIDIg LSBkZXN0cm95KCknZWQgYmVjYXVzZSB0aGUgUGFnZUNhY2hlIGlzIHBydW5pbmcgb3IgdGhlIFdl YlZpZXcgd2FzIGNsb3NlZC4KKyAgICBBU1NFUlQoIW1fZG9jdW1lbnQtPmluUGFnZUNhY2hlKCkp OwogICAgIEFTU0VSVChtX3ZpZXcpOwogICAgIEFTU0VSVChtX2RvY3VtZW50LT5mcmFtZSgpID09 IG1fdmlldy0+ZnJhbWUoKSk7CiAKLSAgICBpZiAobV9kb2N1bWVudC0+aW5QYWdlQ2FjaGUoKSkg ewotICAgICAgICBGcmFtZTo6Y2xlYXJUaW1lcnMobV92aWV3LmdldCgpLCBtX2RvY3VtZW50Lmdl dCgpKTsKLQotICAgICAgICAvLyBGSVhNRTogV2h5IGRvIHdlIG5lZWQgdG8gY2FsbCByZW1vdmVB bGxFdmVudExpc3RlbmVycyBoZXJlPyBXaGVuIHRoZSBkb2N1bWVudCBpcyBpbiBwYWdlIGNhY2hl LCB0aGlzIG1ldGhvZCB3b24ndCB3b3JrCi0gICAgICAgIC8vIGZ1bGx5IGFueXdheSwgYmVjYXVz ZSB0aGUgZG9jdW1lbnQgd29uJ3QgYmUgYWJsZSB0byBhY2Nlc3MgaXRzIERPTVdpbmRvdyBvYmpl Y3QgKGR1ZSB0byBiZWluZyBmcmFtZWxlc3MpLgotICAgICAgICBtX2RvY3VtZW50LT5yZW1vdmVB bGxFdmVudExpc3RlbmVycygpOwotCi0gICAgICAgIG1fZG9jdW1lbnQtPnNldEluUGFnZUNhY2hl KGZhbHNlKTsKLSAgICAgICAgLy8gRklYTUU6IFdlIGRvbid0IGNhbGwgd2lsbFJlbW92ZSBoZXJl LiBXaHkgaXMgdGhhdCBPSz8KLSAgICAgICAgbV9kb2N1bWVudC0+ZGV0YWNoKCk7Ci0gICAgICAg IG1fdmlldy0+Y2xlYXJGcmFtZSgpOwotICAgIH0KLQotICAgIEFTU0VSVCghbV9kb2N1bWVudC0+ aW5QYWdlQ2FjaGUoKSk7Ci0KICAgICBtX2RvY3VtZW50ID0gMDsKICAgICBtX3ZpZXcgPSAwOwog ICAgIG1fbW91c2VQcmVzc05vZGUgPSAwOwogICAgIG1fdXJsID0gS1VSTCgpOwogCiAgICAgbV9j YWNoZWRGcmFtZVBsYXRmb3JtRGF0YS5jbGVhcigpOwotCiAgICAgbV9jYWNoZWRGcmFtZVNjcmlw dERhdGEuY2xlYXIoKTsKIH0KIAordm9pZCBDYWNoZWRGcmFtZTo6ZGVzdHJveSgpCit7CisgICAg aWYgKCFtX2RvY3VtZW50KQorICAgICAgICByZXR1cm47CisgICAgCisgICAgLy8gT25seSBDYWNo ZWRGcmFtZXMgdGhhdCBhcmUgc3RpbGwgaW4gdGhlIFBhZ2VDYWNoZSBzaG91bGQgYmUgZGVzdHJv eWVkIGluIHRoaXMgbWFubmVyCisgICAgQVNTRVJUKG1fZG9jdW1lbnQtPmluUGFnZUNhY2hlKCkp OworICAgIEFTU0VSVChtX3ZpZXcpOworICAgIEFTU0VSVChtX2RvY3VtZW50LT5mcmFtZSgpID09 IG1fdmlldy0+ZnJhbWUoKSk7CisKKyAgICBpZiAobV9jYWNoZWRGcmFtZVBsYXRmb3JtRGF0YSkK KyAgICAgICAgbV9jYWNoZWRGcmFtZVBsYXRmb3JtRGF0YS0+Y2xlYXIoKTsKKworICAgIEZyYW1l OjpjbGVhclRpbWVycyhtX3ZpZXcuZ2V0KCksIG1fZG9jdW1lbnQuZ2V0KCkpOworCisgICAgLy8g RklYTUU6IFdoeSBkbyB3ZSBuZWVkIHRvIGNhbGwgcmVtb3ZlQWxsRXZlbnRMaXN0ZW5lcnMgaGVy ZT8gV2hlbiB0aGUgZG9jdW1lbnQgaXMgaW4gcGFnZSBjYWNoZSwgdGhpcyBtZXRob2Qgd29uJ3Qg d29yaworICAgIC8vIGZ1bGx5IGFueXdheSwgYmVjYXVzZSB0aGUgZG9jdW1lbnQgd29uJ3QgYmUg YWJsZSB0byBhY2Nlc3MgaXRzIERPTVdpbmRvdyBvYmplY3QgKGR1ZSB0byBiZWluZyBmcmFtZWxl c3MpLgorICAgIG1fZG9jdW1lbnQtPnJlbW92ZUFsbEV2ZW50TGlzdGVuZXJzKCk7CisKKyAgICBt X2RvY3VtZW50LT5zZXRJblBhZ2VDYWNoZShmYWxzZSk7CisgICAgLy8gRklYTUU6IFdlIGRvbid0 IGNhbGwgd2lsbFJlbW92ZSBoZXJlLiBXaHkgaXMgdGhhdCBPSz8KKyAgICBtX2RvY3VtZW50LT5k ZXRhY2goKTsKKyAgICBtX3ZpZXctPmNsZWFyRnJhbWUoKTsKKworICAgIGNsZWFyKCk7Cit9CisK IHZvaWQgQ2FjaGVkRnJhbWU6OnNldENhY2hlZEZyYW1lUGxhdGZvcm1EYXRhKENhY2hlZEZyYW1l UGxhdGZvcm1EYXRhKiBkYXRhKQogewogICAgIG1fY2FjaGVkRnJhbWVQbGF0Zm9ybURhdGEuc2V0 KGRhdGEpOwpJbmRleDogV2ViQ29yZS9oaXN0b3J5L0NhY2hlZEZyYW1lLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9oaXN0b3J5L0NhY2hlZEZyYW1lLmgJKHJldmlzaW9uIDQ3OTM0KQorKysgV2Vi Q29yZS9oaXN0b3J5L0NhY2hlZEZyYW1lLmgJKHdvcmtpbmcgY29weSkKQEAgLTUwLDYgKzUwLDcg QEAgcHVibGljOgogCiAgICAgdm9pZCByZXN0b3JlKCk7CiAgICAgdm9pZCBjbGVhcigpOworICAg IHZvaWQgZGVzdHJveSgpOwogCiAgICAgRG9jdW1lbnQqIGRvY3VtZW50KCkgY29uc3QgeyByZXR1 cm4gbV9kb2N1bWVudC5nZXQoKTsgfQogICAgIERvY3VtZW50TG9hZGVyKiBkb2N1bWVudExvYWRl cigpIGNvbnN0IHsgcmV0dXJuIG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCk7IH0KSW5kZXg6IFdlYkNv cmUvaGlzdG9yeS9DYWNoZWRQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2hpc3Rvcnkv Q2FjaGVkUGFnZS5jcHAJKHJldmlzaW9uIDQ3OTM0KQorKysgV2ViQ29yZS9oaXN0b3J5L0NhY2hl ZFBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MSwxMyArNjEsMTcgQEAgQ2FjaGVkUGFnZTo6 fkNhY2hlZFBhZ2UoKQogICAgIGNhY2hlZFBhZ2VDb3VudGVyLmRlY3JlbWVudCgpOwogI2VuZGlm CiAKLSAgICBjbGVhcigpOworICAgIGRlc3Ryb3koKTsKKyAgICBBU1NFUlQoIW1fY2FjaGVkTWFp bkZyYW1lKTsKIH0KIAogdm9pZCBDYWNoZWRQYWdlOjpyZXN0b3JlKFBhZ2UqIHBhZ2UpCiB7Cisg ICAgQVNTRVJUKG1fY2FjaGVkTWFpbkZyYW1lKTsKICAgICBBU1NFUlQocGFnZSAmJiBwYWdlLT5t YWluRnJhbWUoKSAmJiBwYWdlLT5tYWluRnJhbWUoKSA9PSBtX2NhY2hlZE1haW5GcmFtZS0+dmll dygpLT5mcmFtZSgpKTsKIAorICAgIG1fY2FjaGVkTWFpbkZyYW1lLT52aWV3KCktPmZyYW1lKCkt PmxvYWRlcigpLT5vcGVuKCptX2NhY2hlZE1haW5GcmFtZS5nZXQoKSk7CisgICAgCiAgICAgLy8g UmVzdG9yZSB0aGUgZm9jdXMgYXBwZWFyYW5jZSBmb3IgdGhlIGZvY3VzZWQgZWxlbWVudC4KICAg ICAvLyBGSVhNRTogUmlnaHQgbm93IHdlIGRvbid0IHN1cHBvcnQgcGFnZXMgdy8gZnJhbWVzIGlu IHRoZSBiL2YgY2FjaGUuICBUaGlzIG1heSBuZWVkIHRvIGJlIHR3ZWFrZWQgd2hlbiB3ZSBhZGQg c3VwcG9ydCBmb3IgdGhhdC4KICAgICBEb2N1bWVudCogZm9jdXNlZERvY3VtZW50ID0gcGFnZS0+ Zm9jdXNDb250cm9sbGVyKCktPmZvY3VzZWRPck1haW5GcmFtZSgpLT5kb2N1bWVudCgpOwpAQCAt NzUsMTEgKzc5LDIzIEBAIHZvaWQgQ2FjaGVkUGFnZTo6cmVzdG9yZShQYWdlKiBwYWdlKQogICAg ICAgICBpZiAobm9kZS0+aXNFbGVtZW50Tm9kZSgpKQogICAgICAgICAgICAgc3RhdGljX2Nhc3Q8 RWxlbWVudCo+KG5vZGUpLT51cGRhdGVGb2N1c0FwcGVhcmFuY2UodHJ1ZSk7CiAgICAgfQorICAg IAorICAgIGNsZWFyKCk7CiB9CiAKIHZvaWQgQ2FjaGVkUGFnZTo6Y2xlYXIoKQogewotICAgIG1f Y2FjaGVkTWFpbkZyYW1lLmNsZWFyKCk7CisgICAgQVNTRVJUKG1fY2FjaGVkTWFpbkZyYW1lKTsK KyAgICBtX2NhY2hlZE1haW5GcmFtZS0+Y2xlYXIoKTsKKyAgICBtX2NhY2hlZE1haW5GcmFtZSA9 IDA7Cit9CisKK3ZvaWQgQ2FjaGVkUGFnZTo6ZGVzdHJveSgpCit7CisgICAgaWYgKG1fY2FjaGVk TWFpbkZyYW1lKQorICAgICAgICBtX2NhY2hlZE1haW5GcmFtZS0+ZGVzdHJveSgpOworCisgICAg bV9jYWNoZWRNYWluRnJhbWUgPSAwOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4 OiBXZWJDb3JlL2hpc3RvcnkvQ2FjaGVkUGFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaGlz dG9yeS9DYWNoZWRQYWdlLmgJKHJldmlzaW9uIDQ3OTM0KQorKysgV2ViQ29yZS9oaXN0b3J5L0Nh Y2hlZFBhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtNDYsNiArNDYsNyBAQCBwdWJsaWM6CiAKICAg ICB2b2lkIHJlc3RvcmUoUGFnZSopOwogICAgIHZvaWQgY2xlYXIoKTsKKyAgICB2b2lkIGRlc3Ry b3koKTsKIAogICAgIERvY3VtZW50KiBkb2N1bWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fY2FjaGVk TWFpbkZyYW1lLT5kb2N1bWVudCgpOyB9CiAgICAgRG9jdW1lbnRMb2FkZXIqIGRvY3VtZW50TG9h ZGVyKCkgY29uc3QgeyByZXR1cm4gbV9jYWNoZWRNYWluRnJhbWUtPmRvY3VtZW50TG9hZGVyKCk7 IH0KSW5kZXg6IFdlYkNvcmUvaGlzdG9yeS9QYWdlQ2FjaGUuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvaGlzdG9yeS9QYWdlQ2FjaGUuY3BwCShyZXZpc2lvbiA0NzkzNCkKKysrIFdlYkNvcmUv aGlzdG9yeS9QYWdlQ2FjaGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xODIsNyArMTgyLDcgQEAg dm9pZCBQYWdlQ2FjaGU6OnJlbGVhc2VBdXRvcmVsZWFzZWRQYWdlcwogCiAgICAgQ2FjaGVkUGFn ZVNldDo6aXRlcmF0b3IgZW5kID0gdG1wLmVuZCgpOwogICAgIGZvciAoQ2FjaGVkUGFnZVNldDo6 aXRlcmF0b3IgaXQgPSB0bXAuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KQotICAgICAgICAoKml0 KS0+Y2xlYXIoKTsKKyAgICAgICAgKCppdCktPmRlc3Ryb3koKTsKIAogICAgIC8vIE5vdyBkbyB0 aGUgcHJ1bmUuCiAgICAgY2FjaGUoKS0+c2V0UHJ1bmVFbmFibGVkKHRydWUpOwpJbmRleDogV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmNwcAkocmV2aXNpb24gNDc5MzQpCisrKyBXZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI4MzcsMTAgKzI4MzcsOSBAQCB2b2lkIEZy YW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQoCiAgICAgaWYgKG1fc2VudFJlZGlyZWN0 Tm90aWZpY2F0aW9uKQogICAgICAgICBjbGllbnRSZWRpcmVjdENhbmNlbGxlZE9yRmluaXNoZWQo ZmFsc2UpOwogICAgIAotICAgIGlmIChjYWNoZWRQYWdlICYmIGNhY2hlZFBhZ2UtPmRvY3VtZW50 KCkpIHsKKyAgICBpZiAoY2FjaGVkUGFnZSAmJiBjYWNoZWRQYWdlLT5kb2N1bWVudCgpKQogICAg ICAgICBvcGVuKCpjYWNoZWRQYWdlKTsKLSAgICAgICAgY2FjaGVkUGFnZS0+Y2xlYXIoKTsKLSAg ICB9IGVsc2UgeyAgICAgICAgCisgICAgZWxzZSB7ICAgICAgICAKICAgICAgICAgS1VSTCB1cmwg PSBwZGwtPnN1YnN0aXR1dGVEYXRhKCkucmVzcG9uc2VVUkwoKTsKICAgICAgICAgaWYgKHVybC5p c0VtcHR5KCkpCiAgICAgICAgICAgICB1cmwgPSBwZGwtPnVybCgpOwpAQCAtMzA2OSw3ICszMDY4 LDYgQEAgdm9pZCBGcmFtZUxvYWRlcjo6b3BlbihDYWNoZWRQYWdlJiBjYWNoZQogICAgICAgICBt X2ZyYW1lLT5zZXRKU0RlZmF1bHRTdGF0dXNCYXJUZXh0KFN0cmluZygpKTsKICAgICB9CiAKLSAg ICBvcGVuKCpjYWNoZWRQYWdlLmNhY2hlZE1haW5GcmFtZSgpKTsKICAgICBjYWNoZWRQYWdlLnJl c3RvcmUobV9mcmFtZS0+cGFnZSgpKTsKIAogICAgIGNoZWNrQ29tcGxldGVkKCk7CkluZGV4OiBX ZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmgJKHJldmlzaW9uIDQ3OTM0KQorKysgV2ViQ29yZS9sb2FkZXIvRnJhbWVM b2FkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMzAsNiArMzAsOCBAQAogI2lmbmRlZiBGcmFtZUxv YWRlcl9oCiAjZGVmaW5lIEZyYW1lTG9hZGVyX2gKIAorI2luY2x1ZGUgIkNhY2hlZEZyYW1lLmgi CisjaW5jbHVkZSAiQ2FjaGVkUGFnZS5oIgogI2luY2x1ZGUgIkNhY2hlUG9saWN5LmgiCiAjaW5j bHVkZSAiRnJhbWVMb2FkZXJUeXBlcy5oIgogI2luY2x1ZGUgIlJlc291cmNlUmVxdWVzdC5oIgpA QCAtNDY4LDYgKzQ3MCw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICB2b2lkIGNs b3NlT2xkRGF0YVNvdXJjZXMoKTsKICAgICAgICAgdm9pZCBvcGVuKENhY2hlZFBhZ2UmKTsKKyAg ICAgICAgZnJpZW5kIHZvaWQgQ2FjaGVkUGFnZTo6cmVzdG9yZShQYWdlKiBwYWdlKTsKKyAgICAg ICAgZnJpZW5kIHZvaWQgQ2FjaGVkRnJhbWU6OnJlc3RvcmUoKTsKICAgICAgICAgdm9pZCBvcGVu KENhY2hlZEZyYW1lJik7CiAKICAgICAgICAgdm9pZCB1cGRhdGVIaXN0b3J5QWZ0ZXJDbGllbnRS ZWRpcmVjdCgpOwo= 38928 2009-09-02 09:40:10 -0700 2009-09-02 11:15:26 -0700 A next step - more of the handling of the "CachedFrame tree" TuesdayFinalPatch.txt text/plain 7538 beidson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0Nzk1MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDEgQEAKKzIwMDktMDktMDIgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1v cmUgcGFydGlhbCB3b3JrIHRvd2FyZHMgIlBhZ2UgQ2FjaGUgc2hvdWxkIHN1cHBvcnQgcGFnZXMg d2l0aCBGcmFtZXMiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzYzMQorCisgICAgICAgIFRoaXMgcGF0Y2ggaXMgcHJpbWFyaWx5IGFib3V0IHRoZSAi Q2FjaGVkRnJhbWUgdHJlZSIgYW5kIG1ha2luZyBzbGlnaHRseSBkaWZmZXJlbnQgZGVjaXNpb25z CisgICAgICAgIGJhc2VkIG9uIHdoZXRoZXIgYSBDYWNoZWRGcmFtZSBpcyB0aGUgbWFpbiBmcmFt ZSBvciBhIHN1YmZyYW1lLgorCisgICAgICAgIC0gU3RvcmUgd2hldGhlciBhIENhY2hlZEZyYW1l IHJlcHJlc2VudHMgdGhlIG1haW4gZnJhbWUgb3IgYSBzdWJmcmFtZS4KKyAgICAgICAgLSAiQ2hv cCBvZmYgdGhlIGZyYW1lIHRyZWUiIGZvciB0aGUgbWFpbiBmcmFtZSB3aGVuIGNyZWF0aW5nIGl0 cyBDYWNoZWRGcmFtZSwgYXMgbWFpbiBmcmFtZXMgCisgICAgICAgICAgYXJlIHJldXNlZCBhbmQg bmVlZCB0byBzdGFydCBuZXcgcGFnZSBsb2FkcyB3aXRoIGFuIGVtcHR5IGZyYW1lIHRyZWUuCisg ICAgICAgIC0gUmVhdHRhY2ggdGhlIGZyYW1lIHRyZWUgdG8gdGhlIG1haW4gZnJhbWUgd2hlbiBy ZXN0b3JpbmcgaXQuCisgICAgICAgIC0gb3BlbigpIHRoZSBjYWNoZWQgc3ViZnJhbWVzIGluIHRo ZWlyIHJlc3BlY3RpdmUgbG9hZGVycyB3aGVuIHJlc3RvcmluZy4KKyAgICAgICAgLSBQcm9wZXJs eSBjbGVhcigpIGFuZCBkZXN0cm95KCkgY2FjaGVkIHN1YmZyYW1lcy4KKyAgICAgICAgLSBXaGVu IGNvbW1pdHRpbmcgdG8gYSBuZXcgcGFnZSBsb2FkLCBhbmQgYWZ0ZXIgY2FjaGluZyB0aGUgcHJl dmlvdXMgcGFnZSwgb25seSBjbGVhciB0aGUKKyAgICAgICAgICBGcmFtZVZpZXcgZm9yIHRoZSBt YWluIGZyYW1lLgorCisgICAgICAgIE5vdGUgdGhhdCBhbGwgb2YgYWJvdmUgd2lsbCBldmVudHVh bGx5IGJlIG5lY2Vzc2FyeSBhcyBJIGNvbnRpbnVlIHRvIGxhbmQgdGhpcyB3b3JrIGluIHBpZWNl cywKKyAgICAgICAgYnV0IGRvZXNuJ3QgYWN0dWFsbHkgY2hhbmdlIGFueSBiZWhhdmlvciByaWdo dCBub3cgYmVjYXVzZSB3ZSBzdGlsbCByZWZ1c2UgdG8gZXZlbiAqdHJ5KiB0bworICAgICAgICBj YWNoZSBwYWdlcyB3aXRoIGZyYW1lcy4KKworICAgICAgICBObyBuZXcgdGVzdHMuIE5vIGNoYW5n ZSBpbiBiZWhhdmlvciwgYW5kIGN1cnJlbnQgdGVzdHMgY29udGludWUgdG8gcGFzcy4KKworICAg ICAgICAqIGhpc3RvcnkvQ2FjaGVkRnJhbWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVk RnJhbWU6OkNhY2hlZEZyYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZEZyYW1lOjpyZXN0 b3JlKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZEZyYW1lOjpjbGVhcik6CisgICAgICAgIChX ZWJDb3JlOjpDYWNoZWRGcmFtZTo6ZGVzdHJveSk6CisgICAgICAgICogaGlzdG9yeS9DYWNoZWRG cmFtZS5oOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkRnJhbWU6OmlzTWFpbkZyYW1lKToKKwor ICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFt ZUxvYWRlcjo6Y2xlYXIpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6Om9wZW4pOgor ICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5oOgorCiAyMDA5LTA5LTAxICBQYXRyaWNrIE11 ZWxsZXIgIDxQYXRyaWNrX011ZWxsZXJAdXMuaWJtLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBUaW1vdGh5IEhhdGNoZXIuCkluZGV4OiBXZWJDb3JlL2hpc3RvcnkvQ2FjaGVkRnJhbWUuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaGlzdG9yeS9DYWNoZWRGcmFtZS5jcHAJKHJldmlzaW9u IDQ3OTQzKQorKysgV2ViQ29yZS9oaXN0b3J5L0NhY2hlZEZyYW1lLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNTYsNiArNTYsNyBAQCBDYWNoZWRGcmFtZTo6Q2FjaGVkRnJhbWUoRnJhbWUqIGZyYW1l KQogICAgICwgbV92aWV3KGZyYW1lLT52aWV3KCkpCiAgICAgLCBtX21vdXNlUHJlc3NOb2RlKGZy YW1lLT5ldmVudEhhbmRsZXIoKS0+bW91c2VQcmVzc05vZGUoKSkKICAgICAsIG1fdXJsKGZyYW1l LT5sb2FkZXIoKS0+dXJsKCkpCisgICAgLCBtX2lzTWFpbkZyYW1lKCFmcmFtZS0+dHJlZSgpLT5w YXJlbnQoKSkKIHsKICNpZm5kZWYgTkRFQlVHCiAgICAgY2FjaGVkRnJhbWVDb3VudGVyKCkuaW5j cmVtZW50KCk7CkBAIC03NywxMCArNzgsMjMgQEAgQ2FjaGVkRnJhbWU6OkNhY2hlZEZyYW1lKEZy YW1lKiBmcmFtZSkKICAgICAKICAgICBmcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpLT5zYXZlUGxh dGZvcm1EYXRhVG9DYWNoZWRGcmFtZSh0aGlzKTsKIAorICAgIC8vIENyZWF0ZSB0aGUgQ2FjaGVk RnJhbWVzIGZvciBhbGwgRnJhbWVzIGluIHRoZSBGcmFtZVRyZWUuCiAgICAgZm9yIChGcmFtZSog Y2hpbGQgPSBmcmFtZS0+dHJlZSgpLT5maXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxk LT50cmVlKCktPm5leHRTaWJsaW5nKCkpCiAgICAgICAgIG1fY2hpbGRGcmFtZXMuYXBwZW5kKENh Y2hlZEZyYW1lOjpjcmVhdGUoY2hpbGQpKTsKIAotICAgIExPRyhQYWdlQ2FjaGUsICJGaW5pc2hl ZCBjcmVhdGluZyBDYWNoZWRGcmFtZSBmb3IgbWFpbiBmcmFtZSB1cmwgJyVzJyBhbmQgRG9jdW1l bnRMb2FkZXIgJXBcbiIsIG1fdXJsLnN0cmluZygpLnV0ZjgoKS5kYXRhKCksIG1fZG9jdW1lbnRM b2FkZXIuZ2V0KCkpOworICAgIC8vIENob3AgdGhlIGZpcnN0LWxldmVsIGNoaWxkcmVuIG9mIHRo ZSBtYWluIGZyYW1lIG91dCBvZiB0aGUgRnJhbWVUcmVlLCB0byBiZSByZXN0b3JlZCBsYXRlci4K KyAgICBpZiAobV9pc01haW5GcmFtZSkgeworICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBp IDwgbV9jaGlsZEZyYW1lcy5zaXplKCk7ICsraSkKKyAgICAgICAgICAgIGZyYW1lLT50cmVlKCkt PnJlbW92ZUNoaWxkKG1fY2hpbGRGcmFtZXNbaV0tPnZpZXcoKS0+ZnJhbWUoKSk7CisgICAgfQor CisjaWZuZGVmIE5ERUJVRworICAgIGlmIChtX2lzTWFpbkZyYW1lKQorICAgICAgICBMT0coUGFn ZUNhY2hlLCAiRmluaXNoZWQgY3JlYXRpbmcgQ2FjaGVkRnJhbWUgZm9yIG1haW4gZnJhbWUgdXJs ICclcycgYW5kIERvY3VtZW50TG9hZGVyICVwXG4iLCBtX3VybC5zdHJpbmcoKS51dGY4KCkuZGF0 YSgpLCBtX2RvY3VtZW50TG9hZGVyLmdldCgpKTsKKyAgICBlbHNlCisgICAgICAgIExPRyhQYWdl Q2FjaGUsICJGaW5pc2hlZCBjcmVhdGluZyBDYWNoZWRGcmFtZSBmb3IgY2hpbGQgZnJhbWUgd2l0 aCB1cmwgJyVzJyBhbmQgRG9jdW1lbnRMb2FkZXIgJXBcbiIsIG1fdXJsLnN0cmluZygpLnV0Zjgo KS5kYXRhKCksIG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCkpOworI2VuZGlmCisKIH0KIAogQ2FjaGVk RnJhbWU6On5DYWNoZWRGcmFtZSgpCkBAIC0xMTIsNiArMTI2LDE1IEBAIHZvaWQgQ2FjaGVkRnJh bWU6OnJlc3RvcmUoKQogICAgIC8vIGNhY2hlZCBwYWdlLgogICAgIGZyYW1lLT5zY3JpcHQoKS0+ dXBkYXRlUGxhdGZvcm1TY3JpcHRPYmplY3RzKCk7CiAKKyAgICAvLyBQdXQgdGhlIGZpcnN0LWxl dmVsIGNoaWxkcmVuIG9mIHRoZSBtYWluIGZyYW1lIGJhY2sgaW4gdGhlIEZyYW1lVHJlZS4KKyAg ICBpZiAobV9pc01haW5GcmFtZSkKKyAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1f Y2hpbGRGcmFtZXMuc2l6ZSgpOyArK2kpCisgICAgICAgICAgICBmcmFtZS0+dHJlZSgpLT5hcHBl bmRDaGlsZChtX2NoaWxkRnJhbWVzW2ldLT52aWV3KCktPmZyYW1lKCkpOworCisgICAgLy8gT3Bl biB0aGUgY2hpbGQgQ2FjaGVkRnJhbWVzIGluIHRoZWlyIHJlc3BlY3RpdmUgRnJhbWVMb2FkZXJz LgorICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX2NoaWxkRnJhbWVzLnNpemUoKTsgKytp KQorICAgICAgICBtX2NoaWxkRnJhbWVzW2ldLT52aWV3KCktPmZyYW1lKCktPmxvYWRlcigpLT5v cGVuKCptX2NoaWxkRnJhbWVzW2ldKTsKKwogICAgIG1fZG9jdW1lbnQtPmRpc3BhdGNoUGFnZVRy YW5zaXRpb25FdmVudChFdmVudE5hbWVzKCkucGFnZXNob3dFdmVudCwgdHJ1ZSk7CiB9CiAKQEAg LTEyOCw2ICsxNTEsOSBAQCB2b2lkIENhY2hlZEZyYW1lOjpjbGVhcigpCiAgICAgQVNTRVJUKG1f dmlldyk7CiAgICAgQVNTRVJUKG1fZG9jdW1lbnQtPmZyYW1lKCkgPT0gbV92aWV3LT5mcmFtZSgp KTsKIAorICAgIGZvciAoaW50IGkgPSBtX2NoaWxkRnJhbWVzLnNpemUoKSAtIDE7IGkgPj0gMDsg LS1pKQorICAgICAgICBtX2NoaWxkRnJhbWVzW2ldLT5jbGVhcigpOworCiAgICAgbV9kb2N1bWVu dCA9IDA7CiAgICAgbV92aWV3ID0gMDsKICAgICBtX21vdXNlUHJlc3NOb2RlID0gMDsKQEAgLTE0 Nyw2ICsxNzMsOSBAQCB2b2lkIENhY2hlZEZyYW1lOjpkZXN0cm95KCkKICAgICBBU1NFUlQobV92 aWV3KTsKICAgICBBU1NFUlQobV9kb2N1bWVudC0+ZnJhbWUoKSA9PSBtX3ZpZXctPmZyYW1lKCkp OwogCisgICAgZm9yIChpbnQgaSA9IG1fY2hpbGRGcmFtZXMuc2l6ZSgpIC0gMTsgaSA+PSAwOyAt LWkpCisgICAgICAgIG1fY2hpbGRGcmFtZXNbaV0tPmRlc3Ryb3koKTsKKwogICAgIGlmIChtX2Nh Y2hlZEZyYW1lUGxhdGZvcm1EYXRhKQogICAgICAgICBtX2NhY2hlZEZyYW1lUGxhdGZvcm1EYXRh LT5jbGVhcigpOwogCkluZGV4OiBXZWJDb3JlL2hpc3RvcnkvQ2FjaGVkRnJhbWUuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2hpc3RvcnkvQ2FjaGVkRnJhbWUuaAkocmV2aXNpb24gNDc5NDMpCisr KyBXZWJDb3JlL2hpc3RvcnkvQ2FjaGVkRnJhbWUuaAkod29ya2luZyBjb3B5KQpAQCAtNTksNiAr NTksOCBAQCBwdWJsaWM6CiAgICAgY29uc3QgS1VSTCYgdXJsKCkgY29uc3QgeyByZXR1cm4gbV91 cmw7IH0KICAgICBET01XaW5kb3cqIGRvbVdpbmRvdygpIGNvbnN0IHsgcmV0dXJuIG1fY2FjaGVk RnJhbWVTY3JpcHREYXRhLT5kb21XaW5kb3coKTsgfQogCisgICAgYm9vbCBpc01haW5GcmFtZSgp IHsgcmV0dXJuIG1faXNNYWluRnJhbWU7IH0KKwogICAgIHZvaWQgc2V0Q2FjaGVkRnJhbWVQbGF0 Zm9ybURhdGEoQ2FjaGVkRnJhbWVQbGF0Zm9ybURhdGEqKTsKICAgICBDYWNoZWRGcmFtZVBsYXRm b3JtRGF0YSogY2FjaGVkRnJhbWVQbGF0Zm9ybURhdGEoKTsKICAgICAKQEAgLTc0LDYgKzc2LDcg QEAgcHJpdmF0ZToKICAgICBLVVJMIG1fdXJsOwogICAgIE93blB0cjxTY3JpcHRDYWNoZWRGcmFt ZURhdGE+IG1fY2FjaGVkRnJhbWVTY3JpcHREYXRhOwogICAgIE93blB0cjxDYWNoZWRGcmFtZVBs YXRmb3JtRGF0YT4gbV9jYWNoZWRGcmFtZVBsYXRmb3JtRGF0YTsKKyAgICBib29sIG1faXNNYWlu RnJhbWU7CiAgICAgCiAgICAgQ2FjaGVkRnJhbWVWZWN0b3IgbV9jaGlsZEZyYW1lczsKIH07Cklu ZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShyZXZpc2lvbiA0Nzk0MykKKysrIFdlYkNvcmUvbG9h ZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzg5LDcgKzc4OSw3IEBAIHZv aWQgRnJhbWVMb2FkZXI6OmNhbmNlbEFuZENsZWFyKCkKICAgICBtX2ZyYW1lLT5zY3JpcHQoKS0+ dXBkYXRlUGxhdGZvcm1TY3JpcHRPYmplY3RzKCk7CiB9CiAKLXZvaWQgRnJhbWVMb2FkZXI6OmNs ZWFyKGJvb2wgY2xlYXJXaW5kb3dQcm9wZXJ0aWVzLCBib29sIGNsZWFyU2NyaXB0T2JqZWN0cykK K3ZvaWQgRnJhbWVMb2FkZXI6OmNsZWFyKGJvb2wgY2xlYXJXaW5kb3dQcm9wZXJ0aWVzLCBib29s IGNsZWFyU2NyaXB0T2JqZWN0cywgYm9vbCBjbGVhckZyYW1lVmlldykKIHsKICAgICBtX2ZyYW1l LT5lZGl0b3IoKS0+Y2xlYXIoKTsKIApAQCAtODE2LDcgKzgxNiw3IEBAIHZvaWQgRnJhbWVMb2Fk ZXI6OmNsZWFyKGJvb2wgY2xlYXJXaW5kb3cKIAogICAgIG1fZnJhbWUtPnNlbGVjdGlvbigpLT5j bGVhcigpOwogICAgIG1fZnJhbWUtPmV2ZW50SGFuZGxlcigpLT5jbGVhcigpOwotICAgIGlmICht X2ZyYW1lLT52aWV3KCkpCisgICAgaWYgKGNsZWFyRnJhbWVWaWV3ICYmIG1fZnJhbWUtPnZpZXco KSkKICAgICAgICAgbV9mcmFtZS0+dmlldygpLT5jbGVhcigpOwogCiAgICAgbV9mcmFtZS0+c2V0 U2VsZWN0aW9uR3JhbnVsYXJpdHkoQ2hhcmFjdGVyR3JhbnVsYXJpdHkpOwpAQCAtMzA4OSw4ICsz MDg5LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6b3BlbihDYWNoZWRGcmFtZSYgY2FjaAogICAgIG1f d29ya2luZ1VSTCA9IHVybDsKIAogICAgIHN0YXJ0ZWQoKTsKLQotICAgIGNsZWFyKCk7CisgICAg Y2xlYXIodHJ1ZSwgdHJ1ZSwgY2FjaGVkRnJhbWUuaXNNYWluRnJhbWUoKSk7CiAKICAgICBEb2N1 bWVudCogZG9jdW1lbnQgPSBjYWNoZWRGcmFtZS5kb2N1bWVudCgpOwogICAgIEFTU0VSVChkb2N1 bWVudCk7CkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgJKHJldmlzaW9uIDQ3OTQzKQorKysgV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDc2LDcgKzQ3Niw3IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICB2b2lkIHVwZGF0ZUhpc3RvcnlBZnRlckNs aWVudFJlZGlyZWN0KCk7CiAKLSAgICAgICAgdm9pZCBjbGVhcihib29sIGNsZWFyV2luZG93UHJv cGVydGllcyA9IHRydWUsIGJvb2wgY2xlYXJTY3JpcHRPYmplY3RzID0gdHJ1ZSk7CisgICAgICAg IHZvaWQgY2xlYXIoYm9vbCBjbGVhcldpbmRvd1Byb3BlcnRpZXMgPSB0cnVlLCBib29sIGNsZWFy U2NyaXB0T2JqZWN0cyA9IHRydWUsIGJvb2wgY2xlYXJGcmFtZVZpZXcgPSB0cnVlKTsKIAogICAg ICAgICBib29sIHNob3VsZFJlbG9hZFRvSGFuZGxlVW5yZWFjaGFibGVVUkwoRG9jdW1lbnRMb2Fk ZXIqKTsKICAgICAgICAgdm9pZCBoYW5kbGVVbmltcGxlbWVudGFibGVQb2xpY3koY29uc3QgUmVz b3VyY2VFcnJvciYpOwo= 38944 2009-09-02 16:09:54 -0700 2009-09-02 17:05:35 -0700 Another step - getting close! WedThirdToLand.txt text/plain 9357 beidson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0Nzk5NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzkgQEAKKzIwMDktMDktMDIgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1v cmUgcGFydGlhbCB3b3JrIHRvd2FyZHMgIlBhZ2UgQ2FjaGUgc2hvdWxkIHN1cHBvcnQgcGFnZXMg d2l0aCBGcmFtZXMiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzYzMQorCisgICAgICAgIC0gTW9yZSBDYWNoZWRGcmFtZSBkZXN0cnVjdGlvbiB3b3Jr LgorICAgICAgICAtIEluY2x1ZGluZyByZWxhdGVkIEZyYW1lIGFuZCBGcmFtZUxvYWRlciBjaGFu Z2VzIGFuZCBjbGVhbnVwLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE5vIGNoYW5nZSBpbiBi ZWhhdmlvciwgY3VycmVudCB0ZXN0cyBwYXNzKS4KKworICAgICAgICAqIGhpc3RvcnkvQ2FjaGVk RnJhbWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkRnJhbWVCYXNlOjpyZXN0b3JlKTog UmVidWlsZCB1cCB0aGUgd2hvbGUgRnJhbWVUcmVlIHdoZW4gcmVzdG9yaW5nLgorICAgICAgICAo V2ViQ29yZTo6Q2FjaGVkRnJhbWU6OkNhY2hlZEZyYW1lKTogVGVhciBkb3duIHRoZSBlbnRpcmUg RnJhbWVUcmVlIHdoZW4gY2FjaGluZy4KKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZEZyYW1lOjpk ZXN0cm95KTogRm9yIGNoaWxkIGZyYW1lcyB0aGF0IGFyZSBiZWluZyBkZXN0cm95ZWQgd2hpbGUg aW4KKyAgICAgICAgICB0aGUgUGFnZUNhY2hlLCBkbyBsaWdodHdlaWdodCBjbGVhbnVwIHRvOgor ICAgICAgICAgIEEgLSBQcmV2ZW50IHJlZmVycmluZyB0byBhIHN0YWxlIFBhZ2Ugb2JqZWN0Lgor ICAgICAgICAgIEIgLSBQcmV2ZW50IFdvcmxkIExlYWtzIG9mIFdlYktpdCBvYmplY3RzLgorCisg ICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l TG9hZGVyOjpzdG9wQWxsTG9hZGVycyk6IHN0b3BBbGxMb2FkZXJzKCkgc2hvdWxkIG5ldmVyIGJl IGNhbGxlZCBvbiBGcmFtZXMgdGhhdCBhcmUKKyAgICAgICAgICBpbiB0aGUgUGFnZUNhY2hlLiBB U1NFUlQgdGhhdCBmYWN0LgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6Om9wZW4pOiBS ZW1vdmUgYSBib2d1cyByZWxlYXNlLWJ1aWxkIHdvcmthcm91bmQsIGFzIHRoZSBjb21tZW50IHJp Z2h0IGFib3ZlIGl0CisgICAgICAgICAgZXhwbGFpbnMgaXQgaXMgbm90IGVmZmVjdGl2ZSwgYW5k IGl0J2QgYmUgYmV0dGVyIHRvIHNlZSB0aGUgY3Jhc2ggbG9jYWxseSBpbnN0ZWFkIG9mIGRvd25z dHJlYW0uCisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y2xvc2VBbmRSZW1vdmVDaGls ZCk6IE1ha2Ugc3VyZSB0aGUgb3duZXIgZWxlbWVudCBoYXMgYSBwYWdlIHBvaW50ZXIgYmVmb3Jl CisgICAgICAgICAgcmVmZXJlbmNpbmcgaXQuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRl cjo6ZGV0YWNoRnJvbVBhcmVudCk6IFVzZSB0aGUgbmV3IGRldGFjaFZpZXdzQW5kRG9jdW1lbnRM b2FkZXIoKSBjYWxsCisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6ZGV0YWNoVmlld3NB bmREb2N1bWVudExvYWRlcik6IERvZXMgbGlnaHR3ZWlnaHQgY2xlYW51cCBvZiBjbGllbnQgKFdl YktpdCkgb2JqZWN0cy4KKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuaDoKKworICAgICAg ICAqIHBhZ2UvRnJhbWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OmRldGFjaEZyb21Q YWdlKTogU2ltcGx5IGNsZWFyIHRoZSBQYWdlIHBvaW50ZXIgd2l0aG91dCBkb2luZyBhbnkgb3Ro ZXIgd29yay4KKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpwYWdlRGVzdHJveWVkKTogVXNlIHRo ZSBuZXcgZGV0YWNoRnJvbVBhZ2UoKS4KKyAgICAgICAgKiBwYWdlL0ZyYW1lLmg6CisKIDIwMDkt MDktMDIgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KIAogICAgICAg ICBVbnJldmlld2VkLCBidWlsZCBmaXguCkluZGV4OiBXZWJDb3JlL2hpc3RvcnkvQ2FjaGVkRnJh bWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaGlzdG9yeS9DYWNoZWRGcmFtZS5jcHAJKHJl dmlzaW9uIDQ3OTk2KQorKysgV2ViQ29yZS9oaXN0b3J5L0NhY2hlZEZyYW1lLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtODksMTEgKzg5LDkgQEAgdm9pZCBDYWNoZWRGcmFtZUJhc2U6OnJlc3RvcmUo KQogICAgIC8vIGNhY2hlZCBwYWdlLgogICAgIGZyYW1lLT5zY3JpcHQoKS0+dXBkYXRlUGxhdGZv cm1TY3JpcHRPYmplY3RzKCk7CiAKLSAgICAvLyBQdXQgdGhlIGZpcnN0LWxldmVsIGNoaWxkcmVu IG9mIHRoZSBtYWluIGZyYW1lIGJhY2sgaW4gdGhlIEZyYW1lVHJlZS4KLSAgICBpZiAobV9pc01h aW5GcmFtZSkgewotICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9jaGlsZEZyYW1l cy5zaXplKCk7ICsraSkKLSAgICAgICAgICAgIGZyYW1lLT50cmVlKCktPmFwcGVuZENoaWxkKG1f Y2hpbGRGcmFtZXNbaV0tPnZpZXcoKS0+ZnJhbWUoKSk7Ci0gICAgfQorICAgIC8vIFJlY29uc3Ry dWN0IHRoZSBGcmFtZVRyZWUKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9jaGlsZEZy YW1lcy5zaXplKCk7ICsraSkKKyAgICAgICAgZnJhbWUtPnRyZWUoKS0+YXBwZW5kQ2hpbGQobV9j aGlsZEZyYW1lc1tpXS0+dmlldygpLT5mcmFtZSgpKTsKIAogICAgIC8vIE9wZW4gdGhlIGNoaWxk IENhY2hlZEZyYW1lcyBpbiB0aGVpciByZXNwZWN0aXZlIEZyYW1lTG9hZGVycy4KICAgICBmb3Ig KHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9jaGlsZEZyYW1lcy5zaXplKCk7ICsraSkKQEAgLTEyOSwx MSArMTI3LDEyIEBAIENhY2hlZEZyYW1lOjpDYWNoZWRGcmFtZShGcmFtZSogZnJhbWUpCiAgICAg Zm9yIChGcmFtZSogY2hpbGQgPSBmcmFtZS0+dHJlZSgpLT5maXJzdENoaWxkKCk7IGNoaWxkOyBj aGlsZCA9IGNoaWxkLT50cmVlKCktPm5leHRTaWJsaW5nKCkpCiAgICAgICAgIG1fY2hpbGRGcmFt ZXMuYXBwZW5kKENhY2hlZEZyYW1lOjpjcmVhdGUoY2hpbGQpKTsKIAotICAgIC8vIENob3AgdGhl IGZpcnN0LWxldmVsIGNoaWxkcmVuIG9mIHRoZSBtYWluIGZyYW1lIG91dCBvZiB0aGUgRnJhbWVU cmVlLCB0byBiZSByZXN0b3JlZCBsYXRlci4KLSAgICBpZiAobV9pc01haW5GcmFtZSkgewotICAg ICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9jaGlsZEZyYW1lcy5zaXplKCk7ICsraSkK LSAgICAgICAgICAgIGZyYW1lLT50cmVlKCktPnJlbW92ZUNoaWxkKG1fY2hpbGRGcmFtZXNbaV0t PnZpZXcoKS0+ZnJhbWUoKSk7Ci0gICAgfQorICAgIC8vIERlY29uc3RydWN0IHRoZSBGcmFtZVRy ZWUsIHRvIHJlc3RvcmUgaXQgbGF0ZXIuCisgICAgLy8gV2UgZG8gdGhpcyBmb3IgdHdvIHJlYXNv bnM6CisgICAgLy8gMSAtIFdlIHJldXNlIHRoZSBtYWluIGZyYW1lLCBzbyB3aGVuIGl0IG5hdmln YXRlcyB0byBhIG5ldyBwYWdlIGxvYWQgaXQgbmVlZHMgdG8gc3RhcnQgd2l0aCBhIGJsYW5rIEZy YW1lVHJlZS4KKyAgICAvLyAyIC0gSXQncyBtdWNoIGVhc2llciB0byBkZXN0cm95IGEgQ2FjaGVk RnJhbWUgd2hpbGUgaXQgcmVzaWRlcyBpbiB0aGUgUGFnZUNhY2hlIGlmIGl0IGlzIGRpc2Nvbm5l Y3RlZCBmcm9tIGl0cyBwYXJlbnQuCisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fY2hp bGRGcmFtZXMuc2l6ZSgpOyArK2kpCisgICAgICAgIGZyYW1lLT50cmVlKCktPnJlbW92ZUNoaWxk KG1fY2hpbGRGcmFtZXNbaV0tPnZpZXcoKS0+ZnJhbWUoKSk7CiAKICNpZm5kZWYgTkRFQlVHCiAg ICAgaWYgKG1faXNNYWluRnJhbWUpCkBAIC0xODQsNiArMTgzLDExIEBAIHZvaWQgQ2FjaGVkRnJh bWU6OmRlc3Ryb3koKQogICAgIEFTU0VSVChtX3ZpZXcpOwogICAgIEFTU0VSVChtX2RvY3VtZW50 LT5mcmFtZSgpID09IG1fdmlldy0+ZnJhbWUoKSk7CiAKKyAgICBpZiAoIW1faXNNYWluRnJhbWUp IHsKKyAgICAgICAgbV92aWV3LT5mcmFtZSgpLT5kZXRhY2hGcm9tUGFnZSgpOworICAgICAgICBt X3ZpZXctPmZyYW1lKCktPmxvYWRlcigpLT5kZXRhY2hWaWV3c0FuZERvY3VtZW50TG9hZGVyKCk7 CisgICAgfQorICAgIAogICAgIGZvciAoaW50IGkgPSBtX2NoaWxkRnJhbWVzLnNpemUoKSAtIDE7 IGkgPj0gMDsgLS1pKQogICAgICAgICBtX2NoaWxkRnJhbWVzW2ldLT5kZXN0cm95KCk7CiAKSW5k ZXg6IFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L2xvYWRlci9GcmFtZUxvYWRlci5jcHAJKHJldmlzaW9uIDQ3OTk2KQorKysgV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNjgwLDYgKzI2ODAsNyBAQCB2 b2lkIEZyYW1lTG9hZGVyOjpzdG9wTG9hZGluZ1N1YmZyYW1lcygpCiAKIHZvaWQgRnJhbWVMb2Fk ZXI6OnN0b3BBbGxMb2FkZXJzKERhdGFiYXNlUG9saWN5IGRhdGFiYXNlUG9saWN5KQogeworICAg IEFTU0VSVCghbV9mcmFtZS0+ZG9jdW1lbnQoKSB8fCAhbV9mcmFtZS0+ZG9jdW1lbnQoKS0+aW5Q YWdlQ2FjaGUoKSk7CiAgICAgaWYgKG1fdW5sb2FkRXZlbnRCZWluZ0Rpc3BhdGNoZWQpCiAgICAg ICAgIHJldHVybjsKIApAQCAtMzEwNCw4ICszMTA1LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6b3Bl bihDYWNoZWRGcmFtZUJhc2UmIAogICAgIAogICAgIC8vIFdoZW4gbmF2aWdhdGluZyB0byBhIENh Y2hlZEZyYW1lIGl0cyBGcmFtZVZpZXcgc2hvdWxkIG5ldmVyIGJlIG51bGwuICBJZiBpdCBpcyB3 ZSdsbCBjcmFzaCBpbiBjcmVhdGl2ZSB3YXlzIGRvd25zdHJlYW0uCiAgICAgQVNTRVJUKHZpZXcp OwotICAgIGlmICh2aWV3KQotICAgICAgICB2aWV3LT5zZXRXYXNTY3JvbGxlZEJ5VXNlcihmYWxz ZSk7CisgICAgdmlldy0+c2V0V2FzU2Nyb2xsZWRCeVVzZXIoZmFsc2UpOwogCiAgICAgLy8gVXNl IHRoZSBjdXJyZW50IFNjcm9sbFZpZXcncyBmcmFtZSByZWN0LgogICAgIGlmIChtX2ZyYW1lLT52 aWV3KCkpCkBAIC0zNDg5LDcgKzM0ODksNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpjbG9zZUFuZFJl bW92ZUNoaWxkKEZyCiAgICAgY2hpbGQtPnRyZWUoKS0+ZGV0YWNoRnJvbVBhcmVudCgpOwogCiAg ICAgY2hpbGQtPnNldFZpZXcoMCk7Ci0gICAgaWYgKGNoaWxkLT5vd25lckVsZW1lbnQoKSkKKyAg ICBpZiAoY2hpbGQtPm93bmVyRWxlbWVudCgpICYmIGNoaWxkLT5wYWdlKCkpCiAgICAgICAgIGNo aWxkLT5wYWdlKCktPmRlY3JlbWVudEZyYW1lQ291bnQoKTsKICAgICBjaGlsZC0+cGFnZURlc3Ry b3llZCgpOwogCkBAIC0zNTY2LDkgKzM1NjYsOCBAQCB2b2lkIEZyYW1lTG9hZGVyOjpkZXRhY2hG cm9tUGFyZW50KCkKICAgICBpZiAoUGFnZSogcGFnZSA9IG1fZnJhbWUtPnBhZ2UoKSkKICAgICAg ICAgcGFnZS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5mcmFtZURldGFjaGVkRnJvbVBhcmVudCht X2ZyYW1lKTsKIAotICAgIG1fY2xpZW50LT5kZXRhY2hlZEZyb21QYXJlbnQyKCk7Ci0gICAgc2V0 RG9jdW1lbnRMb2FkZXIoMCk7Ci0gICAgbV9jbGllbnQtPmRldGFjaGVkRnJvbVBhcmVudDMoKTsK KyAgICBkZXRhY2hWaWV3c0FuZERvY3VtZW50TG9hZGVyKCk7CisKICAgICBpZiAoRnJhbWUqIHBh cmVudCA9IG1fZnJhbWUtPnRyZWUoKS0+cGFyZW50KCkpIHsKICAgICAgICAgcGFyZW50LT5sb2Fk ZXIoKS0+Y2xvc2VBbmRSZW1vdmVDaGlsZChtX2ZyYW1lKTsKICAgICAgICAgcGFyZW50LT5sb2Fk ZXIoKS0+c2NoZWR1bGVDaGVja0NvbXBsZXRlZCgpOwpAQCAtMzU3Nyw2ICszNTc2LDEzIEBAIHZv aWQgRnJhbWVMb2FkZXI6OmRldGFjaEZyb21QYXJlbnQoKQogICAgICAgICBtX2ZyYW1lLT5wYWdl RGVzdHJveWVkKCk7CiAgICAgfQogfQorCit2b2lkIEZyYW1lTG9hZGVyOjpkZXRhY2hWaWV3c0Fu ZERvY3VtZW50TG9hZGVyKCkKK3sKKyAgICBtX2NsaWVudC0+ZGV0YWNoZWRGcm9tUGFyZW50Migp OworICAgIHNldERvY3VtZW50TG9hZGVyKDApOworICAgIG1fY2xpZW50LT5kZXRhY2hlZEZyb21Q YXJlbnQzKCk7Cit9CiAgICAgCiB2b2lkIEZyYW1lTG9hZGVyOjphZGRFeHRyYUZpZWxkc1RvU3Vi cmVzb3VyY2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIHsKSW5kZXg6IFdlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuaAkocmV2aXNpb24gNDc5OTYpCisrKyBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNDEsNiArMjQxLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogCiAgICAgICAgIHZvaWQgY2hlY2tMb2FkQ29tcGxldGUoKTsKICAgICAgICAgdm9pZCBkZXRh Y2hGcm9tUGFyZW50KCk7CisgICAgICAgIHZvaWQgZGV0YWNoVmlld3NBbmREb2N1bWVudExvYWRl cigpOwogCiAgICAgICAgIHZvaWQgYWRkRXh0cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChS ZXNvdXJjZVJlcXVlc3QmKTsKICAgICAgICAgdm9pZCBhZGRFeHRyYUZpZWxkc1RvTWFpblJlc291 cmNlUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmKTsKSW5kZXg6IFdlYkNvcmUvcGFnZS9GcmFtZS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAkocmV2aXNpb24gNDc5OTYp CisrKyBXZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTU2LDYgKzE1 NTYsMTEgQEAgUGFnZSogRnJhbWU6OnBhZ2UoKSBjb25zdAogICAgIHJldHVybiBtX3BhZ2U7CiB9 CiAKK3ZvaWQgRnJhbWU6OmRldGFjaEZyb21QYWdlKCkKK3sKKyAgICBtX3BhZ2UgPSAwOworfQor CiBFdmVudEhhbmRsZXIqIEZyYW1lOjpldmVudEhhbmRsZXIoKSBjb25zdAogewogICAgIHJldHVy biAmbV9ldmVudEhhbmRsZXI7CkBAIC0xNTc1LDcgKzE1ODAsNyBAQCB2b2lkIEZyYW1lOjpwYWdl RGVzdHJveWVkKCkKICAgICBzY3JpcHQoKS0+Y2xlYXJTY3JpcHRPYmplY3RzKCk7CiAgICAgc2Ny aXB0KCktPnVwZGF0ZVBsYXRmb3JtU2NyaXB0T2JqZWN0cygpOwogCi0gICAgbV9wYWdlID0gMDsK KyAgICBkZXRhY2hGcm9tUGFnZSgpOwogfQogCiB2b2lkIEZyYW1lOjpkaXNjb25uZWN0T3duZXJF bGVtZW50KCkKSW5kZXg6IFdlYkNvcmUvcGFnZS9GcmFtZS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvcGFnZS9GcmFtZS5oCShyZXZpc2lvbiA0Nzk5NikKKysrIFdlYkNvcmUvcGFnZS9GcmFtZS5o CSh3b3JraW5nIGNvcHkpCkBAIC05Nyw2ICs5Nyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICAgICAgdm9pZCBpbml0KCk7CiAKICAgICAgICAgUGFnZSogcGFnZSgpIGNvbnN0OworICAgICAg ICB2b2lkIGRldGFjaEZyb21QYWdlKCk7CiAgICAgICAgIEhUTUxGcmFtZU93bmVyRWxlbWVudCog b3duZXJFbGVtZW50KCkgY29uc3Q7CiAKICAgICAgICAgdm9pZCBwYWdlRGVzdHJveWVkKCk7Cklu ZGV4OiBXZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL0NoYW5n ZUxvZwkocmV2aXNpb24gNDc5OTYpCisrKyBXZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDA5LTA5LTAyICBCcmFkeSBFaWRzb24gIDxiZWlkc29u QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBNb3JlIHBhcnRpYWwgd29yayB0b3dhcmRzICJQYWdlIENhY2hlIHNob3VsZCBzdXBwb3J0 IHBhZ2VzIHdpdGggRnJhbWVzIgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTM2MzEKKworICAgICAgICAqIFdlYlZpZXcvV2ViSFRNTFZpZXcubW06Cisg ICAgICAgICgtW1dlYkhUTUxWaWV3IF90b3BIVE1MVmlld10pOiBSZXdvcmsgdGhlIEFTU0VSVCBp biB0aGlzIG1ldGhvZCB0byByZWZsZWN0IHRoZQorICAgICAgICAgIHJlYWxpdHkgb2YgY2FsbGlu ZyB0aGlzIG1ldGhvZCBmb3IgcGFnZXMgY3VycmVudGx5IGluIHRoZSBQYWdlQ2FjaGUuCisKIDIw MDktMDgtMzEgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KIAogICAg IFJldmVydGluZyBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC80NzkwNCwgYmVjYXVz ZSBpdCBjYXVzZWQKSW5kZXg6IFdlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0JKHJldmlzaW9uIDQ3 OTk2KQorKysgV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCSh3b3JraW5nIGNvcHkp CkBAIC05ODAsOCArOTgwLDcgQEAgc3RhdGljIE5TVVJMKiB1bmlxdWVVUkxXaXRoUmVsYXRpdmVQ YXJ0KAogewogICAgIC8vIEZJWE1FOiB0aGlzIGNhbiBmYWlsIGlmIHRoZSBkYXRhU291cmNlIGlz IG5pbCwgd2hpY2ggaGFwcGVucyB3aGVuIHRoZSBXZWJWaWV3IGlzIHRlYXJpbmcgZG93biBmcm9t IHRoZSB3aW5kb3cgY2xvc2luZy4KICAgICBXZWJIVE1MVmlldyAqdmlldyA9IChXZWJIVE1MVmll dyAqKVtbW1tfcHJpdmF0ZS0+ZGF0YVNvdXJjZSBfd2ViVmlld10gbWFpbkZyYW1lXSBmcmFtZVZp ZXddIGRvY3VtZW50Vmlld107Ci0gICAgQVNTRVJUKHZpZXcpOwotICAgIEFTU0VSVChbdmlldyBp c0tpbmRPZkNsYXNzOltXZWJIVE1MVmlldyBjbGFzc11dKTsKKyAgICBBU1NFUlQoIXZpZXcgfHwg W3ZpZXcgaXNLaW5kT2ZDbGFzczpbV2ViSFRNTFZpZXcgY2xhc3NdXSk7CiAgICAgcmV0dXJuIHZp ZXc7CiB9CiAK 38951 2009-09-02 17:19:12 -0700 2009-09-02 17:38:52 -0700 Almost there... WedFourth.txt text/plain 5461 beidson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0Nzk5OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDktMDktMDIgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1v cmUgcGFydGlhbCB3b3JrIHRvd2FyZHMgIlBhZ2UgQ2FjaGUgc2hvdWxkIHN1cHBvcnQgcGFnZXMg d2l0aCBGcmFtZXMiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzYzMQorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE5vIGNoYW5nZSBpbiBiZWhhdmlv ciwgY3VycmVudCB0ZXN0cyBwYXNzKS4KKworICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6c3RvcExvYWRpbmcpOiBUYWtlIGEg Ym9vbCB0byBjaGFuZ2Ugd2hldGhlciBvciBub3QgdGhlIHBhZ2VoaWRlIGV2ZW50IGlzIAorICAg ICAgICAgIGRpc3BhdGNoZWQsIGFzIHBhZ2VzIGVudGVyaW5nIHRoZSBiYWNrL2ZvcndhcmQgY2Fj aGUgc2hvdWxkIG5vdCBnZXQgaXQuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y2xv c2VVUkwpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnNjaGVkdWxlUmVkaXJlY3Rp b24pOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNhY2hlUGFnZUZvckhpc3RvcnlJ dGVtKTogQ2FsbCBwYWdlSGlkZGVuKCkuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6 cGFnZUhpZGRlbik6IEFkZCB0byBkaXNwYXRjaCB0aGUgcGFnZWhpZGUgZXZlbnQgdG8gYWxsIGZy YW1lcyBpbiB0aGUgY2FzZQorICAgICAgICAgIHdoZXJlIGEgcGFnZSBpcyBhZGRlZCB0byB0aGUg UGFnZUNhY2hlLgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5oOgorCiAyMDA5LTA5LTAy ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAJKHJldmlzaW9uIDQ3OTk5 KQorKysgV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01 NjMsNyArNTYzLDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6c3VibWl0Rm9ybShjb25zdCBjaGFyKgog ICAgIHRhcmdldEZyYW1lLT5sb2FkZXIoKS0+c2NoZWR1bGVGb3JtU3VibWlzc2lvbihmcmFtZVJl cXVlc3QsIGxvY2tIaXN0b3J5LCBldmVudCwgZm9ybVN0YXRlKTsKIH0KIAotdm9pZCBGcmFtZUxv YWRlcjo6c3RvcExvYWRpbmcoYm9vbCBzZW5kVW5sb2FkLCBEYXRhYmFzZVBvbGljeSBkYXRhYmFz ZVBvbGljeSkKK3ZvaWQgRnJhbWVMb2FkZXI6OnN0b3BMb2FkaW5nKGJvb2wgc2VuZFVubG9hZCwg Ym9vbCBzZW5kUGFnZWhpZGUsIERhdGFiYXNlUG9saWN5IGRhdGFiYXNlUG9saWN5KQogewogICAg IGlmIChtX2ZyYW1lLT5kb2N1bWVudCgpICYmIG1fZnJhbWUtPmRvY3VtZW50KCktPnRva2VuaXpl cigpKQogICAgICAgICBtX2ZyYW1lLT5kb2N1bWVudCgpLT50b2tlbml6ZXIoKS0+c3RvcFBhcnNp bmcoKTsKQEAgLTU3Niw3ICs1NzYsOCBAQCB2b2lkIEZyYW1lTG9hZGVyOjpzdG9wTG9hZGluZyhi b29sIHNlbmRVCiAgICAgICAgICAgICAgICAgICAgIGN1cnJlbnRGb2N1c2VkTm9kZS0+YWJvdXRU b1VubG9hZCgpOwogICAgICAgICAgICAgICAgIG1fdW5sb2FkRXZlbnRCZWluZ0Rpc3BhdGNoZWQg PSB0cnVlOwogICAgICAgICAgICAgICAgIGlmIChtX2ZyYW1lLT5kb21XaW5kb3coKSkgewotICAg ICAgICAgICAgICAgICAgICBtX2ZyYW1lLT5kb21XaW5kb3coKS0+ZGlzcGF0Y2hQYWdlVHJhbnNp dGlvbkV2ZW50KEV2ZW50TmFtZXMoKS5wYWdlaGlkZUV2ZW50LCBtX2ZyYW1lLT5kb2N1bWVudCgp LT5pblBhZ2VDYWNoZSgpKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHNlbmRQYWdlaGlkZSkK KyAgICAgICAgICAgICAgICAgICAgICAgIG1fZnJhbWUtPmRvbVdpbmRvdygpLT5kaXNwYXRjaFBh Z2VUcmFuc2l0aW9uRXZlbnQoRXZlbnROYW1lcygpLnBhZ2VoaWRlRXZlbnQsIG1fZnJhbWUtPmRv Y3VtZW50KCktPmluUGFnZUNhY2hlKCkpOwogICAgICAgICAgICAgICAgICAgICBtX2ZyYW1lLT5k b21XaW5kb3coKS0+ZGlzcGF0Y2hVbmxvYWRFdmVudCgpOwogICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgICAgICBtX3VubG9hZEV2ZW50QmVpbmdEaXNwYXRjaGVkID0gZmFsc2U7CkBAIC02 MTQsNyArNjE1LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6c3RvcExvYWRpbmcoYm9vbCBzZW5kVQog CiAgICAgLy8gdGVsbCBhbGwgc3ViZnJhbWVzIHRvIHN0b3AgYXMgd2VsbAogICAgIGZvciAoRnJh bWUqIGNoaWxkID0gbV9mcmFtZS0+dHJlZSgpLT5maXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9 IGNoaWxkLT50cmVlKCktPm5leHRTaWJsaW5nKCkpCi0gICAgICAgIGNoaWxkLT5sb2FkZXIoKS0+ c3RvcExvYWRpbmcoc2VuZFVubG9hZCk7CisgICAgICAgIGNoaWxkLT5sb2FkZXIoKS0+c3RvcExv YWRpbmcoc2VuZFVubG9hZCwgc2VuZFBhZ2VoaWRlKTsKIAogICAgIGNhbmNlbFJlZGlyZWN0aW9u KCk7CiB9CkBAIC02MzYsNyArNjM3LDExIEBAIHZvaWQgRnJhbWVMb2FkZXI6OnN0b3AoKQogYm9v bCBGcmFtZUxvYWRlcjo6Y2xvc2VVUkwoKQogewogICAgIHNhdmVEb2N1bWVudFN0YXRlKCk7Ci0g ICAgc3RvcExvYWRpbmcodHJ1ZSk7CisgICAgCisgICAgLy8gU2hvdWxkIG9ubHkgc2VuZCB0aGUg cGFnZWhpZGUgZXZlbnQgaGVyZSBpZiB0aGUgY3VycmVudCBkb2N1bWVudCBleGlzdHMgYW5kIGhh cyBub3QgYmVlbiBwbGFjZWQgaW4gdGhlIHBhZ2UgY2FjaGUuCisgICAgRG9jdW1lbnQqIGN1cnJl bnREb2N1bWVudCA9IG1fZnJhbWUtPmRvY3VtZW50KCk7CisgICAgc3RvcExvYWRpbmcodHJ1ZSwg Y3VycmVudERvY3VtZW50ICYmICFjdXJyZW50RG9jdW1lbnQtPmluUGFnZUNhY2hlKCkpOworICAg IAogICAgIG1fZnJhbWUtPmVkaXRvcigpLT5jbGVhclVuZG9SZWRvT3BlcmF0aW9ucygpOwogICAg IHJldHVybiB0cnVlOwogfQpAQCAtMjA4MSw3ICsyMDg2LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6 c2NoZWR1bGVSZWRpcmVjdGlvbihTYwogICAgIGlmIChyZWRpcmVjdGlvbi0+d2FzRHVyaW5nTG9h ZCkgewogICAgICAgICBpZiAobV9wcm92aXNpb25hbERvY3VtZW50TG9hZGVyKQogICAgICAgICAg ICAgbV9wcm92aXNpb25hbERvY3VtZW50TG9hZGVyLT5zdG9wTG9hZGluZygpOwotICAgICAgICBz dG9wTG9hZGluZyh0cnVlKTsgICAKKyAgICAgICAgc3RvcExvYWRpbmcodHJ1ZSwgdHJ1ZSk7ICAg CiAgICAgfQogCiAgICAgc3RvcFJlZGlyZWN0aW9uVGltZXIoKTsKQEAgLTQyMzMsMTIgKzQyMzgs MjkgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y2FjaGVQYWdlRm9ySGlzdG9yeUl0ZQogICAgIGlmICgh Y2FuQ2FjaGVQYWdlKCkgfHwgaXRlbS0+aXNJblBhZ2VDYWNoZSgpKQogICAgICAgICByZXR1cm47 CiAKKyAgICBwYWdlSGlkZGVuKCk7CisgICAgCiAgICAgaWYgKFBhZ2UqIHBhZ2UgPSBtX2ZyYW1l LT5wYWdlKCkpIHsKICAgICAgICAgUmVmUHRyPENhY2hlZFBhZ2U+IGNhY2hlZFBhZ2UgPSBDYWNo ZWRQYWdlOjpjcmVhdGUocGFnZSk7CiAgICAgICAgIHBhZ2VDYWNoZSgpLT5hZGQoaXRlbSwgY2Fj aGVkUGFnZS5yZWxlYXNlKCkpOwogICAgIH0KIH0KIAordm9pZCBGcmFtZUxvYWRlcjo6cGFnZUhp ZGRlbigpCit7CisgICAgTm9kZSogY3VycmVudEZvY3VzZWROb2RlID0gbV9mcmFtZS0+ZG9jdW1l bnQoKS0+Zm9jdXNlZE5vZGUoKTsKKyAgICBpZiAoY3VycmVudEZvY3VzZWROb2RlKQorICAgICAg ICBjdXJyZW50Rm9jdXNlZE5vZGUtPmFib3V0VG9VbmxvYWQoKTsKKyAgICBtX3VubG9hZEV2ZW50 QmVpbmdEaXNwYXRjaGVkID0gdHJ1ZTsKKyAgICBpZiAobV9mcmFtZS0+ZG9tV2luZG93KCkpCisg ICAgICAgIG1fZnJhbWUtPmRvbVdpbmRvdygpLT5kaXNwYXRjaFBhZ2VUcmFuc2l0aW9uRXZlbnQo RXZlbnROYW1lcygpLnBhZ2VoaWRlRXZlbnQsIHRydWUpOworICAgIG1fdW5sb2FkRXZlbnRCZWlu Z0Rpc3BhdGNoZWQgPSBmYWxzZTsKKworICAgIC8vIFNlbmQgcGFnZWhpZGUgZXZlbnQgZm9yIHN1 YmZyYW1lcyBhcyB3ZWxsCisgICAgZm9yIChGcmFtZSogY2hpbGQgPSBtX2ZyYW1lLT50cmVlKCkt PmZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPnRyZWUoKS0+bmV4dFNpYmxpbmco KSkKKyAgICAgICAgY2hpbGQtPmxvYWRlcigpLT5wYWdlSGlkZGVuKCk7Cit9CisKIGJvb2wgRnJh bWVMb2FkZXI6OnNob3VsZFRyZWF0VVJMQXNTYW1lQXNDdXJyZW50KGNvbnN0IEtVUkwmIHVybCkg Y29uc3QKIHsKICAgICBpZiAoIW1fY3VycmVudEhpc3RvcnlJdGVtKQpJbmRleDogV2ViQ29yZS9s b2FkZXIvRnJhbWVMb2FkZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlci5oCShyZXZpc2lvbiA0Nzk5OSkKKysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgJ KHdvcmtpbmcgY29weSkKQEAgLTI2MSw3ICsyNjEsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAg ICAgICAgICAgICBib29sIGxvY2tIaXN0b3J5LCBQYXNzUmVmUHRyPEV2ZW50PiwgUGFzc1JlZlB0 cjxGb3JtU3RhdGU+KTsKIAogICAgICAgICB2b2lkIHN0b3AoKTsKLSAgICAgICAgdm9pZCBzdG9w TG9hZGluZyhib29sIHNlbmRVbmxvYWQsIERhdGFiYXNlUG9saWN5ID0gRGF0YWJhc2VQb2xpY3lT dG9wKTsKKyAgICAgICAgdm9pZCBzdG9wTG9hZGluZyhib29sIHNlbmRVbmxvYWQsIGJvb2wgc2Vu ZFBhZ2VoaWRlLCBEYXRhYmFzZVBvbGljeSA9IERhdGFiYXNlUG9saWN5U3RvcCk7CiAgICAgICAg IGJvb2wgY2xvc2VVUkwoKTsKIAogICAgICAgICB2b2lkIGRpZEV4cGxpY2l0T3BlbigpOwpAQCAt NDIyLDYgKzQyMiw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgCiAgICAgICAgIGJv b2wgbG9hZFByb3Zpc2lvbmFsSXRlbUZyb21DYWNoZWRQYWdlKCk7CiAgICAgICAgIHZvaWQgY2Fj aGVQYWdlRm9ySGlzdG9yeUl0ZW0oSGlzdG9yeUl0ZW0qKTsKKyAgICAgICAgdm9pZCBwYWdlSGlk ZGVuKCk7CiAKICAgICAgICAgdm9pZCByZWNlaXZlZEZpcnN0RGF0YSgpOwogCg== 38955 2009-09-02 17:38:52 -0700 2009-09-02 17:43:25 -0700 Address Darin's comments WedFifth.txt text/plain 6960 beidson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODAwMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMDktMDktMDIgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1v cmUgcGFydGlhbCB3b3JrIHRvd2FyZHMgIlBhZ2UgQ2FjaGUgc2hvdWxkIHN1cHBvcnQgcGFnZXMg d2l0aCBGcmFtZXMiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzYzMQorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE5vIGNoYW5nZSBpbiBiZWhhdmlv ciwgY3VycmVudCB0ZXN0cyBwYXNzKS4KKworICAgICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6c3RvcExvYWRpbmcpOiBB ZG9wdCB0aGUgbmV3IGVudW0gZm9ybSBmb3IgRnJhbWVMb2FkZXI6OnN0b3BMb2FkaW5nKCkuCisK KyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJh bWVMb2FkZXI6OnN0b3BMb2FkaW5nKTogVGFrZSBhbiBlbnVtIHRvIGRlY2lkZSB3aGV0aGVyIHRv IGRpc3BhdGNoIG5vIHVubG9hZCBldmVudHMsCisgICAgICAgICAgb25seSB1bmxvYWQsIG9yIHVu bG9hZCBhbmQgcGFnZWhpZGUuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y2xvc2VV UkwpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnNjaGVkdWxlUmVkaXJlY3Rpb24p OgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNhY2hlUGFnZUZvckhpc3RvcnlJdGVt KTogQ2FsbCBwYWdlSGlkZGVuKCkuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6cGFn ZUhpZGRlbik6IEFkZCB0byBkaXNwYXRjaCB0aGUgcGFnZWhpZGUgZXZlbnQgdG8gYWxsIGZyYW1l cyBpbiB0aGUgY2FzZQorICAgICAgICAgIHdoZXJlIGEgcGFnZSBpcyBhZGRlZCB0byB0aGUgUGFn ZUNhY2hlLgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5oOgorCisgICAgICAgICogbG9h ZGVyL0ZyYW1lTG9hZGVyVHlwZXMuaDogQWRkIGFuIFVubG9hZEV2ZW50UG9saWN5IGVudW0uCisK IDIwMDktMDktMDIgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRM b2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNw cAkocmV2aXNpb24gNDc5OTgpCisrKyBXZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTI3Myw3ICsyNzMsNyBAQCB2b2lkIERvY3VtZW50TG9hZGVyOjpz dG9wTG9hZGluZyhEYXRhYmFzCiAgICAgICAgIERvY3VtZW50KiBkb2MgPSBtX2ZyYW1lLT5kb2N1 bWVudCgpOwogICAgICAgICAKICAgICAgICAgaWYgKGxvYWRpbmcgfHwgZG9jLT5wYXJzaW5nKCkp Ci0gICAgICAgICAgICBtX2ZyYW1lLT5sb2FkZXIoKS0+c3RvcExvYWRpbmcoZmFsc2UsIGRhdGFi YXNlUG9saWN5KTsKKyAgICAgICAgICAgIG1fZnJhbWUtPmxvYWRlcigpLT5zdG9wTG9hZGluZyhV bmxvYWRFdmVudFBvbGljeU5vbmUsIGRhdGFiYXNlUG9saWN5KTsKICAgICB9CiAKICAgICAvLyBB bHdheXMgY2FuY2VsIG11bHRpcGFydCBsb2FkZXJzCkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw CShyZXZpc2lvbiA0Nzk5OSkKKysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNTYzLDEyICs1NjMsMTIgQEAgdm9pZCBGcmFtZUxvYWRlcjo6c3VibWl0 Rm9ybShjb25zdCBjaGFyKgogICAgIHRhcmdldEZyYW1lLT5sb2FkZXIoKS0+c2NoZWR1bGVGb3Jt U3VibWlzc2lvbihmcmFtZVJlcXVlc3QsIGxvY2tIaXN0b3J5LCBldmVudCwgZm9ybVN0YXRlKTsK IH0KIAotdm9pZCBGcmFtZUxvYWRlcjo6c3RvcExvYWRpbmcoYm9vbCBzZW5kVW5sb2FkLCBEYXRh YmFzZVBvbGljeSBkYXRhYmFzZVBvbGljeSkKK3ZvaWQgRnJhbWVMb2FkZXI6OnN0b3BMb2FkaW5n KFVubG9hZEV2ZW50UG9saWN5IHVubG9hZEV2ZW50UG9saWN5LCBEYXRhYmFzZVBvbGljeSBkYXRh YmFzZVBvbGljeSkKIHsKICAgICBpZiAobV9mcmFtZS0+ZG9jdW1lbnQoKSAmJiBtX2ZyYW1lLT5k b2N1bWVudCgpLT50b2tlbml6ZXIoKSkKICAgICAgICAgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+dG9r ZW5pemVyKCktPnN0b3BQYXJzaW5nKCk7CiAKLSAgICBpZiAoc2VuZFVubG9hZCkgeworICAgIGlm ICh1bmxvYWRFdmVudFBvbGljeSAhPSBVbmxvYWRFdmVudFBvbGljeU5vbmUpIHsKICAgICAgICAg aWYgKG1fZnJhbWUtPmRvY3VtZW50KCkpIHsKICAgICAgICAgICAgIGlmIChtX2RpZENhbGxJbXBs aWNpdENsb3NlICYmICFtX3dhc1VubG9hZEV2ZW50RW1pdHRlZCkgewogICAgICAgICAgICAgICAg IE5vZGUqIGN1cnJlbnRGb2N1c2VkTm9kZSA9IG1fZnJhbWUtPmRvY3VtZW50KCktPmZvY3VzZWRO b2RlKCk7CkBAIC01NzYsNyArNTc2LDggQEAgdm9pZCBGcmFtZUxvYWRlcjo6c3RvcExvYWRpbmco Ym9vbCBzZW5kVQogICAgICAgICAgICAgICAgICAgICBjdXJyZW50Rm9jdXNlZE5vZGUtPmFib3V0 VG9VbmxvYWQoKTsKICAgICAgICAgICAgICAgICBtX3VubG9hZEV2ZW50QmVpbmdEaXNwYXRjaGVk ID0gdHJ1ZTsKICAgICAgICAgICAgICAgICBpZiAobV9mcmFtZS0+ZG9tV2luZG93KCkpIHsKLSAg ICAgICAgICAgICAgICAgICAgbV9mcmFtZS0+ZG9tV2luZG93KCktPmRpc3BhdGNoUGFnZVRyYW5z aXRpb25FdmVudChFdmVudE5hbWVzKCkucGFnZWhpZGVFdmVudCwgbV9mcmFtZS0+ZG9jdW1lbnQo KS0+aW5QYWdlQ2FjaGUoKSk7CisgICAgICAgICAgICAgICAgICAgIGlmICh1bmxvYWRFdmVudFBv bGljeSA9PSBVbmxvYWRFdmVudFBvbGljeVVubG9hZEFuZFBhZ2VIaWRlKQorICAgICAgICAgICAg ICAgICAgICAgICAgbV9mcmFtZS0+ZG9tV2luZG93KCktPmRpc3BhdGNoUGFnZVRyYW5zaXRpb25F dmVudChFdmVudE5hbWVzKCkucGFnZWhpZGVFdmVudCwgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+aW5Q YWdlQ2FjaGUoKSk7CiAgICAgICAgICAgICAgICAgICAgIG1fZnJhbWUtPmRvbVdpbmRvdygpLT5k aXNwYXRjaFVubG9hZEV2ZW50KCk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAg IG1fdW5sb2FkRXZlbnRCZWluZ0Rpc3BhdGNoZWQgPSBmYWxzZTsKQEAgLTYxNCw3ICs2MTUsNyBA QCB2b2lkIEZyYW1lTG9hZGVyOjpzdG9wTG9hZGluZyhib29sIHNlbmRVCiAKICAgICAvLyB0ZWxs IGFsbCBzdWJmcmFtZXMgdG8gc3RvcCBhcyB3ZWxsCiAgICAgZm9yIChGcmFtZSogY2hpbGQgPSBt X2ZyYW1lLT50cmVlKCktPmZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPnRyZWUo KS0+bmV4dFNpYmxpbmcoKSkKLSAgICAgICAgY2hpbGQtPmxvYWRlcigpLT5zdG9wTG9hZGluZyhz ZW5kVW5sb2FkKTsKKyAgICAgICAgY2hpbGQtPmxvYWRlcigpLT5zdG9wTG9hZGluZyh1bmxvYWRF dmVudFBvbGljeSk7CiAKICAgICBjYW5jZWxSZWRpcmVjdGlvbigpOwogfQpAQCAtNjM2LDcgKzYz NywxMSBAQCB2b2lkIEZyYW1lTG9hZGVyOjpzdG9wKCkKIGJvb2wgRnJhbWVMb2FkZXI6OmNsb3Nl VVJMKCkKIHsKICAgICBzYXZlRG9jdW1lbnRTdGF0ZSgpOwotICAgIHN0b3BMb2FkaW5nKHRydWUp OworICAgIAorICAgIC8vIFNob3VsZCBvbmx5IHNlbmQgdGhlIHBhZ2VoaWRlIGV2ZW50IGhlcmUg aWYgdGhlIGN1cnJlbnQgZG9jdW1lbnQgZXhpc3RzIGFuZCBoYXMgbm90IGJlZW4gcGxhY2VkIGlu IHRoZSBwYWdlIGNhY2hlLiAgICAKKyAgICBEb2N1bWVudCogY3VycmVudERvY3VtZW50ID0gbV9m cmFtZS0+ZG9jdW1lbnQoKTsKKyAgICBzdG9wTG9hZGluZyhjdXJyZW50RG9jdW1lbnQgJiYgIWN1 cnJlbnREb2N1bWVudC0+aW5QYWdlQ2FjaGUoKSA/IFVubG9hZEV2ZW50UG9saWN5VW5sb2FkQW5k UGFnZUhpZGUgOiBVbmxvYWRFdmVudFBvbGljeVVubG9hZE9ubHkpOworICAgIAogICAgIG1fZnJh bWUtPmVkaXRvcigpLT5jbGVhclVuZG9SZWRvT3BlcmF0aW9ucygpOwogICAgIHJldHVybiB0cnVl OwogfQpAQCAtMjA4MSw3ICsyMDg2LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6c2NoZWR1bGVSZWRp cmVjdGlvbihTYwogICAgIGlmIChyZWRpcmVjdGlvbi0+d2FzRHVyaW5nTG9hZCkgewogICAgICAg ICBpZiAobV9wcm92aXNpb25hbERvY3VtZW50TG9hZGVyKQogICAgICAgICAgICAgbV9wcm92aXNp b25hbERvY3VtZW50TG9hZGVyLT5zdG9wTG9hZGluZygpOwotICAgICAgICBzdG9wTG9hZGluZyh0 cnVlKTsgICAKKyAgICAgICAgc3RvcExvYWRpbmcoVW5sb2FkRXZlbnRQb2xpY3lVbmxvYWRBbmRQ YWdlSGlkZSk7ICAgCiAgICAgfQogCiAgICAgc3RvcFJlZGlyZWN0aW9uVGltZXIoKTsKQEAgLTQy MzMsMTIgKzQyMzgsMjYgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y2FjaGVQYWdlRm9ySGlzdG9yeUl0 ZQogICAgIGlmICghY2FuQ2FjaGVQYWdlKCkgfHwgaXRlbS0+aXNJblBhZ2VDYWNoZSgpKQogICAg ICAgICByZXR1cm47CiAKKyAgICBwYWdlSGlkZGVuKCk7CisgICAgCiAgICAgaWYgKFBhZ2UqIHBh Z2UgPSBtX2ZyYW1lLT5wYWdlKCkpIHsKICAgICAgICAgUmVmUHRyPENhY2hlZFBhZ2U+IGNhY2hl ZFBhZ2UgPSBDYWNoZWRQYWdlOjpjcmVhdGUocGFnZSk7CiAgICAgICAgIHBhZ2VDYWNoZSgpLT5h ZGQoaXRlbSwgY2FjaGVkUGFnZS5yZWxlYXNlKCkpOwogICAgIH0KIH0KIAordm9pZCBGcmFtZUxv YWRlcjo6cGFnZUhpZGRlbigpCit7CisgICAgbV91bmxvYWRFdmVudEJlaW5nRGlzcGF0Y2hlZCA9 IHRydWU7CisgICAgaWYgKG1fZnJhbWUtPmRvbVdpbmRvdygpKQorICAgICAgICBtX2ZyYW1lLT5k b21XaW5kb3coKS0+ZGlzcGF0Y2hQYWdlVHJhbnNpdGlvbkV2ZW50KEV2ZW50TmFtZXMoKS5wYWdl aGlkZUV2ZW50LCB0cnVlKTsKKyAgICBtX3VubG9hZEV2ZW50QmVpbmdEaXNwYXRjaGVkID0gZmFs c2U7CisKKyAgICAvLyBTZW5kIHBhZ2VoaWRlIGV2ZW50IGZvciBzdWJmcmFtZXMgYXMgd2VsbAor ICAgIGZvciAoRnJhbWUqIGNoaWxkID0gbV9mcmFtZS0+dHJlZSgpLT5maXJzdENoaWxkKCk7IGNo aWxkOyBjaGlsZCA9IGNoaWxkLT50cmVlKCktPm5leHRTaWJsaW5nKCkpCisgICAgICAgIGNoaWxk LT5sb2FkZXIoKS0+cGFnZUhpZGRlbigpOworfQorCiBib29sIEZyYW1lTG9hZGVyOjpzaG91bGRU cmVhdFVSTEFzU2FtZUFzQ3VycmVudChjb25zdCBLVVJMJiB1cmwpIGNvbnN0CiB7CiAgICAgaWYg KCFtX2N1cnJlbnRIaXN0b3J5SXRlbSkKSW5kZXg6IFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAkocmV2aXNpb24g NDc5OTkpCisrKyBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCSh3b3JraW5nIGNvcHkpCkBA IC0yNjEsNyArMjYxLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgYm9vbCBs b2NrSGlzdG9yeSwgUGFzc1JlZlB0cjxFdmVudD4sIFBhc3NSZWZQdHI8Rm9ybVN0YXRlPik7CiAK ICAgICAgICAgdm9pZCBzdG9wKCk7Ci0gICAgICAgIHZvaWQgc3RvcExvYWRpbmcoYm9vbCBzZW5k VW5sb2FkLCBEYXRhYmFzZVBvbGljeSA9IERhdGFiYXNlUG9saWN5U3RvcCk7CisgICAgICAgIHZv aWQgc3RvcExvYWRpbmcoVW5sb2FkRXZlbnRQb2xpY3ksIERhdGFiYXNlUG9saWN5ID0gRGF0YWJh c2VQb2xpY3lTdG9wKTsKICAgICAgICAgYm9vbCBjbG9zZVVSTCgpOwogCiAgICAgICAgIHZvaWQg ZGlkRXhwbGljaXRPcGVuKCk7CkBAIC00MjIsNiArNDIyLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgICAgICAKICAgICAgICAgYm9vbCBsb2FkUHJvdmlzaW9uYWxJdGVtRnJvbUNhY2hlZFBh Z2UoKTsKICAgICAgICAgdm9pZCBjYWNoZVBhZ2VGb3JIaXN0b3J5SXRlbShIaXN0b3J5SXRlbSop OworICAgICAgICB2b2lkIHBhZ2VIaWRkZW4oKTsKIAogICAgICAgICB2b2lkIHJlY2VpdmVkRmly c3REYXRhKCk7CiAKSW5kZXg6IFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyVHlwZXMuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlclR5cGVzLmgJKHJldmlzaW9uIDQ3 OTk4KQorKysgV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJUeXBlcy5oCSh3b3JraW5nIGNvcHkp CkBAIC04MSw2ICs4MSwxMiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIE9iamVjdENv bnRlbnROZXRzY2FwZVBsdWdpbiwKICAgICAgICAgT2JqZWN0Q29udGVudE90aGVyUGx1Z2luCiAg ICAgfTsKKyAgICAKKyAgICBlbnVtIFVubG9hZEV2ZW50UG9saWN5IHsKKyAgICAgICAgVW5sb2Fk RXZlbnRQb2xpY3lOb25lLAorICAgICAgICBVbmxvYWRFdmVudFBvbGljeVVubG9hZE9ubHksCisg ICAgICAgIFVubG9hZEV2ZW50UG9saWN5VW5sb2FkQW5kUGFnZUhpZGUKKyAgICB9OwogfQogCiAj ZW5kaWYK 39019 2009-09-03 16:39:13 -0700 2009-09-03 16:42:38 -0700 Enable back/forward cache for pages with frames (along with some layout tests) patch.txt text/plain 11420 beidson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODAzNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDktMDktMDMgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBh Z2UgQ2FjaGUgc2hvdWxkIHN1cHBvcnQgcGFnZXMgd2l0aCBGcmFtZXMuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzYzMQorCisgICAgICAgIFRlc3Rz OiBmYXN0L2V2ZW50cy9wYWdlc2hvdy1wYWdlaGlkZS1vbi1iYWNrLWNhY2hlZC13aXRoLWZyYW1l cy5odG1sCisgICAgICAgICAgICAgICBmYXN0L2xvYWRlci9mcmFtZXMtd2l0aC11bmxvYWQtaGFu ZGxlcnMtaW4tcGFnZS1jYWNoZS5odG1sCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNhbkNhY2hlUGFnZUNvbnRhaW5p bmdUaGlzRnJhbWUpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmxvZ0NhbkNhY2hl RnJhbWVEZWNpc2lvbik6CisKIDIwMDktMDktMDMgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBw bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCkluZGV4OiBXZWJDb3Jl L2xvYWRlci9GcmFtZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuY3BwCShyZXZpc2lvbiA0ODAzNCkKKysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTgxOCw3ICsxODE4LDYgQEAgYm9vbCBGcmFtZUxv YWRlcjo6Y2FuQ2FjaGVQYWdlQ29udGFpbmluZwogICAgICAgICAgICAgCiAgICAgcmV0dXJuIG1f ZG9jdW1lbnRMb2FkZXIKICAgICAgICAgJiYgbV9kb2N1bWVudExvYWRlci0+bWFpbkRvY3VtZW50 RXJyb3IoKS5pc051bGwoKQotICAgICAgICAmJiAhbV9mcmFtZS0+dHJlZSgpLT5jaGlsZENvdW50 KCkKICAgICAgICAgLy8gRklYTUU6IElmIHdlIGV2ZXIgY2hhbmdlIHRoaXMgc28gdGhhdCBmcmFt ZXMgd2l0aCBwbHVnLWlucyB3aWxsIGJlIGNhY2hlZCwKICAgICAgICAgLy8gd2UgbmVlZCB0byBt YWtlIHN1cmUgdGhhdCB3ZSBkb24ndCBjYWNoZSBmcmFtZXMgdGhhdCBoYXZlIG91dHN0YW5kaW5n IE5QT2JqZWN0cwogICAgICAgICAvLyAob2JqZWN0cyBjcmVhdGVkIGJ5IHRoZSBwbHVnLWluKS4g U2luY2UgdGhlcmUgaXMgbm8gd2F5IHRvIHBhdXNlL3Jlc3VtZSBhIE5ldHNjYXBlIHBsdWctaW4s CkBAIC0xOTY3LDggKzE5NjYsNiBAQCBib29sIEZyYW1lTG9hZGVyOjpsb2dDYW5DYWNoZUZyYW1l RGVjaXNpCiAgICAgICAgIH0KICAgICAgICAgaWYgKCFtX2RvY3VtZW50TG9hZGVyLT5tYWluRG9j dW1lbnRFcnJvcigpLmlzTnVsbCgpKQogICAgICAgICAgICAgeyBQQ0xPRygiICAgLU1haW4gZG9j dW1lbnQgaGFzIGFuIGVycm9yIik7IGNhbm5vdENhY2hlID0gdHJ1ZTsgfQotICAgICAgICBpZiAo bV9mcmFtZS0+dHJlZSgpLT5jaGlsZENvdW50KCkpCi0gICAgICAgICAgICB7IFBDTE9HKCIgICAt RnJhbWUgaGFzIGNoaWxkIGZyYW1lcyIpOyBjYW5ub3RDYWNoZSA9IHRydWU7IH0KICAgICAgICAg aWYgKG1fY29udGFpbnNQbHVnSW5zKQogICAgICAgICAgICAgeyBQQ0xPRygiICAgLUZyYW1lIGNv bnRhaW5zIHBsdWdpbnMiKTsgY2Fubm90Q2FjaGUgPSB0cnVlOyB9CiAgICAgICAgIGlmIChtX1VS TC5wcm90b2NvbElzKCJodHRwcyIpKQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNDgwMzQpCisrKyBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAwOS0w OS0wMyAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUGFnZSBDYWNoZSBzaG91bGQgc3VwcG9y dCBwYWdlcyB3aXRoIEZyYW1lcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzNjMxCisKKyAgICAgICAgKiBmYXN0L2V2ZW50cy9wYWdlc2hvdy1wYWdl aGlkZS1vbi1iYWNrLWNhY2hlZC13aXRoLWZyYW1lcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAg ICAgICAqIGZhc3QvZXZlbnRzL3BhZ2VzaG93LXBhZ2VoaWRlLW9uLWJhY2stY2FjaGVkLXdpdGgt ZnJhbWVzLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZXZlbnRzL3Jlc291cmNlcy9wYWdl c2hvdy1wYWdlaGlkZS1zdWJmcmFtZS1jYWNoYWJsZS5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBm YXN0L2V2ZW50cy9yZXNvdXJjZXMvcGFnZXNob3ctcGFnZWhpZGUtc3Vic3ViZnJhbWUtY2FjaGFi bGUuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9sb2FkZXIvZnJhbWVzLXdpdGgtdW5sb2Fk LWhhbmRsZXJzLWluLXBhZ2UtY2FjaGUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBm YXN0L2xvYWRlci9mcmFtZXMtd2l0aC11bmxvYWQtaGFuZGxlcnMtaW4tcGFnZS1jYWNoZS5odG1s OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2xvYWRlci9yZXNvdXJjZXMvbm90aWZ5LWRvbmUuaHRt bDogQWRkZWQuCisgICAgICAgICogZmFzdC9sb2FkZXIvcmVzb3VyY2VzL3N1YmZyYW1lLXdpdGgt c3Vic3ViZnJhbWUtd2l0aC11bmxvYWQtaGFuZGxlci5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBm YXN0L2xvYWRlci9yZXNvdXJjZXMvc3ViZnJhbWUtd2l0aC11bmxvYWQtaGFuZGxlci5odG1sOiBB ZGRlZC4KKwogMjAwOS0wOS0wMyAgRHJldyBXaWxzb24gIDxhdHdpbHNvbkBnb29nbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IERhdmUgTGV2aW4uCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0 L2V2ZW50cy9wYWdlc2hvdy1wYWdlaGlkZS1vbi1iYWNrLWNhY2hlZC13aXRoLWZyYW1lcy1leHBl Y3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvcGFnZXNob3ct cGFnZWhpZGUtb24tYmFjay1jYWNoZWQtd2l0aC1mcmFtZXMtZXhwZWN0ZWQudHh0CShyZXZpc2lv biAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvcGFnZXNob3ctcGFnZWhpZGUtb24tYmFj ay1jYWNoZWQtd2l0aC1mcmFtZXMtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsx LDE2IEBACitUZXN0IHBhZ2VzaG93L3BhZ2VoaWRlIGV2ZW50IGJlaGF2aW9yIHdoZW4gbmF2aWdh dGluZyBhd2F5IGZyb20gYSBwYWdlIHdpdGggZnJhbWVzLCBwdXR0aW5nIHRoZSBwYWdlIGluIHRo ZSBwYWdlIGNhY2hlLCB0aGVuIGJhY2sgdG8gaXQuCisqKipUb3AgbGV2ZWwgZnJhbWUgYmVpbmcg cGFyc2VkIGZvciB0aGUgaW5pdGlhbCBwYWdlIGxvYWQqKioKK1N1YnN1YmZyYW1lIHdpbmRvdy5v bmxvYWQKK1N1YnN1YmZyYW1lIHdpbmRvdy5vbnBhZ2VzaG93LCB0YXJnZXQgPSBbb2JqZWN0IEhU TUxEb2N1bWVudF0sIHBlcnNpc3RlZCA9IGZhbHNlCitTdWJmcmFtZSB3aW5kb3cub25sb2FkCitT dWJmcmFtZSB3aW5kb3cub25wYWdlc2hvdywgdGFyZ2V0ID0gW29iamVjdCBIVE1MRG9jdW1lbnRd LCBwZXJzaXN0ZWQgPSBmYWxzZQorTWFpbiBmcmFtZSB3aW5kb3cub25sb2FkCitNYWluIGZyYW1l IHdpbmRvdy5vbnBhZ2VzaG93LCB0YXJnZXQgPSBbb2JqZWN0IEhUTUxEb2N1bWVudF0sIHBlcnNp c3RlZCA9IGZhbHNlCisqKipOYXZpZ2F0aW5nIHRvcC1sZXZlbCBmcmFtZSB0byBhIHBhZ2UgdGhh dCB3aWxsIGltbWVkaWF0ZWx5IG5hdmlnYXRlIGJhY2sgdG8gdGhpcyBvbmUqKioKK01haW4gZnJh bWUgd2luZG93Lm9ucGFnZWhpZGUsIHRhcmdldCA9IFtvYmplY3QgSFRNTERvY3VtZW50XSwgcGVy c2lzdGVkID0gdHJ1ZQorU3ViZnJhbWUgd2luZG93Lm9ucGFnZWhpZGUsIHRhcmdldCA9IFtvYmpl Y3QgSFRNTERvY3VtZW50XSwgcGVyc2lzdGVkID0gdHJ1ZQorU3Vic3ViZnJhbWUgd2luZG93Lm9u cGFnZWhpZGUsIHRhcmdldCA9IFtvYmplY3QgSFRNTERvY3VtZW50XSwgcGVyc2lzdGVkID0gdHJ1 ZQorU3Vic3ViZnJhbWUgd2luZG93Lm9ucGFnZXNob3csIHRhcmdldCA9IFtvYmplY3QgSFRNTERv Y3VtZW50XSwgcGVyc2lzdGVkID0gdHJ1ZQorU3ViZnJhbWUgd2luZG93Lm9ucGFnZXNob3csIHRh cmdldCA9IFtvYmplY3QgSFRNTERvY3VtZW50XSwgcGVyc2lzdGVkID0gdHJ1ZQorTWFpbiBmcmFt ZSB3aW5kb3cub25wYWdlc2hvdywgdGFyZ2V0ID0gW29iamVjdCBIVE1MRG9jdW1lbnRdLCBwZXJz aXN0ZWQgPSB0cnVlCisKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3BhZ2VzaG93LXBh Z2VoaWRlLW9uLWJhY2stY2FjaGVkLXdpdGgtZnJhbWVzLmh0bWwKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvZmFzdC9ldmVudHMvcGFnZXNob3ctcGFnZWhpZGUtb24tYmFjay1jYWNoZWQtd2l0 aC1mcmFtZXMuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3Bh Z2VzaG93LXBhZ2VoaWRlLW9uLWJhY2stY2FjaGVkLXdpdGgtZnJhbWVzLmh0bWwJKHJldmlzaW9u IDApCkBAIC0wLDAgKzEsNDMgQEAKKzxodG1sPgorPGJvZHk+CitUZXN0IHBhZ2VzaG93L3BhZ2Vo aWRlIGV2ZW50IGJlaGF2aW9yIHdoZW4gbmF2aWdhdGluZyBhd2F5IGZyb20gYSBwYWdlIHdpdGgg ZnJhbWVzLCBwdXR0aW5nIHRoZSBwYWdlIGluIHRoZSBwYWdlIGNhY2hlLCB0aGVuIGJhY2sgdG8g aXQuCis8cHJlIGlkPSJsb2ciPjwvcHJlPgorPGlmcmFtZSBzcmM9InJlc291cmNlcy9wYWdlc2hv dy1wYWdlaGlkZS1zdWJmcmFtZS1jYWNoYWJsZS5odG1sIj48L2lmcmFtZT4KKzwvYm9keT4KKzxz Y3JpcHQ+CisKK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICBsYXlvdXRU ZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2Fp dFVudGlsRG9uZSgpOworICAgIGxheW91dFRlc3RDb250cm9sbGVyLm92ZXJyaWRlUHJlZmVyZW5j ZSgiV2ViS2l0VXNlc1BhZ2VDYWNoZVByZWZlcmVuY2VLZXkiLCAxKTsKK30KKworZnVuY3Rpb24g bG9nKG1lc3NhZ2UpCit7CisgICAgdmFyIGxvZyA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJs b2ciKTsKKyAgICBsb2cuaW5uZXJIVE1MICs9IG1lc3NhZ2UgKyAiXG4iOworfQorCitsb2coIioq KlRvcCBsZXZlbCBmcmFtZSBiZWluZyBwYXJzZWQgZm9yIHRoZSBpbml0aWFsIHBhZ2UgbG9hZCoq KiIpOworCit3aW5kb3cub25sb2FkID0gZnVuY3Rpb24oZXZ0KSB7CisgICAgbG9nKCJNYWluIGZy YW1lIHdpbmRvdy5vbmxvYWQiKTsKK30KKword2luZG93Lm9ucGFnZXNob3cgPSBmdW5jdGlvbihl dnQpIHsKKyAgICBsb2coIk1haW4gZnJhbWUgd2luZG93Lm9ucGFnZXNob3ciICsgIiwgdGFyZ2V0 ID0gIiArIGV2dC50YXJnZXQgKyAiLCBwZXJzaXN0ZWQgPSAiICsgZXZ0LnBlcnNpc3RlZCk7Cisg ICAgaWYgKGV2dC5wZXJzaXN0ZWQpIHsKKyAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29u dHJvbGxlcikKKyAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsK KyAgICB9IGVsc2UgeworICAgICAgICBsb2coIioqKk5hdmlnYXRpbmcgdG9wLWxldmVsIGZyYW1l IHRvIGEgcGFnZSB0aGF0IHdpbGwgaW1tZWRpYXRlbHkgbmF2aWdhdGUgYmFjayB0byB0aGlzIG9u ZSoqKiIpOworICAgICAgICB3aW5kb3cubG9jYXRpb24uaHJlZiA9ICJkYXRhOnRleHQvaHRtbCw8 c2NyaXB0Pmhpc3RvcnkuYmFjaygpOzwvc2NyIiArICJpcHQ+IjsKKyAgICB9Cit9CisKK3dpbmRv dy5vbnBhZ2VoaWRlID0gZnVuY3Rpb24oZXZ0KSB7CisgICAgbG9nKCJNYWluIGZyYW1lIHdpbmRv dy5vbnBhZ2VoaWRlIiArICIsIHRhcmdldCA9ICIgKyBldnQudGFyZ2V0ICsgIiwgcGVyc2lzdGVk ID0gIiArIGV2dC5wZXJzaXN0ZWQpOworfQorCis8L3NjcmlwdD4KKzwvaHRtbD4KSW5kZXg6IExh eW91dFRlc3RzL2Zhc3QvZXZlbnRzL3Jlc291cmNlcy9wYWdlc2hvdy1wYWdlaGlkZS1zdWJmcmFt ZS1jYWNoYWJsZS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3Jl c291cmNlcy9wYWdlc2hvdy1wYWdlaGlkZS1zdWJmcmFtZS1jYWNoYWJsZS5odG1sCShyZXZpc2lv biAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvcmVzb3VyY2VzL3BhZ2VzaG93LXBhZ2Vo aWRlLXN1YmZyYW1lLWNhY2hhYmxlLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMTkgQEAK Kzxib2R5IG9ucGFnZXNob3c9J29uUGFnZXNob3coZXZlbnQpJyBvbnBhZ2VoaWRlPSdvblBhZ2Vo aWRlKGV2ZW50KSc+Cis8cD5TdWJmcmFtZTwvcD4KKzxpZnJhbWUgc3JjPSJwYWdlc2hvdy1wYWdl aGlkZS1zdWJzdWJmcmFtZS1jYWNoYWJsZS5odG1sIjwvaWZyYW1lPgorPHNjcmlwdD4KK3dpbmRv dy5vbmxvYWQgPSBmdW5jdGlvbihldnQpIHsKKyAgICB0b3AubG9nKCJTdWJmcmFtZSB3aW5kb3cu b25sb2FkIik7Cit9CisKK2Z1bmN0aW9uIG9uUGFnZXNob3coZXZ0KQoreworICAgIHRvcC5sb2co IlN1YmZyYW1lIHdpbmRvdy5vbnBhZ2VzaG93IiArICIsIHRhcmdldCA9ICIgKyBldnQudGFyZ2V0 ICsgIiwgcGVyc2lzdGVkID0gIiArIGV2dC5wZXJzaXN0ZWQpOworfQorCitmdW5jdGlvbiBvblBh Z2VoaWRlKGV2dCkKK3sKKyAgICB0b3AubG9nKCJTdWJmcmFtZSB3aW5kb3cub25wYWdlaGlkZSIg KyAiLCB0YXJnZXQgPSAiICsgZXZ0LnRhcmdldCArICIsIHBlcnNpc3RlZCA9ICIgKyBldnQucGVy c2lzdGVkKTsKK30KKzwvc2NyaXB0PgorPC9ib2R5PgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9l dmVudHMvcmVzb3VyY2VzL3BhZ2VzaG93LXBhZ2VoaWRlLXN1YnN1YmZyYW1lLWNhY2hhYmxlLmh0 bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvcmVzb3VyY2VzL3BhZ2Vz aG93LXBhZ2VoaWRlLXN1YnN1YmZyYW1lLWNhY2hhYmxlLmh0bWwJKHJldmlzaW9uIDApCisrKyBM YXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9yZXNvdXJjZXMvcGFnZXNob3ctcGFnZWhpZGUtc3Vic3Vi ZnJhbWUtY2FjaGFibGUuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwxNCBAQAorPHA+U3Vi c3ViZnJhbWU8L3A+Cis8c2NyaXB0Pgord2luZG93Lm9ubG9hZCA9IGZ1bmN0aW9uKGV2dCkgewor ICAgIHRvcC5sb2coIlN1YnN1YmZyYW1lIHdpbmRvdy5vbmxvYWQiKTsKK30KKword2luZG93Lm9u cGFnZXNob3cgPSBmdW5jdGlvbihldnQpIHsKKyAgICB0b3AubG9nKCJTdWJzdWJmcmFtZSB3aW5k b3cub25wYWdlc2hvdyIgKyAiLCB0YXJnZXQgPSAiICsgZXZ0LnRhcmdldCArICIsIHBlcnNpc3Rl ZCA9ICIgKyBldnQucGVyc2lzdGVkKTsKK30KKword2luZG93Lm9ucGFnZWhpZGUgPSBmdW5jdGlv bihldnQpIHsKKyAgICB0b3AubG9nKCJTdWJzdWJmcmFtZSB3aW5kb3cub25wYWdlaGlkZSIgKyAi LCB0YXJnZXQgPSAiICsgZXZ0LnRhcmdldCArICIsIHBlcnNpc3RlZCA9ICIgKyBldnQucGVyc2lz dGVkKTsKK30KKzwvc2NyaXB0PgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvZnJhbWVz LXdpdGgtdW5sb2FkLWhhbmRsZXJzLWluLXBhZ2UtY2FjaGUtZXhwZWN0ZWQudHh0Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2ZyYW1lcy13aXRoLXVubG9hZC1oYW5kbGVy cy1pbi1wYWdlLWNhY2hlLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3Rz L2Zhc3QvbG9hZGVyL2ZyYW1lcy13aXRoLXVubG9hZC1oYW5kbGVycy1pbi1wYWdlLWNhY2hlLWV4 cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw3IEBACitmcmFtZSAiPCEtLWZyYW1l UGF0aCAvLzwhLS1mcmFtZTAtLT4vPCEtLWZyYW1lMC0tPi0tPiIgLSBoYXMgMSBvbnVubG9hZCBo YW5kbGVyKHMpCitBTEVSVDogU3ViZnJhbWUgb25sb2FkCitBTEVSVDogU3ViZnJhbWUgb25wYWdl c2hvdworQUxFUlQ6IE1haW4gZnJhbWUgd2luZG93Lm9ucGFnZWhpZGUgY2FsbGVkCitBTEVSVDog U3ViZnJhbWUgb25wYWdlaGlkZQorQUxFUlQ6IFN1YmZyYW1lIG9udW5sb2FkCisKSW5kZXg6IExh eW91dFRlc3RzL2Zhc3QvbG9hZGVyL2ZyYW1lcy13aXRoLXVubG9hZC1oYW5kbGVycy1pbi1wYWdl LWNhY2hlLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvZnJhbWVz LXdpdGgtdW5sb2FkLWhhbmRsZXJzLWluLXBhZ2UtY2FjaGUuaHRtbAkocmV2aXNpb24gMCkKKysr IExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2ZyYW1lcy13aXRoLXVubG9hZC1oYW5kbGVycy1pbi1w YWdlLWNhY2hlLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMjcgQEAKKzxodG1sPgorPGhl YWQ+Cis8c2NyaXB0PgorCitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAg bGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgIGxheW91dFRlc3RDb250cm9s bGVyLndhaXRVbnRpbERvbmUoKTsKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5vdmVycmlkZVBy ZWZlcmVuY2UoIldlYktpdFVzZXNQYWdlQ2FjaGVQcmVmZXJlbmNlS2V5IiwgMSk7Cit9CisKK3dp bmRvdy5vbmxvYWQgPSBmdW5jdGlvbigpIHsKKyAgICB3aW5kb3cubG9jYXRpb24uaHJlZiA9ICJy ZXNvdXJjZXMvbm90aWZ5LWRvbmUuaHRtbCI7Cit9CisKK3dpbmRvdy5vbnBhZ2VoaWRlID0gZnVu Y3Rpb24oZXZ0KSB7CisgICAgYWxlcnQoIk1haW4gZnJhbWUgd2luZG93Lm9ucGFnZWhpZGUgY2Fs bGVkIik7Cit9CisKKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+CitUZXN0cyBpZiBhIHBhZ2Ug d2l0aCBhIHN1YmZyYW1lIHRoYXQgaGFzIGFuIHVubG9hZCBoYW5kbGVyIGlzIGFsbG93ZWQgdG8g Z28gaW4gdGhlIHBhZ2UgY2FjaGUuICAoSXQgc2hvdWxkIG5vdCBiZS4pPGJyPgorSWYgdGhlIHN1 YmZyYW1lJ3MgdW5sb2FkIGhhbmRsZXIgaXMgY2FsbGVkIHdoZW4gbmF2aWdhdGluZyBhd2F5IGZy b20gdGhpcyBwYWdlLCBpdCBkaWQgKk5PVCogZ28gaW4gdGhlIHBhZ2UgY2FjaGUgYW5kIGFsbCBp cyB3ZWxsLjxicj4KK0hvd2V2ZXIsIGlmICpvbmx5KiBpdHMgcGFnZXNob3cgaGFuZGxlciBpcyBj YWxsZWQsIHRoZW4gaXQgKmRpZCogZ28gaW4KKzxpZnJhbWUgc3JjPSJyZXNvdXJjZXMvc3ViZnJh bWUtd2l0aC1zdWJzdWJmcmFtZS13aXRoLXVubG9hZC1oYW5kbGVyLmh0bWwiPjwvaWZyYW1lPgor PC9ib2R5PgorPC9odG1sPgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvcmVzb3VyY2Vz L25vdGlmeS1kb25lLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIv cmVzb3VyY2VzL25vdGlmeS1kb25lLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9m YXN0L2xvYWRlci9yZXNvdXJjZXMvbm90aWZ5LWRvbmUuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAs MCArMSw0IEBACis8c2NyaXB0PgoraWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAg ICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7Cis8L3NjcmlwdD4KSW5kZXg6IExh eW91dFRlc3RzL2Zhc3QvbG9hZGVyL3Jlc291cmNlcy9zdWJmcmFtZS13aXRoLXN1YnN1YmZyYW1l LXdpdGgtdW5sb2FkLWhhbmRsZXIuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0 L2xvYWRlci9yZXNvdXJjZXMvc3ViZnJhbWUtd2l0aC1zdWJzdWJmcmFtZS13aXRoLXVubG9hZC1o YW5kbGVyLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9yZXNv dXJjZXMvc3ViZnJhbWUtd2l0aC1zdWJzdWJmcmFtZS13aXRoLXVubG9hZC1oYW5kbGVyLmh0bWwJ KHJldmlzaW9uIDApCkBAIC0wLDAgKzEgQEAKKzxpZnJhbWUgc3JjPSJzdWJmcmFtZS13aXRoLXVu bG9hZC1oYW5kbGVyLmh0bWwiPjwvaWZyYW1lPgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9sb2Fk ZXIvcmVzb3VyY2VzL3N1YmZyYW1lLXdpdGgtdW5sb2FkLWhhbmRsZXIuaHRtbAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9yZXNvdXJjZXMvc3ViZnJhbWUtd2l0aC11bmxv YWQtaGFuZGxlci5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIv cmVzb3VyY2VzL3N1YmZyYW1lLXdpdGgtdW5sb2FkLWhhbmRsZXIuaHRtbAkocmV2aXNpb24gMCkK QEAgLTAsMCArMSwyNiBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQ+CisKK3dpbmRvdy5vbmxv YWQgPSBmdW5jdGlvbigpIHsKKyAgICBhbGVydCgiU3ViZnJhbWUgb25sb2FkIik7Cit9CisKK3dp bmRvdy5vbnVubG9hZCA9IGZ1bmN0aW9uKCkgeyAKKyAgICBhbGVydCgiU3ViZnJhbWUgb251bmxv YWQiKQorfQorCit3aW5kb3cub25wYWdlc2hvdyA9IGZ1bmN0aW9uKGV2dCkgeworICAgIGFsZXJ0 KCJTdWJmcmFtZSBvbnBhZ2VzaG93Iik7Cit9CisKK3dpbmRvdy5vbnBhZ2VoaWRlID0gZnVuY3Rp b24oZXZ0KSB7CisgICAgYWxlcnQoIlN1YmZyYW1lIG9ucGFnZWhpZGUiKTsKK30KKworPC9zY3Jp cHQ+Cis8L2hlYWQ+Cis8Ym9keT4KK1RoaXMgc3ViZnJhbWUgaGFzIGFuIHVubG9hZCBoYW5kbGVy LgorPC9ib2R5PgorPC9odG1sPgo=