23160 2009-01-07 00:54:30 -0800 add setMemoryCacheClientCallsEnabled SPI so Safari can be faster with activity window closed 2009-01-09 13:24:38 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 darin darin oldest_to_newest 104699 0 darin 2009-01-07 00:54:30 -0800 The recent fix to properly report resources loaded from the memory cache made Safari slower. This will give us what we need to make Safari fast again. 104700 1 26487 darin 2009-01-07 01:05:21 -0800 Created attachment 26487 patch 104701 2 darin 2009-01-07 01:05:52 -0800 I think I will probably need the same thing for Windows. 104714 3 26487 darin 2009-01-07 07:36:21 -0800 Comment on attachment 26487 patch Oliver Hunt reviewed this. Marking it reviewed for him. 104805 4 mrowe 2009-01-07 16:21:53 -0800 Was this landed? 104815 5 26487 darin 2009-01-07 16:45:19 -0800 Comment on attachment 26487 patch Clearing review flag since this was landed. Not closing the bug yet since it's also needed on Windows. 105051 6 darin 2009-01-09 13:24:38 -0800 Mac: http://trac.webkit.org/changeset/39681 Windows: http://trac.webkit.org/changeset/39757 26487 2009-01-07 01:05:21 -0800 2009-01-07 16:45:19 -0800 patch SetMemoryCachePatch.txt text/plain 14865 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzOTY3NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzMgQEAKKzIwMDktMDEtMDcgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAy MzE2MDogYWRkIHNldE1lbW9yeUNhY2hlQ2xpZW50Q2FsbHNFbmFibGVkIFNQSSBzbyBTYWZhcmkg Y2FuIGJlIGZhc3RlciB3aXRoIGFjdGl2aXR5IHdpbmRvdyBjbG9zZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTYwCisKKyAgICAgICAgKiBXZWJD b3JlLmJhc2UuZXhwOiBBZGRlZCBQYWdlOjpzZXRNZW1vcnlDYWNoZUNsaWVudENhbGxzRW5hYmxl ZC4KKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRpZExvYWRSZXNvdXJjZUZyb21NZW1v cnlDYWNoZSk6IFVwZGF0ZWQgdG8gdGFrZSBhIENhY2hlZFJlc291cmNlCisgICAgICAgIHNvIHRo YXQgdGhlcmUncyBubyBleHRyYSB3b3JrIHRoZSBjYWxsZXIgaGFzIHRvIGRvIHdoZW4gdGhlIGlu c3BlY3RvciBpcyBkaXNhYmxlZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJv bGxlci5oOiBEaXR0by4KKworICAgICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5oOiBBZGRl ZCByZWNvcmRNZW1vcnlDYWNoZUxvYWRGb3JGdXR1cmVDbGllbnROb3RpZmljYXRpb24sCisgICAg ICAgIHRha2VNZW1vcnlDYWNoZUxvYWRzRm9yQ2xpZW50Tm90aWZpY2F0aW9uLCBhbmQgbV9yZXNv dXJjZXNMb2FkZWRGcm9tTWVtb3J5Q2FjaGVGb3JDbGllbnROb3RpZmljYXRpb24uCisKKyAgICAg ICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2Fk ZXI6OmxvYWRlZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKTogU3RyZWFtbGluZWQgY29kZSBzbyBs ZXNzIHdvcmsgaXMgZG9uZSB3aGVuCisgICAgICAgIHRoZXJlJ3Mgbm8gaW5zcGVjdG9yIG9yIGNs aWVudCBjYWxsIG5lZWRlZC4gQWRkZWQgY29kZSB0byBjaGVjayBhcmVNZW1vcnlDYWNoZUNsaWVu dENhbGxzRW5hYmxlZAorICAgICAgICBhbmQgaWYgaXQncyBmYWxzZSwgdXNlIHJlY29yZE1lbW9y eUNhY2hlTG9hZEZvckZ1dHVyZUNsaWVudE5vdGlmaWNhdGlvbi4KKyAgICAgICAgKFdlYkNvcmU6 OkZyYW1lTG9hZGVyOjp0ZWxsQ2xpZW50QWJvdXRQYXN0TWVtb3J5Q2FjaGVMb2Fkcyk6IEFkZGVk LgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5oOiBEaXR0by4KKworICAgICAgICAqIHBh Z2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpQYWdlKTogSW5pdGlhbGl6ZSBt X2FyZU1lbW9yeUNhY2hlQ2xpZW50Q2FsbHNFbmFibGVkIHRvIGJlIGNvbXBhdGlibGUgd2l0aCBv bGQgYmVoYXZpb3IuCisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpzZXRNZW1vcnlDYWNoZUNsaWVu dENhbGxzRW5hYmxlZCk6IEFkZGVkLgorICAgICAgICAqIHBhZ2UvUGFnZS5oOiBBZGRlZCBzZXRN ZW1vcnlDYWNoZUNsaWVudENhbGxzRW5hYmxlZCwgYXJlTWVtb3J5Q2FjaGVDbGllbnRDYWxsc0Vu YWJsZWQsCisgICAgICAgIGFuZCBtX2FyZU1lbW9yeUNhY2hlQ2xpZW50Q2FsbHNFbmFibGVkLgor CiAyMDA5LTAxLTA2ICBKdXN0aW4gR2FyY2lhICA8anVzdGluLmdhcmNpYUBhcHBsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgT2xpdmVyIEh1bnQuCkluZGV4OiBXZWJDb3JlL1dlYkNvcmUu YmFzZS5leHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3JlLmJhc2UuZXhwCShyZXZpc2lv biAzOTY3NSkKKysrIFdlYkNvcmUvV2ViQ29yZS5iYXNlLmV4cAkod29ya2luZyBjb3B5KQpAQCAt NDU5LDYgKzQ1OSw3IEBAIF9fWk43V2ViQ29yZTRQYWdlMjNjbGVhclVuZG9SZWRvT3BlcmF0aW8K IF9fWk43V2ViQ29yZTRQYWdlMjNwZW5kaW5nVW5sb2FkRXZlbnRDb3VudEV2CiBfX1pON1dlYkNv cmU0UGFnZTMxc2V0Q3VzdG9tSFRNTFRva2VuaXplckNodW5rU2l6ZUVpCiBfX1pON1dlYkNvcmU0 UGFnZTMxc2V0Q3VzdG9tSFRNTFRva2VuaXplclRpbWVEZWxheUVkCitfX1pON1dlYkNvcmU0UGFn ZTMyc2V0TWVtb3J5Q2FjaGVDbGllbnRDYWxsc0VuYWJsZWRFYgogX19aTjdXZWJDb3JlNFBhZ2Uz N3NldEluTG93UXVhbGl0eUltYWdlSW50ZXJwb2xhdGlvbk1vZGVFYgogX19aTjdXZWJDb3JlNFBh Z2U2Z29CYWNrRXYKIF9fWk43V2ViQ29yZTRQYWdlOGdvVG9JdGVtRVBOU18xMUhpc3RvcnlJdGVt RU5TXzEzRnJhbWVMb2FkVHlwZUUKSW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuY3BwCShyZXZpc2lvbiAzOTY3NSkKKysrIFdlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzc5LDIyICsyMzc5LDIyIEBA IHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6cmVtb3ZlUmVzb3VyY2UKICAgICB9CiB9CiAKLXZv aWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkTG9hZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKERv Y3VtZW50TG9hZGVyKiBsb2FkZXIsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29u c3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UsIGludCBsZW5ndGgpCit2b2lkIEluc3BlY3Rv ckNvbnRyb2xsZXI6OmRpZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZShEb2N1bWVudExvYWRl ciogbG9hZGVyLCBjb25zdCBDYWNoZWRSZXNvdXJjZSogY2FjaGVkUmVzb3VyY2UpCiB7CiAgICAg aWYgKCFlbmFibGVkKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIElmIHRoZSByZXNvdXJj ZSBVUkwgaXMgYWxyZWFkeSBrbm93biwgd2UgZG9uJ3QgbmVlZCB0byBhZGQgaXQgYWdhaW4gc2lu Y2UgdGhpcyBpcyBqdXN0IGEgY2FjaGVkIGxvYWQuCi0gICAgaWYgKG1fa25vd25SZXNvdXJjZXMu Y29udGFpbnMocmVxdWVzdC51cmwoKS5zdHJpbmcoKSkpCisgICAgaWYgKG1fa25vd25SZXNvdXJj ZXMuY29udGFpbnMoY2FjaGVkUmVzb3VyY2UtPnVybCgpKSkKICAgICAgICAgcmV0dXJuOwogCiAg ICAgUmVmUHRyPEluc3BlY3RvclJlc291cmNlPiByZXNvdXJjZSA9IEluc3BlY3RvclJlc291cmNl OjpjcmVhdGUobV9uZXh0SWRlbnRpZmllci0tLCBsb2FkZXIsIGxvYWRlci0+ZnJhbWUoKSk7CiAg ICAgcmVzb3VyY2UtPmZpbmlzaGVkID0gdHJ1ZTsKIAotICAgIHVwZGF0ZVJlc291cmNlUmVxdWVz dChyZXNvdXJjZS5nZXQoKSwgcmVxdWVzdCk7Ci0gICAgdXBkYXRlUmVzb3VyY2VSZXNwb25zZShy ZXNvdXJjZS5nZXQoKSwgcmVzcG9uc2UpOworICAgIHJlc291cmNlLT5yZXF1ZXN0VVJMID0gS1VS TChjYWNoZWRSZXNvdXJjZS0+dXJsKCkpOworICAgIHVwZGF0ZVJlc291cmNlUmVzcG9uc2UocmVz b3VyY2UuZ2V0KCksIGNhY2hlZFJlc291cmNlLT5yZXNwb25zZSgpKTsKIAotICAgIHJlc291cmNl LT5sZW5ndGggPSBsZW5ndGg7CisgICAgcmVzb3VyY2UtPmxlbmd0aCA9IGNhY2hlZFJlc291cmNl LT5lbmNvZGVkU2l6ZSgpOwogICAgIHJlc291cmNlLT5jYWNoZWQgPSB0cnVlOwogICAgIHJlc291 cmNlLT5zdGFydFRpbWUgPSBjdXJyZW50VGltZSgpOwogICAgIHJlc291cmNlLT5yZXNwb25zZVJl Y2VpdmVkVGltZSA9IHJlc291cmNlLT5zdGFydFRpbWU7CkBAIC0yNDAyLDcgKzI0MDIsNyBAQCB2 b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZExvYWRSZXNvdXJjCiAKICAgICBBU1NFUlQobV9p bnNwZWN0ZWRQYWdlKTsKIAotICAgIGlmIChsb2FkZXItPmZyYW1lKCkgPT0gbV9pbnNwZWN0ZWRQ YWdlLT5tYWluRnJhbWUoKSAmJiByZXF1ZXN0LnVybCgpID09IGxvYWRlci0+cmVxdWVzdFVSTCgp KQorICAgIGlmIChsb2FkZXItPmZyYW1lKCkgPT0gbV9pbnNwZWN0ZWRQYWdlLT5tYWluRnJhbWUo KSAmJiBjYWNoZWRSZXNvdXJjZS0+dXJsKCkgPT0gbG9hZGVyLT5yZXF1ZXN0VVJMKCkpCiAgICAg ICAgIG1fbWFpblJlc291cmNlID0gcmVzb3VyY2U7CiAKICAgICBhZGRSZXNvdXJjZShyZXNvdXJj ZS5nZXQoKSk7CkluZGV4OiBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCShy ZXZpc2lvbiAzOTY3NSkKKysrIFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIu aAkod29ya2luZyBjb3B5KQpAQCAtMjksMjEgKzI5LDIwIEBACiAjaWZuZGVmIEluc3BlY3RvckNv bnRyb2xsZXJfaAogI2RlZmluZSBJbnNwZWN0b3JDb250cm9sbGVyX2gKIAotI2lmIEVOQUJMRShK QVZBU0NSSVBUX0RFQlVHR0VSKQotI2luY2x1ZGUgIkphdmFTY3JpcHREZWJ1Z0xpc3RlbmVyLmgi Ci0jZW5kaWYKLQogI2luY2x1ZGUgIkNvbnNvbGUuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVN0cmlu Zy5oIgogI2luY2x1ZGUgIlN0cmluZ0hhc2guaCIKICNpbmNsdWRlICJUaW1lci5oIgotCiAjaW5j bHVkZSA8SmF2YVNjcmlwdENvcmUvSlNDb250ZXh0UmVmLmg+Ci0KICNpbmNsdWRlIDx3dGYvSGFz aE1hcC5oPgogI2luY2x1ZGUgPHd0Zi9IYXNoU2V0Lmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5o PgogCisjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCisjaW5jbHVkZSAiSmF2YVNjcmlw dERlYnVnTGlzdGVuZXIuaCIKKyNlbmRpZgorCisKIG5hbWVzcGFjZSBKU0MgewogICAgIGNsYXNz IFByb2ZpbGU7CiAgICAgY2xhc3MgVVN0cmluZzsKQEAgLTUxLDYgKzUwLDcgQEAgbmFtZXNwYWNl IEpTQyB7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgQ2FjaGVkUmVzb3VyY2U7CiBj bGFzcyBEYXRhYmFzZTsKIGNsYXNzIERvY3VtZW50TG9hZGVyOwogY2xhc3MgR3JhcGhpY3NDb250 ZXh0OwpAQCAtNTksNiArNTksNyBAQCBjbGFzcyBJbnNwZWN0b3JDbGllbnQ7CiBjbGFzcyBKYXZh U2NyaXB0Q2FsbEZyYW1lOwogY2xhc3MgTm9kZTsKIGNsYXNzIFBhZ2U7CitjbGFzcyBSZXNvdXJj ZVJlcXVlc3Q7CiBjbGFzcyBSZXNvdXJjZVJlc3BvbnNlOwogY2xhc3MgUmVzb3VyY2VFcnJvcjsK IGNsYXNzIFNjcmlwdENhbGxTdGFjazsKQEAgLTY3LDcgKzY4LDYgQEAgY2xhc3MgU2hhcmVkQnVm ZmVyOwogc3RydWN0IENvbnNvbGVNZXNzYWdlOwogc3RydWN0IEluc3BlY3RvckRhdGFiYXNlUmVz b3VyY2U7CiBzdHJ1Y3QgSW5zcGVjdG9yUmVzb3VyY2U7Ci1jbGFzcyBSZXNvdXJjZVJlcXVlc3Q7 CiAKIGNsYXNzIEluc3BlY3RvckNvbnRyb2xsZXIKICNpZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJV R0dFUikKQEAgLTE5Niw3ICsxOTYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaWRDb21taXRMb2Fk KERvY3VtZW50TG9hZGVyKik7CiAgICAgdm9pZCBmcmFtZURldGFjaGVkRnJvbVBhcmVudChGcmFt ZSopOwogCi0gICAgdm9pZCBkaWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUoRG9jdW1lbnRM b2FkZXIqLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiwg aW50IGxlbmd0aCk7CisgICAgdm9pZCBkaWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUoRG9j dW1lbnRMb2FkZXIqLCBjb25zdCBDYWNoZWRSZXNvdXJjZSopOwogCiAgICAgdm9pZCBpZGVudGlm aWVyRm9ySW5pdGlhbFJlcXVlc3QodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudExv YWRlciosIGNvbnN0IFJlc291cmNlUmVxdWVzdCYpOwogICAgIHZvaWQgd2lsbFNlbmRSZXF1ZXN0 KERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBSZXNvdXJjZVJlcXVl c3QmLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZWRpcmVjdFJlc3BvbnNlKTsKSW5kZXg6IFdl YkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2Fk ZXIvRG9jdW1lbnRMb2FkZXIuaAkocmV2aXNpb24gMzk2NzUpCisrKyBXZWJDb3JlL2xvYWRlci9E b2N1bWVudExvYWRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xODgsNiArMTg4LDggQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogICAgICAgICAKICAgICAgICAgdm9pZCBkaWRUZWxsQ2xpZW50QWJvdXRM b2FkKGNvbnN0IFN0cmluZyYgdXJsKSB7IG1fcmVzb3VyY2VzQ2xpZW50S25vd3NBYm91dC5hZGQo dXJsKTsgfQogICAgICAgICBib29sIGhhdmVUb2xkQ2xpZW50QWJvdXRMb2FkKGNvbnN0IFN0cmlu ZyYgdXJsKSB7IHJldHVybiBtX3Jlc291cmNlc0NsaWVudEtub3dzQWJvdXQuY29udGFpbnModXJs KTsgfQorICAgICAgICB2b2lkIHJlY29yZE1lbW9yeUNhY2hlTG9hZEZvckZ1dHVyZUNsaWVudE5v dGlmaWNhdGlvbihjb25zdCBTdHJpbmcmIHVybCk7CisgICAgICAgIHZvaWQgdGFrZU1lbW9yeUNh Y2hlTG9hZHNGb3JDbGllbnROb3RpZmljYXRpb24oVmVjdG9yPFN0cmluZz4mIGxvYWRzKTsKIAog I2lmIEVOQUJMRShPRkZMSU5FX1dFQl9BUFBMSUNBVElPTlMpCiAgICAgICAgIGJvb2wgc2NoZWR1 bGVBcHBsaWNhdGlvbkNhY2hlTG9hZChSZXNvdXJjZUxvYWRlciosIGNvbnN0IFJlc291cmNlUmVx dWVzdCYsIGNvbnN0IEtVUkwmIG9yaWdpbmFsVVJMKTsKQEAgLTI4NCw2ICsyODYsNyBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IG1fcGFyc2VkQXJj aGl2ZURhdGE7CiAKICAgICAgICAgSGFzaFNldDxTdHJpbmc+IG1fcmVzb3VyY2VzQ2xpZW50S25v d3NBYm91dDsKKyAgICAgICAgVmVjdG9yPFN0cmluZz4gbV9yZXNvdXJjZXNMb2FkZWRGcm9tTWVt b3J5Q2FjaGVGb3JDbGllbnROb3RpZmljYXRpb247CiAKICNpZiBFTkFCTEUoT0ZGTElORV9XRUJf QVBQTElDQVRJT05TKSAgCiAgICAgICAgIC8vIFRoZSBhcHBsaWNhdGlvbiBjYWNoZSB0aGF0IHRo ZSBkb2N1bWVudCBsb2FkZXIgaXMgYXNzb2NpYXRlZCB3aXRoIChpZiBhbnkpLgpAQCAtMjk4LDYg KzMwMSwxNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAjZW5kaWYKICAgICB9OwogCisgICAgaW5s aW5lIHZvaWQgRG9jdW1lbnRMb2FkZXI6OnJlY29yZE1lbW9yeUNhY2hlTG9hZEZvckZ1dHVyZUNs aWVudE5vdGlmaWNhdGlvbihjb25zdCBTdHJpbmcmIHVybCkKKyAgICB7CisgICAgICAgIG1fcmVz b3VyY2VzTG9hZGVkRnJvbU1lbW9yeUNhY2hlRm9yQ2xpZW50Tm90aWZpY2F0aW9uLmFwcGVuZCh1 cmwpOworICAgIH0KKworICAgIGlubGluZSB2b2lkIERvY3VtZW50TG9hZGVyOjp0YWtlTWVtb3J5 Q2FjaGVMb2Fkc0ZvckNsaWVudE5vdGlmaWNhdGlvbihWZWN0b3I8U3RyaW5nPiYgbG9hZHNTZXQp CisgICAgeworICAgICAgICBsb2Fkc1NldC5zd2FwKG1fcmVzb3VyY2VzTG9hZGVkRnJvbU1lbW9y eUNhY2hlRm9yQ2xpZW50Tm90aWZpY2F0aW9uKTsKKyAgICAgICAgbV9yZXNvdXJjZXNMb2FkZWRG cm9tTWVtb3J5Q2FjaGVGb3JDbGllbnROb3RpZmljYXRpb24uY2xlYXIoKTsKKyAgICB9CisKIH0K IAogI2VuZGlmIC8vIERvY3VtZW50TG9hZGVyX2gKSW5kZXg6IFdlYkNvcmUvbG9hZGVyL0ZyYW1l TG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAJ KHJldmlzaW9uIDM5Njc1KQorKysgV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC00MDI0LDI3ICs0MDI0LDMxIEBAIHZvaWQgRnJhbWVMb2FkZXI6OnJlcXVl c3RGcm9tRGVsZWdhdGUoUmUKIAogdm9pZCBGcmFtZUxvYWRlcjo6bG9hZGVkUmVzb3VyY2VGcm9t TWVtb3J5Q2FjaGUoY29uc3QgQ2FjaGVkUmVzb3VyY2UqIHJlc291cmNlKQogewotICAgIFJlc291 cmNlUmVxdWVzdCByZXF1ZXN0KHJlc291cmNlLT51cmwoKSk7Ci0gICAgY29uc3QgUmVzb3VyY2VS ZXNwb25zZSYgcmVzcG9uc2UgPSByZXNvdXJjZS0+cmVzcG9uc2UoKTsKLSAgICBTaGFyZWRCdWZm ZXIqIGRhdGEgPSByZXNvdXJjZS0+ZGF0YSgpOwotICAgIGludCBsZW5ndGggPSBkYXRhID8gZGF0 YS0+c2l6ZSgpIDogMDsKKyAgICBQYWdlKiBwYWdlID0gbV9mcmFtZS0+cGFnZSgpOworICAgIGlm ICghcGFnZSkKKyAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKFBhZ2UqIHBhZ2UgPSBtX2ZyYW1l LT5wYWdlKCkpCi0gICAgICAgIHBhZ2UtPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+ZGlkTG9hZFJl c291cmNlRnJvbU1lbW9yeUNhY2hlKG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCksIHJlcXVlc3QsIHJl c3BvbnNlLCBsZW5ndGgpOworICAgIHBhZ2UtPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+ZGlkTG9h ZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCksIHJlc291cmNl KTsKIAotICAgIGlmICghcmVzb3VyY2UtPnNlbmRSZXNvdXJjZUxvYWRDYWxsYmFja3MoKSB8fCBt X2RvY3VtZW50TG9hZGVyLT5oYXZlVG9sZENsaWVudEFib3V0TG9hZChyZXF1ZXN0LnVybCgpKSkK KyAgICBpZiAoIXJlc291cmNlLT5zZW5kUmVzb3VyY2VMb2FkQ2FsbGJhY2tzKCkgfHwgbV9kb2N1 bWVudExvYWRlci0+aGF2ZVRvbGRDbGllbnRBYm91dExvYWQocmVzb3VyY2UtPnVybCgpKSkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgaWYgKG1fY2xpZW50LT5kaXNwYXRjaERpZExvYWRSZXNvdXJj ZUZyb21NZW1vcnlDYWNoZShtX2RvY3VtZW50TG9hZGVyLmdldCgpLCByZXF1ZXN0LCByZXNwb25z ZSwgbGVuZ3RoKSkgewotICAgICAgICBtX2RvY3VtZW50TG9hZGVyLT5kaWRUZWxsQ2xpZW50QWJv dXRMb2FkKHJlcXVlc3QudXJsKCkpOworICAgIGlmICghcGFnZS0+YXJlTWVtb3J5Q2FjaGVDbGll bnRDYWxsc0VuYWJsZWQoKSkgeworICAgICAgICBtX2RvY3VtZW50TG9hZGVyLT5yZWNvcmRNZW1v cnlDYWNoZUxvYWRGb3JGdXR1cmVDbGllbnROb3RpZmljYXRpb24ocmVzb3VyY2UtPnVybCgpKTsK KyAgICAgICAgbV9kb2N1bWVudExvYWRlci0+ZGlkVGVsbENsaWVudEFib3V0TG9hZChyZXNvdXJj ZS0+dXJsKCkpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgUmVzb3VyY2VSZXF1ZXN0 IHJlcXVlc3QocmVzb3VyY2UtPnVybCgpKTsKKyAgICBpZiAobV9jbGllbnQtPmRpc3BhdGNoRGlk TG9hZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCksIHJlcXVl c3QsIHJlc291cmNlLT5yZXNwb25zZSgpLCByZXNvdXJjZS0+ZW5jb2RlZFNpemUoKSkpIHsKKyAg ICAgICAgbV9kb2N1bWVudExvYWRlci0+ZGlkVGVsbENsaWVudEFib3V0TG9hZChyZXNvdXJjZS0+ dXJsKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAgdW5zaWduZWQgbG9uZyBpZGVu dGlmaWVyOwogICAgIFJlc291cmNlRXJyb3IgZXJyb3I7Ci0gICAgUmVzb3VyY2VSZXF1ZXN0IHIo cmVxdWVzdCk7Ci0gICAgcmVxdWVzdEZyb21EZWxlZ2F0ZShyLCBpZGVudGlmaWVyLCBlcnJvcik7 Ci0gICAgc2VuZFJlbWFpbmluZ0RlbGVnYXRlTWVzc2FnZXMoaWRlbnRpZmllciwgcmVzcG9uc2Us IGxlbmd0aCwgZXJyb3IpOworICAgIHJlcXVlc3RGcm9tRGVsZWdhdGUocmVxdWVzdCwgaWRlbnRp ZmllciwgZXJyb3IpOworICAgIHNlbmRSZW1haW5pbmdEZWxlZ2F0ZU1lc3NhZ2VzKGlkZW50aWZp ZXIsIHJlc291cmNlLT5yZXNwb25zZSgpLCByZXNvdXJjZS0+ZW5jb2RlZFNpemUoKSwgZXJyb3Ip OwogfQogCiB2b2lkIEZyYW1lTG9hZGVyOjphcHBseVVzZXJBZ2VudChSZXNvdXJjZVJlcXVlc3Qm IHJlcXVlc3QpCkBAIC01MTU1LDYgKzUxNTksMzMgQEAgdm9pZCBGcmFtZUxvYWRlcjo6ZGlzcGF0 Y2hEaWRGaW5pc2hMb2FkaQogICAgICAgICBwYWdlLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPmRp ZEZpbmlzaExvYWRpbmcobG9hZGVyLCBpZGVudGlmaWVyKTsKIH0KIAordm9pZCBGcmFtZUxvYWRl cjo6dGVsbENsaWVudEFib3V0UGFzdE1lbW9yeUNhY2hlTG9hZHMoKQoreworICAgIEFTU0VSVCht X2ZyYW1lLT5wYWdlKCkpOworICAgIEFTU0VSVChtX2ZyYW1lLT5wYWdlKCktPmFyZU1lbW9yeUNh Y2hlQ2xpZW50Q2FsbHNFbmFibGVkKCkpOworCisgICAgaWYgKCFtX2RvY3VtZW50TG9hZGVyKQor ICAgICAgICByZXR1cm47CisKKyAgICBWZWN0b3I8U3RyaW5nPiBwYXN0TG9hZHM7CisgICAgbV9k b2N1bWVudExvYWRlci0+dGFrZU1lbW9yeUNhY2hlTG9hZHNGb3JDbGllbnROb3RpZmljYXRpb24o cGFzdExvYWRzKTsKKworICAgIHNpemVfdCBzaXplID0gcGFzdExvYWRzLnNpemUoKTsKKyAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IHNpemU7ICsraSkgeworICAgICAgICBDYWNoZWRSZXNvdXJj ZSogcmVzb3VyY2UgPSBjYWNoZSgpLT5yZXNvdXJjZUZvclVSTChwYXN0TG9hZHNbaV0pOworCisg ICAgICAgIC8vIEZJWE1FOiBUaGVzZSBsb2FkcywgbG9hZGVkIGZyb20gY2FjaGUsIGJ1dCBub3cg Z29uZSBmcm9tIHRoZSBjYWNoZSBieSB0aGUgdGltZQorICAgICAgICAvLyBQYWdlOjpzZXRNZW1v cnlDYWNoZUNsaWVudENhbGxzRW5hYmxlZCh0cnVlKSBpcyBjYWxsZWQsIHdpbGwgbm90IGJlIHNl ZW4gYnkgdGhlIGNsaWVudC4KKyAgICAgICAgLy8gQ29uc2lkZXIgaWYgdGhlcmUncyBzb21lIGVm ZmljaWVudCB3YXkgb2YgcmVtZW1iZXJpbmcgZW5vdWdoIHRvIGRlbGl2ZXIgdGhpcyBjbGllbnQg Y2FsbC4KKyAgICAgICAgLy8gV2UgaGF2ZSB0aGUgVVJMLCBidXQgbm90IHRoZSByZXN0IG9mIHRo ZSByZXNwb25zZSBvciB0aGUgbGVuZ3RoLgorICAgICAgICBpZiAoIXJlc291cmNlKQorICAgICAg ICAgICAgY29udGludWU7CisKKyAgICAgICAgUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QocmVzb3Vy Y2UtPnVybCgpKTsKKyAgICAgICAgbV9jbGllbnQtPmRpc3BhdGNoRGlkTG9hZFJlc291cmNlRnJv bU1lbW9yeUNhY2hlKG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCksIHJlcXVlc3QsIHJlc291cmNlLT5y ZXNwb25zZSgpLCByZXNvdXJjZS0+ZW5jb2RlZFNpemUoKSk7CisgICAgfQorfQorCiAjaWYgVVNF KExPV19CQU5EV0lEVEhfRElTUExBWSkKIAogYm9vbCBGcmFtZUxvYWRlcjo6YWRkTG93QmFuZHdp ZHRoRGlzcGxheVJlcXVlc3QoQ2FjaGVkUmVzb3VyY2UqIGNhY2hlKQpJbmRleDogV2ViQ29yZS9s b2FkZXIvRnJhbWVMb2FkZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlci5oCShyZXZpc2lvbiAzOTY3NSkKKysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgJ KHdvcmtpbmcgY29weSkKQEAgLTI2NCw2ICsyNjQsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAg ICAgICAgIHZvaWQgc2VuZFJlbWFpbmluZ0RlbGVnYXRlTWVzc2FnZXModW5zaWduZWQgbG9uZyBp ZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiwgaW50IGxlbmd0aCwgY29uc3QgUmVz b3VyY2VFcnJvciYpOwogICAgICAgICB2b2lkIHJlcXVlc3RGcm9tRGVsZWdhdGUoUmVzb3VyY2VS ZXF1ZXN0JiwgdW5zaWduZWQgbG9uZyYgaWRlbnRpZmllciwgUmVzb3VyY2VFcnJvciYpOwogICAg ICAgICB2b2lkIGxvYWRlZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKGNvbnN0IENhY2hlZFJlc291 cmNlKik7CisgICAgICAgIHZvaWQgdGVsbENsaWVudEFib3V0UGFzdE1lbW9yeUNhY2hlTG9hZHMo KTsKIAogICAgICAgICB2b2lkIHJlY3Vyc2l2ZUNoZWNrTG9hZENvbXBsZXRlKCk7CiAgICAgICAg IHZvaWQgY2hlY2tMb2FkQ29tcGxldGUoKTsKSW5kZXg6IFdlYkNvcmUvcGFnZS9QYWdlLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvUGFnZS5jcHAJKHJldmlzaW9uIDM5Njc1KQorKysg V2ViQ29yZS9wYWdlL1BhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjEsNiArMTIxLDcgQEAg UGFnZTo6UGFnZShDaHJvbWVDbGllbnQqIGNocm9tZUNsaWVudCwgQwogICAgICwgbV9kZWZlcnNM b2FkaW5nKGZhbHNlKQogICAgICwgbV9pbkxvd1F1YWxpdHlJbnRlcnBvbGF0aW9uTW9kZShmYWxz ZSkKICAgICAsIG1fY29va2llRW5hYmxlZCh0cnVlKQorICAgICwgbV9hcmVNZW1vcnlDYWNoZUNs aWVudENhbGxzRW5hYmxlZCh0cnVlKQogICAgICwgbV9tZWRpYVZvbHVtZSgxKQogICAgICwgbV9w YXJlbnRJbnNwZWN0b3JDb250cm9sbGVyKDApCiAgICAgLCBtX2RpZExvYWRVc2VyU3R5bGVTaGVl dChmYWxzZSkKQEAgLTYxMyw0ICs2MTQsMTcgQEAgdm9pZCBQYWdlOjpzZXRDdXN0b21IVE1MVG9r ZW5pemVyQ2h1bmtTaQogICAgIG1fY3VzdG9tSFRNTFRva2VuaXplckNodW5rU2l6ZSA9IGN1c3Rv bUhUTUxUb2tlbml6ZXJDaHVua1NpemU7CiB9CiAKK3ZvaWQgUGFnZTo6c2V0TWVtb3J5Q2FjaGVD bGllbnRDYWxsc0VuYWJsZWQoYm9vbCBlbmFibGVkKQoreworICAgIGlmIChtX2FyZU1lbW9yeUNh Y2hlQ2xpZW50Q2FsbHNFbmFibGVkID09IGVuYWJsZWQpCisgICAgICAgIHJldHVybjsKKworICAg IG1fYXJlTWVtb3J5Q2FjaGVDbGllbnRDYWxsc0VuYWJsZWQgPSBlbmFibGVkOworICAgIGlmICgh ZW5hYmxlZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgZm9yIChSZWZQdHI8RnJhbWU+IGZyYW1l ID0gbWFpbkZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCktPnRyYXZlcnNlTmV4 dCgpKQorICAgICAgICBmcmFtZS0+bG9hZGVyKCktPnRlbGxDbGllbnRBYm91dFBhc3RNZW1vcnlD YWNoZUxvYWRzKCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFdlYkNvcmUv cGFnZS9QYWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL1BhZ2UuaAkocmV2aXNpb24g Mzk2NzUpCisrKyBXZWJDb3JlL3BhZ2UvUGFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNywxMSAr MjcsMTIgQEAKICNpbmNsdWRlICJGcmFtZUxvYWRlclR5cGVzLmgiCiAjaW5jbHVkZSAiTGlua0hh c2guaCIKICNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgorI2luY2x1ZGUgPHd0Zi9IYXNoU2V0 Lmg+CisjaW5jbHVkZSA8d3RmL093blB0ci5oPgorCiAjaWYgUExBVEZPUk0oTUFDKQogI2luY2x1 ZGUgIlNjaGVkdWxlUGFpci5oIgogI2VuZGlmCi0jaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KLSNp bmNsdWRlIDx3dGYvT3duUHRyLmg+CiAKICNpZiBQTEFURk9STShXSU4pIHx8IChQTEFURk9STShX WCkgJiYgUExBVEZPUk0oV0lOX09TKSkgfHwgKFBMQVRGT1JNKFFUKSAmJiBkZWZpbmVkKFFfV1Nf V0lOKSkKIHR5cGVkZWYgc3RydWN0IEhJTlNUQU5DRV9fKiBISU5TVEFOQ0U7CkBAIC0xOTMsNiAr MTk0LDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIGhhc0N1c3RvbUhUTUxU b2tlbml6ZXJDaHVua1NpemUoKSBjb25zdCB7IHJldHVybiBtX2N1c3RvbUhUTUxUb2tlbml6ZXJD aHVua1NpemUgIT0gLTE7IH0KICAgICAgICAgaW50IGN1c3RvbUhUTUxUb2tlbml6ZXJDaHVua1Np emUoKSBjb25zdCB7IEFTU0VSVChtX2N1c3RvbUhUTUxUb2tlbml6ZXJDaHVua1NpemUgIT0gLTEp OyByZXR1cm4gbV9jdXN0b21IVE1MVG9rZW5pemVyQ2h1bmtTaXplOyB9CiAKKyAgICAgICAgdm9p ZCBzZXRNZW1vcnlDYWNoZUNsaWVudENhbGxzRW5hYmxlZChib29sKTsKKyAgICAgICAgYm9vbCBh cmVNZW1vcnlDYWNoZUNsaWVudENhbGxzRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fYXJlTWVt b3J5Q2FjaGVDbGllbnRDYWxsc0VuYWJsZWQ7IH0KKwogICAgIHByaXZhdGU6CiAgICAgICAgIHZv aWQgaW5pdEdyb3VwKCk7CiAKQEAgLTIyMiw2ICsyMjYsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKICAgICAgICAgYm9vbCBtX2luTG93UXVhbGl0eUludGVycG9sYXRpb25Nb2RlOwogICAgICAg ICBib29sIG1fY29va2llRW5hYmxlZDsKKyAgICAgICAgYm9vbCBtX2FyZU1lbW9yeUNhY2hlQ2xp ZW50Q2FsbHNFbmFibGVkOwogICAgICAgICBmbG9hdCBtX21lZGlhVm9sdW1lOwogICAgIAogICAg ICAgICBJbnNwZWN0b3JDb250cm9sbGVyKiBtX3BhcmVudEluc3BlY3RvckNvbnRyb2xsZXI7CkBA IC0yNDUsNiArMjUwLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogI2lmIEVOQUJMRShET01fU1RP UkFHRSkKICAgICAgICAgUmVmUHRyPFNlc3Npb25TdG9yYWdlPiBtX3Nlc3Npb25TdG9yYWdlOwog I2VuZGlmCisKICNpZiBQTEFURk9STShXSU4pIHx8IChQTEFURk9STShXWCkgJiYgZGVmaW5lZChf X1dYTVNXX18pKSB8fCAoUExBVEZPUk0oUVQpICYmIGRlZmluZWQoUV9XU19XSU4pKQogICAgICAg ICBzdGF0aWMgSElOU1RBTkNFIHNfaW5zdGFuY2VIYW5kbGU7CiAjZW5kaWYK