140507 2015-01-15 13:15:08 -0800 Clearing the website data store should clear local storage 2015-01-15 15:49:27 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue joepeck oldest_to_newest 1061614 0 andersca 2015-01-15 13:15:08 -0800 Clearing the website data store should clear local storage 1061616 1 244709 andersca 2015-01-15 13:17:48 -0800 Created attachment 244709 Patch 1061617 2 244710 andersca 2015-01-15 13:18:14 -0800 Created attachment 244710 Patch 1061618 3 commit-queue 2015-01-15 13:20:35 -0800 Attachment 244710 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.h:67: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.cpp:573: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 2 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 1061621 4 244710 kling 2015-01-15 13:23:47 -0800 Comment on attachment 244710 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=244710&action=review r=me > Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h:59 > + Vector<RefPtr<WebCore::SecurityOrigin>> deleteDatabasesModifiedSince(std::chrono::system_clock::time_point); I would have this return a Vector of Refs. 1061623 5 andersca 2015-01-15 13:26:51 -0800 Committed r178526: <http://trac.webkit.org/changeset/178526> 1061671 6 joepeck 2015-01-15 15:49:27 -0800 This appears to have caused some ASSERTs on the Mountain Lion Debug bot: https://build.webkit.org/builders/Apple%20MountainLion%20Debug%20WK2%20%28Tests%29/builds/20805 > Exception Type: EXC_BAD_ACCESS (SIGSEGV) > Exception Codes: KERN_INVALID_ADDRESS at 0x00000000bbadbeef > > Application Specific Information: > CRASHING TEST: platform/mac-wk2/tiled-drawing/header-and-footer-hit-testing.html > > Thread 0 Crashed:: Dispatch queue: com.apple.main-thread > 0 WTFCrash + 42 (Assertions.cpp:321) > 1 IPC::Connection::addWorkQueueMessageReceiver(IPC::StringReference, WorkQueue*, IPC::Connection::WorkQueueMessageReceiver*) + 172 (Connection.cpp:283) > 2 WebKit::StorageManager::processWillOpenConnection(WebKit::WebProcessProxy*) + 114 (StorageManager.cpp:491) > 3 WebKit::WebsiteDataStore::webProcessWillOpenConnection(WebKit::WebProcessProxy&, IPC::Connection&) + 88 (WebsiteDataStore.cpp:204) > 4 WebKit::WebProcessLifetimeObserver::addWebPage(WebKit::WebPageProxy&) + 221 (WebProcessLifetimeObserver.cpp:51) > 5 WebKit::WebProcessLifetimeTracker::addObserver(WebKit::WebProcessLifetimeObserver&) + 212 (WebProcessLifetimeTracker.cpp:53) > 6 WebKit::WebPageProxy::WebPageProxy(WebKit::PageClient&, WebKit::WebProcessProxy&, unsigned long long, WebKit::WebPageConfiguration const&) + 3229 (WebPageProxy.cpp:388) > 7 WebKit::WebPageProxy::WebPageProxy(WebKit::PageClient&, WebKit::WebProcessProxy&, unsigned long long, WebKit::WebPageConfiguration const&) + 53 (WebPageProxy.cpp:436) > 8 WebKit::WebPageProxy::create(WebKit::PageClient&, WebKit::WebProcessProxy&, unsigned long long, WebKit::WebPageConfiguration const&) + 81 (WebPageProxy.cpp:257) > 9 WebKit::WebProcessProxy::createWebPage(WebKit::PageClient&, WebKit::WebPageConfiguration const&) + 95 (WebProcessProxy.cpp:189) > 10 WebKit::WebProcessPool::createWebPage(WebKit::PageClient&, WebKit::WebPageConfiguration) + 618 (WebProcessPool.cpp:895) > 11 -[WKView initWithFrame:processPool:configuration:webView:] + 1703 (WKView.mm:3584) > 12 -[WKView(Private) initWithFrame:contextRef:pageGroupRef:relatedToPage:] + 318 (WKView.mm:3798) > 13 -[TestRunnerWKView initWithFrame:contextRef:pageGroupRef:relatedToPage:useThreadedScrolling:] + 189 (PlatformWebViewMac.mm:65) > 14 WTR::PlatformWebView::PlatformWebView(OpaqueWKContext const*, OpaqueWKPageGroup const*, OpaqueWKPage const*, OpaqueWKDictionary const*) + 1091 (PlatformWebViewMac.mm:141) > 15 WTR::PlatformWebView::PlatformWebView(OpaqueWKContext const*, OpaqueWKPageGroup const*, OpaqueWKPage const*, OpaqueWKDictionary const*) + 53 (PlatformWebViewMac.mm:152) > 16 std::_Unique_if<WTR::PlatformWebView>::_Single_object std::make_unique<WTR::PlatformWebView, OpaqueWKContext const*, OpaqueWKPageGroup const*, std::nullptr_t, OpaqueWKDictionary const*&>(OpaqueWKContext const*&&, OpaqueWKPageGroup const*&&, std::nullptr_t&&, OpaqueWKDictionary const*&&&) + 170 (StdLibExtras.h:337) > 17 WTR::TestController::createWebViewWithOptions(OpaqueWKDictionary const*) + 168 (TestController.cpp:471) > 18 WTR::TestController::ensureViewSupportsOptions(OpaqueWKDictionary const*) + 697 (TestController.cpp:602) > 19 WTR::TestController::platformConfigureViewForTest(WTR::TestInvocation const&) + 503 (TestControllerMac.mm:96) > 20 WTR::TestController::configureViewForTest(WTR::TestInvocation const&) + 98 (TestController.cpp:834) > 21 WTR::TestInvocation::invoke() + 52 (TestInvocation.cpp:134) > 22 WTR::TestController::runTest(char const*) + 1303 (TestController.cpp:935) > 23 WTR::TestController::runTestingServerLoop() + 178 (TestController.cpp:952) > 24 WTR::TestController::run() + 91 (TestController.cpp:965) > 25 WTR::TestController::TestController(int, char const**) + 1217 (TestController.cpp:128) > 26 WTR::TestController::TestController(int, char const**) + 35 (TestController.cpp:129) > 27 main + 122 (main.mm:49) > 28 start + 1 The crashes seem StorageManager related. 244709 2015-01-15 13:17:48 -0800 2015-01-15 13:18:10 -0800 Patch bug-140507-20150115131755.patch text/plain 9381 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NTI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODljNzljZWE3ODRhYjAx OWQ0MjEzNWFkNGRlMGNjNjhjYjdmNjBjOC4uNjcyNjFiNjlhMjJhNWNhNWQ3M2E5MWYxN2JkOWUy NzhiOGI3NTdkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ0IEBACiAyMDE1LTAxLTE1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xlYXJpbmcgdGhl IHdlYnNpdGUgZGF0YSBzdG9yZSBzaG91bGQgY2xlYXIgbG9jYWwgc3RvcmFnZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQwNTA3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvV2Vic2l0ZURh dGEvV2Vic2l0ZURhdGFUeXBlcy5oOgorICAgICAgICBBZGQgV2Vic2l0ZURhdGFUeXBlTG9jYWxT dG9yYWdlLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0 b3JlLmg6CisgICAgICAgIEFkZCBXS1dlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZQorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlLm1tOgorICAgICAg ICAodG9XZWJzaXRlRGF0YVR5cGVzKToKKyAgICAgICAgSGFuZGxlIFdLV2Vic2l0ZURhdGFUeXBl TG9jYWxTdG9yYWdlLgorCisgICAgICAgICogVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdl RGF0YWJhc2VUcmFja2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6ZmlsZU1vZGlmaWNhdGlvblRp bWUpOgorICAgICAgICBVc2UgYW4gZWFybHkgcmV0dXJuLgorCisgICAgICAgIChXZWJLaXQ6Okxv Y2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6ZGVsZXRlRGF0YWJhc2VzTW9kaWZpZWRTaW5jZSk6 CisgICAgICAgIENoYW5nZSB0aGlzIHRvIHRha2UgYW4gc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9j azo6dGltZV9wb2ludCBhbmQgZG9uJ3QKKyAgICAgICAgdHJ5IHRvIG1vZGlmaXkgbV9vcmlnaW5z IHdoaWxlIGl0ZXJhdGluZyBpdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL0xvY2Fs U3RvcmFnZURhdGFiYXNlVHJhY2tlci5oOgorICAgICAgICBVcGRhdGUgZGVjbGFyYXRpb25zLgor CisgICAgICAgICogVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwOgorICAgICAg ICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlTG9jYWxTdG9yYWdlT3JpZ2luc01vZGlm aWVkU2luY2UpOgorICAgICAgICBDaGFuZ2UgdGhpcyB0byB0YWtlIGFuIHN0ZDo6Y2hyb25vOjpz eXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvU3RvcmFnZS9T dG9yYWdlTWFuYWdlci5oOgorICAgICAgICBVcGRhdGUgZGVjbGFyYXRpb25zLgorCisgICAgICAg ICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpyZW1vdmVEYXRhKToKKyAgICAgICAgUmVtb3ZlIGRh dGEgZnJvbSB0aGUgc3RvcmFnZSBtYW5hZ2VyIGFzIHdlbGwuCisKKzIwMTUtMDEtMTUgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBHaXZlIFdlYnNpdGVE YXRhU3RvcmUgYSBTdG9yYWdlTWFuYWdlcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQwNTA1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVR5cGVzLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFUeXBlcy5oCmluZGV4IGFkYWMyNGZhNWRiZTdiMmUw N2E1ZDc1ZDQ0ZGQ5Y2RiNjU2MjU3M2MuLjc3MzIzZDNhYTBlNDU4ZTc2N2Q4NDI3MzJhN2FkZjlk MDIxZmVmNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJzaXRlRGF0YS9X ZWJzaXRlRGF0YVR5cGVzLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYnNpdGVEYXRh L1dlYnNpdGVEYXRhVHlwZXMuaApAQCAtMzEsNiArMzEsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsK IGVudW0gV2Vic2l0ZURhdGFUeXBlcyB7CiAgICAgV2Vic2l0ZURhdGFUeXBlQ29va2llcyA9IDEg PDwgMCwKICAgICBXZWJzaXRlRGF0YVR5cGVEaXNrQ2FjaGUgPSAxIDw8IDEsCisgICAgV2Vic2l0 ZURhdGFUeXBlTG9jYWxTdG9yYWdlID0gMSA8PCAyLAogfTsKIAogfTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZS5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlLmgK aW5kZXggN2U1ZTg2NjFlMWRhNjlkYzZlOWUwODAxODllMDU3ZDI5ZjJhNjBmZC4uOTE0MTUyMGEy YTU0ZTgzNzg4MjQ5Njg0MTM5MGVlMzM2OWJkZTQyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlLmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlLmgKQEAgLTMz LDYgKzMzLDcgQEAgdHlwZWRlZiBOU19PUFRJT05TKE5TVUludGVnZXIsIFdLV2Vic2l0ZURhdGFU eXBlcykgewogICAgIFdLV2Vic2l0ZURhdGFUeXBlQ29va2llcyA9IDEgPDwgMCwKICAgICBXS1dl YnNpdGVEYXRhVHlwZURpc2tDYWNoZSA9IDEgPDwgMSwKIAorICAgIFdLV2Vic2l0ZURhdGFUeXBl TG9jYWxTdG9yYWdlID0gMSA8PCAyLAogICAgIFdLV2Vic2l0ZURhdGFUeXBlQWxsID0gTlNVSW50 ZWdlck1heCwKIH0gV0tfRU5VTV9BVkFJTEFCTEUoV0tfTUFDX1RCQSwgV0tfSU9TX1RCQSk7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0 ZURhdGFTdG9yZS5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vi c2l0ZURhdGFTdG9yZS5tbQppbmRleCAyMWY4Y2ExOTVkMmJiMjY5MjFkZGVkM2NhODI2NzFkZjgw ZWMwMDg0Li4xZmRhYzc3MWExNWU3ZjFhOTI1Yjk1MzljMGI0N2I2ZWY3YjdjM2E2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3Rv cmUubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRl RGF0YVN0b3JlLm1tCkBAIC02Miw2ICs2Miw4IEBAIHN0YXRpYyBXZWJLaXQ6OldlYnNpdGVEYXRh VHlwZXMgdG9XZWJzaXRlRGF0YVR5cGVzKFdLV2Vic2l0ZURhdGFUeXBlcyB3a1dlYnNpdGVECiAg ICAgICAgIHdlYnNpdGVEYXRhVHlwZXMgfD0gV2Vic2l0ZURhdGFUeXBlczo6V2Vic2l0ZURhdGFU eXBlQ29va2llczsKICAgICBpZiAod2tXZWJzaXRlRGF0YVR5cGVzICYgV0tXZWJzaXRlRGF0YVR5 cGVEaXNrQ2FjaGUpCiAgICAgICAgIHdlYnNpdGVEYXRhVHlwZXMgfD0gV2Vic2l0ZURhdGFUeXBl czo6V2Vic2l0ZURhdGFUeXBlRGlza0NhY2hlOworICAgIGlmICh3a1dlYnNpdGVEYXRhVHlwZXMg JiBXS1dlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZSkKKyAgICAgICAgd2Vic2l0ZURhdGFUeXBl cyB8PSBXZWJzaXRlRGF0YVR5cGVzOjpXZWJzaXRlRGF0YVR5cGVMb2NhbFN0b3JhZ2U7CiAKICAg ICByZXR1cm4gc3RhdGljX2Nhc3Q8V2Vic2l0ZURhdGFUeXBlcz4od2Vic2l0ZURhdGFUeXBlcyk7 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0 b3JhZ2VEYXRhYmFzZVRyYWNrZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3Jh Z2UvTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLmNwcAppbmRleCA1MGZkNzJiODI1MzY1YzJm NWQ2ZWM3Zjg0NmU4YjdhZTE3YzZiMjRiLi44ODVhNWM2YzYwYWVkMmI5MDY1M2Y4YzliNzgzZGQ5 MjNhYzkwZWU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9M b2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5jcHAKQEAgLTEzNCwxMiAr MTM0LDE1IEBAIHN0YXRpYyBPcHRpb25hbDx0aW1lX3Q+IGZpbGVDcmVhdGlvblRpbWUoY29uc3Qg U3RyaW5nJiBmaWxlUGF0aCkKIHN0YXRpYyBPcHRpb25hbDx0aW1lX3Q+IGZpbGVNb2RpZmljYXRp b25UaW1lKGNvbnN0IFN0cmluZyYgZmlsZVBhdGgpCiB7CiAgICAgdGltZV90IHRpbWU7Ci0gICAg cmV0dXJuIGdldEZpbGVNb2RpZmljYXRpb25UaW1lKGZpbGVQYXRoLCB0aW1lKSA/IHRpbWUgOiBP cHRpb25hbDx0aW1lX3Q+KE51bGxvcHQpOworICAgIGlmICghZ2V0RmlsZU1vZGlmaWNhdGlvblRp bWUoZmlsZVBhdGgsIHRpbWUpKQorICAgICAgICByZXR1cm4gTnVsbG9wdDsKKworICAgIHJldHVy biB0aW1lOwogfQogCi1WZWN0b3I8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPj4gTG9jYWxTdG9yYWdl RGF0YWJhc2VUcmFja2VyOjpkZWxldGVEYXRhYmFzZXNNb2RpZmllZFNpbmNlKHRpbWVfdCB0aW1l KQorVmVjdG9yPFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+IExvY2FsU3RvcmFnZURhdGFiYXNlVHJh Y2tlcjo6ZGVsZXRlRGF0YWJhc2VzTW9kaWZpZWRTaW5jZShzdGQ6OmNocm9ubzo6c3lzdGVtX2Ns b2NrOjp0aW1lX3BvaW50IHRpbWUpCiB7Ci0gICAgVmVjdG9yPFJlZlB0cjxTZWN1cml0eU9yaWdp bj4+IGRlbGV0ZWREYXRhYmFzZU9yaWdpbnM7CisgICAgVmVjdG9yPFN0cmluZz4gb3JpZ2luSWRl bnRpZmllcnNUb0RlbGV0ZTsKIAogICAgIGZvciAoY29uc3QgU3RyaW5nJiBvcmlnaW4gOiBtX29y aWdpbnMpIHsKICAgICAgICAgU3RyaW5nIGZpbGVQYXRoID0gcGF0aEZvckRhdGFiYXNlV2l0aE9y aWdpbklkZW50aWZpZXIob3JpZ2luKTsKQEAgLTE0OCwxMSArMTUxLDE3IEBAIFZlY3RvcjxSZWZQ dHI8U2VjdXJpdHlPcmlnaW4+PiBMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI6OmRlbGV0ZURh dGFiYXNlc01vZGlmCiAgICAgICAgIGlmICghbW9kaWZpY2F0aW9uVGltZSkKICAgICAgICAgICAg IGNvbnRpbnVlOwogCi0gICAgICAgIGlmIChtb2RpZmljYXRpb25UaW1lLnZhbHVlKCkgPj0gdGlt ZSkgewotICAgICAgICAgICAgcmVtb3ZlRGF0YWJhc2VXaXRoT3JpZ2luSWRlbnRpZmllcihvcmln aW4pOworICAgICAgICBpZiAobW9kaWZpY2F0aW9uVGltZS52YWx1ZSgpID49IHN0ZDo6Y2hyb25v OjpzeXN0ZW1fY2xvY2s6OnRvX3RpbWVfdCh0aW1lKSkKKyAgICAgICAgICAgIG9yaWdpbklkZW50 aWZpZXJzVG9EZWxldGUuYXBwZW5kKG9yaWdpbik7CisgICAgfQogCi0gICAgICAgICAgICBkZWxl dGVkRGF0YWJhc2VPcmlnaW5zLmFwcGVuZChTZWN1cml0eU9yaWdpbjo6Y3JlYXRlRnJvbURhdGFi YXNlSWRlbnRpZmllcihvcmlnaW4pKTsKLSAgICAgICAgfQorICAgIFZlY3RvcjxSZWZQdHI8U2Vj dXJpdHlPcmlnaW4+PiBkZWxldGVkRGF0YWJhc2VPcmlnaW5zOworICAgIGRlbGV0ZWREYXRhYmFz ZU9yaWdpbnMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShvcmlnaW5JZGVudGlmaWVyc1RvRGVsZXRl LnNpemUoKSk7CisKKyAgICBmb3IgKGNvbnN0IGF1dG8mIG9yaWdpbklkZW50aWZpZXIgOiBvcmln aW5JZGVudGlmaWVyc1RvRGVsZXRlKSB7CisgICAgICAgIHJlbW92ZURhdGFiYXNlV2l0aE9yaWdp bklkZW50aWZpZXIob3JpZ2luSWRlbnRpZmllcik7CisgICAgICAgIHByaW50ZigiZGVsZXRpbmcg JXNcbiIsIG9yaWdpbklkZW50aWZpZXIuYXNjaWkoKS5kYXRhKCkpOworICAgICAgICBkZWxldGVk RGF0YWJhc2VPcmlnaW5zLnVuY2hlY2tlZEFwcGVuZChTZWN1cml0eU9yaWdpbjo6Y3JlYXRlRnJv bURhdGFiYXNlSWRlbnRpZmllcihvcmlnaW5JZGVudGlmaWVyKSk7CiAgICAgfQogCiAgICAgcmV0 dXJuIGRlbGV0ZWREYXRhYmFzZU9yaWdpbnM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5oCmlu ZGV4IGIwMmU4YTBhZmZhOTlhYWVkYzEyYWIxNGU0OWNiZGI4OTY1ZTVjYjQuLmNjY2I5NjUyNzQw NGMzZmI2YTkxMWE0MTVhNTk3MzQxYmY4ZmI1ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tl ci5oCkBAIC01Niw3ICs1Niw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRlbGV0ZUFsbERhdGFiYXNl cygpOwogCiAgICAgLy8gUmV0dXJucyBhIHZlY3RvciBvZiB0aGUgb3JpZ2lucyB3aG9zZSBkYXRh YmFzZXMgaGF2ZSBiZWVuIGRlbGV0ZWQuCi0gICAgVmVjdG9yPFJlZlB0cjxXZWJDb3JlOjpTZWN1 cml0eU9yaWdpbj4+IGRlbGV0ZURhdGFiYXNlc01vZGlmaWVkU2luY2UodGltZV90KTsKKyAgICBW ZWN0b3I8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4gZGVsZXRlRGF0YWJhc2VzTW9k aWZpZWRTaW5jZShzdGQ6OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjp0aW1lX3BvaW50KTsKIAogICAg IFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+PiBvcmlnaW5zKCkgY29uc3Q7 CiAgICAgVmVjdG9yPExvY2FsU3RvcmFnZURldGFpbHM+IGRldGFpbHMoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcAppbmRleCBk NDdhZWMyYjE0YTU3MzdhODFlZTMyMDg1ZTQzZGNlN2E2YzUyY2IyLi40NGRmNDZmNzljODNlOGVk ZmI1ODU4Njg0YTUyMWJkNmI5NmY0ZDlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCkBAIC01NzAsNyArNTcwLDcgQEAgdm9p ZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlQWxsRW50cmllcygpCiAgICAgfSk7CiB9CiAKLXZvaWQg U3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUxvY2FsU3RvcmFnZU9yaWdpbnNNb2RpZmllZFNpbmNlKHRp bWVfdCB0aW1lLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGNvbXBsZXRpb25IYW5kbGVyKQordm9p ZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlTG9jYWxTdG9yYWdlT3JpZ2luc01vZGlmaWVkU2luY2Uo c3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6dGltZV9wb2ludCB0aW1lLCBzdGQ6OmZ1bmN0aW9u PHZvaWQgKCk+IGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIFJlZlB0cjxTdG9yYWdlTWFuYWdl cj4gc3RvcmFnZU1hbmFnZXIodGhpcyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCmluZGV4IDMzZDI0NTFiNGRjNTBhYjA5NDBhY2Vl MTE1MWZhMWM1N2M0MTNkMDguLjVjZGUxOGU5NmE4ZWI1YWZkMjRkMzFmZGIzMDgyZDNkMjc0NTMy ZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VN YW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1h bmFnZXIuaApAQCAtNjQsNyArNjQsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkZWxldGVFbnRyaWVz Rm9yT3JpZ2luKGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luJik7CiAgICAgdm9pZCBkZWxl dGVBbGxFbnRyaWVzKCk7CiAKLSAgICB2b2lkIGRlbGV0ZUxvY2FsU3RvcmFnZU9yaWdpbnNNb2Rp ZmllZFNpbmNlKHRpbWVfdCwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBjb21wbGV0aW9uSGFuZGxl cik7CisgICAgdm9pZCBkZWxldGVMb2NhbFN0b3JhZ2VPcmlnaW5zTW9kaWZpZWRTaW5jZShzdGQ6 OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjp0aW1lX3BvaW50LCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+ IGNvbXBsZXRpb25IYW5kbGVyKTsKIAogcHJpdmF0ZToKICAgICBleHBsaWNpdCBTdG9yYWdlTWFu YWdlcihjb25zdCBTdHJpbmcmIGxvY2FsU3RvcmFnZURpcmVjdG9yeSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5j cHAKaW5kZXggYTI4YzNjMTc4NDlkNjk2ZGVmYWQyOGM3MmU5NzE2NjZhZTRlMGFlNS4uN2E3MTk1 ZTMwMGI4MTAxN2E2YWI4MWYzOWY4Y2M4ODZmYWI3NmY3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcApA QCAtMTczLDYgKzE3MywxNCBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZURhdGEoV2Vi c2l0ZURhdGFUeXBlcyBkYXRhVHlwZXMsIHN0ZDo6Y2hyb25vOjpzeXN0ZQogICAgICAgICB9CiAg ICAgfQogCisgICAgaWYgKGRhdGFUeXBlcyAmIFdlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZSAm JiBtX3N0b3JhZ2VNYW5hZ2VyKSB7CisgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+YWRkUGVu ZGluZ0NhbGxiYWNrKCk7CisKKyAgICAgICAgbV9zdG9yYWdlTWFuYWdlci0+ZGVsZXRlTG9jYWxT dG9yYWdlT3JpZ2luc01vZGlmaWVkU2luY2UobW9kaWZpZWRTaW5jZSwgW2NhbGxiYWNrQWdncmVn YXRvcl0geworICAgICAgICAgICAgY2FsbGJhY2tBZ2dyZWdhdG9yLT5yZW1vdmVQZW5kaW5nQ2Fs bGJhY2soKTsKKyAgICAgICAgfSk7CisgICAgfQorCiAgICAgLy8gVGhlcmUncyBhIGNoYW5jZSB0 aGF0IHdlIGRvbid0IGhhdmUgYW55IHBlbmRpbmcgY2FsbGJhY2tzLiBJZiBzbywgd2Ugd2FudCB0 byBkaXNwYXRjaCB0aGUgY29tcGxldGlvbiBoYW5kbGVyIHJpZ2h0IGF3YXkuCiAgICAgY2FsbGJh Y2tBZ2dyZWdhdG9yLT5jYWxsSWZOZWVkZWQoKTsKIH0K 244710 2015-01-15 13:18:14 -0800 2015-01-15 13:23:47 -0800 Patch bug-140507-20150115131821.patch text/plain 9316 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NTI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODljNzljZWE3ODRhYjAx OWQ0MjEzNWFkNGRlMGNjNjhjYjdmNjBjOC4uNjcyNjFiNjlhMjJhNWNhNWQ3M2E5MWYxN2JkOWUy NzhiOGI3NTdkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ0IEBACiAyMDE1LTAxLTE1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xlYXJpbmcgdGhl IHdlYnNpdGUgZGF0YSBzdG9yZSBzaG91bGQgY2xlYXIgbG9jYWwgc3RvcmFnZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQwNTA3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvV2Vic2l0ZURh dGEvV2Vic2l0ZURhdGFUeXBlcy5oOgorICAgICAgICBBZGQgV2Vic2l0ZURhdGFUeXBlTG9jYWxT dG9yYWdlLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0 b3JlLmg6CisgICAgICAgIEFkZCBXS1dlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZQorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlLm1tOgorICAgICAg ICAodG9XZWJzaXRlRGF0YVR5cGVzKToKKyAgICAgICAgSGFuZGxlIFdLV2Vic2l0ZURhdGFUeXBl TG9jYWxTdG9yYWdlLgorCisgICAgICAgICogVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdl RGF0YWJhc2VUcmFja2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6ZmlsZU1vZGlmaWNhdGlvblRp bWUpOgorICAgICAgICBVc2UgYW4gZWFybHkgcmV0dXJuLgorCisgICAgICAgIChXZWJLaXQ6Okxv Y2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6ZGVsZXRlRGF0YWJhc2VzTW9kaWZpZWRTaW5jZSk6 CisgICAgICAgIENoYW5nZSB0aGlzIHRvIHRha2UgYW4gc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9j azo6dGltZV9wb2ludCBhbmQgZG9uJ3QKKyAgICAgICAgdHJ5IHRvIG1vZGlmaXkgbV9vcmlnaW5z IHdoaWxlIGl0ZXJhdGluZyBpdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL0xvY2Fs U3RvcmFnZURhdGFiYXNlVHJhY2tlci5oOgorICAgICAgICBVcGRhdGUgZGVjbGFyYXRpb25zLgor CisgICAgICAgICogVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwOgorICAgICAg ICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlTG9jYWxTdG9yYWdlT3JpZ2luc01vZGlm aWVkU2luY2UpOgorICAgICAgICBDaGFuZ2UgdGhpcyB0byB0YWtlIGFuIHN0ZDo6Y2hyb25vOjpz eXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvU3RvcmFnZS9T dG9yYWdlTWFuYWdlci5oOgorICAgICAgICBVcGRhdGUgZGVjbGFyYXRpb25zLgorCisgICAgICAg ICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpyZW1vdmVEYXRhKToKKyAgICAgICAgUmVtb3ZlIGRh dGEgZnJvbSB0aGUgc3RvcmFnZSBtYW5hZ2VyIGFzIHdlbGwuCisKKzIwMTUtMDEtMTUgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBHaXZlIFdlYnNpdGVE YXRhU3RvcmUgYSBTdG9yYWdlTWFuYWdlcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQwNTA1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVR5cGVzLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFUeXBlcy5oCmluZGV4IGFkYWMyNGZhNWRiZTdiMmUw N2E1ZDc1ZDQ0ZGQ5Y2RiNjU2MjU3M2MuLjc3MzIzZDNhYTBlNDU4ZTc2N2Q4NDI3MzJhN2FkZjlk MDIxZmVmNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJzaXRlRGF0YS9X ZWJzaXRlRGF0YVR5cGVzLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYnNpdGVEYXRh L1dlYnNpdGVEYXRhVHlwZXMuaApAQCAtMzEsNiArMzEsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsK IGVudW0gV2Vic2l0ZURhdGFUeXBlcyB7CiAgICAgV2Vic2l0ZURhdGFUeXBlQ29va2llcyA9IDEg PDwgMCwKICAgICBXZWJzaXRlRGF0YVR5cGVEaXNrQ2FjaGUgPSAxIDw8IDEsCisgICAgV2Vic2l0 ZURhdGFUeXBlTG9jYWxTdG9yYWdlID0gMSA8PCAyLAogfTsKIAogfTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZS5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlLmgK aW5kZXggN2U1ZTg2NjFlMWRhNjlkYzZlOWUwODAxODllMDU3ZDI5ZjJhNjBmZC4uOTE0MTUyMGEy YTU0ZTgzNzg4MjQ5Njg0MTM5MGVlMzM2OWJkZTQyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlLmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlLmgKQEAgLTMz LDYgKzMzLDcgQEAgdHlwZWRlZiBOU19PUFRJT05TKE5TVUludGVnZXIsIFdLV2Vic2l0ZURhdGFU eXBlcykgewogICAgIFdLV2Vic2l0ZURhdGFUeXBlQ29va2llcyA9IDEgPDwgMCwKICAgICBXS1dl YnNpdGVEYXRhVHlwZURpc2tDYWNoZSA9IDEgPDwgMSwKIAorICAgIFdLV2Vic2l0ZURhdGFUeXBl TG9jYWxTdG9yYWdlID0gMSA8PCAyLAogICAgIFdLV2Vic2l0ZURhdGFUeXBlQWxsID0gTlNVSW50 ZWdlck1heCwKIH0gV0tfRU5VTV9BVkFJTEFCTEUoV0tfTUFDX1RCQSwgV0tfSU9TX1RCQSk7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0 ZURhdGFTdG9yZS5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vi c2l0ZURhdGFTdG9yZS5tbQppbmRleCAyMWY4Y2ExOTVkMmJiMjY5MjFkZGVkM2NhODI2NzFkZjgw ZWMwMDg0Li4xZmRhYzc3MWExNWU3ZjFhOTI1Yjk1MzljMGI0N2I2ZWY3YjdjM2E2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3Rv cmUubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRl RGF0YVN0b3JlLm1tCkBAIC02Miw2ICs2Miw4IEBAIHN0YXRpYyBXZWJLaXQ6OldlYnNpdGVEYXRh VHlwZXMgdG9XZWJzaXRlRGF0YVR5cGVzKFdLV2Vic2l0ZURhdGFUeXBlcyB3a1dlYnNpdGVECiAg ICAgICAgIHdlYnNpdGVEYXRhVHlwZXMgfD0gV2Vic2l0ZURhdGFUeXBlczo6V2Vic2l0ZURhdGFU eXBlQ29va2llczsKICAgICBpZiAod2tXZWJzaXRlRGF0YVR5cGVzICYgV0tXZWJzaXRlRGF0YVR5 cGVEaXNrQ2FjaGUpCiAgICAgICAgIHdlYnNpdGVEYXRhVHlwZXMgfD0gV2Vic2l0ZURhdGFUeXBl czo6V2Vic2l0ZURhdGFUeXBlRGlza0NhY2hlOworICAgIGlmICh3a1dlYnNpdGVEYXRhVHlwZXMg JiBXS1dlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZSkKKyAgICAgICAgd2Vic2l0ZURhdGFUeXBl cyB8PSBXZWJzaXRlRGF0YVR5cGVzOjpXZWJzaXRlRGF0YVR5cGVMb2NhbFN0b3JhZ2U7CiAKICAg ICByZXR1cm4gc3RhdGljX2Nhc3Q8V2Vic2l0ZURhdGFUeXBlcz4od2Vic2l0ZURhdGFUeXBlcyk7 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0 b3JhZ2VEYXRhYmFzZVRyYWNrZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3Jh Z2UvTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLmNwcAppbmRleCA1MGZkNzJiODI1MzY1YzJm NWQ2ZWM3Zjg0NmU4YjdhZTE3YzZiMjRiLi44MGI2MDJlOGQxNjZhYmMzNWE4MDkxYzZhMDRiMDNm MDc2OWNkYjk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9M b2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5jcHAKQEAgLTEzNCwxMiAr MTM0LDE1IEBAIHN0YXRpYyBPcHRpb25hbDx0aW1lX3Q+IGZpbGVDcmVhdGlvblRpbWUoY29uc3Qg U3RyaW5nJiBmaWxlUGF0aCkKIHN0YXRpYyBPcHRpb25hbDx0aW1lX3Q+IGZpbGVNb2RpZmljYXRp b25UaW1lKGNvbnN0IFN0cmluZyYgZmlsZVBhdGgpCiB7CiAgICAgdGltZV90IHRpbWU7Ci0gICAg cmV0dXJuIGdldEZpbGVNb2RpZmljYXRpb25UaW1lKGZpbGVQYXRoLCB0aW1lKSA/IHRpbWUgOiBP cHRpb25hbDx0aW1lX3Q+KE51bGxvcHQpOworICAgIGlmICghZ2V0RmlsZU1vZGlmaWNhdGlvblRp bWUoZmlsZVBhdGgsIHRpbWUpKQorICAgICAgICByZXR1cm4gTnVsbG9wdDsKKworICAgIHJldHVy biB0aW1lOwogfQogCi1WZWN0b3I8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPj4gTG9jYWxTdG9yYWdl RGF0YWJhc2VUcmFja2VyOjpkZWxldGVEYXRhYmFzZXNNb2RpZmllZFNpbmNlKHRpbWVfdCB0aW1l KQorVmVjdG9yPFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+IExvY2FsU3RvcmFnZURhdGFiYXNlVHJh Y2tlcjo6ZGVsZXRlRGF0YWJhc2VzTW9kaWZpZWRTaW5jZShzdGQ6OmNocm9ubzo6c3lzdGVtX2Ns b2NrOjp0aW1lX3BvaW50IHRpbWUpCiB7Ci0gICAgVmVjdG9yPFJlZlB0cjxTZWN1cml0eU9yaWdp bj4+IGRlbGV0ZWREYXRhYmFzZU9yaWdpbnM7CisgICAgVmVjdG9yPFN0cmluZz4gb3JpZ2luSWRl bnRpZmllcnNUb0RlbGV0ZTsKIAogICAgIGZvciAoY29uc3QgU3RyaW5nJiBvcmlnaW4gOiBtX29y aWdpbnMpIHsKICAgICAgICAgU3RyaW5nIGZpbGVQYXRoID0gcGF0aEZvckRhdGFiYXNlV2l0aE9y aWdpbklkZW50aWZpZXIob3JpZ2luKTsKQEAgLTE0OCwxMSArMTUxLDE3IEBAIFZlY3RvcjxSZWZQ dHI8U2VjdXJpdHlPcmlnaW4+PiBMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI6OmRlbGV0ZURh dGFiYXNlc01vZGlmCiAgICAgICAgIGlmICghbW9kaWZpY2F0aW9uVGltZSkKICAgICAgICAgICAg IGNvbnRpbnVlOwogCi0gICAgICAgIGlmIChtb2RpZmljYXRpb25UaW1lLnZhbHVlKCkgPj0gdGlt ZSkgewotICAgICAgICAgICAgcmVtb3ZlRGF0YWJhc2VXaXRoT3JpZ2luSWRlbnRpZmllcihvcmln aW4pOworICAgICAgICBpZiAobW9kaWZpY2F0aW9uVGltZS52YWx1ZSgpID49IHN0ZDo6Y2hyb25v OjpzeXN0ZW1fY2xvY2s6OnRvX3RpbWVfdCh0aW1lKSkKKyAgICAgICAgICAgIG9yaWdpbklkZW50 aWZpZXJzVG9EZWxldGUuYXBwZW5kKG9yaWdpbik7CisgICAgfQogCi0gICAgICAgICAgICBkZWxl dGVkRGF0YWJhc2VPcmlnaW5zLmFwcGVuZChTZWN1cml0eU9yaWdpbjo6Y3JlYXRlRnJvbURhdGFi YXNlSWRlbnRpZmllcihvcmlnaW4pKTsKLSAgICAgICAgfQorICAgIFZlY3RvcjxSZWZQdHI8U2Vj dXJpdHlPcmlnaW4+PiBkZWxldGVkRGF0YWJhc2VPcmlnaW5zOworICAgIGRlbGV0ZWREYXRhYmFz ZU9yaWdpbnMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShvcmlnaW5JZGVudGlmaWVyc1RvRGVsZXRl LnNpemUoKSk7CisKKyAgICBmb3IgKGNvbnN0IGF1dG8mIG9yaWdpbklkZW50aWZpZXIgOiBvcmln aW5JZGVudGlmaWVyc1RvRGVsZXRlKSB7CisgICAgICAgIHJlbW92ZURhdGFiYXNlV2l0aE9yaWdp bklkZW50aWZpZXIob3JpZ2luSWRlbnRpZmllcik7CisKKyAgICAgICAgZGVsZXRlZERhdGFiYXNl T3JpZ2lucy51bmNoZWNrZWRBcHBlbmQoU2VjdXJpdHlPcmlnaW46OmNyZWF0ZUZyb21EYXRhYmFz ZUlkZW50aWZpZXIob3JpZ2luSWRlbnRpZmllcikpOwogICAgIH0KIAogICAgIHJldHVybiBkZWxl dGVkRGF0YWJhc2VPcmlnaW5zOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuaAppbmRleCBiMDJl OGEwYWZmYTk5YWFlZGMxMmFiMTRlNDljYmRiODk2NWU1Y2I0Li5jY2NiOTY1Mjc0MDRjM2ZiNmE5 MTFhNDE1YTU5NzM0MWJmOGZiNWQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuaApAQCAt NTYsNyArNTYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkZWxldGVBbGxEYXRhYmFzZXMoKTsKIAog ICAgIC8vIFJldHVybnMgYSB2ZWN0b3Igb2YgdGhlIG9yaWdpbnMgd2hvc2UgZGF0YWJhc2VzIGhh dmUgYmVlbiBkZWxldGVkLgotICAgIFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmln aW4+PiBkZWxldGVEYXRhYmFzZXNNb2RpZmllZFNpbmNlKHRpbWVfdCk7CisgICAgVmVjdG9yPFJl ZlB0cjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4+IGRlbGV0ZURhdGFiYXNlc01vZGlmaWVkU2lu Y2Uoc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6dGltZV9wb2ludCk7CiAKICAgICBWZWN0b3I8 UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4gb3JpZ2lucygpIGNvbnN0OwogICAgIFZl Y3RvcjxMb2NhbFN0b3JhZ2VEZXRhaWxzPiBkZXRhaWxzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAKaW5kZXggZDQ3YWVjMmIx NGE1NzM3YTgxZWUzMjA4NWU0M2RjZTdhNmM1MmNiMi4uNDRkZjQ2Zjc5YzgzZThlZGZiNTg1ODY4 NGE1MjFiZDZiOTZmNGQ5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0 b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9T dG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcApAQCAtNTcwLDcgKzU3MCw3IEBAIHZvaWQgU3RvcmFn ZU1hbmFnZXI6OmRlbGV0ZUFsbEVudHJpZXMoKQogICAgIH0pOwogfQogCi12b2lkIFN0b3JhZ2VN YW5hZ2VyOjpkZWxldGVMb2NhbFN0b3JhZ2VPcmlnaW5zTW9kaWZpZWRTaW5jZSh0aW1lX3QgdGlt ZSwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBjb21wbGV0aW9uSGFuZGxlcikKK3ZvaWQgU3RvcmFn ZU1hbmFnZXI6OmRlbGV0ZUxvY2FsU3RvcmFnZU9yaWdpbnNNb2RpZmllZFNpbmNlKHN0ZDo6Y2hy b25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQgdGltZSwgc3RkOjpmdW5jdGlvbjx2b2lkICgp PiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBSZWZQdHI8U3RvcmFnZU1hbmFnZXI+IHN0b3Jh Z2VNYW5hZ2VyKHRoaXMpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv U3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3Jh Z2UvU3RvcmFnZU1hbmFnZXIuaAppbmRleCAzM2QyNDUxYjRkYzUwYWIwOTQwYWNlZTExNTFmYTFj NTdjNDEzZDA4Li41Y2RlMThlOTZhOGViNWFmZDI0ZDMxZmRiMzA4MmQzZDI3NDUzMmQ1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5o CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmgK QEAgLTY0LDcgKzY0LDcgQEAgcHVibGljOgogICAgIHZvaWQgZGVsZXRlRW50cmllc0Zvck9yaWdp bihjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbiYpOwogICAgIHZvaWQgZGVsZXRlQWxsRW50 cmllcygpOwogCi0gICAgdm9pZCBkZWxldGVMb2NhbFN0b3JhZ2VPcmlnaW5zTW9kaWZpZWRTaW5j ZSh0aW1lX3QsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gY29tcGxldGlvbkhhbmRsZXIpOworICAg IHZvaWQgZGVsZXRlTG9jYWxTdG9yYWdlT3JpZ2luc01vZGlmaWVkU2luY2Uoc3RkOjpjaHJvbm86 OnN5c3RlbV9jbG9jazo6dGltZV9wb2ludCwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBjb21wbGV0 aW9uSGFuZGxlcik7CiAKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgU3RvcmFnZU1hbmFnZXIoY29u c3QgU3RyaW5nJiBsb2NhbFN0b3JhZ2VEaXJlY3RvcnkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCmluZGV4 IGEyOGMzYzE3ODQ5ZDY5NmRlZmFkMjhjNzJlOTcxNjY2YWU0ZTBhZTUuLjdhNzE5NWUzMDBiODEw MTdhNmFiODFmMzlmOGNjODg2ZmFiNzZmNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKQEAgLTE3Myw2 ICsxNzMsMTQgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpyZW1vdmVEYXRhKFdlYnNpdGVEYXRh VHlwZXMgZGF0YVR5cGVzLCBzdGQ6OmNocm9ubzo6c3lzdGUKICAgICAgICAgfQogICAgIH0KIAor ICAgIGlmIChkYXRhVHlwZXMgJiBXZWJzaXRlRGF0YVR5cGVMb2NhbFN0b3JhZ2UgJiYgbV9zdG9y YWdlTWFuYWdlcikgeworICAgICAgICBjYWxsYmFja0FnZ3JlZ2F0b3ItPmFkZFBlbmRpbmdDYWxs YmFjaygpOworCisgICAgICAgIG1fc3RvcmFnZU1hbmFnZXItPmRlbGV0ZUxvY2FsU3RvcmFnZU9y aWdpbnNNb2RpZmllZFNpbmNlKG1vZGlmaWVkU2luY2UsIFtjYWxsYmFja0FnZ3JlZ2F0b3JdIHsK KyAgICAgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+cmVtb3ZlUGVuZGluZ0NhbGxiYWNrKCk7 CisgICAgICAgIH0pOworICAgIH0KKwogICAgIC8vIFRoZXJlJ3MgYSBjaGFuY2UgdGhhdCB3ZSBk b24ndCBoYXZlIGFueSBwZW5kaW5nIGNhbGxiYWNrcy4gSWYgc28sIHdlIHdhbnQgdG8gZGlzcGF0 Y2ggdGhlIGNvbXBsZXRpb24gaGFuZGxlciByaWdodCBhd2F5LgogICAgIGNhbGxiYWNrQWdncmVn YXRvci0+Y2FsbElmTmVlZGVkKCk7CiB9Cg==