113603 2013-03-29 13:29:37 -0700 "Empty cache..." clears the disk cache from each WebProcess 2013-03-31 01:51:08 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson andersca ap ossy sam webkit-ews oldest_to_newest 866333 0 beidson 2013-03-29 13:29:37 -0700 "Empty cache..." clears the disk cache from each WebProcess This is silly - Just once from the network process will suffice. 866334 1 beidson 2013-03-29 13:30:14 -0700 In radar <rdar://problem/12456652> 866341 2 195790 beidson 2013-03-29 13:39:16 -0700 Created attachment 195790 Patch v1 866342 3 195790 eflews.bot 2013-03-29 13:42:43 -0700 Comment on attachment 195790 Patch v1 Attachment 195790 did not pass efl-ews (efl): Output: http://webkit-commit-queue.appspot.com/results/17227834 866344 4 195790 webkit-ews 2013-03-29 13:46:14 -0700 Comment on attachment 195790 Patch v1 Attachment 195790 did not pass qt-wk2-ews (qt): Output: http://webkit-commit-queue.appspot.com/results/17323451 866354 5 195790 sam 2013-03-29 13:54:24 -0700 Comment on attachment 195790 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=195790&action=review > Source/WebKit2/NetworkProcess/NetworkProcess.h:131 > +#if PLATFORM(MAC) > + dispatch_group_t m_clearCacheDispatchGroup; > +#endif Please add a FIXME and file a bug about doing this in a way that doesn't require an #ifdef. e.g. Using a WorkQueue and BinarySemaphore. > Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp:121 > // FIXME (Multi-WebProcess): <rdar://problem/12239765> There is no need to relaunch all processes. One process to take care of persistent cache is enough. > context()->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebResourceCacheManager::ClearCacheForAllOrigins(cachesToClear)); Do we still want to send this if we are using the network process? 866369 6 beidson 2013-03-29 14:15:56 -0700 (In reply to comment #5) > (From update of attachment 195790 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=195790&action=review > > > Source/WebKit2/NetworkProcess/NetworkProcess.h:131 > > +#if PLATFORM(MAC) > > + dispatch_group_t m_clearCacheDispatchGroup; > > +#endif > > Please add a FIXME and file a bug about doing this in a way that doesn't require an #ifdef. e.g. Using a WorkQueue and BinarySemaphore. Due to "popular request", I'm doing that now. > > > Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp:121 > > // FIXME (Multi-WebProcess): <rdar://problem/12239765> There is no need to relaunch all processes. One process to take care of persistent cache is enough. > > context()->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebResourceCacheManager::ClearCacheForAllOrigins(cachesToClear)); > > Do we still want to send this if we are using the network process? Yes - WebProcesses still need to clear their individual memory caches. 866375 7 beidson 2013-03-29 14:27:17 -0700 (In reply to comment #6) > (In reply to comment #5) > > (From update of attachment 195790 [details] [details]) > > > > Please add a FIXME and file a bug about doing this in a way that doesn't require an #ifdef. e.g. Using a WorkQueue and BinarySemaphore. > > Due to "popular request", I'm doing that now. > Or, maybe not. A binary semaphore isn't good enough. We'd need a counting semaphore. That's why the WebResourceCacheManager version of this code uses dispatch_group; It has to handle multiple requests to clear and wait for all of them to complete. I'll definitely add the FIXME about this but WorkQueue and/or Semaphore improvements are definitely needed before they can be a solution to this problem. 866378 8 beidson 2013-03-29 14:31:02 -0700 http://trac.webkit.org/changeset/147251 866586 9 ossy 2013-03-30 02:03:17 -0700 (In reply to comment #8) > http://trac.webkit.org/changeset/147251 And buildfix for !ENABLE(NETWORK_PROCESS) landed in http://trac.webkit.org/changeset/147268. Otherwise are you planning to review network process patches to let enable network process for other ports? https://bugs.webkit.org/show_bug.cgi?id=108832 Positive and/or negative review would be welcome ... 866619 10 beidson 2013-03-30 09:51:29 -0700 (In reply to comment #9) > (In reply to comment #8) > > http://trac.webkit.org/changeset/147251 > > And buildfix for !ENABLE(NETWORK_PROCESS) landed in > http://trac.webkit.org/changeset/147268. > > Otherwise are you planning to review network process patches to let > enable network process for other ports? https://bugs.webkit.org/show_bug.cgi?id=108832 > > Positive and/or negative review would be welcome ... From https://bugs.webkit.org/show_bug.cgi?id=108832 - "Let's do this in smaller steps" seems like extremely good feedback!!! 866759 11 ossy 2013-03-31 01:51:08 -0700 > From https://bugs.webkit.org/show_bug.cgi?id=108832 - "Let's do this in smaller steps" seems like extremely good feedback!!! Balázs - the author of the patch - said it, and then filed many bug reports for it 1.5 months before. But after it, I can't see any feedback from the WebKit2 authors. 195790 2013-03-29 13:39:16 -0700 2013-03-29 13:54:24 -0700 Patch v1 patch text/plain 7923 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmY2JkMWIyLi43ODMxNjE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTMtMDMtMjkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgICJFbXB0eSBjYWNoZS4uLiIgY2xlYXJzIHRoZSBkaXNrIGNhY2hlIGZyb20gZWFjaCBXZWJQ cm9jZXNzLgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTI0NTY2NTI+IGFuZCBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzNjAzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJv Y2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjpOZXR3b3JrUHJvY2Vz cyk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjp0ZXJtaW5hdGUpOiBPdmVycmlk ZSBDaGlsZFByb2Nlc3M6OnRlcm1pbmF0ZSB0byBhbGxvdyB1cyB0byBmaW5pc2ggY2xlYXJpbmcg dGhlIGNhY2hlLgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmg6CisK KyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5tZXNzYWdlcy5pbjogQWRk IHRoZSBDbGVhckNhY2hlRm9yQWxsT3JpZ2lucyBtZXNzYWdlLgorCisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvbWFjL05ldHdvcmtQcm9jZXNzTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3 b3JrUHJvY2Vzczo6Y2xlYXJDYWNoZUZvckFsbE9yaWdpbnMpOiBDbGVhciB0aGUgZGlzayBjYWNo ZS4KKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OnBsYXRmb3JtVGVybWluYXRlKTog V2FpdCBmb3IgdGhlIGNsZWFyIHRvIGNvbXBsZXRlLgorCisgICAgICAgICogVUlQcm9jZXNzL1dl YlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNv dXJjZUNhY2hlTWFuYWdlclByb3h5OjpjbGVhckNhY2hlRm9yQWxsT3JpZ2lucyk6IE1lc3NhZ2Ug dGhlIG5ldHdvcmsgcHJvY2VzcywgYWxzby4KKworICAgICAgICAqIFdlYlByb2Nlc3MvbWFjL1dl YlByb2Nlc3NNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnBsYXRmb3JtQ2xl YXJSZXNvdXJjZUNhY2hlcyk6IERvbid0IGNsZWFyIHRoZSBkaXNrIGNhY2hlIGlmIHdlIHVzZSB0 aGUgbmV0d29yayBwcm9jZXNzLgorCiAyMDEzLTAzLTI4ICBCcmFkeSBFaWRzb24gIDxiZWlkc29u QGFwcGxlLmNvbT4KIAogICAgICAgICBXZSBsZWFrIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9j ZXNzIG9iamVjdHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrUHJvY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr UHJvY2Vzcy5jcHAKaW5kZXggNDlkYjkzNC4uOTRkMDkwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcApAQCAtNjQsNiArNjQsOSBAQCBO ZXR3b3JrUHJvY2VzcyYgTmV0d29ya1Byb2Nlc3M6OnNoYXJlZCgpCiBOZXR3b3JrUHJvY2Vzczo6 TmV0d29ya1Byb2Nlc3MoKQogICAgIDogbV9oYXNTZXRDYWNoZU1vZGVsKGZhbHNlKQogICAgICwg bV9jYWNoZU1vZGVsKENhY2hlTW9kZWxEb2N1bWVudFZpZXdlcikKKyNpZiBQTEFURk9STShNQUMp CisgICAgLCBtX2NsZWFyQ2FjaGVEaXNwYXRjaEdyb3VwKDApCisjZW5kaWYKIHsKICAgICBOZXR3 b3JrUHJvY2Vzc1BsYXRmb3JtU3RyYXRlZ2llczo6aW5pdGlhbGl6ZSgpOwogCkBAIC0yMzgsNiAr MjQxLDEyIEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmdldE5ldHdvcmtQcm9jZXNzU3RhdGlzdGlj cyh1aW50NjRfdCBjYWxsYmFja0lEKQogICAgIHBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCktPnNl bmQoTWVzc2FnZXM6OldlYkNvbnRleHQ6OkRpZEdldFN0YXRpc3RpY3MoZGF0YSwgY2FsbGJhY2tJ RCksIDApOwogfQogCit2b2lkIE5ldHdvcmtQcm9jZXNzOjp0ZXJtaW5hdGUoKQoreworICAgIHBs YXRmb3JtVGVybWluYXRlKCk7CisgICAgQ2hpbGRQcm9jZXNzOjp0ZXJtaW5hdGUoKTsKK30KKwog I2lmICFQTEFURk9STShNQUMpCiB2b2lkIE5ldHdvcmtQcm9jZXNzOjppbml0aWFsaXplUHJvY2Vz c05hbWUoY29uc3QgQ2hpbGRQcm9jZXNzSW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzJikKIHsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5oCmluZGV4IDM3 ZjljNDguLjZlYTEwNGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNz L05ldHdvcmtQcm9jZXNzLmgKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0 d29ya1Byb2Nlc3MuaApAQCAtNzcsNiArNzcsOSBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBwbGF0 Zm9ybUluaXRpYWxpemVOZXR3b3JrUHJvY2Vzcyhjb25zdCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9u UGFyYW1ldGVycyYpOwogCisgICAgdmlydHVhbCB2b2lkIHRlcm1pbmF0ZSgpIE9WRVJSSURFOwor ICAgIHZvaWQgcGxhdGZvcm1UZXJtaW5hdGUoKTsKKwogICAgIC8vIENoaWxkUHJvY2VzcwogICAg IHZpcnR1YWwgdm9pZCBpbml0aWFsaXplUHJvY2Vzc05hbWUoY29uc3QgQ2hpbGRQcm9jZXNzSW5p dGlhbGl6YXRpb25QYXJhbWV0ZXJzJikgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIGluaXRp YWxpemVTYW5kYm94KGNvbnN0IENoaWxkUHJvY2Vzc0luaXRpYWxpemF0aW9uUGFyYW1ldGVycyYs IFNhbmRib3hJbml0aWFsaXphdGlvblBhcmFtZXRlcnMmKSBPVkVSUklERTsKQEAgLTEwNCwxMCAr MTA3LDkgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRvd25sb2FkUmVxdWVzdCh1aW50NjRfdCBkb3du bG9hZElELCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmKTsKICAgICB2b2lkIGNhbmNl bERvd25sb2FkKHVpbnQ2NF90IGRvd25sb2FkSUQpOwogICAgIHZvaWQgc2V0Q2FjaGVNb2RlbCh1 aW50MzJfdCk7Ci0KICAgICB2b2lkIGFsbG93U3BlY2lmaWNIVFRQU0NlcnRpZmljYXRlRm9ySG9z dChjb25zdCBQbGF0Zm9ybUNlcnRpZmljYXRlSW5mbyYsIGNvbnN0IFN0cmluZyYgaG9zdCk7Ci0K ICAgICB2b2lkIGdldE5ldHdvcmtQcm9jZXNzU3RhdGlzdGljcyh1aW50NjRfdCBjYWxsYmFja0lE KTsKKyAgICB2b2lkIGNsZWFyQ2FjaGVGb3JBbGxPcmlnaW5zKHVpbnQzMl90IGNhY2hlc1RvQ2xl YXIpOwogCiAgICAgLy8gUGxhdGZvcm0gSGVscGVycwogICAgIHZvaWQgcGxhdGZvcm1TZXRDYWNo ZU1vZGVsKENhY2hlTW9kZWwpOwpAQCAtMTIzLDYgKzEyNSwxMCBAQCBwcml2YXRlOgogCiAgICAg dHlwZWRlZiBIYXNoTWFwPGNvbnN0IGNoYXIqLCBPd25QdHI8TmV0d29ya1Byb2Nlc3NTdXBwbGVt ZW50PiwgUHRySGFzaDxjb25zdCBjaGFyKj4gPiBOZXR3b3JrUHJvY2Vzc1N1cHBsZW1lbnRNYXA7 CiAgICAgTmV0d29ya1Byb2Nlc3NTdXBwbGVtZW50TWFwIG1fc3VwcGxlbWVudHM7CisKKyNpZiBQ TEFURk9STShNQUMpCisgICAgZGlzcGF0Y2hfZ3JvdXBfdCBtX2NsZWFyQ2FjaGVEaXNwYXRjaEdy b3VwOworI2VuZGlmCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLm1lc3NhZ2VzLmluIGIv U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MubWVzc2FnZXMuaW4K aW5kZXggZDVmZjk1Zi4uYTVmY2JjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIv TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MubWVzc2FnZXMuaW4KQEAgLTQyLDYgKzQyLDgg QEAgbWVzc2FnZXMgLT4gTmV0d29ya1Byb2Nlc3MgTGVnYWN5UmVjZWl2ZXIgewogICAgIEFsbG93 U3BlY2lmaWNIVFRQU0NlcnRpZmljYXRlRm9ySG9zdChXZWJLaXQ6OlBsYXRmb3JtQ2VydGlmaWNh dGVJbmZvIGNlcnRpZmljYXRlLCBXVEY6OlN0cmluZyBob3N0KQogICAgIAogICAgIEdldE5ldHdv cmtQcm9jZXNzU3RhdGlzdGljcyh1aW50NjRfdCBjYWxsYmFja0lEKQorICAgIAorICAgIENsZWFy Q2FjaGVGb3JBbGxPcmlnaW5zKHVpbnQzMl90IGNhY2hlc1RvQ2xlYXIpCiB9CiAKICNlbmRpZiAv LyBFTkFCTEUoTkVUV09SS19QUk9DRVNTKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0 d29ya1Byb2Nlc3MvbWFjL05ldHdvcmtQcm9jZXNzTWFjLm1tIGIvU291cmNlL1dlYktpdDIvTmV0 d29ya1Byb2Nlc3MvbWFjL05ldHdvcmtQcm9jZXNzTWFjLm1tCmluZGV4IDlkMTljNzQuLjBhMjEw ZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL21hYy9OZXR3b3Jr UHJvY2Vzc01hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9tYWMvTmV0 d29ya1Byb2Nlc3NNYWMubW0KQEAgLTMxLDYgKzMxLDcgQEAKICNpbXBvcnQgIk5ldHdvcmtQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgiCiAjaW1wb3J0ICJOZXR3b3JrUmVzb3VyY2VMb2FkZXIu aCIKICNpbXBvcnQgIlBsYXRmb3JtQ2VydGlmaWNhdGVJbmZvLmgiCisjaW1wb3J0ICJSZXNvdXJj ZUNhY2hlc1RvQ2xlYXIuaCIKICNpbXBvcnQgIlNhbmRib3hFeHRlbnNpb24uaCIKICNpbXBvcnQg IlNhbmRib3hJbml0aWFsaXphdGlvblBhcmFtZXRlcnMuaCIKICNpbXBvcnQgIlN0cmluZ1V0aWxp dGllcy5oIgpAQCAtMjAxLDYgKzIwMiwyOSBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzOjppbml0aWFs aXplU2FuZGJveChjb25zdCBDaGlsZFByb2Nlc3NJbml0aWFsaXphdGlvblBhcmFtZXRlcgogICAg IENoaWxkUHJvY2Vzczo6aW5pdGlhbGl6ZVNhbmRib3gocGFyYW1ldGVycywgc2FuZGJveFBhcmFt ZXRlcnMpOwogfQogCit2b2lkIE5ldHdvcmtQcm9jZXNzOjpjbGVhckNhY2hlRm9yQWxsT3JpZ2lu cyh1aW50MzJfdCBjYWNoZXNUb0NsZWFyKQoreworICAgIFJlc291cmNlQ2FjaGVzVG9DbGVhciBy ZXNvdXJjZUNhY2hlc1RvQ2xlYXIgPSBzdGF0aWNfY2FzdDxSZXNvdXJjZUNhY2hlc1RvQ2xlYXI+ KGNhY2hlc1RvQ2xlYXIpOworICAgIGlmIChyZXNvdXJjZUNhY2hlc1RvQ2xlYXIgPT0gSW5NZW1v cnlSZXNvdXJjZUNhY2hlc09ubHkpCisgICAgICAgIHJldHVybjsKKworICAgIGlmICghbV9jbGVh ckNhY2hlRGlzcGF0Y2hHcm91cCkKKyAgICAgICAgbV9jbGVhckNhY2hlRGlzcGF0Y2hHcm91cCA9 IGRpc3BhdGNoX2dyb3VwX2NyZWF0ZSgpOworCisgICAgZGlzcGF0Y2hfZ3JvdXBfYXN5bmMobV9j bGVhckNhY2hlRGlzcGF0Y2hHcm91cCwgZGlzcGF0Y2hfZ2V0X2dsb2JhbF9xdWV1ZShESVNQQVRD SF9RVUVVRV9QUklPUklUWV9ERUZBVUxULCAwKSwgXnsKKyAgICAgICAgW1tOU1VSTENhY2hlIHNo YXJlZFVSTENhY2hlXSByZW1vdmVBbGxDYWNoZWRSZXNwb25zZXNdOworICAgIH0pOworfQorCit2 b2lkIE5ldHdvcmtQcm9jZXNzOjpwbGF0Zm9ybVRlcm1pbmF0ZSgpCit7CisgICAgaWYgKG1fY2xl YXJDYWNoZURpc3BhdGNoR3JvdXApIHsKKyAgICAgICAgZGlzcGF0Y2hfZ3JvdXBfd2FpdChtX2Ns ZWFyQ2FjaGVEaXNwYXRjaEdyb3VwLCBESVNQQVRDSF9USU1FX0ZPUkVWRVIpOworICAgICAgICBk aXNwYXRjaF9yZWxlYXNlKG1fY2xlYXJDYWNoZURpc3BhdGNoR3JvdXApOworICAgICAgICBtX2Ns ZWFyQ2FjaGVEaXNwYXRjaEdyb3VwID0gMDsKKyAgICB9Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdl YktpdAogCiAjZW5kaWYgLy8gRU5BQkxFKE5FVFdPUktfUFJPQ0VTUykKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5LmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5LmNw cAppbmRleCA4YzA4YTQ3Li45YmZiN2ZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXJQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHkuY3BwCkBAIC0yOCw2ICsy OCw3IEBACiAKICNpbmNsdWRlICJJbW11dGFibGVBcnJheS5oIgogI2luY2x1ZGUgIkltbXV0YWJs ZURpY3Rpb25hcnkuaCIKKyNpbmNsdWRlICJOZXR3b3JrUHJvY2Vzc01lc3NhZ2VzLmgiCiAjaW5j bHVkZSAiU2VjdXJpdHlPcmlnaW5EYXRhLmgiCiAjaW5jbHVkZSAiV2ViQ29udGV4dC5oIgogI2lu Y2x1ZGUgIldlYlJlc291cmNlQ2FjaGVNYW5hZ2VyTWVzc2FnZXMuaCIKQEAgLTExNCw2ICsxMTUs OCBAQCB2b2lkIFdlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHk6OmNsZWFyQ2FjaGVGb3JPcmln aW4oV2ViU2VjdXJpdHlPcmlnaW4qIG9yaWdpbgogCiB2b2lkIFdlYlJlc291cmNlQ2FjaGVNYW5h Z2VyUHJveHk6OmNsZWFyQ2FjaGVGb3JBbGxPcmlnaW5zKFJlc291cmNlQ2FjaGVzVG9DbGVhciBj YWNoZXNUb0NsZWFyKQogeworICAgIGNvbnRleHQoKS0+c2VuZFRvTmV0d29ya2luZ1Byb2Nlc3NS ZWxhdW5jaGluZ0lmTmVjZXNzYXJ5KE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2Vzczo6Q2xlYXJDYWNo ZUZvckFsbE9yaWdpbnMoY2FjaGVzVG9DbGVhcikpOworCiAgICAgLy8gRklYTUUgKE11bHRpLVdl YlByb2Nlc3MpOiA8cmRhcjovL3Byb2JsZW0vMTIyMzk3NjU+IFRoZXJlIGlzIG5vIG5lZWQgdG8g cmVsYXVuY2ggYWxsIHByb2Nlc3Nlcy4gT25lIHByb2Nlc3MgdG8gdGFrZSBjYXJlIG9mIHBlcnNp c3RlbnQgY2FjaGUgaXMgZW5vdWdoLgogICAgIGNvbnRleHQoKS0+c2VuZFRvQWxsUHJvY2Vzc2Vz UmVsYXVuY2hpbmdUaGVtSWZOZWNlc3NhcnkoTWVzc2FnZXM6OldlYlJlc291cmNlQ2FjaGVNYW5h Z2VyOjpDbGVhckNhY2hlRm9yQWxsT3JpZ2lucyhjYWNoZXNUb0NsZWFyKSk7CiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL21hYy9XZWJQcm9jZXNzTWFjLm1tIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc01hYy5tbQppbmRleCBkMmZkMjA1 Li42YTcyZmRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL21hYy9XZWJQ cm9jZXNzTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvbWFjL1dlYlByb2Nl c3NNYWMubW0KQEAgLTEzMCw2ICsxMzAsMTAgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUNs ZWFyUmVzb3VyY2VDYWNoZXMoUmVzb3VyY2VDYWNoZXNUb0NsZWFyIGNhY2hlc1RvQ2xlYXIKICAg ICBpZiAoY2FjaGVzVG9DbGVhciA9PSBJbk1lbW9yeVJlc291cmNlQ2FjaGVzT25seSkKICAgICAg ICAgcmV0dXJuOwogCisgICAgLy8gSWYgd2UncmUgdXNpbmcgdGhlIG5ldHdvcmsgcHJvY2VzcyB0 aGVuIGl0IGlzIHRoZSBvbmx5IG9uZSB0aGF0IG5lZWRzIHRvIGNsZWFyIHRoZSBkaXNrIGNhY2hl LgorICAgIGlmICh1c2VzTmV0d29ya1Byb2Nlc3MoKSkKKyAgICAgICAgcmV0dXJuOworCiAgICAg aWYgKCFtX2NsZWFyUmVzb3VyY2VDYWNoZXNEaXNwYXRjaEdyb3VwKQogICAgICAgICBtX2NsZWFy UmVzb3VyY2VDYWNoZXNEaXNwYXRjaEdyb3VwID0gZGlzcGF0Y2hfZ3JvdXBfY3JlYXRlKCk7CiAK