94481 2012-08-20 07:43:55 -0700 [Chromium] Remove WebKitPlatformSupport::sharedWorkerRepository 2012-09-05 09:26:25 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED DUPLICATE 95861 P2 Normal --- 82948 1 pilgrim pilgrim abarth dglazkov fishd haraken jamesr michaeln peter+ews tkent+wkapi webkit.review.bot oldest_to_newest 699496 0 pilgrim 2012-08-20 07:43:55 -0700 [Chromium] Remove WebKitPlatformSupport::sharedWorkerRepository 699497 1 159425 pilgrim 2012-08-20 07:44:35 -0700 Created attachment 159425 WIP Incomplete Patch 699501 2 webkit.review.bot 2012-08-20 07:46:50 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 699502 3 159425 pilgrim 2012-08-20 07:47:27 -0700 Comment on attachment 159425 WIP Incomplete Patch This patch is incomplete. I need to find where Chromium implements WebKitPlatformSupport::sharedWorkerRepository() so I can remove that function, then find where Chromium calls WebKit::initialize() so I can add the call to SharedWorkerRepository::setSharedWorkerRepository. Other comments welcome too. 699508 4 159425 peter+ews 2012-08-20 07:51:00 -0700 Comment on attachment 159425 WIP Incomplete Patch Attachment 159425 did not pass cr-android-ews (chromium-android): Output: http://queues.webkit.org/results/13539602 699509 5 159425 webkit.review.bot 2012-08-20 07:51:16 -0700 Comment on attachment 159425 WIP Incomplete Patch Attachment 159425 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/13543350 699751 6 159425 abarth 2012-08-20 11:52:48 -0700 Comment on attachment 159425 WIP Incomplete Patch View in context: https://bugs.webkit.org/attachment.cgi?id=159425&action=review > Source/WebCore/workers/SharedWorkerRepository.h:67 > + // sets global shared worker repository > + static void setSharedWorkerRepository(WebKit::WebSharedWorkerRepository*); We shouldn't have code in that references Chromium API types outside of Chromium-specific regions of the code. Do we need a SharedWorkerRepositoryChromium.h to house this static method? I didn't find anyone who calls this function, so I'm not sure what to recommend. Do you plan to keep the implementation in Source/WebKit/chromium/src/SharedWorkerRepository.cpp ? If so, it might make sense to put the header for this function in Source/WebKit/chromium/src. 699753 7 159425 abarth 2012-08-20 11:54:11 -0700 Comment on attachment 159425 WIP Incomplete Patch View in context: https://bugs.webkit.org/attachment.cgi?id=159425&action=review > Source/WebKit/chromium/src/SharedWorkerRepository.cpp:197 > bool SharedWorkerRepository::isAvailable() Note: In the long term, we don't want to have "namespace WebCore" code in WebKit because it will prevent us from splitting WebCore.dll from WebKit.dll. 699755 8 abarth 2012-08-20 11:56:10 -0700 > then find where Chromium calls WebKit::initialize() WebKit::initialize is in http://trac.webkit.org/browser/trunk/Source/WebKit/chromium/src/WebKit.cpp#L102 712132 9 pilgrim 2012-09-05 09:26:25 -0700 *** This bug has been marked as a duplicate of bug 95861 *** 159425 2012-08-20 07:44:35 -0700 2012-08-22 13:35:02 -0700 WIP Incomplete Patch bug-94481-20120820104345.patch text/plain 9364 pilgrim SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNjAyNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA4LTIwICBNYXJrIFBp bGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIFJlbW92 ZSBXZWJLaXRQbGF0Zm9ybVN1cHBvcnQ6OnNoYXJlZFdvcmtlclJlcG9zaXRvcnkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0NDgxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUGFydCBvZiBhIHJlZmFjdG9y aW5nIHNlcmllcy4gU2VlIHRyYWNraW5nIGJ1ZyA4Mjk0OC4KKworICAgICAgICAqIHdvcmtlcnMv U2hhcmVkV29ya2VyUmVwb3NpdG9yeS5oOgorICAgICAgICAoU2hhcmVkV29ya2VyUmVwb3NpdG9y eSk6CisKIDIwMTItMDgtMjAgIFhhbiBMb3BleiAgPHhsb3BlekBpZ2FsaWEuY29tPgogCiAgICAg ICAgIFtHVEtdIFByb3ZpZGUgYmFja3dhcmRzIGNvbXBhdGlibGUgbWV0aG9kIGZvciBXZWJLaXRE T01XZWJLaXROYW1lZEZsb3c6Om92ZXJmbG93CkluZGV4OiBTb3VyY2UvV2ViQ29yZS93b3JrZXJz L1NoYXJlZFdvcmtlclJlcG9zaXRvcnkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS93 b3JrZXJzL1NoYXJlZFdvcmtlclJlcG9zaXRvcnkuaAkocmV2aXNpb24gMTI2MDIzKQorKysgU291 cmNlL1dlYkNvcmUvd29ya2Vycy9TaGFyZWRXb3JrZXJSZXBvc2l0b3J5LmgJKHdvcmtpbmcgY29w eSkKQEAgLTM3LDYgKzM3LDggQEAKICNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgogI2luY2x1 ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAKK25hbWVzcGFjZSBXZWJLaXQgeyBjbGFzcyBXZWJTaGFy ZWRXb3JrZXJSZXBvc2l0b3J5OyB9CisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIGNsYXNz IERvY3VtZW50OwpAQCAtNjAsNiArNjIsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAg ICAgIC8vIFJldHVybnMgdHJ1ZSBpZiB0aGUgcGFzc2VkIGRvY3VtZW50IGlzIGFzc29jaWF0ZWQg d2l0aCBhbnkgU2hhcmVkV29ya2Vycy4KICAgICAgICAgc3RhdGljIGJvb2wgaGFzU2hhcmVkV29y a2VycyhEb2N1bWVudCopOworCisgICAgICAgIC8vIHNldHMgZ2xvYmFsIHNoYXJlZCB3b3JrZXIg cmVwb3NpdG9yeQorICAgICAgICBzdGF0aWMgdm9pZCBzZXRTaGFyZWRXb3JrZXJSZXBvc2l0b3J5 KFdlYktpdDo6V2ViU2hhcmVkV29ya2VyUmVwb3NpdG9yeSopOworCiAgICAgcHJpdmF0ZToKICAg ICAgICAgU2hhcmVkV29ya2VyUmVwb3NpdG9yeSgpIHsgfQogICAgIH07CkluZGV4OiBTb3VyY2Uv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gMTI2MDI1KQorKysgU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyOSBAQAorMjAxMi0wOC0y MCAgTWFyayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9t aXVtXSBSZW1vdmUgV2ViS2l0UGxhdGZvcm1TdXBwb3J0OjpzaGFyZWRXb3JrZXJSZXBvc2l0b3J5 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDQ4MQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhcnQgb2Yg YSByZWZhY3RvcmluZyBzZXJpZXMuIFNlZSB0cmFja2luZyBidWcgODI5NDguCisKKyAgICAgICAg KiBwdWJsaWMvV2ViQ29tbW9uV29ya2VyQ2xpZW50Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYkNv bW1vbldvcmtlckNsaWVudDo6YWxsb3dEYXRhYmFzZSk6CisgICAgICAgICogcHVibGljL1dlYk5v dGlmaWNhdGlvblByZXNlbnRlci5oOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKiBwdWJs aWMvcGxhdGZvcm0vV2ViS2l0UGxhdGZvcm1TdXBwb3J0Lmg6CisgICAgICAgIChXZWJLaXQpOgor ICAgICAgICAoV2ViS2l0OjpXZWJLaXRQbGF0Zm9ybVN1cHBvcnQ6OmdldFBsdWdpbkxpc3QpOgor ICAgICAgICAqIHNyYy9EYXRhYmFzZU9ic2VydmVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6QWxs b3dEYXRhYmFzZU1haW5UaHJlYWRCcmlkZ2U6OmFsbG93RGF0YWJhc2VUYXNrKToKKyAgICAgICAg KiBzcmMvU2hhcmVkV29ya2VyUmVwb3NpdG9yeS5jcHA6CisgICAgICAgIChXZWJDb3JlKToKKyAg ICAgICAgKFdlYkNvcmU6OlNoYXJlZFdvcmtlclJlcG9zaXRvcnk6OmlzQXZhaWxhYmxlKToKKyAg ICAgICAgKFdlYkNvcmU6OlNoYXJlZFdvcmtlclJlcG9zaXRvcnk6OmNvbm5lY3QpOgorICAgICAg ICAoV2ViQ29yZTo6U2hhcmVkV29ya2VyUmVwb3NpdG9yeTo6ZG9jdW1lbnREZXRhY2hlZCk6Cisg ICAgICAgIChXZWJDb3JlOjpTaGFyZWRXb3JrZXJSZXBvc2l0b3J5OjpoYXNTaGFyZWRXb3JrZXJz KToKKyAgICAgICAgKFdlYkNvcmU6OlNoYXJlZFdvcmtlclJlcG9zaXRvcnk6OnNldFNoYXJlZFdv cmtlclJlcG9zaXRvcnkpOgorCiAyMDEyLTA4LTIwICBTYW1pIEt5b3N0aWxhICA8c2t5b3N0aWxA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gQ29udmVydCBzY3JlZW4gc3BhY2Ug c2Nyb2xsIGdlc3R1cmVzIHRvIGxheWVyIHNwYWNlCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJDb21tb25Xb3JrZXJDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJDb21tb25Xb3JrZXJDbGllbnQuaAkocmV2aXNpb24g MTI2MDIzKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQ29tbW9uV29ya2Vy Q2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDcgKzQ3LDcgQEAgY2xhc3MgV2ViV29ya2Vy Q2xpZW50OwogY2xhc3MgV2ViQ29tbW9uV29ya2VyQ2xpZW50IHsKIHB1YmxpYzoKICAgICAvLyBD YWxsZWQgb24gdGhlIG1haW4gd2Via2l0IHRocmVhZCBiZWZvcmUgb3BlbmluZyBhIHdlYiBkYXRh YmFzZS4KLSAgICB2aXJ0dWFsIGJvb2wgYWxsb3dEYXRhYmFzZShXZWJGcmFtZSosIGNvbnN0IFdl YlN0cmluZyYgbmFtZSwgY29uc3QgV2ViU3RyaW5nJiBkaXNwbGF5TmFtZSwgdW5zaWduZWQgbG9u ZyBlc3RpbWF0ZWRTaXplKQorICAgIHZpcnR1YWwgYm9vbCBhbGxvd0RhdGFiYXNlKGNvbnN0IFdl YlN0cmluZyYgbmFtZSwgY29uc3QgV2ViU3RyaW5nJiBkaXNwbGF5TmFtZSwgdW5zaWduZWQgbG9u ZyBlc3RpbWF0ZWRTaXplKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQpJbmRl eDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTm90aWZpY2F0aW9uUHJlc2VudGVy LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTm90aWZp Y2F0aW9uUHJlc2VudGVyLmgJKHJldmlzaW9uIDEyNjAyMykKKysrIFNvdXJjZS9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYk5vdGlmaWNhdGlvblByZXNlbnRlci5oCSh3b3JraW5nIGNvcHkpCkBA IC0zNyw3ICszNyw2IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1jbGFzcyBXZWJEb2N1bWVu dDsKIGNsYXNzIFdlYk5vdGlmaWNhdGlvbjsKIAogLy8gUHJvdmlkZXMgdGhlIHNlcnZpY2VzIHRv IHNob3cgZGVza3RvcCBub3RpZmljYXRpb25zIHRvIHRoZSB1c2VyLgpJbmRleDogU291cmNlL1dl YktpdC9jaHJvbWl1bS9wdWJsaWMvcGxhdGZvcm0vV2ViS2l0UGxhdGZvcm1TdXBwb3J0LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvcGxhdGZvcm0vV2ViS2l0 UGxhdGZvcm1TdXBwb3J0LmgJKHJldmlzaW9uIDEyNjAyMykKKysrIFNvdXJjZS9XZWJLaXQvY2hy b21pdW0vcHVibGljL3BsYXRmb3JtL1dlYktpdFBsYXRmb3JtU3VwcG9ydC5oCSh3b3JraW5nIGNv cHkpCkBAIC01Miw3ICs1Miw2IEBAIGNsYXNzIFdlYklEQkZhY3Rvcnk7IC8vIEZJWE1FOiBEb2Vz IHRoaXMKIGNsYXNzIFdlYklEQktleTsgLy8gRklYTUU6IERvZXMgdGhpcyBiZWxvbmcgaW4gcGxh dGZvcm0/CiBjbGFzcyBXZWJJREJLZXlQYXRoOyAvLyBGSVhNRTogRG9lcyB0aGlzIGJlbG9uZyBp biBwbGF0Zm9ybT8KIGNsYXNzIFdlYlBsdWdpbkxpc3RCdWlsZGVyOyAvLyBGSVhNRTogRG9lcyB0 aGlzIGJlbG9uZyBpbiBwbGF0Zm9ybT8KLWNsYXNzIFdlYlNoYXJlZFdvcmtlclJlcG9zaXRvcnk7 IC8vIEZJWE1FOiBEb2VzIHRoaXMgYmVsb25nIGluIHBsYXRmb3JtPwogCiAvLyBGSVhNRTogRXZl bnR1YWxseSBhbGwgdGhlc2UgQVBJIHdpbGwgbmVlZCB0byBtb3ZlIHRvIFdlYktpdDo6UGxhdGZv cm0uCiBjbGFzcyBXZWJLaXRQbGF0Zm9ybVN1cHBvcnQgOiBwdWJsaWMgUGxhdGZvcm0gewpAQCAt NzAsMTEgKzY5LDYgQEAgcHVibGljOgogICAgIC8vIHNhdGlzZnkgdGhpcyBjYWxsLgogICAgIHZp cnR1YWwgdm9pZCBnZXRQbHVnaW5MaXN0KGJvb2wgcmVmcmVzaCwgV2ViUGx1Z2luTGlzdEJ1aWxk ZXIqKSB7IH0KIAotCi0gICAgLy8gU2hhcmVkIFdvcmtlcnMgLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCi0KLSAgICB2aXJ0dWFsIFdlYlNoYXJl ZFdvcmtlclJlcG9zaXRvcnkqIHNoYXJlZFdvcmtlclJlcG9zaXRvcnkoKSB7IHJldHVybiAwOyB9 Ci0KIHByb3RlY3RlZDoKICAgICB+V2ViS2l0UGxhdGZvcm1TdXBwb3J0KCkgeyB9CiB9OwpJbmRl eDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRGF0YWJhc2VPYnNlcnZlci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRGF0YWJhc2VPYnNlcnZlci5jcHAJ KHJldmlzaW9uIDEyNjAyMykKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0RhdGFiYXNl T2JzZXJ2ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDQsNyArMTA0LDcgQEAgcHJpdmF0ZToK IAogICAgIHN0YXRpYyB2b2lkIGFsbG93RGF0YWJhc2VUYXNrKFdlYkNvcmU6OlNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQqIGNvbnRleHQsIGNvbnN0IFN0cmluZyBtb2RlLCBXZWJDb21tb25Xb3JrZXJD bGllbnQqIGNvbW1vbkNsaWVudCwgV2ViRnJhbWUqIGZyYW1lLCBjb25zdCBTdHJpbmcgbmFtZSwg Y29uc3QgU3RyaW5nIGRpc3BsYXlOYW1lLCB1bnNpZ25lZCBsb25nIGVzdGltYXRlZFNpemUsIFBh c3NSZWZQdHI8QWxsb3dEYXRhYmFzZU1haW5UaHJlYWRCcmlkZ2U+IGJyaWRnZSkKICAgICB7Ci0g ICAgICAgIGJvb2wgYWxsb3dEYXRhYmFzZSA9IGNvbW1vbkNsaWVudCA/IGNvbW1vbkNsaWVudC0+ YWxsb3dEYXRhYmFzZShmcmFtZSwgbmFtZSwgZGlzcGxheU5hbWUsIGVzdGltYXRlZFNpemUpIDog ZmFsc2U7CisgICAgICAgIGJvb2wgYWxsb3dEYXRhYmFzZSA9IGNvbW1vbkNsaWVudCA/IGNvbW1v bkNsaWVudC0+YWxsb3dEYXRhYmFzZShuYW1lLCBkaXNwbGF5TmFtZSwgZXN0aW1hdGVkU2l6ZSkg OiBmYWxzZTsKICAgICAgICAgYnJpZGdlLT5zaWduYWxDb21wbGV0ZWQobW9kZSwgYWxsb3dEYXRh YmFzZSk7CiAgICAgfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9TaGFyZWRX b3JrZXJSZXBvc2l0b3J5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9TaGFyZWRXb3JrZXJSZXBvc2l0b3J5LmNwcAkocmV2aXNpb24gMTI2MDIzKQorKysgU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvU2hhcmVkV29ya2VyUmVwb3NpdG9yeS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTY2LDYgKzY2LDggQEAgdXNpbmcgV2ViS2l0OjpXZWJNZXNzYWdlUG9ydENo YW5uZWw7CiB1c2luZyBXZWJLaXQ6OldlYlNoYXJlZFdvcmtlcjsKIHVzaW5nIFdlYktpdDo6V2Vi U2hhcmVkV29ya2VyUmVwb3NpdG9yeTsKIAorc3RhdGljIFdlYktpdDo6V2ViU2hhcmVkV29ya2Vy UmVwb3NpdG9yeSogc193ZWJTaGFyZWRXb3JrZXJSZXBvc2l0b3J5ID0gMDsKKwogLy8gQ2FsbGJh Y2sgY2xhc3MgdGhhdCBrZWVwcyB0aGUgU2hhcmVkV29ya2VyIGFuZCBXZWJTaGFyZWRXb3JrZXIg b2JqZWN0cyBhbGl2ZSB3aGlsZSBsb2FkcyBhcmUgcG90ZW50aWFsbHkgaGFwcGVuaW5nLCBhbmQg YWxzbyB0cmFuc2xhdGVzIGxvYWQgZXJyb3JzIGludG8gZXJyb3IgZXZlbnRzIG9uIHRoZSB3b3Jr ZXIuCiBjbGFzcyBTaGFyZWRXb3JrZXJTY3JpcHRMb2FkZXIgOiBwcml2YXRlIFdvcmtlclNjcmlw dExvYWRlckNsaWVudCwgcHJpdmF0ZSBXZWJTaGFyZWRXb3JrZXI6OkNvbm5lY3RMaXN0ZW5lciB7 CiBwdWJsaWM6CkBAIC0xOTQsOCArMTk2LDcgQEAgdm9pZCBTaGFyZWRXb3JrZXJTY3JpcHRMb2Fk ZXI6OmNvbm5lY3RlZAogCiBib29sIFNoYXJlZFdvcmtlclJlcG9zaXRvcnk6OmlzQXZhaWxhYmxl KCkKIHsKLSAgICAvLyBBbGxvdyB0aGUgV2ViS2l0UGxhdGZvcm1TdXBwb3J0IHRvIGRldGVybWlu ZSBpZiBTaGFyZWRXb3JrZXJzIGFyZSBhdmFpbGFibGUuCi0gICAgcmV0dXJuIFdlYktpdDo6d2Vi S2l0UGxhdGZvcm1TdXBwb3J0KCktPnNoYXJlZFdvcmtlclJlcG9zaXRvcnkoKTsKKyAgICByZXR1 cm4gc193ZWJTaGFyZWRXb3JrZXJSZXBvc2l0b3J5OwogfQogCiBzdGF0aWMgV2ViU2hhcmVkV29y a2VyUmVwb3NpdG9yeTo6RG9jdW1lbnRJRCBnZXRJZCh2b2lkKiBkb2N1bWVudCkKQEAgLTIwOCw3 ICsyMDksNyBAQCB2b2lkIFNoYXJlZFdvcmtlclJlcG9zaXRvcnk6OmNvbm5lY3QoUGFzCiB7CiAg ICAgLy8gVGhpcyBzaG91bGQgbm90IGJlIGNhbGxhYmxlIHVubGVzcyB0aGVyZSdzIGEgU2hhcmVk V29ya2VyUmVwb3NpdG9yeSBmb3IKICAgICAvLyB0aGlzIGNvbnRleHQgKHNpbmNlIGlzQXZhaWxh YmxlKCkgc2hvdWxkIGhhdmUgcmV0dXJuZWQgbnVsbCkuCi0gICAgQVNTRVJUKFdlYktpdDo6d2Vi S2l0UGxhdGZvcm1TdXBwb3J0KCktPnNoYXJlZFdvcmtlclJlcG9zaXRvcnkoKSk7CisgICAgQVNT RVJUKHNfd2ViU2hhcmVkV29ya2VyUmVwb3NpdG9yeS0+c2hhcmVkV29ya2VyUmVwb3NpdG9yeSgp KTsKIAogICAgIC8vIE5vIG5lc3RlZCB3b3JrZXJzIChmb3Igbm93KSAtIGNvbm5lY3QoKSBzaG91 bGQgb25seSBiZSBjYWxsZWQgZnJvbSBkb2N1bWVudCBjb250ZXh0LgogICAgIEFTU0VSVCh3b3Jr ZXItPnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+aXNEb2N1bWVudCgpKTsKQEAgLTIyMyw4ICsy MjQsNyBAQCB2b2lkIFNoYXJlZFdvcmtlclJlcG9zaXRvcnk6OmNvbm5lY3QoUGFzCiAgICAgICAg IHJldHVybjsKICAgICB9CiAKLSAgICBXZWJLaXQ6OndlYktpdFBsYXRmb3JtU3VwcG9ydCgpLT5z aGFyZWRXb3JrZXJSZXBvc2l0b3J5KCktPmFkZFNoYXJlZFdvcmtlcigKLSAgICAgICAgd2ViV29y a2VyLmdldCgpLCBnZXRJZChkb2N1bWVudCkpOworICAgIHNfd2ViU2hhcmVkV29ya2VyUmVwb3Np dG9yeS0+YWRkU2hhcmVkV29ya2VyKHdlYldvcmtlci5nZXQoKSwgZ2V0SWQoZG9jdW1lbnQpKTsK IAogICAgIC8vIFRoZSBsb2FkZXIgb2JqZWN0IG1hbmFnZXMgaXRzIG93biBsaWZlY3ljbGUgKGFu ZCB0aGUgbGlmZWN5Y2xlcyBvZiB0aGUgdHdvIHdvcmtlciBvYmplY3RzKS4KICAgICAvLyBJdCB3 aWxsIGZyZWUgaXRzZWxmIG9uY2UgbG9hZGluZyBpcyBjb21wbGV0ZWQuCkBAIC0yMzQsOSArMjM0 LDggQEAgdm9pZCBTaGFyZWRXb3JrZXJSZXBvc2l0b3J5Ojpjb25uZWN0KFBhcwogCiB2b2lkIFNo YXJlZFdvcmtlclJlcG9zaXRvcnk6OmRvY3VtZW50RGV0YWNoZWQoRG9jdW1lbnQqIGRvY3VtZW50 KQogewotICAgIFdlYlNoYXJlZFdvcmtlclJlcG9zaXRvcnkqIHJlcG8gPSBXZWJLaXQ6OndlYktp dFBsYXRmb3JtU3VwcG9ydCgpLT5zaGFyZWRXb3JrZXJSZXBvc2l0b3J5KCk7Ci0gICAgaWYgKHJl cG8pCi0gICAgICAgIHJlcG8tPmRvY3VtZW50RGV0YWNoZWQoZ2V0SWQoZG9jdW1lbnQpKTsKKyAg ICBpZiAoc193ZWJTaGFyZWRXb3JrZXJSZXBvc2l0b3J5KQorICAgICAgICBzX3dlYlNoYXJlZFdv cmtlclJlcG9zaXRvcnktPmRvY3VtZW50RGV0YWNoZWQoZ2V0SWQoZG9jdW1lbnQpKTsKIAogICAg IC8vIFN0b3AgdGhlIGNyZWF0aW9uIG9mIGFueSBwZW5kaW5nIFNoYXJlZFdvcmtlcnMgZm9yIHRo aXMgY29udGV4dC4KICAgICAvLyBGSVhNRTogTmVlZCBhIHdheSB0byBpbnZva2UgdGhpcyBmb3Ig V29ya2VyQ29udGV4dHMgYXMgd2VsbCB3aGVuIHdlIHN1cHBvcnQgZm9yIG5lc3RlZCB3b3JrZXJz LgpAQCAtMjQ1LDExICsyNDQsMTMgQEAgdm9pZCBTaGFyZWRXb3JrZXJSZXBvc2l0b3J5Ojpkb2N1 bWVudERldAogCiBib29sIFNoYXJlZFdvcmtlclJlcG9zaXRvcnk6Omhhc1NoYXJlZFdvcmtlcnMo RG9jdW1lbnQqIGRvY3VtZW50KQogewotICAgIFdlYlNoYXJlZFdvcmtlclJlcG9zaXRvcnkqIHJl cG8gPSBXZWJLaXQ6OndlYktpdFBsYXRmb3JtU3VwcG9ydCgpLT5zaGFyZWRXb3JrZXJSZXBvc2l0 b3J5KCk7Ci0gICAgcmV0dXJuIHJlcG8gJiYgcmVwby0+aGFzU2hhcmVkV29ya2VycyhnZXRJZChk b2N1bWVudCkpOworICAgIHJldHVybiBzX3dlYlNoYXJlZFdvcmtlclJlcG9zaXRvcnkgJiYgc193 ZWJTaGFyZWRXb3JrZXJSZXBvc2l0b3J5LT5oYXNTaGFyZWRXb3JrZXJzKGdldElkKGRvY3VtZW50 KSk7CiB9CiAKLQordm9pZCBTaGFyZWRXb3JrZXJSZXBvc2l0b3J5OjpzZXRTaGFyZWRXb3JrZXJS ZXBvc2l0b3J5KFdlYlNoYXJlZFdvcmtlclJlcG9zaXRvcnkqIHJlcG9zaXRvcnkpCit7CisgICAg c193ZWJTaGFyZWRXb3JrZXJSZXBvc2l0b3J5ID0gcmVwb3NpdG9yeTsKK30KIAogfSAvLyBuYW1l c3BhY2UgV2ViQ29yZQogCg==