132928 2014-05-14 16:06:22 -0700 Add image to cache 2014-05-16 10:07:55 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mhock mhock ap commit-queue japhet psolanki oldest_to_newest 1009359 0 mhock 2014-05-14 16:06:22 -0700 Restore the call to add in MemoryCache::addImageToCache erroneously removed in r165117 and return the result. <rdar://problem/16651547> 1009360 1 231470 mhock 2014-05-14 16:10:24 -0700 Created attachment 231470 patch 1009578 2 231470 ap 2014-05-15 10:48:05 -0700 Comment on attachment 231470 patch Is there any way to do a regression test for this fix? 1009583 3 mhock 2014-05-15 11:02:47 -0700 I create(In reply to comment #2) > (From update of attachment 231470 [details]) > Is there any way to do a regression test for this fix? I created https://bugs.webkit.org/show_bug.cgi?id=132962 to track adding some unit tests to MemoryCache. 1009630 4 231535 mhock 2014-05-15 14:35:13 -0700 Created attachment 231535 API test 1009634 5 231535 ap 2014-05-15 15:07:10 -0700 Comment on attachment 231535 API test View in context: https://bugs.webkit.org/attachment.cgi?id=231535&action=review > Tools/TestWebKitAPI/Tests/Cocoa/MemoryCacheAddImageToCache.mm:34 > +#if TARGET_OS_IPHONE Would it be possible to create a separate directory for iOS tests, like we have for Mac ones? > Tools/TestWebKitAPI/Tests/Cocoa/MemoryCacheAddImageToCache.mm:35 > + CGColorSpaceRef rgb = CGColorSpaceCreateDeviceRGB(); This looks like it leaks. > Tools/TestWebKitAPI/Tests/Cocoa/MemoryCacheAddImageToCache.mm:39 > + NSURL* url = [NSURL URLWithString:@"about:blank"]; Misplaced star. 1009636 6 231535 psolanki 2014-05-15 15:10:57 -0700 Comment on attachment 231535 API test View in context: https://bugs.webkit.org/attachment.cgi?id=231535&action=review This is great! Thanks for adding this test. > Tools/TestWebKitAPI/Tests/Cocoa/MemoryCacheAddImageToCache.mm:41 > + EXPECT_TRUE([WebCache imageForURL:url] == image); Let's test removeImageFrom cache as well. Something like this perhaps [WebCache removeImageFromCacheForURL:url]; EXPECT_TRUE([WebCache imageForURL:url] == 0); 1009696 7 mhock 2014-05-15 19:34:25 -0700 (In reply to comment #6) > (From update of attachment 231535 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=231535&action=review > > This is great! Thanks for adding this test. > > > Tools/TestWebKitAPI/Tests/Cocoa/MemoryCacheAddImageToCache.mm:41 > > + EXPECT_TRUE([WebCache imageForURL:url] == image); > > Let's test removeImageFrom cache as well. Something like this perhaps > > [WebCache removeImageFromCacheForURL:url]; > EXPECT_TRUE([WebCache imageForURL:url] == 0); Actually, it turns out that removeImageFromCache doesn't immediately remove the image from the cache since it's manually cached. See the following comment: // Removing the last client of a CachedImage turns the resource // into a dead resource which will eventually be evicted when // dead resources are pruned. That might be immediately since // removing the last client triggers a MemoryCache::prune, so the // resource may be deleted after this call. But since the MemoryCache is not full, prune does nothing. 1009723 8 psolanki 2014-05-16 00:12:16 -0700 (In reply to comment #7) > (In reply to comment #6) > > (From update of attachment 231535 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=231535&action=review > > > > This is great! Thanks for adding this test. > > > > > Tools/TestWebKitAPI/Tests/Cocoa/MemoryCacheAddImageToCache.mm:41 > > > + EXPECT_TRUE([WebCache imageForURL:url] == image); > > > > Let's test removeImageFrom cache as well. Something like this perhaps > > > > [WebCache removeImageFromCacheForURL:url]; > > EXPECT_TRUE([WebCache imageForURL:url] == 0); > > Actually, it turns out that removeImageFromCache doesn't immediately remove the image from the cache since it's manually cached. See the following comment: Thanks for the explanation. I think your test is fine in that case. 1009724 9 231561 mhock 2014-05-16 00:30:05 -0700 Created attachment 231561 address comments 1009725 10 mhock 2014-05-16 00:33:08 -0700 (In reply to comment #5) > (From update of attachment 231535 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=231535&action=review > > > Tools/TestWebKitAPI/Tests/Cocoa/MemoryCacheAddImageToCache.mm:34 > > +#if TARGET_OS_IPHONE > > Would it be possible to create a separate directory for iOS tests, like we have for Mac ones? I created an "ios" directory. There already was a similar directory at another level of the project, so I followed the pattern it established of ending the filename in IOS. > > Tools/TestWebKitAPI/Tests/Cocoa/MemoryCacheAddImageToCache.mm:35 > > + CGColorSpaceRef rgb = CGColorSpaceCreateDeviceRGB(); > > This looks like it leaks. Fixed (along with the other leaks). > > Tools/TestWebKitAPI/Tests/Cocoa/MemoryCacheAddImageToCache.mm:39 > > + NSURL* url = [NSURL URLWithString:@"about:blank"]; > > Misplaced star. Fixed. 1009785 11 mhock 2014-05-16 10:07:55 -0700 Committed r168970: <http://trac.webkit.org/changeset/168970> 231470 2014-05-14 16:10:24 -0700 2014-05-15 14:35:13 -0700 patch addimage.01.diff text/plain 1242 mhock ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmZGJmMmYyLi5hM2E4N2E2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTQtMDUtMTQgIE1hcnRpbiBIb2NrICA8bWhvY2tAYXBwbGUuY29tPgorCisgICAgICAg IE1lbW9yeUNhY2hlOjphZGRJbWFnZVRvQ2FjaGUgc2hvdWxkIHJldHVybiB0aGUgcmVzdWx0IG9m IGFkZCgpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTMyOTI4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjY1MTU0Nz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGxvYWRlci9jYWNoZS9NZW1vcnlD YWNoZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZW1vcnlDYWNoZTo6YWRkSW1hZ2VUb0NhY2hl KToKKwogMjAxNC0wNS0xNCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAg ICAgICAgSW1wbGVtZW50IE5TU2hhcmluZ1NlcnZpY2VEZWxlZ2F0ZSBtZXRob2QgInRyYW5zaXRp b25JbWFnZUZvclNoYXJlSXRlbSIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9j YWNoZS9NZW1vcnlDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5 Q2FjaGUuY3BwCmluZGV4IDQyNDFhZmUuLjkyOGQyZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcApAQCAtMjY2LDcgKzI2Niw3IEBAIGJvb2wgTWVtb3J5 Q2FjaGU6OmFkZEltYWdlVG9DYWNoZShOYXRpdmVJbWFnZVB0ciBpbWFnZSwgY29uc3QgVVJMJiB1 cmwsIGNvbnN0IFN0CiAjaWYgRU5BQkxFKENBQ0hFX1BBUlRJVElPTklORykKICAgICBjYWNoZWRJ bWFnZS0+cmVzb3VyY2VSZXF1ZXN0KCkuc2V0Q2FjaGVQYXJ0aXRpb24oY2FjaGVQYXJ0aXRpb24p OwogI2VuZGlmCi0gICAgcmV0dXJuIHRydWU7CisgICAgcmV0dXJuIGFkZChjYWNoZWRJbWFnZS5y ZWxlYXNlKCkpOwogfQogCiB2b2lkIE1lbW9yeUNhY2hlOjpyZW1vdmVJbWFnZUZyb21DYWNoZShj b25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBjYWNoZVBhcnRpdGlvbikK 231535 2014-05-15 14:35:13 -0700 2014-05-16 00:30:05 -0700 API test addimage.02.diff text/plain 9061 mhock ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3OGYyYzQwLi5lZGY2NjI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTQtMDUtMTUgIE1hcnRpbiBIb2NrICA8bWhvY2tAYXBwbGUuY29tPgorCisgICAgICAg IE1lbW9yeUNhY2hlOjphZGRJbWFnZVRvQ2FjaGUgc2hvdWxkIHJldHVybiB0aGUgcmVzdWx0IG9m IGFkZCgpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTMyOTI4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjY1MTU0Nz4KKworICAgICAgICBSZXZp ZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292LgorCisgICAgICAgIEFQSSB0ZXN0OiBXZWJLaXQx Lk1lbW9yeUNhY2hlQWRkSW1hZ2VUb0NhY2hlCisKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvTWVt b3J5Q2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVtb3J5Q2FjaGU6OmFkZEltYWdlVG9D YWNoZSk6CisKIDIwMTQtMDUtMTUgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5j b20+CiAKICAgICAgICAgW1VJLXNpZGUgY29tcG9zaXRpbmddIEZpeCBjb3B5aW5nIGFuaW1hdGlv bnMgYmV0d2VlbiBsYXllcnMsIGFuZCBwYXVzaW5nIHRoZW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3BwCmluZGV4IDQyNDFhZmUuLjkyOGQyZWUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcApAQCAtMjY2LDcgKzI2Niw3 IEBAIGJvb2wgTWVtb3J5Q2FjaGU6OmFkZEltYWdlVG9DYWNoZShOYXRpdmVJbWFnZVB0ciBpbWFn ZSwgY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0CiAjaWYgRU5BQkxFKENBQ0hFX1BBUlRJVElPTklO RykKICAgICBjYWNoZWRJbWFnZS0+cmVzb3VyY2VSZXF1ZXN0KCkuc2V0Q2FjaGVQYXJ0aXRpb24o Y2FjaGVQYXJ0aXRpb24pOwogI2VuZGlmCi0gICAgcmV0dXJuIHRydWU7CisgICAgcmV0dXJuIGFk ZChjYWNoZWRJbWFnZS5yZWxlYXNlKCkpOwogfQogCiB2b2lkIE1lbW9yeUNhY2hlOjpyZW1vdmVJ bWFnZUZyb21DYWNoZShjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBjYWNoZVBhcnRpdGlv bikKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAy ZjBjZTQxLi5mYTZlMWY4IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTQtMDUtMTUgIE1hcnRpbiBIb2NrICA8bWhv Y2tAYXBwbGUuY29tPgorCisgICAgICAgIE1lbW9yeUNhY2hlOjphZGRJbWFnZVRvQ2FjaGUgc2hv dWxkIHJldHVybiB0aGUgcmVzdWx0IG9mIGFkZCgpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyOTI4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8x NjY1MTU0Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292LgorCisg ICAgICAgICogVGVzdFdlYktpdEFQSS9Db25maWd1cmF0aW9ucy9UZXN0V2ViS2l0QVBJLnhjY29u ZmlnOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJv amVjdC5wYnhwcm9qOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvQ29jb2EvTWVtb3J5 Q2FjaGVBZGRJbWFnZVRvQ2FjaGUubW06IEFkZGVkLgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6 VEVTVCk6CisKIDIwMTQtMDUtMTUgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4K IAogICAgICAgICBUZXN0V2ViS2l0QVBJOiBVUkxFeHRyYXMubW0gc2hvdWxkIGJlIGEgc2hhcmVk IHRlc3QgZm9yIGlPUyBhbmQgTWFjCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL0Nv bmZpZ3VyYXRpb25zL1Rlc3RXZWJLaXRBUEkueGNjb25maWcgYi9Ub29scy9UZXN0V2ViS2l0QVBJ L0NvbmZpZ3VyYXRpb25zL1Rlc3RXZWJLaXRBUEkueGNjb25maWcKaW5kZXggOTQwOTI2MS4uZTIw NTE3OSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9Db25maWd1cmF0aW9ucy9UZXN0 V2ViS2l0QVBJLnhjY29uZmlnCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvQ29uZmlndXJhdGlv bnMvVGVzdFdlYktpdEFQSS54Y2NvbmZpZwpAQCAtMjUsNiArMjUsNiBAQCBQUk9EVUNUX05BTUUg PSBUZXN0V2ViS2l0QVBJOwogR0NDX0VOQUJMRV9PQkpDX0VYQ0VQVElPTlMgPSBZRVM7CiAKIE9U SEVSX0xERkxBR1MgPSAkKGluaGVyaXRlZCkgLWxndGVzdCAtZnJhbWV3b3JrIEphdmFTY3JpcHRD b3JlIC1mcmFtZXdvcmsgV2ViS2l0IC1mcmFtZXdvcmsgV2ViS2l0MiAkKE9USEVSX0xERkxBR1Nf JChQTEFURk9STV9OQU1FKSk7Ci1PVEhFUl9MREZMQUdTX2lwaG9uZW9zID0gLWZyYW1ld29yayBX ZWJDb3JlOworT1RIRVJfTERGTEFHU19pcGhvbmVvcyA9IC1mcmFtZXdvcmsgV2ViQ29yZSAtZnJh bWV3b3JrIENvcmVHcmFwaGljczsKIE9USEVSX0xERkxBR1NfaXBob25lc2ltdWxhdG9yID0gJChP VEhFUl9MREZMQUdTX2lwaG9uZW9zKTsKIE9USEVSX0xERkxBR1NfbWFjb3N4ID0gLWZyYW1ld29y ayBDb2NvYSAtZnJhbWV3b3JrIENhcmJvbjsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggMzhk MjcyOS4uMzc3NmU0MyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0 QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTExMCw2ICsxMTAsNyBA QAogCQk1MkNCNDc0MTE0NDhGQjkzMDA4NzM5OTUgLyogTG9hZEFsdGVybmF0ZUhUTUxTdHJpbmdX aXRoTm9uRGlyZWN0b3J5VVJMLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDUyQ0I0NzQwMTQ0OEZCOTMwMDg3Mzk5NSAvKiBMb2FkQWx0ZXJuYXRlSFRN TFN0cmluZ1dpdGhOb25EaXJlY3RvcnlVUkwuY3BwICovOyB9OwogCQk1MkU1Q0U0NjE0RDIxRTlE MDAzQjJCRDggLyogUGFyZW50RnJhbWUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gNTJFNUNFNDUxNEQyMUU5RDAwM0IyQkQ4IC8qIFBhcmVudEZyYW1l LmNwcCAqLzsgfTsKIAkJNTJFNUNFNDkxNEQyMUVBQjAwM0IyQkQ4IC8qIFBhcmVudEZyYW1lX0J1 bmRsZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1 MkU1Q0U0ODE0RDIxRUFCMDAzQjJCRDggLyogUGFyZW50RnJhbWVfQnVuZGxlLmNwcCAqLzsgfTsK KwkJNzU2MDkxNzUxOTI1NUVFRDAwOUVGMDZFIC8qIE1lbW9yeUNhY2hlQWRkSW1hZ2VUb0NhY2hl Lm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNzU2MDkx NzQxOTI1NUVFRDAwOUVGMDZFIC8qIE1lbW9yeUNhY2hlQWRkSW1hZ2VUb0NhY2hlLm1tICovOyB9 OwogCQk3NUYzMTM0MDE4QzE3MUI3MDA0MUNBRUMgLyogRXBoZW1lcmFsU2Vzc2lvblB1c2hTdGF0 ZU5vSGlzdG9yeUNhbGxiYWNrLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDc1RjMxMzNGMThDMTcxQjcwMDQxQ0FFQyAvKiBFcGhlbWVyYWxTZXNzaW9u UHVzaFN0YXRlTm9IaXN0b3J5Q2FsbGJhY2suY3BwICovOyB9OwogCQk3NkUxODJEQTE1NDc1NTAx MDBGMUZBREQgLyogV2lsbFNlbmRTdWJtaXRFdmVudC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3NkUxODJEOTE1NDc1NTAxMDBGMUZBREQgLyogV2ls bFNlbmRTdWJtaXRFdmVudC5jcHAgKi87IH07CiAJCTc2RTE4MkREMTU0NzU2OTEwMEYxRkFERCAv KiBXaWxsU2VuZFN1Ym1pdEV2ZW50X0J1bmRsZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3NkUxODJEQzE1NDc1NjkxMDBGMUZBREQgLyogV2lsbFNl bmRTdWJtaXRFdmVudF9CdW5kbGUuY3BwICovOyB9OwpAQCAtNDQ1LDYgKzQ0Niw3IEBACiAJCTUy Q0I0NzQwMTQ0OEZCOTMwMDg3Mzk5NSAvKiBMb2FkQWx0ZXJuYXRlSFRNTFN0cmluZ1dpdGhOb25E aXJlY3RvcnlVUkwuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gTG9h ZEFsdGVybmF0ZUhUTUxTdHJpbmdXaXRoTm9uRGlyZWN0b3J5VVJMLmNwcDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJNTJFNUNFNDUxNEQyMUU5RDAwM0IyQkQ4IC8qIFBhcmVudEZyYW1l LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFBhcmVudEZyYW1lLmNw cDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNTJFNUNFNDgxNEQyMUVBQjAwM0IyQkQ4 IC8qIFBhcmVudEZyYW1lX0J1bmRsZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7 IHBhdGggPSBQYXJlbnRGcmFtZV9CdW5kbGUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OworCQk3NTYwOTE3NDE5MjU1RUVEMDA5RUYwNkUgLyogTWVtb3J5Q2FjaGVBZGRJbWFnZVRvQ2Fj aGUubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBNZW1vcnlDYWNo ZUFkZEltYWdlVG9DYWNoZS5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNzVGMzEz M0YxOEMxNzFCNzAwNDFDQUVDIC8qIEVwaGVtZXJhbFNlc3Npb25QdXNoU3RhdGVOb0hpc3RvcnlD YWxsYmFjay5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBFcGhlbWVy YWxTZXNzaW9uUHVzaFN0YXRlTm9IaXN0b3J5Q2FsbGJhY2suY3BwOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQk3NkUxODJEOTE1NDc1NTAxMDBGMUZBREQgLyogV2lsbFNlbmRTdWJtaXRF dmVudC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBXaWxsU2VuZFN1 Ym1pdEV2ZW50LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNzZFMTgyREMxNTQ3 NTY5MTAwRjFGQUREIC8qIFdpbGxTZW5kU3VibWl0RXZlbnRfQnVuZGxlLmNwcCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFdpbGxTZW5kU3VibWl0RXZlbnRfQnVuZGxlLmNw cDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTcxOSw2ICs3MjEsNyBAQAogCQk0NEE4 MkU3QjE5MjUxQjM1MDBDMUM4QzQgLyogQ29jb2EgKi8gPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsK IAkJCWNoaWxkcmVuID0gKAorCQkJCTc1NjA5MTc0MTkyNTVFRUQwMDlFRjA2RSAvKiBNZW1vcnlD YWNoZUFkZEltYWdlVG9DYWNoZS5tbSAqLywKIAkJCQk5M0E3RUIzQzE4RkE2M0E0MDA5RTc2NzAg LyogVVJMRXh0cmFzLm1tICovLAogCQkJKTsKIAkJCXBhdGggPSBDb2NvYTsKQEAgLTEzMTIsNiAr MTMxNSw3IEBACiAJCQkJRTQ5MDI5NjgxNEUyRTNBNDAwMkJFREQxIC8qIFR5cGluZ1N0eWxlQ3Jh c2gubW0gaW4gU291cmNlcyAqLywKIAkJCQkyOTQzQkU4NjE2MURGRUI4MDA5OTlFM0QgLyogVXNl ckNvbnRlbnRUZXN0Lm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJMUE3QkZDMEMxNzFBMEJEQjAwQkM1 RjY0IC8qIFdpbGxTZW5kU3VibWl0RXZlbnQubW0gaW4gU291cmNlcyAqLywKKwkJCQk3NTYwOTE3 NTE5MjU1RUVEMDA5RUYwNkUgLyogTWVtb3J5Q2FjaGVBZGRJbWFnZVRvQ2FjaGUubW0gaW4gU291 cmNlcyAqLywKIAkJCQlCQzIyRDMxNTE0REM2ODk4MDBGRkIxREQgLyogVXNlck1lc3NhZ2UuY3Bw IGluIFNvdXJjZXMgKi8sCiAJCQkJQkM1NUY1RjkxNEFENzhFRTAwNDg0QkUxIC8qIFZlY3Rvci5j cHAgaW4gU291cmNlcyAqLywKIAkJCQkyOTBBOUJCNzE3MzVERThBMDBENzFCQkMgLyogQ2xvc2VO ZXdXaW5kb3dJbk5hdmlnYXRpb25Qb2xpY3lEZWxlZ2F0ZS5tbSBpbiBTb3VyY2VzICovLApkaWZm IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9Db2NvYS9NZW1vcnlDYWNoZUFkZElt YWdlVG9DYWNoZS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvQ29jb2EvTWVtb3J5Q2Fj aGVBZGRJbWFnZVRvQ2FjaGUubW0KbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4u N2RlZTY4MQotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvQ29j b2EvTWVtb3J5Q2FjaGVBZGRJbWFnZVRvQ2FjaGUubW0KQEAgLTAsMCArMSw0NSBAQAorLyoKKyAq IENvcHlyaWdodCAoQykgMjAxNCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgor ICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0 aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1 dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICog ICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9k dWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50 YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRp b24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJ VFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQg V0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElF RCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNV TEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJ TkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5E SVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJ QUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9G CisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1Ig UFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5E IE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RS SUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNF KQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUs IEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgor ICovCisKKyNpbXBvcnQgImNvbmZpZy5oIgorI2ltcG9ydCAiUGxhdGZvcm1VdGlsaXRpZXMuaCIK KyNpbXBvcnQgPFdlYktpdC9XZWJDYWNoZS5oPgorCituYW1lc3BhY2UgVGVzdFdlYktpdEFQSSB7 CisKK1RFU1QoV2ViS2l0MSwgTWVtb3J5Q2FjaGVBZGRJbWFnZVRvQ2FjaGUpCit7CisjaWYgVEFS R0VUX09TX0lQSE9ORQorICAgIENHQ29sb3JTcGFjZVJlZiByZ2IgPSBDR0NvbG9yU3BhY2VDcmVh dGVEZXZpY2VSR0IoKTsKKyAgICB1aW50MzJfdCBwaXhlbCA9IDA7CisgICAgQ0dEYXRhUHJvdmlk ZXJSZWYgcHJvdmlkZXIgPSBDR0RhdGFQcm92aWRlckNyZWF0ZVdpdGhEYXRhKG51bGxwdHIsICZw aXhlbCwgNCwgbnVsbHB0cik7CisgICAgQ0dJbWFnZVJlZiBpbWFnZSA9IENHSW1hZ2VDcmVhdGUo MSwgMSwgOCwgMzIsIDQsIHJnYiwga0NHSW1hZ2VBbHBoYUZpcnN0IHwga0NHQml0bWFwQnl0ZU9y ZGVyRGVmYXVsdCwgcHJvdmlkZXIsIG51bGxwdHIsIGZhbHNlLCBrQ0dSZW5kZXJpbmdJbnRlbnRE ZWZhdWx0KTsKKyAgICBOU1VSTCogdXJsID0gW05TVVJMIFVSTFdpdGhTdHJpbmc6QCJhYm91dDpi bGFuayJdOworICAgIEVYUEVDVF9UUlVFKFtXZWJDYWNoZSBhZGRJbWFnZVRvQ2FjaGU6aW1hZ2Ug Zm9yVVJMOnVybF0pOworICAgIEVYUEVDVF9UUlVFKFtXZWJDYWNoZSBpbWFnZUZvclVSTDp1cmxd ID09IGltYWdlKTsKKyNlbmRpZgorfQorCit9IC8vIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJCg== 231561 2014-05-16 00:30:05 -0700 2014-05-16 09:34:10 -0700 address comments addimage.03.diff text/plain 9758 mhock ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwNmIwMTQyLi4yMDYzMDU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTQtMDUtMTYgIE1hcnRpbiBIb2NrICA8bWhvY2tAYXBwbGUuY29tPgorCisgICAgICAg IE1lbW9yeUNhY2hlOjphZGRJbWFnZVRvQ2FjaGUgc2hvdWxkIHJldHVybiB0aGUgcmVzdWx0IG9m IGFkZCgpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTMyOTI4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjY1MTU0Nz4KKworICAgICAgICBSZXZp ZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292LgorCisgICAgICAgIEFQSSB0ZXN0OiBXZWJLaXQx Lk1lbW9yeUNhY2hlQURkSW1hZ2VUb0NhY2hlIChNZW1vcnlDYWNoZUFkZEltYWdlVG9DYWNoZUlP Uy5tbSkKKworICAgICAgICAqIGxvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpNZW1vcnlDYWNoZTo6YWRkSW1hZ2VUb0NhY2hlKToKKwogMjAxNC0wNS0xNSAg RGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgQXR0ZW1wdCB0byBm aXggdGhlIEFwcGxlIE1hdmVyaWNrcyBSZWxlYXNlLCBBcHBsZSBNb3VudGFpbkxpb24gUmVsZWFz ZSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3BwCmluZGV4IDQy NDFhZmUuLjkyOGQyZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9N ZW1vcnlDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNh Y2hlLmNwcApAQCAtMjY2LDcgKzI2Niw3IEBAIGJvb2wgTWVtb3J5Q2FjaGU6OmFkZEltYWdlVG9D YWNoZShOYXRpdmVJbWFnZVB0ciBpbWFnZSwgY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0CiAjaWYg RU5BQkxFKENBQ0hFX1BBUlRJVElPTklORykKICAgICBjYWNoZWRJbWFnZS0+cmVzb3VyY2VSZXF1 ZXN0KCkuc2V0Q2FjaGVQYXJ0aXRpb24oY2FjaGVQYXJ0aXRpb24pOwogI2VuZGlmCi0gICAgcmV0 dXJuIHRydWU7CisgICAgcmV0dXJuIGFkZChjYWNoZWRJbWFnZS5yZWxlYXNlKCkpOwogfQogCiB2 b2lkIE1lbW9yeUNhY2hlOjpyZW1vdmVJbWFnZUZyb21DYWNoZShjb25zdCBVUkwmIHVybCwgY29u c3QgU3RyaW5nJiBjYWNoZVBhcnRpdGlvbikKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwY2VjYjAwLi5mZTg3M2E3IDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTQt MDUtMTYgIE1hcnRpbiBIb2NrICA8bWhvY2tAYXBwbGUuY29tPgorCisgICAgICAgIE1lbW9yeUNh Y2hlOjphZGRJbWFnZVRvQ2FjaGUgc2hvdWxkIHJldHVybiB0aGUgcmVzdWx0IG9mIGFkZCgpLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyOTI4Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjY1MTU0Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvQ29uZmlndXJhdGlvbnMv VGVzdFdlYktpdEFQSS54Y2NvbmZpZzoKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RXZWJL aXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJ L1Rlc3RzL2lvcy9NZW1vcnlDYWNoZUFkZEltYWdlVG9DYWNoZUlPUy5tbTogQWRkZWQuCisgICAg ICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKwogMjAxNC0wNS0xNSAgR3l1eW91bmcgS2ltICA8 Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdW1dLMl0gU2tpcCBmYWls aW5nIHVuaXQgdGVzdHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvQ29uZmlndXJh dGlvbnMvVGVzdFdlYktpdEFQSS54Y2NvbmZpZyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvQ29uZmln dXJhdGlvbnMvVGVzdFdlYktpdEFQSS54Y2NvbmZpZwppbmRleCA5NDA5MjYxLi5lMjA1MTc5IDEw MDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL0NvbmZpZ3VyYXRpb25zL1Rlc3RXZWJLaXRB UEkueGNjb25maWcKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9Db25maWd1cmF0aW9ucy9UZXN0 V2ViS2l0QVBJLnhjY29uZmlnCkBAIC0yNSw2ICsyNSw2IEBAIFBST0RVQ1RfTkFNRSA9IFRlc3RX ZWJLaXRBUEk7CiBHQ0NfRU5BQkxFX09CSkNfRVhDRVBUSU9OUyA9IFlFUzsKIAogT1RIRVJfTERG TEFHUyA9ICQoaW5oZXJpdGVkKSAtbGd0ZXN0IC1mcmFtZXdvcmsgSmF2YVNjcmlwdENvcmUgLWZy YW1ld29yayBXZWJLaXQgLWZyYW1ld29yayBXZWJLaXQyICQoT1RIRVJfTERGTEFHU18kKFBMQVRG T1JNX05BTUUpKTsKLU9USEVSX0xERkxBR1NfaXBob25lb3MgPSAtZnJhbWV3b3JrIFdlYkNvcmU7 CitPVEhFUl9MREZMQUdTX2lwaG9uZW9zID0gLWZyYW1ld29yayBXZWJDb3JlIC1mcmFtZXdvcmsg Q29yZUdyYXBoaWNzOwogT1RIRVJfTERGTEFHU19pcGhvbmVzaW11bGF0b3IgPSAkKE9USEVSX0xE RkxBR1NfaXBob25lb3MpOwogT1RIRVJfTERGTEFHU19tYWNvc3ggPSAtZnJhbWV3b3JrIENvY29h IC1mcmFtZXdvcmsgQ2FyYm9uOwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCAzOGQyNzI5Li5i YzU4MTM4IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJL aXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtMTEwLDYgKzExMCw3IEBACiAJCTUy Q0I0NzQxMTQ0OEZCOTMwMDg3Mzk5NSAvKiBMb2FkQWx0ZXJuYXRlSFRNTFN0cmluZ1dpdGhOb25E aXJlY3RvcnlVUkwuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gNTJDQjQ3NDAxNDQ4RkI5MzAwODczOTk1IC8qIExvYWRBbHRlcm5hdGVIVE1MU3RyaW5n V2l0aE5vbkRpcmVjdG9yeVVSTC5jcHAgKi87IH07CiAJCTUyRTVDRTQ2MTREMjFFOUQwMDNCMkJE OCAvKiBQYXJlbnRGcmFtZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSA1MkU1Q0U0NTE0RDIxRTlEMDAzQjJCRDggLyogUGFyZW50RnJhbWUuY3BwICov OyB9OwogCQk1MkU1Q0U0OTE0RDIxRUFCMDAzQjJCRDggLyogUGFyZW50RnJhbWVfQnVuZGxlLmNw cCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDUyRTVDRTQ4 MTREMjFFQUIwMDNCMkJEOCAvKiBQYXJlbnRGcmFtZV9CdW5kbGUuY3BwICovOyB9OworCQk3NTYw OTE3ODE5MjU5QzU5MDA5RUYwNkUgLyogTWVtb3J5Q2FjaGVBZGRJbWFnZVRvQ2FjaGVJT1MubW0g aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3NTYwOTE3NzE5 MjU5QzU5MDA5RUYwNkUgLyogTWVtb3J5Q2FjaGVBZGRJbWFnZVRvQ2FjaGVJT1MubW0gKi87IH07 CiAJCTc1RjMxMzQwMThDMTcxQjcwMDQxQ0FFQyAvKiBFcGhlbWVyYWxTZXNzaW9uUHVzaFN0YXRl Tm9IaXN0b3J5Q2FsbGJhY2suY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gNzVGMzEzM0YxOEMxNzFCNzAwNDFDQUVDIC8qIEVwaGVtZXJhbFNlc3Npb25Q dXNoU3RhdGVOb0hpc3RvcnlDYWxsYmFjay5jcHAgKi87IH07CiAJCTc2RTE4MkRBMTU0NzU1MDEw MEYxRkFERCAvKiBXaWxsU2VuZFN1Ym1pdEV2ZW50LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDc2RTE4MkQ5MTU0NzU1MDEwMEYxRkFERCAvKiBXaWxs U2VuZFN1Ym1pdEV2ZW50LmNwcCAqLzsgfTsKIAkJNzZFMTgyREQxNTQ3NTY5MTAwRjFGQUREIC8q IFdpbGxTZW5kU3VibWl0RXZlbnRfQnVuZGxlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDc2RTE4MkRDMTU0NzU2OTEwMEYxRkFERCAvKiBXaWxsU2Vu ZFN1Ym1pdEV2ZW50X0J1bmRsZS5jcHAgKi87IH07CkBAIC00NDUsNiArNDQ2LDcgQEAKIAkJNTJD QjQ3NDAxNDQ4RkI5MzAwODczOTk1IC8qIExvYWRBbHRlcm5hdGVIVE1MU3RyaW5nV2l0aE5vbkRp cmVjdG9yeVVSTC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBMb2Fk QWx0ZXJuYXRlSFRNTFN0cmluZ1dpdGhOb25EaXJlY3RvcnlVUkwuY3BwOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQk1MkU1Q0U0NTE0RDIxRTlEMDAzQjJCRDggLyogUGFyZW50RnJhbWUu Y3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gUGFyZW50RnJhbWUuY3Bw OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1MkU1Q0U0ODE0RDIxRUFCMDAzQjJCRDgg LyogUGFyZW50RnJhbWVfQnVuZGxlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsg cGF0aCA9IFBhcmVudEZyYW1lX0J1bmRsZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CisJCTc1NjA5MTc3MTkyNTlDNTkwMDlFRjA2RSAvKiBNZW1vcnlDYWNoZUFkZEltYWdlVG9DYWNo ZUlPUy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IE1lbW9yeUNh Y2hlQWRkSW1hZ2VUb0NhY2hlSU9TLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3 NUYzMTMzRjE4QzE3MUI3MDA0MUNBRUMgLyogRXBoZW1lcmFsU2Vzc2lvblB1c2hTdGF0ZU5vSGlz dG9yeUNhbGxiYWNrLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEVw aGVtZXJhbFNlc3Npb25QdXNoU3RhdGVOb0hpc3RvcnlDYWxsYmFjay5jcHA7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCTc2RTE4MkQ5MTU0NzU1MDEwMEYxRkFERCAvKiBXaWxsU2VuZFN1 Ym1pdEV2ZW50LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFdpbGxT ZW5kU3VibWl0RXZlbnQuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3NkUxODJE QzE1NDc1NjkxMDBGMUZBREQgLyogV2lsbFNlbmRTdWJtaXRFdmVudF9CdW5kbGUuY3BwICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gV2lsbFNlbmRTdWJtaXRFdmVudF9CdW5k bGUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNzI0LDYgKzcyNiwxNCBAQAog CQkJcGF0aCA9IENvY29hOwogCQkJc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsKIAkJfTsKKwkJNzU2 MDkxNzYxOTI1OUM1OTAwOUVGMDZFIC8qIGlvcyAqLyA9IHsKKwkJCWlzYSA9IFBCWEdyb3VwOwor CQkJY2hpbGRyZW4gPSAoCisJCQkJNzU2MDkxNzcxOTI1OUM1OTAwOUVGMDZFIC8qIE1lbW9yeUNh Y2hlQWRkSW1hZ2VUb0NhY2hlSU9TLm1tICovLAorCQkJKTsKKwkJCXBhdGggPSBpb3M7CisJCQlz b3VyY2VUcmVlID0gIjxncm91cD4iOworCQl9OwogCQlCQzAyOUIxQTE0ODZCMjM4MDA4MTdEQTkg LyogbnMgKi8gPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsKIAkJCWNoaWxkcmVuID0gKApAQCAtOTYy LDYgKzk3Miw3IEBACiAJCQljaGlsZHJlbiA9ICgKIAkJCQk0NEE4MkU3QjE5MjUxQjM1MDBDMUM4 QzQgLyogQ29jb2EgKi8sCiAJCQkJRkUyMTdFQ0IxNjQwQTU0QTAwNTI5ODhCIC8qIEphdmFTY3Jp cHRDb3JlICovLAorCQkJCTc1NjA5MTc2MTkyNTlDNTkwMDlFRjA2RSAvKiBpb3MgKi8sCiAJCQkJ QzA3RTZDQUQxM0ZENjc2NTAwMzhCMjJCIC8qIG1hYyAqLywKIAkJCQlDMDg1ODdGOTEzRkVDMzlC MDAxRUY0RTUgLyogVGVzdFdlYktpdEFQSSAqLywKIAkJCQk0NDBBMUQzNjE0QTAxMDAwMDA4QTY2 RjIgLyogV2ViQ29yZSAqLywKQEAgLTExOTksNiArMTIxMCw3IEBACiAJCQkJOTM5QkE5MTcxNDEw MzQxMjAwMUEwMUJEIC8qIERldmljZVNjYWxlRmFjdG9yT25CYWNrLm1tIGluIFNvdXJjZXMgKi8s CiAJCQkJQkNCNjgwNDAxMjZGQkZFMTAwNjQyQTYxIC8qIERvY3VtZW50U3RhcnRVc2VyU2NyaXB0 QWxlcnRDcmFzaC5jcHAgaW4gU291cmNlcyAqLywKIAkJCQkzN0UxMDY0RDE2OTc2Qzg1MDBCNzhC RDAgLyogRE9NSFRNTFRhYmxlQ2VsbENlbGxBYm92ZS5tbSBpbiBTb3VyY2VzICovLAorCQkJCTc1 NjA5MTc4MTkyNTlDNTkwMDlFRjA2RSAvKiBNZW1vcnlDYWNoZUFkZEltYWdlVG9DYWNoZUlPUy5t bSBpbiBTb3VyY2VzICovLAogCQkJCTM3NTFBRjdDMTY5NTE4RjgwMDc2NDMxOSAvKiBET01Ob2Rl RnJvbUpTT2JqZWN0Lm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJMzdEQzY3OEQxNDBEN0M1MDAwQUJD Q0RCIC8qIERPTVJhbmdlT2ZTdHJpbmcubW0gaW4gU291cmNlcyAqLywKIAkJCQk1MTM5M0UyMDE1 MjM5NDRBMDA1RjM5QzUgLyogRE9NV2luZG93RXh0ZW5zaW9uQmFzaWMuY3BwIGluIFNvdXJjZXMg Ki8sCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9NZW1vcnlDYWNo ZUFkZEltYWdlVG9DYWNoZUlPUy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL01l bW9yeUNhY2hlQWRkSW1hZ2VUb0NhY2hlSU9TLm1tCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLmMxN2RkODEKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL2lvcy9NZW1vcnlDYWNoZUFkZEltYWdlVG9DYWNoZUlPUy5tbQpAQCAtMCwwICsxLDQ4 IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5 IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBw cm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEu IFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29w eXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0g bXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxp c3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICog ICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhl IGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExF IElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1Mg T1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAq IFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZP UiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNI QUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkg RElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICog Q09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJP Q1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNF LCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVS IENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENP TlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBP UiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJ UyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCisgKi8KKworI2ltcG9ydCAiY29uZmlnLmgiCisjaW1wb3J0ICJQbGF0Zm9ybVV0 aWxpdGllcy5oIgorI2ltcG9ydCA8V2ViS2l0L1dlYkNhY2hlLmg+CisKK25hbWVzcGFjZSBUZXN0 V2ViS2l0QVBJIHsKKworVEVTVChXZWJLaXQxLCBNZW1vcnlDYWNoZUFkZEltYWdlVG9DYWNoZSkK K3sKKyAgICBDR0NvbG9yU3BhY2VSZWYgcmdiID0gQ0dDb2xvclNwYWNlQ3JlYXRlRGV2aWNlUkdC KCk7CisgICAgdWludDMyX3QgcGl4ZWwgPSAwOworICAgIENHRGF0YVByb3ZpZGVyUmVmIHByb3Zp ZGVyID0gQ0dEYXRhUHJvdmlkZXJDcmVhdGVXaXRoRGF0YShudWxscHRyLCAmcGl4ZWwsIDQsIG51 bGxwdHIpOworICAgIENHSW1hZ2VSZWYgaW1hZ2UgPSBDR0ltYWdlQ3JlYXRlKDEsIDEsIDgsIDMy LCA0LCByZ2IsIGtDR0ltYWdlQWxwaGFGaXJzdCB8IGtDR0JpdG1hcEJ5dGVPcmRlckRlZmF1bHQs IHByb3ZpZGVyLCBudWxscHRyLCBmYWxzZSwga0NHUmVuZGVyaW5nSW50ZW50RGVmYXVsdCk7Cisg ICAgTlNVUkwgKnVybCA9IFtOU1VSTCBVUkxXaXRoU3RyaW5nOkAiYWJvdXQ6YmxhbmsiXTsKKyAg ICBFWFBFQ1RfVFJVRShbV2ViQ2FjaGUgYWRkSW1hZ2VUb0NhY2hlOmltYWdlIGZvclVSTDp1cmxd KTsKKyAgICBFWFBFQ1RfRVEoaW1hZ2UsIFtXZWJDYWNoZSBpbWFnZUZvclVSTDp1cmxdKTsKKyAg ICAvLyBCeSBkZXNpZ24sIHJlbW92ZUltYWdlRnJvbUNhY2hlRm9yVVJMIGRvZXNuJ3QgbmVjZXNz YXJpbHkgcmVtb3ZlIHRoZSByZXNvdXJjZSBmcm9tIHRoZSBjYWNoZSwKKyAgICAvLyBqdXN0IG1h a2VzIGl0IHBydW5lYWJsZSwgc28gd2UgY2FuJ3QgcmVhbGx5IHRlc3QgcmVtb3ZlLgorICAgIENH SW1hZ2VSZWxlYXNlKGltYWdlKTsKKyAgICBDR0RhdGFQcm92aWRlclJlbGVhc2UocHJvdmlkZXIp OworICAgIENHQ29sb3JTcGFjZVJlbGVhc2UocmdiKTsKK30KKworfSAvLyBuYW1lc3BhY2UgVGVz dFdlYktpdEFQSQo=