105364 2012-12-18 16:26:42 -0800 Notify context client of change to table, and allow client to get a copy of it 2012-12-19 12:03:04 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Mac OS X 10.8 RESOLVED FIXED InRadar P2 Normal --- 1 jonlee jonlee andersca ap beidson sam webkit-bug-importer oldest_to_newest 794152 0 jonlee 2012-12-18 16:26:42 -0800 When a new origin hash is added, notify the context client of the change. The client can then request from the context a copy of the table for its own record keeping, such as saving to disk. 794155 1 webkit-bug-importer 2012-12-18 16:27:02 -0800 <rdar://problem/12906267> 794409 2 180108 jonlee 2012-12-19 00:37:55 -0800 Created attachment 180108 Patch 794823 3 180108 beidson 2012-12-19 11:24:36 -0800 Comment on attachment 180108 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=180108&action=review > Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp:55 > m_context->sendToAllProcesses(Messages::WebProcess::DidAddPlugInAutoStartOrigin(plugInOriginHash)); > + m_context->client().plugInAutoStartOriginHashesChanged(m_context); > } Is it expected that a client will always call WKContextCopyPlugInAutoStartOriginHashes in response to this client callback? If so, we should just pass the new hashes along with it. And - if so - we might not even need the autoStartOriginsTableCopy accessor at all. > Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp:69 > + ImmutableDictionary::MapType map; > + AutoStartTable::const_iterator itEnd = m_autoStartTable.end(); > + for (AutoStartTable::const_iterator it = m_autoStartTable.begin(); it != itEnd; ++it) { > + Vector<RefPtr<APIObject> > hashes; Just call itEnd "end", please. That's what we do everywhere else. > Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp:71 > + HashSet<unsigned>::iterator valueItEnd = it->value.end(); > + for (HashSet<unsigned>::iterator valueIt = it->value.begin(); valueIt != valueItEnd; ++valueIt) And "valueItEnd" should just be "valueEnd" 794825 4 180108 jonlee 2012-12-19 11:29:47 -0800 Comment on attachment 180108 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=180108&action=review >> Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp:55 >> } > > Is it expected that a client will always call WKContextCopyPlugInAutoStartOriginHashes in response to this client callback? > > If so, we should just pass the new hashes along with it. > > And - if so - we might not even need the autoStartOriginsTableCopy accessor at all. No. The client may choose to aggregate these callbacks, and only invoke WKContextCopyPlugInAutoStartOriginHashes periodically. >> Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp:69 >> + Vector<RefPtr<APIObject> > hashes; > > Just call itEnd "end", please. That's what we do everywhere else. Done. >> Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp:71 >> + for (HashSet<unsigned>::iterator valueIt = it->value.begin(); valueIt != valueItEnd; ++valueIt) > > And "valueItEnd" should just be "valueEnd" Done. 794828 5 180108 beidson 2012-12-19 11:34:13 -0800 Comment on attachment 180108 Patch r+ assuming Jon made the changes he said he made. 794845 6 jonlee 2012-12-19 12:03:04 -0800 Committed r138185: <http://trac.webkit.org/changeset/138185> 180108 2012-12-19 00:37:55 -0800 2012-12-19 11:34:12 -0800 Patch bug-105364-20121219003511.patch text/plain 9106 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4MDk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMGZjYjdmYjAzOGE3MTUx N2Q0N2E5NzAyNmE5YmY1ZWMyYWQzODhhYS4uNjZlYzZlYmRkN2RhMDEzY2Y0ZGI2ZjgxNDhlZDFk MDA3OTc0OTgxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDEyLTEyLTE4ICBKb24g TGVlICA8am9ubGVlQGFwcGxlLmNvbT4KIAorICAgICAgICBOb3RpZnkgY29udGV4dCBjbGllbnQg b2YgY2hhbmdlIHRvIHRhYmxlLCBhbmQgYWxsb3cgY2xpZW50IHRvIGdldCBhIGNvcHkgb2YgaXQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNTM2NAor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTI5MDYyNjc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgY2FsbGJhY2sgdG8gbm90aWZ5IHRoZSBj b250ZXh0IGNsaWVudCB0aGF0IHRoZSBvcmlnaW4gaGFzaGVzIGhhdmUgY2hhbmdlZC4KKyAgICAg ICAgVGhlIGNsaWVudCBtYXkgY2hvb3NlIHRvIGdldCBhIGNvcHkgb2YgdGhhdCB0YWJsZSBhbmQg c2F2ZSBpdCB0byBkaXNrLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dC5j cHA6CisgICAgICAgIChXS0NvbnRleHRDb3B5UGx1Z0luQXV0b1N0YXJ0T3JpZ2luSGFzaGVzKTog QWRkZWQgdG8gdGhlIGNvbnRleHQgY2xpZW50LgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9X S0NvbnRleHQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYkNvbnRleHQ6OnBsdWdJbkF1dG9TdGFydE9yaWdpbkhhc2hlcyk6IFJldHVy biBhIGNvcHkgb2YgdGhlIG9yaWdpbiBoYXNoCisgICAgICAgIHRhYmxlLgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJDb250ZXh0Lmg6CisKKyAgICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lucy9QbHVn SW5BdXRvU3RhcnRQcm92aWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdJbkF1dG9TdGFy dFByb3ZpZGVyOjphZGRBdXRvU3RhcnRPcmlnaW4pOiBXaGVuIHRoZSBvcmlnaW4gaXMgYWRkZWQg dG8KKyAgICAgICAgdGhlIHRhYmxlLCBub3RpZnkgdGhlIGNvbnRleHQgY2xpZW50LgorICAgICAg ICAoV2ViS2l0OjpQbHVnSW5BdXRvU3RhcnRQcm92aWRlcjo6YXV0b1N0YXJ0T3JpZ2luc1RhYmxl Q29weSk6IENyZWF0ZSBhIGNvcHkgb2YgdGhlCisgICAgICAgIHRhYmxlLgorICAgICAgICAqIFVJ UHJvY2Vzcy9QbHVnaW5zL1BsdWdJbkF1dG9TdGFydFByb3ZpZGVyLmg6CisKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViQ29udGV4dENsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRl eHRDbGllbnQ6OnBsdWdJbkF1dG9TdGFydE9yaWdpbkhhc2hlc0NoYW5nZWQpOiBDYWxsIHRoZSBj bGllbnQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHRDbGllbnQuaDoKKworMjAxMi0x Mi0xOCAgSm9uIExlZSAgPGpvbmxlZUBhcHBsZS5jb20+CisKICAgICAgICAgW1dLMl0gQ3JlYXRl IGEgY29udGV4dCBjbGllbnQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwNTMxNgogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTI5MDE3NjI+CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHQuY3BwCmluZGV4IDUxMDgyZGM0 NmE1NjZkM2QzY2Y1M2VhYmRjZTBjOGYxZmU4NjA4YTQuLjhkMzBkZGFjNTQ1YWM1Yjk3YTY5OGQ2 YjY4OWJkOWFjZTczNDNiNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQy9XS0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9X S0NvbnRleHQuY3BwCkBAIC0zMzcsNiArMzM3LDExIEBAIHZvaWQgV0tDb250ZXh0U2V0VXNlc05l dHdvcmtQcm9jZXNzKFdLQ29udGV4dFJlZiBjb250ZXh0UmVmLCBib29sIHVzZXNOZXR3b3JrUHJv CiAgICAgdG9JbXBsKGNvbnRleHRSZWYpLT5zZXRVc2VzTmV0d29ya1Byb2Nlc3ModXNlc05ldHdv cmtQcm9jZXNzKTsKIH0KIAorV0tEaWN0aW9uYXJ5UmVmIFdLQ29udGV4dENvcHlQbHVnSW5BdXRv U3RhcnRPcmlnaW5IYXNoZXMoV0tDb250ZXh0UmVmIGNvbnRleHRSZWYpCit7CisgICAgcmV0dXJu IHRvQVBJKHRvSW1wbChjb250ZXh0UmVmKS0+cGx1Z0luQXV0b1N0YXJ0T3JpZ2luSGFzaGVzKCku bGVha1JlZigpKTsKK30KKwogLy8gRGVwcmVjYXRlZCBmdW5jdGlvbnMuCiB2b2lkIF9XS0NvbnRl eHRTZXRBZGRpdGlvbmFsUGx1Z2luc0RpcmVjdG9yeShXS0NvbnRleHRSZWYgY29udGV4dCwgV0tT dHJpbmdSZWYgcGx1Z2luc0RpcmVjdG9yeSkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHQuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQy9XS0NvbnRleHQuaAppbmRleCA2MTczNmZhZmVhY2RhZWYwYzRiZTY5MTUyMWU0NWJhYmNl MzczNjlmLi5iMDFjZWJmNDdkOGMxOTA3MzA4MmZlM2JlM2IwZWU0ZmViZjlkZTc1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmgKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dC5oCkBAIC00MCw5ICs0MCwxMiBA QCBlbnVtIHsKIHR5cGVkZWYgdWludDMyX3QgV0tDYWNoZU1vZGVsOwogCiAvLyBDb250ZXh0IENs aWVudAordHlwZWRlZiB2b2lkICgqV0tDb250ZXh0UGx1Z0luQXV0b1N0YXJ0T3JpZ2luSGFzaGVz Q2hhbmdlZENhbGxiYWNrKShXS0NvbnRleHRSZWYgY29udGV4dCwgY29uc3Qgdm9pZCAqY2xpZW50 SW5mbyk7CisKIHN0cnVjdCBXS0NvbnRleHRDbGllbnQgewogICAgIGludCAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdmVyc2lv bjsKICAgICBjb25zdCB2b2lkICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNsaWVudEluZm87CisgICAgV0tDb250ZXh0UGx1Z0luQXV0b1N0 YXJ0T3JpZ2luSGFzaGVzQ2hhbmdlZENhbGxiYWNrICAgICAgICAgICAgICAgICBwbHVnSW5BdXRv U3RhcnRPcmlnaW5IYXNoZXNDaGFuZ2VkOwogfTsKIHR5cGVkZWYgc3RydWN0IFdLQ29udGV4dENs aWVudCBXS0NvbnRleHRDbGllbnQ7CiAKQEAgLTE4Nyw2ICsxOTAsOCBAQCBXS19FWFBPUlQgdm9p ZCBXS0NvbnRleHRHZXRTdGF0aXN0aWNzKFdLQ29udGV4dFJlZiBjb250ZXh0LCB2b2lkKiBmdW5j dGlvbkNvbnRleAogV0tfRVhQT1JUIHZvaWQgV0tDb250ZXh0R2FyYmFnZUNvbGxlY3RKYXZhU2Ny aXB0T2JqZWN0cyhXS0NvbnRleHRSZWYgY29udGV4dCk7CiBXS19FWFBPUlQgdm9pZCBXS0NvbnRl eHRTZXRKYXZhU2NyaXB0R2FyYmFnZUNvbGxlY3RvclRpbWVyRW5hYmxlZChXS0NvbnRleHRSZWYg Y29udGV4dCwgYm9vbCBlbmFibGUpOwogCitXS19FWFBPUlQgV0tEaWN0aW9uYXJ5UmVmIFdLQ29u dGV4dENvcHlQbHVnSW5BdXRvU3RhcnRPcmlnaW5IYXNoZXMoV0tDb250ZXh0UmVmIGNvbnRleHQp OworCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z0luQXV0b1N0YXJ0UHJvdmlkZXIuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z0luQXV0b1N0YXJ0UHJvdmlkZXIuY3Bw CmluZGV4IDIwZmYxNzMxYmM1YzNhMTQzMjYzMDQ4ZmFiN2QxOGE1NTQzYzBiM2UuLmI3ZGRiYmU3 ZGUxNTg3MjViZGRlYTFhMTBhMzAyOGFlYzQ3Y2ViNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdJbkF1dG9TdGFydFByb3ZpZGVyLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnSW5BdXRvU3RhcnRQcm92aWRlci5j cHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJQbHVnSW5BdXRvU3RhcnRQcm92aWRlci5o IgogCiAjaW5jbHVkZSAiV2ViQ29udGV4dC5oIgorI2luY2x1ZGUgIldlYkNvbnRleHRDbGllbnQu aCIKICNpbmNsdWRlICJXZWJQcm9jZXNzTWVzc2FnZXMuaCIKIAogdXNpbmcgbmFtZXNwYWNlIFdl YkNvcmU7CkBAIC01MCw2ICs1MSw3IEBAIHZvaWQgUGx1Z0luQXV0b1N0YXJ0UHJvdmlkZXI6OmFk ZEF1dG9TdGFydE9yaWdpbihjb25zdCBTdHJpbmcmIHBhZ2VPcmlnaW4sIHVuc2lnCiAgICAgaXQt PnZhbHVlLmFkZChwbHVnSW5PcmlnaW5IYXNoKTsKICAgICBtX2F1dG9TdGFydEhhc2hlcy5hZGQo cGx1Z0luT3JpZ2luSGFzaCk7CiAgICAgbV9jb250ZXh0LT5zZW5kVG9BbGxQcm9jZXNzZXMoTWVz c2FnZXM6OldlYlByb2Nlc3M6OkRpZEFkZFBsdWdJbkF1dG9TdGFydE9yaWdpbihwbHVnSW5Pcmln aW5IYXNoKSk7CisgICAgbV9jb250ZXh0LT5jbGllbnQoKS5wbHVnSW5BdXRvU3RhcnRPcmlnaW5I YXNoZXNDaGFuZ2VkKG1fY29udGV4dCk7CiB9CiAKIFZlY3Rvcjx1bnNpZ25lZD4gUGx1Z0luQXV0 b1N0YXJ0UHJvdmlkZXI6OmF1dG9TdGFydE9yaWdpbnNDb3B5KCkgY29uc3QKQEAgLTU5LDQgKzYx LDIwIEBAIFZlY3Rvcjx1bnNpZ25lZD4gUGx1Z0luQXV0b1N0YXJ0UHJvdmlkZXI6OmF1dG9TdGFy dE9yaWdpbnNDb3B5KCkgY29uc3QKICAgICByZXR1cm4gY29weVZlY3RvcjsKIH0KIAorUGFzc1Jl ZlB0cjxJbW11dGFibGVEaWN0aW9uYXJ5PiBQbHVnSW5BdXRvU3RhcnRQcm92aWRlcjo6YXV0b1N0 YXJ0T3JpZ2luc1RhYmxlQ29weSgpIGNvbnN0Cit7CisgICAgSW1tdXRhYmxlRGljdGlvbmFyeTo6 TWFwVHlwZSBtYXA7CisgICAgQXV0b1N0YXJ0VGFibGU6OmNvbnN0X2l0ZXJhdG9yIGl0RW5kID0g bV9hdXRvU3RhcnRUYWJsZS5lbmQoKTsKKyAgICBmb3IgKEF1dG9TdGFydFRhYmxlOjpjb25zdF9p dGVyYXRvciBpdCA9IG1fYXV0b1N0YXJ0VGFibGUuYmVnaW4oKTsgaXQgIT0gaXRFbmQ7ICsraXQp IHsKKyAgICAgICAgVmVjdG9yPFJlZlB0cjxBUElPYmplY3Q+ID4gaGFzaGVzOworICAgICAgICBI YXNoU2V0PHVuc2lnbmVkPjo6aXRlcmF0b3IgdmFsdWVJdEVuZCA9IGl0LT52YWx1ZS5lbmQoKTsK KyAgICAgICAgZm9yIChIYXNoU2V0PHVuc2lnbmVkPjo6aXRlcmF0b3IgdmFsdWVJdCA9IGl0LT52 YWx1ZS5iZWdpbigpOyB2YWx1ZUl0ICE9IHZhbHVlSXRFbmQ7ICsrdmFsdWVJdCkKKyAgICAgICAg ICAgIGhhc2hlcy5hcHBlbmQoV2ViVUludDY0OjpjcmVhdGUoKnZhbHVlSXQpKTsKKworICAgICAg ICBtYXAuc2V0KGl0LT5rZXksIEltbXV0YWJsZUFycmF5OjphZG9wdChoYXNoZXMpKTsKKyAgICB9 CisKKyAgICByZXR1cm4gSW1tdXRhYmxlRGljdGlvbmFyeTo6YWRvcHQobWFwKTsKK30KKwogfSAv LyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv UGx1Z2lucy9QbHVnSW5BdXRvU3RhcnRQcm92aWRlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1BsdWdpbnMvUGx1Z0luQXV0b1N0YXJ0UHJvdmlkZXIuaAppbmRleCAxNWNiZTljZmFhYTI5 N2ViMTc2ZjhjMzNiYzYwMDlkOGJiYWZlNDZmLi45ZjM2ZjM4OGY4YjY3MDBlMzI3N2ZhNDM0OGNh MTFmYmVlMjc5OWY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lu cy9QbHVnSW5BdXRvU3RhcnRQcm92aWRlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9QbHVnaW5zL1BsdWdJbkF1dG9TdGFydFByb3ZpZGVyLmgKQEAgLTMzLDYgKzMzLDcgQEAKIAog bmFtZXNwYWNlIFdlYktpdCB7CiAKK2NsYXNzIEltbXV0YWJsZURpY3Rpb25hcnk7CiBjbGFzcyBX ZWJDb250ZXh0OwogCiBjbGFzcyBQbHVnSW5BdXRvU3RhcnRQcm92aWRlciB7CkBAIC00MSw3ICs0 Miw5IEBAIHB1YmxpYzoKICAgICBleHBsaWNpdCBQbHVnSW5BdXRvU3RhcnRQcm92aWRlcihXZWJD b250ZXh0Kik7CiAKICAgICB2b2lkIGFkZEF1dG9TdGFydE9yaWdpbihjb25zdCBTdHJpbmcmIHBh Z2VPcmlnaW4sIHVuc2lnbmVkIHBsdWdJbk9yaWdpbkhhc2gpOworCiAgICAgVmVjdG9yPHVuc2ln bmVkPiBhdXRvU3RhcnRPcmlnaW5zQ29weSgpIGNvbnN0OworICAgIFBhc3NSZWZQdHI8SW1tdXRh YmxlRGljdGlvbmFyeT4gYXV0b1N0YXJ0T3JpZ2luc1RhYmxlQ29weSgpIGNvbnN0OwogCiBwcml2 YXRlOgogICAgIFdlYkNvbnRleHQqIG1fY29udGV4dDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJDb250ZXh0LmNwcAppbmRleCA2ZmNmOWFjMTI2ZjliYmE5ZGM4MTY0NDcxZGY2NThkYmI3YmZl ZDU4Li40ODA2ODRmZTUzYzI1MTE3YTQ1NWNkZjZiYWU3YmI1MWIwYmZmYmM4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCkBAIC0xMTQ4LDYgKzExNDgsMTEgQEAgdm9p ZCBXZWJDb250ZXh0OjphZGRQbHVnSW5BdXRvU3RhcnRPcmlnaW5IYXNoKGNvbnN0IFN0cmluZyYg cGFnZU9yaWdpbiwgdW5zaWduZWQKICAgICBtX3BsdWdJbkF1dG9TdGFydFByb3ZpZGVyLmFkZEF1 dG9TdGFydE9yaWdpbihwYWdlT3JpZ2luLCBwbHVnSW5PcmlnaW5IYXNoKTsKIH0KIAorUGFzc1Jl ZlB0cjxJbW11dGFibGVEaWN0aW9uYXJ5PiBXZWJDb250ZXh0OjpwbHVnSW5BdXRvU3RhcnRPcmln aW5IYXNoZXMoKSBjb25zdAoreworICAgIHJldHVybiBtX3BsdWdJbkF1dG9TdGFydFByb3ZpZGVy LmF1dG9TdGFydE9yaWdpbnNUYWJsZUNvcHkoKTsKK30KKwogI2lmIEVOQUJMRShDVVNUT01fUFJP VE9DT0xTKQogdm9pZCBXZWJDb250ZXh0OjpyZWdpc3RlclNjaGVtZUZvckN1c3RvbVByb3RvY29s KGNvbnN0IFdURjo6U3RyaW5nJiBzY2hlbWUpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNv bnRleHQuaAppbmRleCBhOTRiY2U2N2RhYmQxYjNlMjZiNGFhY2U1ZjQ0ODlmNDAwZTFlNDgyLi5i NjVhN2UzMDU5ODdmYTQ5ZGI1MzNmNzg0ZWI1OGVlYTI3ZmY0ZGE3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJDb250ZXh0LmgKQEAgLTI5LDYgKzI5LDcgQEAKICNpbmNsdWRlICJBUElPYmpl Y3QuaCIKICNpbmNsdWRlICJEb3dubG9hZFByb3h5TWFwLmgiCiAjaW5jbHVkZSAiR2VuZXJpY0Nh bGxiYWNrLmgiCisjaW5jbHVkZSAiSW1tdXRhYmxlRGljdGlvbmFyeS5oIgogI2luY2x1ZGUgIk1l c3NhZ2VSZWNlaXZlci5oIgogI2luY2x1ZGUgIk1lc3NhZ2VSZWNlaXZlck1hcC5oIgogI2luY2x1 ZGUgIlBsdWdJbkF1dG9TdGFydFByb3ZpZGVyLmgiCkBAIC0yNTcsNiArMjU4LDcgQEAgcHVibGlj OgogCiAgICAgdm9pZCB0ZXh0Q2hlY2tlclN0YXRlQ2hhbmdlZCgpOwogCisgICAgUGFzc1JlZlB0 cjxJbW11dGFibGVEaWN0aW9uYXJ5PiBwbHVnSW5BdXRvU3RhcnRPcmlnaW5IYXNoZXMoKSBjb25z dDsKIAogICAgIC8vIE5ldHdvcmsgUHJvY2VzcyBNYW5hZ2VtZW50CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0Q2xpZW50LmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0Q2xpZW50LmNwcAppbmRleCBkOWVkN2JiY2U4MjNkNmU5 YmNiZjBkOWIwZjRiYjIzMjJmYjQ1NDdhLi5mZTllZmYzZTAzOTNlYTQ5ZmU4NGM4MDAwODIwZmVj ZWFkYjk0NjE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4 dENsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHRDbGll bnQuY3BwCkBAIC0yNiw2ICsyNiwxNiBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUg IldlYkNvbnRleHRDbGllbnQuaCIKIAorI2luY2x1ZGUgIldlYkNvbnRleHQuaCIKKwogbmFtZXNw YWNlIFdlYktpdCB7CiAKK3ZvaWQgV2ViQ29udGV4dENsaWVudDo6cGx1Z0luQXV0b1N0YXJ0T3Jp Z2luSGFzaGVzQ2hhbmdlZChXZWJDb250ZXh0KiBjb250ZXh0KQoreworICAgIGlmICghbV9jbGll bnQucGx1Z0luQXV0b1N0YXJ0T3JpZ2luSGFzaGVzQ2hhbmdlZCkKKyAgICAgICAgcmV0dXJuOwor CisgICAgbV9jbGllbnQucGx1Z0luQXV0b1N0YXJ0T3JpZ2luSGFzaGVzQ2hhbmdlZCh0b0FQSShj b250ZXh0KSwgbV9jbGllbnQuY2xpZW50SW5mbyk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktp dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHRDbGllbnQu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0Q2xpZW50LmgKaW5kZXggYzNl MGU0ZmFmYjc0NzZjNWFlN2U3ZTA1NzU0N2YxNzE3NWQ5ZTFkOS4uZjE1NDNjMzU5Zjg2M2FmN2U5 N2RlYTI2NGRhODBiNTZmMDBmNDg5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYkNvbnRleHRDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi Q29udGV4dENsaWVudC5oCkBAIC0zMSw3ICszMSwxMSBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsK IAorY2xhc3MgV2ViQ29udGV4dDsKKwogY2xhc3MgV2ViQ29udGV4dENsaWVudCA6IHB1YmxpYyBB UElDbGllbnQ8V0tDb250ZXh0Q2xpZW50LCBrV0tDb250ZXh0Q2xpZW50Q3VycmVudFZlcnNpb24+ IHsKK3B1YmxpYzoKKyAgICB2b2lkIHBsdWdJbkF1dG9TdGFydE9yaWdpbkhhc2hlc0NoYW5nZWQo V2ViQ29udGV4dCopOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg==