156861 2016-04-21 13:02:47 -0700 Stop using ApplicationCacheStorage::singleton() on Windows 2016-04-21 14:16:41 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1185888 0 andersca 2016-04-21 13:02:47 -0700 Stop using ApplicationCacheStorage::singleton() on Windows 1185891 1 276945 andersca 2016-04-21 13:06:49 -0700 Created attachment 276945 Patch 1185910 2 276952 andersca 2016-04-21 13:36:11 -0700 Created attachment 276952 Patch 1185915 3 276952 darin 2016-04-21 13:46:08 -0700 Comment on attachment 276952 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=276952&action=review > Source/WebKit/win/WebApplicationCache.cpp:66 > + RetainPtr<CFPropertyListRef> cacheDirectoryPreference = adoptCF(CFPreferencesCopyAppValue(WebKitLocalCacheDefaultsKey, kCFPreferencesCurrentApplication)); Use auto here? > Source/WebKit/win/WebApplicationCache.cpp:67 > + if (cacheDirectoryPreference && (CFStringGetTypeID() == CFGetTypeID(cacheDirectoryPreference.get()))) Remove extra () here? 1185950 4 andersca 2016-04-21 14:16:41 -0700 Committed r199836: <http://trac.webkit.org/changeset/199836> 276945 2016-04-21 13:06:49 -0700 2016-04-21 13:36:09 -0700 Patch bug-156861-20160421130711.patch text/plain 5746 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5ODI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dp bi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggZTI3MDk1ODZm YjU3YWNhY2UxNTVhZjViMGNkNzlmYWQ0YWE1M2E3ZS4uYzMzNGNjZDMzMGQ5MmM5ZGFkZDkwMDhl ZGUyMTE3OGU4Y2UyNjM2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE2 LTA0LTIxICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAg U3RvcCB1c2luZyBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c2luZ2xldG9uKCkgb24gV2luZG93 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2ODYx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJB cHBsaWNhdGlvbkNhY2hlLmNwcDoKKyAgICAgICAgKGFwcGxpY2F0aW9uQ2FjaGVQYXRoKToKKyAg ICAgICAgKFdlYkFwcGxpY2F0aW9uQ2FjaGU6OnN0b3JhZ2UpOgorICAgICAgICAqIFdlYkFwcGxp Y2F0aW9uQ2FjaGUuaDoKKyAgICAgICAgKiBXZWJDYWNoZS5jcHA6CisgICAgICAgIChXZWJDYWNo ZTo6ZW1wdHkpOgorICAgICAgICAqIFdlYlZpZXcuY3BwOgorICAgICAgICAoV2ViVmlldzo6aW5p dFdpdGhGcmFtZSk6CisgICAgICAgIChXZWJLaXRTZXRBcHBsaWNhdGlvbkNhY2hlUGF0aElmTmVj ZXNzYXJ5KTogRGVsZXRlZC4KKwogMjAxNi0wNC0xNSAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFt QGFwcGxlLmNvbT4KIAogICAgICAgICBDU1A6IE1ha2UgZHluYW1pY2FsbHktYWRkZWQgZmF2aWNv bnMgKHZpYSBsaW5rIHJlbD0iaWNvbiIpIG9iZXkgQ29udGVudC1TZWN1cml0eS1Qb2xpY3kKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkFwcGxpY2F0aW9uQ2FjaGUuY3BwIGIvU291 cmNlL1dlYktpdC93aW4vV2ViQXBwbGljYXRpb25DYWNoZS5jcHAKaW5kZXggYTI5NzcwZDBjNzBj NDQxN2RiYzJlYjgxOGRmNDZhNTRmNmRiOGRkMi4uZDZlNGU3NTgwMmNlYTA1ZTI4MDE2YjMwZjRl Y2QzMzAwMjI2ZGZhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vV2ViQXBwbGljYXRp b25DYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViQXBwbGljYXRpb25DYWNoZS5j cHAKQEAgLTU4LDkgKzU4LDI0IEBAIFdlYkFwcGxpY2F0aW9uQ2FjaGUqIFdlYkFwcGxpY2F0aW9u Q2FjaGU6OmNyZWF0ZUluc3RhbmNlKCkKICAgICByZXR1cm4gaW5zdGFuY2U7CiB9CiAKK3N0YXRp YyBTdHJpbmcgYXBwbGljYXRpb25DYWNoZVBhdGgoKQoreworICAgIFN0cmluZyBwYXRoID0gbG9j YWxVc2VyU3BlY2lmaWNTdG9yYWdlRGlyZWN0b3J5KCk7CisKKyNpZiBVU0UoQ0YpCisgICAgUmV0 YWluUHRyPENGUHJvcGVydHlMaXN0UmVmPiBjYWNoZURpcmVjdG9yeVByZWZlcmVuY2UgPSBhZG9w dENGKENGUHJlZmVyZW5jZXNDb3B5QXBwVmFsdWUoV2ViS2l0TG9jYWxDYWNoZURlZmF1bHRzS2V5 LCBrQ0ZQcmVmZXJlbmNlc0N1cnJlbnRBcHBsaWNhdGlvbikpOworICAgIGlmIChjYWNoZURpcmVj dG9yeVByZWZlcmVuY2UgJiYgKENGU3RyaW5nR2V0VHlwZUlEKCkgPT0gQ0ZHZXRUeXBlSUQoY2Fj aGVEaXJlY3RvcnlQcmVmZXJlbmNlLmdldCgpKSkpCisgICAgICAgIHBhdGggPSBzdGF0aWNfY2Fz dDxDRlN0cmluZ1JlZj4oY2FjaGVEaXJlY3RvcnlQcmVmZXJlbmNlLmdldCgpKTsKKyNlbmRpZgor CisgICAgcmV0dXJuIHBhdGg7Cit9CisKIFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdl JiBXZWJBcHBsaWNhdGlvbkNhY2hlOjpzdG9yYWdlKCkKIHsKLSAgICByZXR1cm4gV2ViQ29yZTo6 QXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OnNpbmdsZXRvbigpOworICAgIHN0YXRpYyBBcHBsaWNh dGlvbkNhY2hlU3RvcmFnZSYgc3RvcmFnZSA9IEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpjcmVh dGUoYXBwbGljYXRpb25DYWNoZVBhdGgoKSwgIkFwcGxpY2F0aW9uQ2FjaGUiKS5sZWFrUmVmKCk7 CisKKyAgICByZXR1cm4gc3RvcmFnZTsKIH0KIAogLy8gSVVua25vd24gLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vV2ViQXBwbGljYXRpb25DYWNoZS5oIGIvU291cmNl L1dlYktpdC93aW4vV2ViQXBwbGljYXRpb25DYWNoZS5oCmluZGV4IGIyMTViYTQzMzc5ZTc2OGZk MjI0ZmVmNDdmZDk1MTZiMjQ1MDM3MmIuLmVhZGJmOTZlY2NiNGZiYzdjOWVkY2RjMTc2ODAxYzk3 NDYwNzY1MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkFwcGxpY2F0aW9uQ2Fj aGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJBcHBsaWNhdGlvbkNhY2hlLmgKQEAgLTM2 LDcgKzM2LDcgQEAgY2xhc3MgREVDTFNQRUNfVVVJRCgiMTExOUU5NzAtNEIxMy00QjlBLUEwNDkt NDEwOTYxMDRCNjg5IikgV2ViQXBwbGljYXRpb25DYWNoZQogcHVibGljOgogICAgIHN0YXRpYyBX ZWJBcHBsaWNhdGlvbkNhY2hlKiBjcmVhdGVJbnN0YW5jZSgpOwogCi0gICAgV2ViQ29yZTo6QXBw bGljYXRpb25DYWNoZVN0b3JhZ2UmIHN0b3JhZ2UoKTsKKyAgICBzdGF0aWMgV2ViQ29yZTo6QXBw bGljYXRpb25DYWNoZVN0b3JhZ2UmIHN0b3JhZ2UoKTsKIAogcHJvdGVjdGVkOgogICAgIFdlYkFw cGxpY2F0aW9uQ2FjaGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNhY2hl LmNwcCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNhY2hlLmNwcAppbmRleCAxZDFiY2NjZDAyNDAz OTA4MmE5MmFkYjQ5ZTNhYTQ0OWU5YmMxZDUzLi4wOTY5MTMzZmJkMWQwYzg0Mzg0ZTU4ZGIwYjZj Yjc1NGYxOWE2ZGNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDYWNoZS5jcHAK KysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViQ2FjaGUuY3BwCkBAIC0yNyw2ICsyNyw3IEBACiAj aW5jbHVkZSAiV2ViQ2FjaGUuaCIKIAogI2luY2x1ZGUgIkNGRGljdGlvbmFyeVByb3BlcnR5QmFn LmgiCisjaW5jbHVkZSAiV2ViQXBwbGljYXRpb25DYWNoZS5oIgogI2luY2x1ZGUgPFdlYkNvcmUv QXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0JTdHJpbmcuaD4K ICNpbmNsdWRlIDxXZWJDb3JlL01lbW9yeUNhY2hlLmg+CkBAIC0yMTQsNyArMjE1LDcgQEAgSFJF U1VMVCBXZWJDYWNoZTo6ZW1wdHkoKQogICAgIG1lbW9yeUNhY2hlLnNldERpc2FibGVkKGZhbHNl KTsKIAogICAgIC8vIEVtcHR5IHRoZSBhcHBsaWNhdGlvbiBjYWNoZS4KLSAgICBXZWJDb3JlOjpB cHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c2luZ2xldG9uKCkuZW1wdHkoKTsKKyAgICBXZWJBcHBs aWNhdGlvbkNhY2hlOjpzdG9yYWdlKCkuZW1wdHkoKTsKIAogICAgIC8vIEVtcHR5IHRoZSBDcm9z cy1PcmlnaW4gUHJlZmxpZ2h0IGNhY2hlCiAgICAgV2ViQ29yZTo6Q3Jvc3NPcmlnaW5QcmVmbGln aHRSZXN1bHRDYWNoZTo6c2luZ2xldG9uKCkuZW1wdHkoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvd2luL1dlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAKaW5k ZXggYTViYTgwN2I2MzVlZDlkNjhjNTA5N2JiMjM3OWRhMGMyMGMxMWFmYy4uMDhkZmM2MDAxMGFk ZTVkNzAzNmRkN2Q5YmZhNWU1NmQyOWUzMDNhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93 aW4vV2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAKQEAgLTI4 MjgsMjYgKzI4MjgsNiBAQCBIUkVTVUxUIFdlYlZpZXc6OlVSTFRpdGxlRnJvbVBhc3RlYm9hcmQo X0luX29wdF8gSURhdGFPYmplY3QqIC8qcGFzdGVib2FyZCovLCBfRAogICAgIHJldHVybiBFX05P VElNUEw7CiB9CiAKLXN0YXRpYyB2b2lkIFdlYktpdFNldEFwcGxpY2F0aW9uQ2FjaGVQYXRoSWZO ZWNlc3NhcnkoKQotewotICAgIHN0YXRpYyBib29sIGluaXRpYWxpemVkID0gZmFsc2U7Ci0gICAg aWYgKGluaXRpYWxpemVkKQotICAgICAgICByZXR1cm47Ci0KLSAgICBTdHJpbmcgcGF0aCA9IGxv Y2FsVXNlclNwZWNpZmljU3RvcmFnZURpcmVjdG9yeSgpOwotCi0jaWYgVVNFKENGKQotICAgIFJl dGFpblB0cjxDRlByb3BlcnR5TGlzdFJlZj4gY2FjaGVEaXJlY3RvcnlQcmVmZXJlbmNlID0gYWRv cHRDRihDRlByZWZlcmVuY2VzQ29weUFwcFZhbHVlKFdlYktpdExvY2FsQ2FjaGVEZWZhdWx0c0tl eSwga0NGUHJlZmVyZW5jZXNDdXJyZW50QXBwbGljYXRpb24pKTsKLSAgICBpZiAoY2FjaGVEaXJl Y3RvcnlQcmVmZXJlbmNlICYmIChDRlN0cmluZ0dldFR5cGVJRCgpID09IENGR2V0VHlwZUlEKGNh Y2hlRGlyZWN0b3J5UHJlZmVyZW5jZS5nZXQoKSkpKQotICAgICAgICBwYXRoID0gc3RhdGljX2Nh c3Q8Q0ZTdHJpbmdSZWY+KGNhY2hlRGlyZWN0b3J5UHJlZmVyZW5jZS5nZXQoKSk7Ci0jZW5kaWYK LQotICAgIGlmICghcGF0aC5pc051bGwoKSkKLSAgICAgICAgQXBwbGljYXRpb25DYWNoZVN0b3Jh Z2U6OnNpbmdsZXRvbigpLnNldENhY2hlRGlyZWN0b3J5KHBhdGgpOwotCi0gICAgaW5pdGlhbGl6 ZWQgPSB0cnVlOwotfQotCiBib29sIFdlYlZpZXc6OnNob3VsZEluaXRpYWxpemVUcmFja1BvaW50 SGFjaygpCiB7CiAgICAgc3RhdGljIGJvb2wgc2hvdWxkQ3JlYXRlU2Nyb2xsYmFyczsKQEAgLTI5 MTYsNyArMjg5Niw2IEBAIEhSRVNVTFQgV2ViVmlldzo6aW5pdFdpdGhGcmFtZShSRUNUIGZyYW1l LCBfSW5fIEJTVFIgZnJhbWVOYW1lLCBfSW5fIEJTVFIgZ3JvdXBOCiAgICAgICAgIFdlYlBsYXRm b3JtU3RyYXRlZ2llczo6aW5pdGlhbGl6ZSgpOwogCiAgICAgICAgIFdlYktpdEluaXRpYWxpemVX ZWJEYXRhYmFzZXNJZk5lY2Vzc2FyeSgpOwotICAgICAgICBXZWJLaXRTZXRBcHBsaWNhdGlvbkNh Y2hlUGF0aElmTmVjZXNzYXJ5KCk7CiAKICAgICAgICAgTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjpz aW5nbGV0b24oKS5pbnN0YWxsKCk7CiAKQEAgLTI5MzYsNiArMjkxNSw3IEBAIEhSRVNVTFQgV2Vi Vmlldzo6aW5pdFdpdGhGcmFtZShSRUNUIGZyYW1lLCBfSW5fIEJTVFIgZnJhbWVOYW1lLCBfSW5f IEJTVFIgZ3JvdXBOCiAgICAgY29uZmlndXJhdGlvbi5kcmFnQ2xpZW50ID0gbmV3IFdlYkRyYWdD bGllbnQodGhpcyk7CiAgICAgY29uZmlndXJhdGlvbi5pbnNwZWN0b3JDbGllbnQgPSBtX2luc3Bl Y3RvckNsaWVudDsKICAgICBjb25maWd1cmF0aW9uLmxvYWRlckNsaWVudEZvck1haW5GcmFtZSA9 IG5ldyBXZWJGcmFtZUxvYWRlckNsaWVudDsKKyAgICBjb25maWd1cmF0aW9uLmFwcGxpY2F0aW9u Q2FjaGVTdG9yYWdlID0gJldlYkFwcGxpY2F0aW9uQ2FjaGU6OnN0b3JhZ2UoKTsKICAgICBjb25m aWd1cmF0aW9uLmRhdGFiYXNlUHJvdmlkZXIgPSAmV2ViRGF0YWJhc2VQcm92aWRlcjo6c2luZ2xl dG9uKCk7CiAgICAgY29uZmlndXJhdGlvbi5zdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIgPSAmbV93 ZWJWaWV3R3JvdXAtPnN0b3JhZ2VOYW1lc3BhY2VQcm92aWRlcigpOwogICAgIGNvbmZpZ3VyYXRp b24ucHJvZ3Jlc3NUcmFja2VyQ2xpZW50ID0gc3RhdGljX2Nhc3Q8V2ViRnJhbWVMb2FkZXJDbGll bnQqPihjb25maWd1cmF0aW9uLmxvYWRlckNsaWVudEZvck1haW5GcmFtZSk7Cg== 276952 2016-04-21 13:36:11 -0700 2016-04-21 13:46:08 -0700 Patch bug-156861-20160421133633.patch text/plain 5978 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5ODI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dp bi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggZTI3MDk1ODZm YjU3YWNhY2UxNTVhZjViMGNkNzlmYWQ0YWE1M2E3ZS4uYzMzNGNjZDMzMGQ5MmM5ZGFkZDkwMDhl ZGUyMTE3OGU4Y2UyNjM2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE2 LTA0LTIxICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAg U3RvcCB1c2luZyBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c2luZ2xldG9uKCkgb24gV2luZG93 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2ODYx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJB cHBsaWNhdGlvbkNhY2hlLmNwcDoKKyAgICAgICAgKGFwcGxpY2F0aW9uQ2FjaGVQYXRoKToKKyAg ICAgICAgKFdlYkFwcGxpY2F0aW9uQ2FjaGU6OnN0b3JhZ2UpOgorICAgICAgICAqIFdlYkFwcGxp Y2F0aW9uQ2FjaGUuaDoKKyAgICAgICAgKiBXZWJDYWNoZS5jcHA6CisgICAgICAgIChXZWJDYWNo ZTo6ZW1wdHkpOgorICAgICAgICAqIFdlYlZpZXcuY3BwOgorICAgICAgICAoV2ViVmlldzo6aW5p dFdpdGhGcmFtZSk6CisgICAgICAgIChXZWJLaXRTZXRBcHBsaWNhdGlvbkNhY2hlUGF0aElmTmVj ZXNzYXJ5KTogRGVsZXRlZC4KKwogMjAxNi0wNC0xNSAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFt QGFwcGxlLmNvbT4KIAogICAgICAgICBDU1A6IE1ha2UgZHluYW1pY2FsbHktYWRkZWQgZmF2aWNv bnMgKHZpYSBsaW5rIHJlbD0iaWNvbiIpIG9iZXkgQ29udGVudC1TZWN1cml0eS1Qb2xpY3kKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkFwcGxpY2F0aW9uQ2FjaGUuY3BwIGIvU291 cmNlL1dlYktpdC93aW4vV2ViQXBwbGljYXRpb25DYWNoZS5jcHAKaW5kZXggYTI5NzcwZDBjNzBj NDQxN2RiYzJlYjgxOGRmNDZhNTRmNmRiOGRkMi4uZDZlNGU3NTgwMmNlYTA1ZTI4MDE2YjMwZjRl Y2QzMzAwMjI2ZGZhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vV2ViQXBwbGljYXRp b25DYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViQXBwbGljYXRpb25DYWNoZS5j cHAKQEAgLTU4LDkgKzU4LDI0IEBAIFdlYkFwcGxpY2F0aW9uQ2FjaGUqIFdlYkFwcGxpY2F0aW9u Q2FjaGU6OmNyZWF0ZUluc3RhbmNlKCkKICAgICByZXR1cm4gaW5zdGFuY2U7CiB9CiAKK3N0YXRp YyBTdHJpbmcgYXBwbGljYXRpb25DYWNoZVBhdGgoKQoreworICAgIFN0cmluZyBwYXRoID0gbG9j YWxVc2VyU3BlY2lmaWNTdG9yYWdlRGlyZWN0b3J5KCk7CisKKyNpZiBVU0UoQ0YpCisgICAgUmV0 YWluUHRyPENGUHJvcGVydHlMaXN0UmVmPiBjYWNoZURpcmVjdG9yeVByZWZlcmVuY2UgPSBhZG9w dENGKENGUHJlZmVyZW5jZXNDb3B5QXBwVmFsdWUoV2ViS2l0TG9jYWxDYWNoZURlZmF1bHRzS2V5 LCBrQ0ZQcmVmZXJlbmNlc0N1cnJlbnRBcHBsaWNhdGlvbikpOworICAgIGlmIChjYWNoZURpcmVj dG9yeVByZWZlcmVuY2UgJiYgKENGU3RyaW5nR2V0VHlwZUlEKCkgPT0gQ0ZHZXRUeXBlSUQoY2Fj aGVEaXJlY3RvcnlQcmVmZXJlbmNlLmdldCgpKSkpCisgICAgICAgIHBhdGggPSBzdGF0aWNfY2Fz dDxDRlN0cmluZ1JlZj4oY2FjaGVEaXJlY3RvcnlQcmVmZXJlbmNlLmdldCgpKTsKKyNlbmRpZgor CisgICAgcmV0dXJuIHBhdGg7Cit9CisKIFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdl JiBXZWJBcHBsaWNhdGlvbkNhY2hlOjpzdG9yYWdlKCkKIHsKLSAgICByZXR1cm4gV2ViQ29yZTo6 QXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OnNpbmdsZXRvbigpOworICAgIHN0YXRpYyBBcHBsaWNh dGlvbkNhY2hlU3RvcmFnZSYgc3RvcmFnZSA9IEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpjcmVh dGUoYXBwbGljYXRpb25DYWNoZVBhdGgoKSwgIkFwcGxpY2F0aW9uQ2FjaGUiKS5sZWFrUmVmKCk7 CisKKyAgICByZXR1cm4gc3RvcmFnZTsKIH0KIAogLy8gSVVua25vd24gLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vV2ViQXBwbGljYXRpb25DYWNoZS5oIGIvU291cmNl L1dlYktpdC93aW4vV2ViQXBwbGljYXRpb25DYWNoZS5oCmluZGV4IGIyMTViYTQzMzc5ZTc2OGZk MjI0ZmVmNDdmZDk1MTZiMjQ1MDM3MmIuLmVhZGJmOTZlY2NiNGZiYzdjOWVkY2RjMTc2ODAxYzk3 NDYwNzY1MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkFwcGxpY2F0aW9uQ2Fj aGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJBcHBsaWNhdGlvbkNhY2hlLmgKQEAgLTM2 LDcgKzM2LDcgQEAgY2xhc3MgREVDTFNQRUNfVVVJRCgiMTExOUU5NzAtNEIxMy00QjlBLUEwNDkt NDEwOTYxMDRCNjg5IikgV2ViQXBwbGljYXRpb25DYWNoZQogcHVibGljOgogICAgIHN0YXRpYyBX ZWJBcHBsaWNhdGlvbkNhY2hlKiBjcmVhdGVJbnN0YW5jZSgpOwogCi0gICAgV2ViQ29yZTo6QXBw bGljYXRpb25DYWNoZVN0b3JhZ2UmIHN0b3JhZ2UoKTsKKyAgICBzdGF0aWMgV2ViQ29yZTo6QXBw bGljYXRpb25DYWNoZVN0b3JhZ2UmIHN0b3JhZ2UoKTsKIAogcHJvdGVjdGVkOgogICAgIFdlYkFw cGxpY2F0aW9uQ2FjaGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNhY2hl LmNwcCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNhY2hlLmNwcAppbmRleCAxZDFiY2NjZDAyNDAz OTA4MmE5MmFkYjQ5ZTNhYTQ0OWU5YmMxZDUzLi4wOTY5MTMzZmJkMWQwYzg0Mzg0ZTU4ZGIwYjZj Yjc1NGYxOWE2ZGNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDYWNoZS5jcHAK KysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViQ2FjaGUuY3BwCkBAIC0yNyw2ICsyNyw3IEBACiAj aW5jbHVkZSAiV2ViQ2FjaGUuaCIKIAogI2luY2x1ZGUgIkNGRGljdGlvbmFyeVByb3BlcnR5QmFn LmgiCisjaW5jbHVkZSAiV2ViQXBwbGljYXRpb25DYWNoZS5oIgogI2luY2x1ZGUgPFdlYkNvcmUv QXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0JTdHJpbmcuaD4K ICNpbmNsdWRlIDxXZWJDb3JlL01lbW9yeUNhY2hlLmg+CkBAIC0yMTQsNyArMjE1LDcgQEAgSFJF U1VMVCBXZWJDYWNoZTo6ZW1wdHkoKQogICAgIG1lbW9yeUNhY2hlLnNldERpc2FibGVkKGZhbHNl KTsKIAogICAgIC8vIEVtcHR5IHRoZSBhcHBsaWNhdGlvbiBjYWNoZS4KLSAgICBXZWJDb3JlOjpB cHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c2luZ2xldG9uKCkuZW1wdHkoKTsKKyAgICBXZWJBcHBs aWNhdGlvbkNhY2hlOjpzdG9yYWdlKCkuZW1wdHkoKTsKIAogICAgIC8vIEVtcHR5IHRoZSBDcm9z cy1PcmlnaW4gUHJlZmxpZ2h0IGNhY2hlCiAgICAgV2ViQ29yZTo6Q3Jvc3NPcmlnaW5QcmVmbGln aHRSZXN1bHRDYWNoZTo6c2luZ2xldG9uKCkuZW1wdHkoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvd2luL1dlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAKaW5k ZXggYTViYTgwN2I2MzVlZDlkNjhjNTA5N2JiMjM3OWRhMGMyMGMxMWFmYy4uN2NiYTk4OTY5Y2Y4 ZDMxY2UxOGY1M2EwYjY0NDA5Yjg1NDY3ZDZiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93 aW4vV2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAKQEAgLTM3 LDYgKzM3LDcgQEAKICNpbmNsdWRlICJTb2Z0TGlua2luZy5oIgogI2luY2x1ZGUgIlN1YmZyYW1l TG9hZGVyLmgiCiAjaW5jbHVkZSAiVGV4dEl0ZXJhdG9yLmgiCisjaW5jbHVkZSAiV2ViQXBwbGlj YXRpb25DYWNoZS5oIgogI2luY2x1ZGUgIldlYkJhY2tGb3J3YXJkTGlzdC5oIgogI2luY2x1ZGUg IldlYkNocm9tZUNsaWVudC5oIgogI2luY2x1ZGUgIldlYkNvbnRleHRNZW51Q2xpZW50LmgiCkBA IC0yODI4LDI2ICsyODI5LDYgQEAgSFJFU1VMVCBXZWJWaWV3OjpVUkxUaXRsZUZyb21QYXN0ZWJv YXJkKF9Jbl9vcHRfIElEYXRhT2JqZWN0KiAvKnBhc3RlYm9hcmQqLywgX0QKICAgICByZXR1cm4g RV9OT1RJTVBMOwogfQogCi1zdGF0aWMgdm9pZCBXZWJLaXRTZXRBcHBsaWNhdGlvbkNhY2hlUGF0 aElmTmVjZXNzYXJ5KCkKLXsKLSAgICBzdGF0aWMgYm9vbCBpbml0aWFsaXplZCA9IGZhbHNlOwot ICAgIGlmIChpbml0aWFsaXplZCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgU3RyaW5nIHBhdGgg PSBsb2NhbFVzZXJTcGVjaWZpY1N0b3JhZ2VEaXJlY3RvcnkoKTsKLQotI2lmIFVTRShDRikKLSAg ICBSZXRhaW5QdHI8Q0ZQcm9wZXJ0eUxpc3RSZWY+IGNhY2hlRGlyZWN0b3J5UHJlZmVyZW5jZSA9 IGFkb3B0Q0YoQ0ZQcmVmZXJlbmNlc0NvcHlBcHBWYWx1ZShXZWJLaXRMb2NhbENhY2hlRGVmYXVs dHNLZXksIGtDRlByZWZlcmVuY2VzQ3VycmVudEFwcGxpY2F0aW9uKSk7Ci0gICAgaWYgKGNhY2hl RGlyZWN0b3J5UHJlZmVyZW5jZSAmJiAoQ0ZTdHJpbmdHZXRUeXBlSUQoKSA9PSBDRkdldFR5cGVJ RChjYWNoZURpcmVjdG9yeVByZWZlcmVuY2UuZ2V0KCkpKSkKLSAgICAgICAgcGF0aCA9IHN0YXRp Y19jYXN0PENGU3RyaW5nUmVmPihjYWNoZURpcmVjdG9yeVByZWZlcmVuY2UuZ2V0KCkpOwotI2Vu ZGlmCi0KLSAgICBpZiAoIXBhdGguaXNOdWxsKCkpCi0gICAgICAgIEFwcGxpY2F0aW9uQ2FjaGVT dG9yYWdlOjpzaW5nbGV0b24oKS5zZXRDYWNoZURpcmVjdG9yeShwYXRoKTsKLQotICAgIGluaXRp YWxpemVkID0gdHJ1ZTsKLX0KLQogYm9vbCBXZWJWaWV3OjpzaG91bGRJbml0aWFsaXplVHJhY2tQ b2ludEhhY2soKQogewogICAgIHN0YXRpYyBib29sIHNob3VsZENyZWF0ZVNjcm9sbGJhcnM7CkBA IC0yOTE2LDcgKzI4OTcsNiBAQCBIUkVTVUxUIFdlYlZpZXc6OmluaXRXaXRoRnJhbWUoUkVDVCBm cmFtZSwgX0luXyBCU1RSIGZyYW1lTmFtZSwgX0luXyBCU1RSIGdyb3VwTgogICAgICAgICBXZWJQ bGF0Zm9ybVN0cmF0ZWdpZXM6OmluaXRpYWxpemUoKTsKIAogICAgICAgICBXZWJLaXRJbml0aWFs aXplV2ViRGF0YWJhc2VzSWZOZWNlc3NhcnkoKTsKLSAgICAgICAgV2ViS2l0U2V0QXBwbGljYXRp b25DYWNoZVBhdGhJZk5lY2Vzc2FyeSgpOwogCiAgICAgICAgIE1lbW9yeVByZXNzdXJlSGFuZGxl cjo6c2luZ2xldG9uKCkuaW5zdGFsbCgpOwogCkBAIC0yOTM2LDYgKzI5MTYsNyBAQCBIUkVTVUxU IFdlYlZpZXc6OmluaXRXaXRoRnJhbWUoUkVDVCBmcmFtZSwgX0luXyBCU1RSIGZyYW1lTmFtZSwg X0luXyBCU1RSIGdyb3VwTgogICAgIGNvbmZpZ3VyYXRpb24uZHJhZ0NsaWVudCA9IG5ldyBXZWJE cmFnQ2xpZW50KHRoaXMpOwogICAgIGNvbmZpZ3VyYXRpb24uaW5zcGVjdG9yQ2xpZW50ID0gbV9p bnNwZWN0b3JDbGllbnQ7CiAgICAgY29uZmlndXJhdGlvbi5sb2FkZXJDbGllbnRGb3JNYWluRnJh bWUgPSBuZXcgV2ViRnJhbWVMb2FkZXJDbGllbnQ7CisgICAgY29uZmlndXJhdGlvbi5hcHBsaWNh dGlvbkNhY2hlU3RvcmFnZSA9ICZXZWJBcHBsaWNhdGlvbkNhY2hlOjpzdG9yYWdlKCk7CiAgICAg Y29uZmlndXJhdGlvbi5kYXRhYmFzZVByb3ZpZGVyID0gJldlYkRhdGFiYXNlUHJvdmlkZXI6OnNp bmdsZXRvbigpOwogICAgIGNvbmZpZ3VyYXRpb24uc3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyID0g Jm1fd2ViVmlld0dyb3VwLT5zdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIoKTsKICAgICBjb25maWd1 cmF0aW9uLnByb2dyZXNzVHJhY2tlckNsaWVudCA9IHN0YXRpY19jYXN0PFdlYkZyYW1lTG9hZGVy Q2xpZW50Kj4oY29uZmlndXJhdGlvbi5sb2FkZXJDbGllbnRGb3JNYWluRnJhbWUpOwo=