66132 2011-08-12 04:11:06 -0700 Chromium: expose MemoryCache::prune and FontCache::purgeInactiveFontData 2011-08-25 08:07:52 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 66259 1 mnaganov mnaganov abarth dglazkov fishd satish tony tonyg webkit.review.bot oldest_to_newest 450376 0 mnaganov 2011-08-12 04:11:06 -0700 For handling low-memory situations we need to call MemoryCache::prune and FontCache::purgeInactiveFontData. Need to have them in WebCache and WebFontCache. 450377 1 103757 mnaganov 2011-08-12 04:13:53 -0700 Created attachment 103757 Patch 450379 2 webkit.review.bot 2011-08-12 04:17:08 -0700 Attachment 103757 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/chromium/ChangeLog', u'Sourc..." exit_code: 1 Source/WebKit/chromium/src/WebCache.cpp:113: One line control clauses should not use braces. [whitespace/braces] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 450380 3 103758 mnaganov 2011-08-12 04:17:29 -0700 Created attachment 103758 Patch 450381 4 webkit.review.bot 2011-08-12 04:20:02 -0700 Attachment 103758 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/chromium/ChangeLog', u'Sourc..." exit_code: 1 Source/WebKit/chromium/src/WebCache.cpp:113: One line control clauses should not use braces. [whitespace/braces] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 450383 5 103758 webkit.review.bot 2011-08-12 04:22:33 -0700 Comment on attachment 103758 Patch Attachment 103758 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/9358590 450389 6 103758 webkit.review.bot 2011-08-12 04:48:55 -0700 Comment on attachment 103758 Patch Attachment 103758 did not pass cr-mac-ews (chromium): Output: http://queues.webkit.org/results/9358594 450392 7 103761 mnaganov 2011-08-12 04:51:35 -0700 Created attachment 103761 Fixed style and compilation issues 450393 8 tonyg 2011-08-12 04:55:17 -0700 This looks good to me. Darin should probably approve though since it is adding to the WebKit/chromium API. 450445 9 103761 fishd 2011-08-12 08:58:08 -0700 Comment on attachment 103761 Fixed style and compilation issues View in context: https://bugs.webkit.org/attachment.cgi?id=103761&action=review > Source/WebKit/chromium/public/WebCache.h:83 > + // Prune memory cache. nit: all of the other comments say "resource cache" instead of "memory cache" I'd probably move this method to be next to "clear", and it would be very helpful if you could document the difference between clear and prune. they sound like synonyms, but they aren't, right? makes consumers of this API have to wonder and search .cpp files for the answer :( > Source/WebKit/chromium/public/WebFontCache.h:51 > + WEBKIT_EXPORT static void purgeInactiveFontData(); would it make sense to also name this function "prune"? it seems like we might want to use consistent jargon. 451001 10 mnaganov 2011-08-15 02:08:46 -0700 (In reply to comment #9) > (From update of attachment 103761 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=103761&action=review > > > Source/WebKit/chromium/public/WebCache.h:83 > > + // Prune memory cache. > > nit: all of the other comments say "resource cache" instead of "memory cache" > Done. > I'd probably move this method to be next to "clear", and it would be very > helpful if you could document the difference between clear and prune. they > sound like synonyms, but they aren't, right? makes consumers of this API > have to wonder and search .cpp files for the answer :( > Done. Also by searching .cpp files, I've found that "clear" actually duplicates already existing "MemoryCache::evictResources" method. > > Source/WebKit/chromium/public/WebFontCache.h:51 > > + WEBKIT_EXPORT static void purgeInactiveFontData(); > > would it make sense to also name this function "prune"? it seems like > we might want to use consistent jargon. Done. 451003 11 103894 mnaganov 2011-08-15 02:10:00 -0700 Created attachment 103894 Comments addressed 451151 12 103894 fishd 2011-08-15 11:06:06 -0700 Comment on attachment 103894 Comments addressed View in context: https://bugs.webkit.org/attachment.cgi?id=103894&action=review > Source/WebKit/chromium/src/WebCache.cpp:70 > + cache->evictResources(); nice! 451294 13 mnaganov 2011-08-15 14:29:40 -0700 Manually committed https://trac.webkit.org/changeset/93060 2011-08-15 Mikhail Naganov <mnaganov@chromium.org> Chromium: expose MemoryCache::prune and FontCache::purgeInactiveFontData. https://bugs.webkit.org/show_bug.cgi?id=66132 Reviewed by Darin Fisher. * public/WebCache.h: * public/WebFontCache.h: * src/WebCache.cpp: (WebKit::WebCache::prune): * src/WebFontCache.cpp: (WebKit::WebFontCache::prune): 451319 14 tony 2011-08-15 15:16:00 -0700 The chromium win bots on build.webkit.org seem to be failing to link with the following error: 15>webkit.lib(WebCache.obj) : error LNK2019: unresolved external symbol "public: void __thiscall WebCore::MemoryCache::pruneLiveResources(void)" (?pruneLiveResources@MemoryCache@WebCore@@QAEXXZ) referenced in function "public: void __thiscall WebCore::MemoryCache::prune(void)" (?prune@MemoryCache@WebCore@@QAEXXZ) 15>webkit.lib(WebCache.obj) : error LNK2019: unresolved external symbol "public: void __thiscall WebCore::MemoryCache::pruneDeadResources(void)" (?pruneDeadResources@MemoryCache@WebCore@@QAEXXZ) referenced in function "public: void __thiscall WebCore::MemoryCache::prune(void)" (?prune@MemoryCache@WebCore@@QAEXXZ) 451347 15 abarth 2011-08-15 15:51:08 -0700 I've rolled out this commit because of the Windows build failures. 456839 16 105186 mnaganov 2011-08-25 07:30:38 -0700 Created attachment 105186 Fixed Windows Chromium port compilation issue For some reason, VC++ compiler assumes that 'pruneLiveResources' and 'pruneDeadResources' are public. The issue is resolved by converting inline definitions of 'prune' and 'pruneToPercentage' into regular methods defined in .cpp file. 456861 17 mnaganov 2011-08-25 08:07:52 -0700 Manually committed http://trac.webkit.org/changeset/93782 Chromium: expose MemoryCache::prune and FontCache::purgeInactiveFontData. https://bugs.webkit.org/show_bug.cgi?id=66132 Reviewed by Tony Gentilcore. * loader/cache/MemoryCache.cpp: (WebCore::MemoryCache::prune): (WebCore::MemoryCache::pruneToPercentage): * loader/cache/MemoryCache.h: Methods moved from .h to .cpp to work around compilation problem with the Win Chromium port. * public/WebCache.h: * public/WebFontCache.h: * src/WebCache.cpp: (WebKit::WebCache::clear): (WebKit::WebCache::prune): * src/WebFontCache.cpp: (WebKit::WebFontCache::prune): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@93782 268f45cc-cd09-0410-ab3c-d52691b4dbfc 103757 2011-08-12 04:13:53 -0700 2011-08-12 04:17:29 -0700 Patch patch-66132 application/octet-stream 2705 mnaganov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggMDQ1ZmRlOS4uMWJmNTQ1YSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMS0wOC0xMiAgTWlraGFpbCBO YWdhbm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIENocm9taXVtOiBleHBv c2UgTWVtb3J5Q2FjaGU6OnBydW5lIGFuZCBGb250Q2FjaGU6OnB1cmdlSW5hY3RpdmVGb250RGF0 YS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MTMy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwdWJs aWMvV2ViQ2FjaGUuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViRm9udENhY2hlLmg6CisgICAgICAg ICogc3JjL1dlYkNhY2hlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ2FjaGU6OnBydW5lKToK KyAgICAgICAgKiBzcmMvV2ViRm9udENhY2hlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRm9u dENhY2hlOjpwdXJnZUluYWN0aXZlRm9udERhdGEpOgorCiAyMDExLTA4LTAzICBLZW50YXJvIEhh cmEgIDxoYXJha2VuQGdvb2dsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IEV2ZW50U2VuZGVy LnNjYWxlUGFnZUJ5KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYkNhY2hlLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJDYWNoZS5oCmlu ZGV4IGU4YTE4ZDMuLmJmZjVlNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYkNhY2hlLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi Q2FjaGUuaApAQCAtODAsNiArODAsOSBAQCBwdWJsaWM6CiAgICAgLy8gR2V0IHVzYWdlIHN0YXRz IGFib3V0IHRoZSByZXNvdXJjZSBjYWNoZS4KICAgICBXRUJLSVRfQVBJIHN0YXRpYyB2b2lkIGdl dFJlc291cmNlVHlwZVN0YXRzKFJlc291cmNlVHlwZVN0YXRzKik7CiAKKyAgICAvLyBQcnVuZSBt ZW1vcnkgY2FjaGUuCisgICAgV0VCS0lUX0FQSSBzdGF0aWMgdm9pZCBwcnVuZSgpOworCiBwcml2 YXRlOgogICAgIFdlYkNhY2hlKCk7ICAvLyBOb3QgaW50ZW5kZWQgdG8gYmUgaW5zdGFuY2VkLgog fTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZvbnRDYWNo ZS5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRm9udENhY2hlLmgKaW5kZXgg MDVhYWRjNy4uNzM1ZTlmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViRm9udENhY2hlLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi Rm9udENhY2hlLmgKQEAgLTQ3LDYgKzQ3LDkgQEAgcHVibGljOgogICAgIC8vIENsZWFycyB0aGUg Y2FjaGUuCiAgICAgV0VCS0lUX0FQSSBzdGF0aWMgdm9pZCBjbGVhcigpOwogCisgICAgLy8gUHVy Z2VzIGluYWN0aXZlIGZvbnQgZGF0YS4KKyAgICBXRUJLSVRfQVBJIHN0YXRpYyB2b2lkIHB1cmdl SW5hY3RpdmVGb250RGF0YSgpOworCiBwcml2YXRlOgogICAgIFdlYkZvbnRDYWNoZSgpOyAgLy8g Tm90IGludGVuZGVkIHRvIGJlIGluc3RhbmNlZC4KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJDYWNoZS5jcHAKaW5kZXggN2RmNGM2Ni4uYzQ1MGY3ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViQ2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYkNhY2hlLmNwcApAQCAtMTA1LDQgKzEwNSwxMiBAQCB2b2lkIFdlYkNhY2hl OjpnZXRSZXNvdXJjZVR5cGVTdGF0cyhSZXNvdXJjZVR5cGVTdGF0cyogcmVzdWx0KQogICAgICAg ICBtZW1zZXQocmVzdWx0LCAwLCBzaXplb2YoV2ViQ2FjaGU6OlJlc291cmNlVHlwZVN0YXRzKSk7 CiB9CiAKK3ZvaWQgV2ViQ2FjaGU6OnBydW5lKCkKK3sKKyAgICBNZW1vcnlDYWNoZSogY2FjaGUg PSBXZWJDb3JlOjptZW1vcnlDYWNoZSgpOworICAgIGlmIChjYWNoZSkgeworICAgICAgICBjYWNo ZS0+cHJ1bmUoKTsKKyAgICB9Cit9CisKIH0gIC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZvbnRDYWNoZS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGb250Q2FjaGUuY3BwCmluZGV4IDUyMzU4ZWMuLjA1MTI1 NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZvbnRDYWNoZS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRm9udENhY2hlLmNwcApAQCAt NTUsNCArNTUsOSBAQCB2b2lkIFdlYkZvbnRDYWNoZTo6Y2xlYXIoKQogICAgIGZvbnRDYWNoZSgp LT5pbnZhbGlkYXRlKCk7CiB9CiAKK3ZvaWQgV2ViRm9udENhY2hlOjpwdXJnZUluYWN0aXZlRm9u dERhdGEoKQoreworICAgIGZvbnRDYWNoZSgpLT5wdXJnZUluYWN0aXZlRm9udERhdGEoKTsKK30K KwogfSAgLy8gbmFtZXNwYWNlIFdlYktpdAo= 103758 2011-08-12 04:17:29 -0700 2011-08-12 04:51:35 -0700 Patch patch-66132 text/plain 2705 mnaganov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggMDQ1ZmRlOS4uMWJmNTQ1YSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMS0wOC0xMiAgTWlraGFpbCBO YWdhbm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIENocm9taXVtOiBleHBv c2UgTWVtb3J5Q2FjaGU6OnBydW5lIGFuZCBGb250Q2FjaGU6OnB1cmdlSW5hY3RpdmVGb250RGF0 YS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MTMy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwdWJs aWMvV2ViQ2FjaGUuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViRm9udENhY2hlLmg6CisgICAgICAg ICogc3JjL1dlYkNhY2hlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ2FjaGU6OnBydW5lKToK KyAgICAgICAgKiBzcmMvV2ViRm9udENhY2hlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRm9u dENhY2hlOjpwdXJnZUluYWN0aXZlRm9udERhdGEpOgorCiAyMDExLTA4LTAzICBLZW50YXJvIEhh cmEgIDxoYXJha2VuQGdvb2dsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IEV2ZW50U2VuZGVy LnNjYWxlUGFnZUJ5KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYkNhY2hlLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJDYWNoZS5oCmlu ZGV4IGU4YTE4ZDMuLmJmZjVlNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYkNhY2hlLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi Q2FjaGUuaApAQCAtODAsNiArODAsOSBAQCBwdWJsaWM6CiAgICAgLy8gR2V0IHVzYWdlIHN0YXRz IGFib3V0IHRoZSByZXNvdXJjZSBjYWNoZS4KICAgICBXRUJLSVRfQVBJIHN0YXRpYyB2b2lkIGdl dFJlc291cmNlVHlwZVN0YXRzKFJlc291cmNlVHlwZVN0YXRzKik7CiAKKyAgICAvLyBQcnVuZSBt ZW1vcnkgY2FjaGUuCisgICAgV0VCS0lUX0FQSSBzdGF0aWMgdm9pZCBwcnVuZSgpOworCiBwcml2 YXRlOgogICAgIFdlYkNhY2hlKCk7ICAvLyBOb3QgaW50ZW5kZWQgdG8gYmUgaW5zdGFuY2VkLgog fTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZvbnRDYWNo ZS5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRm9udENhY2hlLmgKaW5kZXgg MDVhYWRjNy4uNzM1ZTlmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViRm9udENhY2hlLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi Rm9udENhY2hlLmgKQEAgLTQ3LDYgKzQ3LDkgQEAgcHVibGljOgogICAgIC8vIENsZWFycyB0aGUg Y2FjaGUuCiAgICAgV0VCS0lUX0FQSSBzdGF0aWMgdm9pZCBjbGVhcigpOwogCisgICAgLy8gUHVy Z2VzIGluYWN0aXZlIGZvbnQgZGF0YS4KKyAgICBXRUJLSVRfQVBJIHN0YXRpYyB2b2lkIHB1cmdl SW5hY3RpdmVGb250RGF0YSgpOworCiBwcml2YXRlOgogICAgIFdlYkZvbnRDYWNoZSgpOyAgLy8g Tm90IGludGVuZGVkIHRvIGJlIGluc3RhbmNlZC4KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJDYWNoZS5jcHAKaW5kZXggN2RmNGM2Ni4uYzQ1MGY3ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViQ2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYkNhY2hlLmNwcApAQCAtMTA1LDQgKzEwNSwxMiBAQCB2b2lkIFdlYkNhY2hl OjpnZXRSZXNvdXJjZVR5cGVTdGF0cyhSZXNvdXJjZVR5cGVTdGF0cyogcmVzdWx0KQogICAgICAg ICBtZW1zZXQocmVzdWx0LCAwLCBzaXplb2YoV2ViQ2FjaGU6OlJlc291cmNlVHlwZVN0YXRzKSk7 CiB9CiAKK3ZvaWQgV2ViQ2FjaGU6OnBydW5lKCkKK3sKKyAgICBNZW1vcnlDYWNoZSogY2FjaGUg PSBXZWJDb3JlOjptZW1vcnlDYWNoZSgpOworICAgIGlmIChjYWNoZSkgeworICAgICAgICBjYWNo ZS0+cHJ1bmUoKTsKKyAgICB9Cit9CisKIH0gIC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZvbnRDYWNoZS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGb250Q2FjaGUuY3BwCmluZGV4IDUyMzU4ZWMuLjA1MTI1 NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZvbnRDYWNoZS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRm9udENhY2hlLmNwcApAQCAt NTUsNCArNTUsOSBAQCB2b2lkIFdlYkZvbnRDYWNoZTo6Y2xlYXIoKQogICAgIGZvbnRDYWNoZSgp LT5pbnZhbGlkYXRlKCk7CiB9CiAKK3ZvaWQgV2ViRm9udENhY2hlOjpwdXJnZUluYWN0aXZlRm9u dERhdGEoKQoreworICAgIGZvbnRDYWNoZSgpLT5wdXJnZUluYWN0aXZlRm9udERhdGEoKTsKK30K KwogfSAgLy8gbmFtZXNwYWNlIFdlYktpdAo= 103761 2011-08-12 04:51:35 -0700 2011-08-15 02:10:00 -0700 Fixed style and compilation issues patch-66132 text/plain 2740 mnaganov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggOTI3MjgzOS4uOTk4ZjMyOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMS0wOC0xMiAgTWlraGFpbCBO YWdhbm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIENocm9taXVtOiBleHBv c2UgTWVtb3J5Q2FjaGU6OnBydW5lIGFuZCBGb250Q2FjaGU6OnB1cmdlSW5hY3RpdmVGb250RGF0 YS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MTMy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwdWJs aWMvV2ViQ2FjaGUuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViRm9udENhY2hlLmg6CisgICAgICAg ICogc3JjL1dlYkNhY2hlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ2FjaGU6OnBydW5lKToK KyAgICAgICAgKiBzcmMvV2ViRm9udENhY2hlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRm9u dENhY2hlOjpwdXJnZUluYWN0aXZlRm9udERhdGEpOgorCiAyMDExLTA4LTEwICBBbmRyZXkgS29z eWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gUm9sbGVk IERFUFMgOTU4MTM6OTYwMDkgdG8gcGljayBkYXRhIHVybCB0aW1pbmcgZml4LgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQ2FjaGUuaCBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYkNhY2hlLmgKaW5kZXggYmE5M2ZlOC4uODQwMTZkMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQ2FjaGUuaAorKysgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJDYWNoZS5oCkBAIC04MCw2ICs4MCw5IEBA IHB1YmxpYzoKICAgICAvLyBHZXQgdXNhZ2Ugc3RhdHMgYWJvdXQgdGhlIHJlc291cmNlIGNhY2hl LgogICAgIFdFQktJVF9FWFBPUlQgc3RhdGljIHZvaWQgZ2V0UmVzb3VyY2VUeXBlU3RhdHMoUmVz b3VyY2VUeXBlU3RhdHMqKTsKIAorICAgIC8vIFBydW5lIG1lbW9yeSBjYWNoZS4KKyAgICBXRUJL SVRfRVhQT1JUIHN0YXRpYyB2b2lkIHBydW5lKCk7CisKIHByaXZhdGU6CiAgICAgV2ViQ2FjaGUo KTsgIC8vIE5vdCBpbnRlbmRlZCB0byBiZSBpbnN0YW5jZWQuCiB9OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRm9udENhY2hlLmggYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJGb250Q2FjaGUuaAppbmRleCBmYzVlM2Y2Li5lZDAyZTJiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGb250Q2FjaGUuaAor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGb250Q2FjaGUuaApAQCAtNDcs NiArNDcsOSBAQCBwdWJsaWM6CiAgICAgLy8gQ2xlYXJzIHRoZSBjYWNoZS4KICAgICBXRUJLSVRf RVhQT1JUIHN0YXRpYyB2b2lkIGNsZWFyKCk7CiAKKyAgICAvLyBQdXJnZXMgaW5hY3RpdmUgZm9u dCBkYXRhLgorICAgIFdFQktJVF9FWFBPUlQgc3RhdGljIHZvaWQgcHVyZ2VJbmFjdGl2ZUZvbnRE YXRhKCk7CisKIHByaXZhdGU6CiAgICAgV2ViRm9udENhY2hlKCk7ICAvLyBOb3QgaW50ZW5kZWQg dG8gYmUgaW5zdGFuY2VkLgogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYkNhY2hlLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkNhY2hlLmNw cAppbmRleCA3ZGY0YzY2Li5lNDRiYmIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Q2FjaGUuY3BwCkBAIC0xMDUsNCArMTA1LDExIEBAIHZvaWQgV2ViQ2FjaGU6OmdldFJlc291cmNl VHlwZVN0YXRzKFJlc291cmNlVHlwZVN0YXRzKiByZXN1bHQpCiAgICAgICAgIG1lbXNldChyZXN1 bHQsIDAsIHNpemVvZihXZWJDYWNoZTo6UmVzb3VyY2VUeXBlU3RhdHMpKTsKIH0KIAordm9pZCBX ZWJDYWNoZTo6cHJ1bmUoKQoreworICAgIE1lbW9yeUNhY2hlKiBjYWNoZSA9IFdlYkNvcmU6Om1l bW9yeUNhY2hlKCk7CisgICAgaWYgKGNhY2hlKQorICAgICAgICBjYWNoZS0+cHJ1bmUoKTsKK30K KwogfSAgLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViRm9udENhY2hlLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YkZvbnRDYWNoZS5jcHAKaW5kZXggNTIzNThlYy4uMDUxMjU0OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRm9udENhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJGb250Q2FjaGUuY3BwCkBAIC01NSw0ICs1NSw5IEBAIHZvaWQgV2Vi Rm9udENhY2hlOjpjbGVhcigpCiAgICAgZm9udENhY2hlKCktPmludmFsaWRhdGUoKTsKIH0KIAor dm9pZCBXZWJGb250Q2FjaGU6OnB1cmdlSW5hY3RpdmVGb250RGF0YSgpCit7CisgICAgZm9udENh Y2hlKCktPnB1cmdlSW5hY3RpdmVGb250RGF0YSgpOworfQorCiB9ICAvLyBuYW1lc3BhY2UgV2Vi S2l0Cg== 103894 2011-08-15 02:10:00 -0700 2011-08-25 07:30:38 -0700 Comments addressed patch-66132 text/plain 3238 mnaganov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggZDBiOTQzMi4uNTVlMzFhZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMS0wOC0xMiAgTWlraGFpbCBO YWdhbm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIENocm9taXVtOiBleHBv c2UgTWVtb3J5Q2FjaGU6OnBydW5lIGFuZCBGb250Q2FjaGU6OnB1cmdlSW5hY3RpdmVGb250RGF0 YS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MTMy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwdWJs aWMvV2ViQ2FjaGUuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViRm9udENhY2hlLmg6CisgICAgICAg ICogc3JjL1dlYkNhY2hlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ2FjaGU6OnBydW5lKToK KyAgICAgICAgKiBzcmMvV2ViRm9udENhY2hlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRm9u dENhY2hlOjpwcnVuZSk6CisKIDIwMTEtMDgtMTEgIEpvaG4gQmF1bWFuICA8amJhdW1hbkBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgUmVhZGJhY2sgY29tcG9zaXRlZCB3ZWJnbCByZXN1bHRzIGZv ciBwcmludGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi Q2FjaGUuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkNhY2hlLmgKaW5kZXgg YmE5M2ZlOC4uMzQ3MGI2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViQ2FjaGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJDYWNo ZS5oCkBAIC03MSw5ICs3MSwxNCBAQCBwdWJsaWM6CiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHNpemVfdCBjYXBhY2l0eSk7CiAKICAgICAvLyBDbGVhcnMgdGhl IGNhY2hlIChhcyBtdWNoIGFzIHBvc3NpYmxlOyBzb21lIHJlc291cmNlcyBtYXkgbm90IGJlCi0g ICAgLy8gY2xlYXJlZCBpZiB0aGV5IGFyZSBhY3RpdmVseSByZWZlcmVuY2VkKS4KKyAgICAvLyBj bGVhcmVkIGlmIHRoZXkgYXJlIGFjdGl2ZWx5IHJlZmVyZW5jZWQpLiBOb3RlIHRoYXQgdGhpcyBt ZXRob2QKKyAgICAvLyBvbmx5IHJlbW92ZXMgcmVzb3VyY2VzIGZyb20gbGl2ZSBsaXN0LCB3L28g cmVsZWFzaW5nIGNhY2hlIG1lbW9yeS4KICAgICBXRUJLSVRfRVhQT1JUIHN0YXRpYyB2b2lkIGNs ZWFyKCk7CiAKKyAgICAvLyBQcnVuZXMgcmVzb3VyY2UgY2FjaGUuIERlc3Ryb3lzIGRlY29kZWQg aW1hZ2VzIGRhdGEgYW5kIHJldHVybnMKKyAgICAvLyBtZW1vcnkgdG8gdGhlIHN5c3RlbS4KKyAg ICBXRUJLSVRfRVhQT1JUIHN0YXRpYyB2b2lkIHBydW5lKCk7CisKICAgICAvLyBHZXRzIHRoZSB1 c2FnZSBzdGF0aXN0aWNzIGZyb20gdGhlIHJlc291cmNlIGNhY2hlLgogICAgIFdFQktJVF9FWFBP UlQgc3RhdGljIHZvaWQgZ2V0VXNhZ2VTdGF0cyhVc2FnZVN0YXRzKik7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZvbnRDYWNoZS5oIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRm9udENhY2hlLmgKaW5kZXggZmM1ZTNmNi4uNThhY2U4 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRm9udENhY2hl LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRm9udENhY2hlLmgKQEAg LTQ3LDYgKzQ3LDkgQEAgcHVibGljOgogICAgIC8vIENsZWFycyB0aGUgY2FjaGUuCiAgICAgV0VC S0lUX0VYUE9SVCBzdGF0aWMgdm9pZCBjbGVhcigpOwogCisgICAgLy8gUHVyZ2VzIGluYWN0aXZl IGZvbnQgZGF0YS4KKyAgICBXRUJLSVRfRVhQT1JUIHN0YXRpYyB2b2lkIHBydW5lKCk7CisKIHBy aXZhdGU6CiAgICAgV2ViRm9udENhY2hlKCk7ICAvLyBOb3QgaW50ZW5kZWQgdG8gYmUgaW5zdGFu Y2VkLgogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkNhY2hl LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkNhY2hlLmNwcAppbmRleCA3ZGY0 YzY2Li5mYTI2MGNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJD YWNoZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViQ2FjaGUuY3BwCkBA IC02NiwxMCArNjYsMTUgQEAgdm9pZCBXZWJDYWNoZTo6c2V0Q2FwYWNpdGllcygKIHZvaWQgV2Vi Q2FjaGU6OmNsZWFyKCkKIHsKICAgICBNZW1vcnlDYWNoZSogY2FjaGUgPSBXZWJDb3JlOjptZW1v cnlDYWNoZSgpOwotICAgIGlmIChjYWNoZSAmJiAhY2FjaGUtPmRpc2FibGVkKCkpIHsKLSAgICAg ICAgY2FjaGUtPnNldERpc2FibGVkKHRydWUpOwotICAgICAgICBjYWNoZS0+c2V0RGlzYWJsZWQo ZmFsc2UpOwotICAgIH0KKyAgICBpZiAoY2FjaGUpCisgICAgICAgIGNhY2hlLT5ldmljdFJlc291 cmNlcygpOworfQorCit2b2lkIFdlYkNhY2hlOjpwcnVuZSgpCit7CisgICAgTWVtb3J5Q2FjaGUq IGNhY2hlID0gV2ViQ29yZTo6bWVtb3J5Q2FjaGUoKTsKKyAgICBpZiAoY2FjaGUpCisgICAgICAg IGNhY2hlLT5wcnVuZSgpOwogfQogCiB2b2lkIFdlYkNhY2hlOjpnZXRVc2FnZVN0YXRzKFVzYWdl U3RhdHMqIHJlc3VsdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YkZvbnRDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGb250Q2FjaGUu Y3BwCmluZGV4IDUyMzU4ZWMuLmFhNjU3MDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYkZvbnRDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViRm9udENhY2hlLmNwcApAQCAtNTUsNCArNTUsMTAgQEAgdm9pZCBXZWJGb250Q2FjaGU6 OmNsZWFyKCkKICAgICBmb250Q2FjaGUoKS0+aW52YWxpZGF0ZSgpOwogfQogCisvLyBzdGF0aWMK K3ZvaWQgV2ViRm9udENhY2hlOjpwcnVuZSgpCit7CisgICAgZm9udENhY2hlKCktPnB1cmdlSW5h Y3RpdmVGb250RGF0YSgpOworfQorCiB9ICAvLyBuYW1lc3BhY2UgV2ViS2l0Cg== 105186 2011-08-25 07:30:38 -0700 2011-08-25 07:32:21 -0700 Fixed Windows Chromium port compilation issue patch-66132 text/plain 6207 mnaganov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxMjQ4ZTA5Li42ZDEwZmRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMDgtMjUgIE1pa2hhaWwgTmFnYW5vdiAgPG1uYWdhbm92QGNocm9taXVtLm9yZz4K KworICAgICAgICBDaHJvbWl1bTogZXhwb3NlIE1lbW9yeUNhY2hlOjpwcnVuZSBhbmQgRm9udENh Y2hlOjpwdXJnZUluYWN0aXZlRm9udERhdGEuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02NjEzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Ok1lbW9yeUNhY2hlOjpwcnVuZSk6CisgICAgICAgIChXZWJDb3JlOjpNZW1v cnlDYWNoZTo6cHJ1bmVUb1BlcmNlbnRhZ2UpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9NZW1v cnlDYWNoZS5oOiBNZXRob2RzIG1vdmVkIGZyb20gLmggdG8gLmNwcCB0byB3b3JrIGFyb3VuZCBj b21waWxhdGlvbiBwcm9ibGVtIHdpdGggdGhlIFdpbiBDaHJvbWl1bSBwb3J0LgorCiAyMDExLTA4 LTI1ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAg ICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByOTM3NzEuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L2NhY2hlL01lbW9yeUNhY2hlLmNwcAppbmRleCA3NTY4YjQ1Li42ZWM2NDAwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5jcHAKQEAgLTY5Nyw2ICs2OTcsMjIg QEAgdm9pZCBNZW1vcnlDYWNoZTo6ZXZpY3RSZXNvdXJjZXMoKQogICAgIHNldERpc2FibGVkKGZh bHNlKTsKIH0KIAordm9pZCBNZW1vcnlDYWNoZTo6cHJ1bmUoKQoreworICAgIGlmIChtX2xpdmVT aXplICsgbV9kZWFkU2l6ZSA8PSBtX2NhcGFjaXR5ICYmIG1fbWF4RGVhZENhcGFjaXR5ICYmIG1f ZGVhZFNpemUgPD0gbV9tYXhEZWFkQ2FwYWNpdHkpIC8vIEZhc3QgcGF0aC4KKyAgICAgICAgcmV0 dXJuOworICAgICAgICAKKyAgICBwcnVuZURlYWRSZXNvdXJjZXMoKTsgLy8gUHJ1bmUgZGVhZCBm aXJzdCwgaW4gY2FzZSBpdCB3YXMgImJvcnJvd2luZyIgY2FwYWNpdHkgZnJvbSBsaXZlLgorICAg IHBydW5lTGl2ZVJlc291cmNlcygpOworfQorCit2b2lkIE1lbW9yeUNhY2hlOjpwcnVuZVRvUGVy Y2VudGFnZShmbG9hdCB0YXJnZXRQZXJjZW50TGl2ZSkKK3sKKyAgICBwcnVuZURlYWRSZXNvdXJj ZXNUb1BlcmNlbnRhZ2UodGFyZ2V0UGVyY2VudExpdmUpOyAvLyBQcnVuZSBkZWFkIGZpcnN0LCBp biBjYXNlIGl0IHdhcyAiYm9ycm93aW5nIiBjYXBhY2l0eSBmcm9tIGxpdmUuCisgICAgcHJ1bmVM aXZlUmVzb3VyY2VzVG9QZXJjZW50YWdlKHRhcmdldFBlcmNlbnRMaXZlKTsKK30KKworCiAjaWZu ZGVmIE5ERUJVRwogdm9pZCBNZW1vcnlDYWNoZTo6ZHVtcFN0YXRzKCkKIHsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5oIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmgKaW5kZXggYzU3NTJkMC4uMWEyNGM4MiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmgKKysrIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmgKQEAgLTEzMCwyMCArMTMw LDggQEAgcHVibGljOgogICAgIHZvaWQgZXZpY3RSZXNvdXJjZXMoKTsKICAgICAKICAgICB2b2lk IHNldFBydW5lRW5hYmxlZChib29sIGVuYWJsZWQpIHsgbV9wcnVuZUVuYWJsZWQgPSBlbmFibGVk OyB9Ci0gICAgdm9pZCBwcnVuZSgpCi0gICAgewotICAgICAgICBpZiAobV9saXZlU2l6ZSArIG1f ZGVhZFNpemUgPD0gbV9jYXBhY2l0eSAmJiBtX21heERlYWRDYXBhY2l0eSAmJiBtX2RlYWRTaXpl IDw9IG1fbWF4RGVhZENhcGFjaXR5KSAvLyBGYXN0IHBhdGguCi0gICAgICAgICAgICByZXR1cm47 Ci0gICAgICAgICAgICAKLSAgICAgICAgcHJ1bmVEZWFkUmVzb3VyY2VzKCk7IC8vIFBydW5lIGRl YWQgZmlyc3QsIGluIGNhc2UgaXQgd2FzICJib3Jyb3dpbmciIGNhcGFjaXR5IGZyb20gbGl2ZS4K LSAgICAgICAgcHJ1bmVMaXZlUmVzb3VyY2VzKCk7Ci0gICAgfQotCi0gICAgdm9pZCBwcnVuZVRv UGVyY2VudGFnZShmbG9hdCB0YXJnZXRQZXJjZW50TGl2ZSkKLSAgICB7Ci0gICAgICAgIHBydW5l RGVhZFJlc291cmNlc1RvUGVyY2VudGFnZSh0YXJnZXRQZXJjZW50TGl2ZSk7IC8vIFBydW5lIGRl YWQgZmlyc3QsIGluIGNhc2UgaXQgd2FzICJib3Jyb3dpbmciIGNhcGFjaXR5IGZyb20gbGl2ZS4K LSAgICAgICAgcHJ1bmVMaXZlUmVzb3VyY2VzVG9QZXJjZW50YWdlKHRhcmdldFBlcmNlbnRMaXZl KTsKLSAgICB9CisgICAgdm9pZCBwcnVuZSgpOworICAgIHZvaWQgcHJ1bmVUb1BlcmNlbnRhZ2Uo ZmxvYXQgdGFyZ2V0UGVyY2VudExpdmUpOwogCiAgICAgdm9pZCBzZXREZWFkRGVjb2RlZERhdGFE ZWxldGlvbkludGVydmFsKGRvdWJsZSBpbnRlcnZhbCkgeyBtX2RlYWREZWNvZGVkRGF0YURlbGV0 aW9uSW50ZXJ2YWwgPSBpbnRlcnZhbDsgfQogICAgIGRvdWJsZSBkZWFkRGVjb2RlZERhdGFEZWxl dGlvbkludGVydmFsKCkgY29uc3QgeyByZXR1cm4gbV9kZWFkRGVjb2RlZERhdGFEZWxldGlvbklu dGVydmFsOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDU0ZTgxNjkuLjYzM2ExNmYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDgtMjUg IE1pa2hhaWwgTmFnYW5vdiAgPG1uYWdhbm92QGNocm9taXVtLm9yZz4KKworICAgICAgICBDaHJv bWl1bTogZXhwb3NlIE1lbW9yeUNhY2hlOjpwcnVuZSBhbmQgRm9udENhY2hlOjpwdXJnZUluYWN0 aXZlRm9udERhdGEuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02NjEzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogcHVibGljL1dlYkNhY2hlLmg6CisgICAgICAgICogcHVibGljL1dlYkZvbnRDYWNoZS5o OgorICAgICAgICAqIHNyYy9XZWJDYWNoZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNhY2hl OjpjbGVhcik6CisgICAgICAgIChXZWJLaXQ6OldlYkNhY2hlOjpwcnVuZSk6CisgICAgICAgICog c3JjL1dlYkZvbnRDYWNoZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZvbnRDYWNoZTo6cHJ1 bmUpOgorCiAyMDExLTA4LTI0ICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGdvb2dsZS5jb20+CiAK ICAgICAgICAgSW1wbGVtZW50IGEga2V5cGF0aCBwYXJzZXIgc3RyaWN0bHkgZm9sbG93aW5nIHRo ZSBzcGVjaWZpY2F0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJDYWNoZS5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQ2FjaGUuaApp bmRleCBiYTkzZmU4Li4zNDcwYjY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJDYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl YkNhY2hlLmgKQEAgLTcxLDkgKzcxLDE0IEBAIHB1YmxpYzoKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZV90IGNhcGFjaXR5KTsKIAogICAgIC8vIENsZWFy cyB0aGUgY2FjaGUgKGFzIG11Y2ggYXMgcG9zc2libGU7IHNvbWUgcmVzb3VyY2VzIG1heSBub3Qg YmUKLSAgICAvLyBjbGVhcmVkIGlmIHRoZXkgYXJlIGFjdGl2ZWx5IHJlZmVyZW5jZWQpLgorICAg IC8vIGNsZWFyZWQgaWYgdGhleSBhcmUgYWN0aXZlbHkgcmVmZXJlbmNlZCkuIE5vdGUgdGhhdCB0 aGlzIG1ldGhvZAorICAgIC8vIG9ubHkgcmVtb3ZlcyByZXNvdXJjZXMgZnJvbSBsaXZlIGxpc3Qs IHcvbyByZWxlYXNpbmcgY2FjaGUgbWVtb3J5LgogICAgIFdFQktJVF9FWFBPUlQgc3RhdGljIHZv aWQgY2xlYXIoKTsKIAorICAgIC8vIFBydW5lcyByZXNvdXJjZSBjYWNoZS4gRGVzdHJveXMgZGVj b2RlZCBpbWFnZXMgZGF0YSBhbmQgcmV0dXJucworICAgIC8vIG1lbW9yeSB0byB0aGUgc3lzdGVt LgorICAgIFdFQktJVF9FWFBPUlQgc3RhdGljIHZvaWQgcHJ1bmUoKTsKKwogICAgIC8vIEdldHMg dGhlIHVzYWdlIHN0YXRpc3RpY3MgZnJvbSB0aGUgcmVzb3VyY2UgY2FjaGUuCiAgICAgV0VCS0lU X0VYUE9SVCBzdGF0aWMgdm9pZCBnZXRVc2FnZVN0YXRzKFVzYWdlU3RhdHMqKTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRm9udENhY2hlLmggYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGb250Q2FjaGUuaAppbmRleCBmYzVlM2Y2Li41 OGFjZTgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGb250 Q2FjaGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGb250Q2FjaGUu aApAQCAtNDcsNiArNDcsOSBAQCBwdWJsaWM6CiAgICAgLy8gQ2xlYXJzIHRoZSBjYWNoZS4KICAg ICBXRUJLSVRfRVhQT1JUIHN0YXRpYyB2b2lkIGNsZWFyKCk7CiAKKyAgICAvLyBQdXJnZXMgaW5h Y3RpdmUgZm9udCBkYXRhLgorICAgIFdFQktJVF9FWFBPUlQgc3RhdGljIHZvaWQgcHJ1bmUoKTsK KwogcHJpdmF0ZToKICAgICBXZWJGb250Q2FjaGUoKTsgIC8vIE5vdCBpbnRlbmRlZCB0byBiZSBp bnN0YW5jZWQuCiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Q2FjaGUuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViQ2FjaGUuY3BwCmluZGV4 IDdkZjRjNjYuLmZhMjYwY2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkNhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJDYWNoZS5j cHAKQEAgLTY2LDEwICs2NiwxNSBAQCB2b2lkIFdlYkNhY2hlOjpzZXRDYXBhY2l0aWVzKAogdm9p ZCBXZWJDYWNoZTo6Y2xlYXIoKQogewogICAgIE1lbW9yeUNhY2hlKiBjYWNoZSA9IFdlYkNvcmU6 Om1lbW9yeUNhY2hlKCk7Ci0gICAgaWYgKGNhY2hlICYmICFjYWNoZS0+ZGlzYWJsZWQoKSkgewot ICAgICAgICBjYWNoZS0+c2V0RGlzYWJsZWQodHJ1ZSk7Ci0gICAgICAgIGNhY2hlLT5zZXREaXNh YmxlZChmYWxzZSk7Ci0gICAgfQorICAgIGlmIChjYWNoZSkKKyAgICAgICAgY2FjaGUtPmV2aWN0 UmVzb3VyY2VzKCk7Cit9CisKK3ZvaWQgV2ViQ2FjaGU6OnBydW5lKCkKK3sKKyAgICBNZW1vcnlD YWNoZSogY2FjaGUgPSBXZWJDb3JlOjptZW1vcnlDYWNoZSgpOworICAgIGlmIChjYWNoZSkKKyAg ICAgICAgY2FjaGUtPnBydW5lKCk7CiB9CiAKIHZvaWQgV2ViQ2FjaGU6OmdldFVzYWdlU3RhdHMo VXNhZ2VTdGF0cyogcmVzdWx0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViRm9udENhY2hlLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZvbnRD YWNoZS5jcHAKaW5kZXggNTIzNThlYy4uYWE2NTcwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViRm9udENhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJGb250Q2FjaGUuY3BwCkBAIC01NSw0ICs1NSwxMCBAQCB2b2lkIFdlYkZvbnRD YWNoZTo6Y2xlYXIoKQogICAgIGZvbnRDYWNoZSgpLT5pbnZhbGlkYXRlKCk7CiB9CiAKKy8vIHN0 YXRpYwordm9pZCBXZWJGb250Q2FjaGU6OnBydW5lKCkKK3sKKyAgICBmb250Q2FjaGUoKS0+cHVy Z2VJbmFjdGl2ZUZvbnREYXRhKCk7Cit9CisKIH0gIC8vIG5hbWVzcGFjZSBXZWJLaXQK