76500 2012-01-17 17:11:52 -0800 IndexedDB: Check for permission before using IndexedDB from a worker. 2012-01-18 14:39:39 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dgrogan dgrogan jsbell levin levin+threading michaeln webkit.review.bot oldest_to_newest 537463 0 dgrogan 2012-01-17 17:11:52 -0800 IndexedDB: Check for permission before using IndexedDB from a worker. 537494 1 122848 dgrogan 2012-01-17 17:35:26 -0800 Created attachment 122848 Patch 537497 2 dgrogan 2012-01-17 17:40:50 -0800 Dave Levin - could you review? This patch has updated parts of https://bugs.webkit.org/show_bug.cgi?id=73609 that I had pulled out. There are some comments in the code explaining why I think this is thread-safe, but the WebCore::AllowCrossThreadAccess call still feels gross. 537609 3 122848 levin 2012-01-17 21:03:42 -0800 Comment on attachment 122848 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=122848&action=review > Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp:115 > + m_webWorkerClientImpl->postTaskForModeToWorkerContext( No new line needed here but if you add one then you need {} for this. > Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp:136 > + bridge->signalCompleted(false, mode); indentation isn't correct. 538099 4 122978 dgrogan 2012-01-18 13:20:33 -0800 Created attachment 122978 Patch for landing 538185 5 122978 webkit.review.bot 2012-01-18 14:39:34 -0800 Comment on attachment 122978 Patch for landing Clearing flags on attachment: 122978 Committed r105324: <http://trac.webkit.org/changeset/105324> 538186 6 webkit.review.bot 2012-01-18 14:39:39 -0800 All reviewed patches have been landed. Closing bug. 122848 2012-01-17 17:35:26 -0800 2012-01-18 13:20:28 -0800 Patch bug-76500-20120117173525.patch text/plain 6376 dgrogan U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGU2Y2RiM2Y4ZmIzODVmMmQ3MTY0OTc5MDhkYjU4MWZiOGVjNTE4NmQuLjBhOTA0ZTU2ODNiODIx Yzk2NTBjNDZiNDdiMTI3N2UzM2U0MDU4NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTItMDEtMTcgIERhdmlkIEdyb2dhbiAgPGRncm9nYW5AY2hyb21p dW0ub3JnPgorCisgICAgICAgIEluZGV4ZWREQjogQ2hlY2sgZm9yIHBlcm1pc3Npb24gYmVmb3Jl IHVzaW5nIEluZGV4ZWREQiBmcm9tIGEgd29ya2VyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzY1MDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIHNyYy9JREJGYWN0b3J5QmFja2VuZFByb3h5LmNwcDoK KyAgICAgICAgKFdlYktpdDo6QWxsb3dJbmRleGVkREJNYWluVGhyZWFkQnJpZGdlOjpjcmVhdGUp OgorICAgICAgICAoV2ViS2l0OjpBbGxvd0luZGV4ZWREQk1haW5UaHJlYWRCcmlkZ2U6OmNhbmNl bCk6CisgICAgICAgIChXZWJLaXQ6OkFsbG93SW5kZXhlZERCTWFpblRocmVhZEJyaWRnZTo6cmVz dWx0KToKKyAgICAgICAgKFdlYktpdDo6QWxsb3dJbmRleGVkREJNYWluVGhyZWFkQnJpZGdlOjpz aWduYWxDb21wbGV0ZWQpOgorICAgICAgICAoV2ViS2l0OjpBbGxvd0luZGV4ZWREQk1haW5UaHJl YWRCcmlkZ2U6OkFsbG93SW5kZXhlZERCTWFpblRocmVhZEJyaWRnZSk6CisgICAgICAgIChXZWJL aXQ6OkFsbG93SW5kZXhlZERCTWFpblRocmVhZEJyaWRnZTo6YWxsb3dJbmRleGVkREJUYXNrKTog Q2FsbAorICAgICAgICB3ZWJWaWV3LT5wZXJtaXNzaW9uQ2xpZW50KCktPmFsbG93SW5kZXhlZERC IG9uIHRoZSBtYWluIHRocmVhZCBiZWNhdXNlCisgICAgICAgIENvbnRlbnRTZXR0aW5nc09ic2Vy dmVyOjpBbGxvd0luZGV4ZWREQigpLCB3aGljaCBpcyBjYWxsZWQgZG93biB0aGUKKyAgICAgICAg Y2hhaW4sIGV4cGVjdHMgdG8gYmUgcnVuIG9uIHRoZSBtYWluIHRocmVhZC4KKyAgICAgICAgKFdl YktpdDo6QWxsb3dJbmRleGVkREJNYWluVGhyZWFkQnJpZGdlOjpkaWRDb21wbGV0ZSk6CisgICAg ICAgIChXZWJLaXQ6OklEQkZhY3RvcnlCYWNrZW5kUHJveHk6OmFsbG93SURCRnJvbVdvcmtlclRo cmVhZCk6IFdhaXQgZm9yCisgICAgICAgIG1haW4gcGVybWlzc2lvbiBjaGVjayB0byBjb21wbGV0 ZSBvbiBtYWluIHRocmVhZCBiZWZvcmUgcHJvY2VlZGluZyBvbgorICAgICAgICB3b3JrZXIgdGhy ZWFkLgorCiAyMDEyLTAxLTE2ICBCaWxsIEJ1ZGdlICA8YmJ1ZGdlQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBDaGFuZ2VzIEFzc29jaWF0ZWRVUkxMb2FkZXIgdG8gcmVtb3ZlIG5vbi13aGl0ZWxp c3RlZCBIVFRQIHJlc3BvbnNlIGhlYWRlcnMgZm9yIENPUlMgcmVxdWVzdHMsCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9JREJGYWN0b3J5QmFja2VuZFByb3h5LmNwcCBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0lEQkZhY3RvcnlCYWNrZW5kUHJveHkuY3BwCmlu ZGV4IGMyMjMwOWIyYTAyMDFmYWIzMGYzZjA0OGM2NGI4ZDRjN2ZiNDA0YjguLjczMmUwZGZkMzA0 MGI0NzgzN2U3NmYwZjA3NTZiZjg2MGNkZThjM2IgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL0lEQkZhY3RvcnlCYWNrZW5kUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL0lEQkZhY3RvcnlCYWNrZW5kUHJveHkuY3BwCkBAIC00Nyw2ICs0Nyw3 IEBACiAjaW5jbHVkZSAicGxhdGZvcm0vV2ViVmVjdG9yLmgiCiAjaW5jbHVkZSAiV2ViVmlld0lt cGwuaCIKICNpbmNsdWRlICJXZWJXb3JrZXJCYXNlLmgiCisjaW5jbHVkZSAiV2ViV29ya2VyQ2xp ZW50SW1wbC5oIgogI2luY2x1ZGUgIldvcmtlckNvbnRleHQuaCIKICNpbmNsdWRlICJXb3JrZXJM b2FkZXJQcm94eS5oIgogI2luY2x1ZGUgIldvcmtlclNjcmlwdENvbnRyb2xsZXIuaCIKQEAgLTg1 LDkgKzg2LDkyIEBAIHZvaWQgSURCRmFjdG9yeUJhY2tlbmRQcm94eTo6Z2V0RGF0YWJhc2VOYW1l cyhQYXNzUmVmUHRyPElEQkNhbGxiYWNrcz4gY2FsbGJhY2tzCiAgICAgbV93ZWJJREJGYWN0b3J5 LT5nZXREYXRhYmFzZU5hbWVzKG5ldyBXZWJJREJDYWxsYmFja3NJbXBsKGNhbGxiYWNrcyksIG9y aWdpbiwgd2ViRnJhbWUsIGRhdGFEaXIpOwogfQogCi1ib29sIElEQkZhY3RvcnlCYWNrZW5kUHJv eHk6OmFsbG93SURCRnJvbVdvcmtlclRocmVhZChXb3JrZXJDb250ZXh0KiwgY29uc3QgU3RyaW5n JiwgY29uc3QgV2ViU2VjdXJpdHlPcmlnaW4mKQorc3RhdGljIGNvbnN0IGNoYXIgYWxsb3dJbmRl eGVkREJNb2RlW10gPSAiYWxsb3dJbmRleGVkREJNb2RlIjsKKworY2xhc3MgQWxsb3dJbmRleGVk REJNYWluVGhyZWFkQnJpZGdlIDogcHVibGljIFRocmVhZFNhZmVSZWZDb3VudGVkPEFsbG93SW5k ZXhlZERCTWFpblRocmVhZEJyaWRnZT4geworcHVibGljOgorICAgIHN0YXRpYyBQYXNzUmVmUHRy PEFsbG93SW5kZXhlZERCTWFpblRocmVhZEJyaWRnZT4gY3JlYXRlKFdlYldvcmtlckNsaWVudElt cGwqIHdlYldvcmtlckNsaWVudEltcGwsIGNvbnN0IFN0cmluZyYgbW9kZSwgY29uc3QgU3RyaW5n JiBuYW1lKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBBbGxvd0luZGV4ZWRE Qk1haW5UaHJlYWRCcmlkZ2Uod2ViV29ya2VyQ2xpZW50SW1wbCwgbW9kZSwgbmFtZSkpOworICAg IH0KKworICAgIC8vIFRoZXNlIG1ldGhvZHMgYXJlIGludm9rZWQgb24gdGhlIHdvcmtlciBjb250 ZXh0LgorICAgIHZvaWQgY2FuY2VsKCkKKyAgICB7CisgICAgICAgIE11dGV4TG9ja2VyIGxvY2tl cihtX211dGV4KTsKKyAgICAgICAgbV93ZWJXb3JrZXJDbGllbnRJbXBsID0gMDsKKyAgICB9CisK KyAgICBib29sIHJlc3VsdCgpCisgICAgeworICAgICAgICByZXR1cm4gbV9yZXN1bHQ7CisgICAg fQorCisgICAgLy8gVGhpcyBtZXRob2QgaXMgaW52b2tlZCBvbiB0aGUgbWFpbiB0aHJlYWQuCisg ICAgdm9pZCBzaWduYWxDb21wbGV0ZWQoYm9vbCByZXN1bHQsIGNvbnN0IFN0cmluZyYgbW9kZSkK KyAgICB7CisgICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX211dGV4KTsKKyAgICAgICAgaWYg KG1fd2ViV29ya2VyQ2xpZW50SW1wbCkKKyAgICAgICAgICAgIG1fd2ViV29ya2VyQ2xpZW50SW1w bC0+cG9zdFRhc2tGb3JNb2RlVG9Xb3JrZXJDb250ZXh0KAorICAgICAgICAgICAgICAgIGNyZWF0 ZUNhbGxiYWNrVGFzaygmZGlkQ29tcGxldGUsIHRoaXMsIHJlc3VsdCksIG1vZGUpOworICAgIH0K KworcHJpdmF0ZToKKyAgICBBbGxvd0luZGV4ZWREQk1haW5UaHJlYWRCcmlkZ2UoV2ViV29ya2Vy Q2xpZW50SW1wbCogd2ViV29ya2VyQ2xpZW50SW1wbCwgY29uc3QgU3RyaW5nJiBtb2RlLCBjb25z dCBTdHJpbmcmIG5hbWUpCisgICAgICAgIDogbV9yZXN1bHQoZmFsc2UpCisgICAgICAgICwgbV93 ZWJXb3JrZXJDbGllbnRJbXBsKHdlYldvcmtlckNsaWVudEltcGwpCisgICAgeworICAgICAgICBX ZWJGcmFtZUltcGwqIHdlYkZyYW1lID0gc3RhdGljX2Nhc3Q8V2ViRnJhbWVJbXBsKj4od2ViV29y a2VyQ2xpZW50SW1wbC0+dmlldygpLT5tYWluRnJhbWUoKSk7CisgICAgICAgIC8vIHdlYkZyYW1l IGlzIG5vdCBkZWxldGVkIGFzIGxvbmcgYXMgdGhlIHByb2Nlc3MgaXMgYWxpdmUsIHJlbHlpbmcg b24KKyAgICAgICAgLy8gaXQgdG8gZXhpc3Qgb24gdGhlIG1haW4gdGhyZWFkIHNob3VsZCBiZSBv ay4KKyAgICAgICAgV2ViV29ya2VyQmFzZTo6ZGlzcGF0Y2hUYXNrVG9NYWluVGhyZWFkKAorICAg ICAgICAgICAgY3JlYXRlQ2FsbGJhY2tUYXNrKCZhbGxvd0luZGV4ZWREQlRhc2ssIHRoaXMsIFdl YkNvcmU6OkFsbG93Q3Jvc3NUaHJlYWRBY2Nlc3Mod2ViRnJhbWUpLCBuYW1lLCBtb2RlKSk7Cisg ICAgfQorCisgICAgc3RhdGljIHZvaWQgYWxsb3dJbmRleGVkREJUYXNrKFNjcmlwdEV4ZWN1dGlv bkNvbnRleHQqLCBQYXNzUmVmUHRyPEFsbG93SW5kZXhlZERCTWFpblRocmVhZEJyaWRnZT4gYnJp ZGdlLCBQYXNzUmVmUHRyPFdlYkZyYW1lSW1wbD4gcHJwV2ViRnJhbWUsIGNvbnN0IFN0cmluZyYg bmFtZSwgY29uc3QgU3RyaW5nJiBtb2RlKQorICAgIHsKKyAgICAgICAgUmVmUHRyPFdlYkZyYW1l SW1wbD4gd2ViRnJhbWUgPSBwcnBXZWJGcmFtZTsKKyAgICAgICAgV2ViVmlld0ltcGwqIHdlYlZp ZXcgPSB3ZWJGcmFtZS0+dmlld0ltcGwoKTsKKyAgICAgICAgaWYgKCF3ZWJWaWV3KSB7CisgICAg ICAgICAgYnJpZGdlLT5zaWduYWxDb21wbGV0ZWQoZmFsc2UsIG1vZGUpOworICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgfQorICAgICAgICBib29sIGFsbG93ZWQgPSAhd2ViVmlldy0+cGVybWlz c2lvbkNsaWVudCgpIHx8IHdlYlZpZXctPnBlcm1pc3Npb25DbGllbnQoKS0+YWxsb3dJbmRleGVk REIod2ViRnJhbWUuZ2V0KCksIG5hbWUsIFdlYlNlY3VyaXR5T3JpZ2luKCkpOworICAgICAgICBi cmlkZ2UtPnNpZ25hbENvbXBsZXRlZChhbGxvd2VkLCBtb2RlKTsKKyAgICB9CisKKyAgICBzdGF0 aWMgdm9pZCBkaWRDb21wbGV0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBQYXNz UmVmUHRyPEFsbG93SW5kZXhlZERCTWFpblRocmVhZEJyaWRnZT4gYnJpZGdlLCBib29sIHJlc3Vs dCkKKyAgICB7CisgICAgICAgIGJyaWRnZS0+bV9yZXN1bHQgPSByZXN1bHQ7CisgICAgfQorCisg ICAgYm9vbCBtX3Jlc3VsdDsKKyAgICBNdXRleCBtX211dGV4OworICAgIC8vIFdlYldvcmtlckNs aWVudEltcGwgaXMgbmV2ZXIgZGVsZXRlZCBhcyBsb25nIGFzIHRoZSByZW5kZXJlciBwcm9jZXNz CisgICAgLy8gaXMgYWxpdmUuIFdlIHVzZSBpdCBvbiB0aGUgbWFpbiB0aHJlYWQgdG8gbm90aWZ5 IHRoZSB3b3JrZXIgdGhyZWFkIHRoYXQKKyAgICAvLyB0aGUgcGVybWlzc2lvbiByZXN1bHQgaGFz IGJlZW4gc2V0LiBUaGUgdW5kZXJseWluZyBtZXNzYWdlIHByb3h5IG9iamVjdAorICAgIC8vIGlz IHZhbGlkIGFzIGxvbmcgYXMgdGhlIHdvcmtlciBydW4gbG9vcCBoYXNuJ3QgcmV0dXJuZWQKKyAg ICAvLyBNZXNzYWdlUXVldWVUZXJtaW5hdGVkLCBpbiB3aGljaCBjYXNlIHdlIGRvbid0IHVzZSB0 aGUKKyAgICAvLyBXZWJXb3JrZXJDbGllbnRJbXBsLgorICAgIFdlYldvcmtlckNsaWVudEltcGwq IG1fd2ViV29ya2VyQ2xpZW50SW1wbDsKK307CisKK2Jvb2wgSURCRmFjdG9yeUJhY2tlbmRQcm94 eTo6YWxsb3dJREJGcm9tV29ya2VyVGhyZWFkKFdvcmtlckNvbnRleHQqIHdvcmtlckNvbnRleHQs IGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgV2ViU2VjdXJpdHlPcmlnaW4mKQogewotICAgIHJl dHVybiB0cnVlOworICAgIFdlYldvcmtlckNsaWVudEltcGwqIHdlYldvcmtlckNsaWVudEltcGwg PSBzdGF0aWNfY2FzdDxXZWJXb3JrZXJDbGllbnRJbXBsKj4oJndvcmtlckNvbnRleHQtPnRocmVh ZCgpLT53b3JrZXJMb2FkZXJQcm94eSgpKTsKKyAgICBXb3JrZXJSdW5Mb29wJiBydW5Mb29wID0g d29ya2VyQ29udGV4dC0+dGhyZWFkKCktPnJ1bkxvb3AoKTsKKworICAgIFN0cmluZyBtb2RlID0g YWxsb3dJbmRleGVkREJNb2RlOworICAgIG1vZGUuYXBwZW5kKFN0cmluZzo6bnVtYmVyKHJ1bkxv b3AuY3JlYXRlVW5pcXVlSWQoKSkpOworICAgIFJlZlB0cjxBbGxvd0luZGV4ZWREQk1haW5UaHJl YWRCcmlkZ2U+IGJyaWRnZSA9IEFsbG93SW5kZXhlZERCTWFpblRocmVhZEJyaWRnZTo6Y3JlYXRl KHdlYldvcmtlckNsaWVudEltcGwsIG1vZGUsIG5hbWUpOworCisgICAgLy8gRWl0aGVyIHRoZSBi cmlkZ2UgcmV0dXJucywgb3IgdGhlIHF1ZXVlIGdldHMgdGVybWluYXRlZC4KKyAgICBpZiAocnVu TG9vcC5ydW5Jbk1vZGUod29ya2VyQ29udGV4dCwgbW9kZSkgPT0gTWVzc2FnZVF1ZXVlVGVybWlu YXRlZCkgeworICAgICAgICBicmlkZ2UtPmNhbmNlbCgpOworICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgfQorCisgICAgcmV0dXJuIGJyaWRnZS0+cmVzdWx0KCk7CiB9CiAKIHZvaWQgSURCRmFj dG9yeUJhY2tlbmRQcm94eTo6b3BlbkZyb21Xb3JrZXIoY29uc3QgU3RyaW5nJiBuYW1lLCBJREJD YWxsYmFja3MqIGNhbGxiYWNrcywgUGFzc1JlZlB0cjxTZWN1cml0eU9yaWdpbj4gcHJwT3JpZ2lu LCBXb3JrZXJDb250ZXh0KiBjb250ZXh0LCBjb25zdCBTdHJpbmcmIGRhdGFEaXIpCg== 122978 2012-01-18 13:20:33 -0800 2012-01-18 14:39:34 -0800 Patch for landing bug-76500-20120118132032.patch text/plain 6359 dgrogan U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGU2Y2RiM2Y4ZmIzODVmMmQ3MTY0OTc5MDhkYjU4MWZiOGVjNTE4NmQuLmJkZThkNzkyZGIxYTZl ZGY0MWIzZDg1NDFiYzQyNjI4NWJkN2ZjMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTItMDEtMTcgIERhdmlkIEdyb2dhbiAgPGRncm9nYW5AY2hyb21p dW0ub3JnPgorCisgICAgICAgIEluZGV4ZWREQjogQ2hlY2sgZm9yIHBlcm1pc3Npb24gYmVmb3Jl IHVzaW5nIEluZGV4ZWREQiBmcm9tIGEgd29ya2VyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzY1MDAKKworICAgICAgICBSZXZpZXdlZCBieSBEYXZp ZCBMZXZpbi4KKworICAgICAgICAqIHNyYy9JREJGYWN0b3J5QmFja2VuZFByb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6QWxsb3dJbmRleGVkREJNYWluVGhyZWFkQnJpZGdlOjpjcmVhdGUpOgor ICAgICAgICAoV2ViS2l0OjpBbGxvd0luZGV4ZWREQk1haW5UaHJlYWRCcmlkZ2U6OmNhbmNlbCk6 CisgICAgICAgIChXZWJLaXQ6OkFsbG93SW5kZXhlZERCTWFpblRocmVhZEJyaWRnZTo6cmVzdWx0 KToKKyAgICAgICAgKFdlYktpdDo6QWxsb3dJbmRleGVkREJNYWluVGhyZWFkQnJpZGdlOjpzaWdu YWxDb21wbGV0ZWQpOgorICAgICAgICAoV2ViS2l0OjpBbGxvd0luZGV4ZWREQk1haW5UaHJlYWRC cmlkZ2U6OkFsbG93SW5kZXhlZERCTWFpblRocmVhZEJyaWRnZSk6CisgICAgICAgIChXZWJLaXQ6 OkFsbG93SW5kZXhlZERCTWFpblRocmVhZEJyaWRnZTo6YWxsb3dJbmRleGVkREJUYXNrKTogQ2Fs bAorICAgICAgICB3ZWJWaWV3LT5wZXJtaXNzaW9uQ2xpZW50KCktPmFsbG93SW5kZXhlZERCIG9u IHRoZSBtYWluIHRocmVhZCBiZWNhdXNlCisgICAgICAgIENvbnRlbnRTZXR0aW5nc09ic2VydmVy OjpBbGxvd0luZGV4ZWREQigpLCB3aGljaCBpcyBjYWxsZWQgZG93biB0aGUKKyAgICAgICAgY2hh aW4sIGV4cGVjdHMgdG8gYmUgcnVuIG9uIHRoZSBtYWluIHRocmVhZC4KKyAgICAgICAgKFdlYktp dDo6QWxsb3dJbmRleGVkREJNYWluVGhyZWFkQnJpZGdlOjpkaWRDb21wbGV0ZSk6CisgICAgICAg IChXZWJLaXQ6OklEQkZhY3RvcnlCYWNrZW5kUHJveHk6OmFsbG93SURCRnJvbVdvcmtlclRocmVh ZCk6IFdhaXQgZm9yCisgICAgICAgIG1haW4gcGVybWlzc2lvbiBjaGVjayB0byBjb21wbGV0ZSBv biBtYWluIHRocmVhZCBiZWZvcmUgcHJvY2VlZGluZyBvbgorICAgICAgICB3b3JrZXIgdGhyZWFk LgorCiAyMDEyLTAxLTE2ICBCaWxsIEJ1ZGdlICA8YmJ1ZGdlQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBDaGFuZ2VzIEFzc29jaWF0ZWRVUkxMb2FkZXIgdG8gcmVtb3ZlIG5vbi13aGl0ZWxpc3Rl ZCBIVFRQIHJlc3BvbnNlIGhlYWRlcnMgZm9yIENPUlMgcmVxdWVzdHMsCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9JREJGYWN0b3J5QmFja2VuZFByb3h5LmNwcCBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0lEQkZhY3RvcnlCYWNrZW5kUHJveHkuY3BwCmluZGV4 IGMyMjMwOWIyYTAyMDFmYWIzMGYzZjA0OGM2NGI4ZDRjN2ZiNDA0YjguLjgwYjcxMWE1NmNkOTQ1 OTk0N2M4YTlhNTkxOTljNjBhZjE3YzNhZDUgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL0lEQkZhY3RvcnlCYWNrZW5kUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL0lEQkZhY3RvcnlCYWNrZW5kUHJveHkuY3BwCkBAIC00Nyw2ICs0Nyw3IEBA CiAjaW5jbHVkZSAicGxhdGZvcm0vV2ViVmVjdG9yLmgiCiAjaW5jbHVkZSAiV2ViVmlld0ltcGwu aCIKICNpbmNsdWRlICJXZWJXb3JrZXJCYXNlLmgiCisjaW5jbHVkZSAiV2ViV29ya2VyQ2xpZW50 SW1wbC5oIgogI2luY2x1ZGUgIldvcmtlckNvbnRleHQuaCIKICNpbmNsdWRlICJXb3JrZXJMb2Fk ZXJQcm94eS5oIgogI2luY2x1ZGUgIldvcmtlclNjcmlwdENvbnRyb2xsZXIuaCIKQEAgLTg1LDkg Kzg2LDkxIEBAIHZvaWQgSURCRmFjdG9yeUJhY2tlbmRQcm94eTo6Z2V0RGF0YWJhc2VOYW1lcyhQ YXNzUmVmUHRyPElEQkNhbGxiYWNrcz4gY2FsbGJhY2tzCiAgICAgbV93ZWJJREJGYWN0b3J5LT5n ZXREYXRhYmFzZU5hbWVzKG5ldyBXZWJJREJDYWxsYmFja3NJbXBsKGNhbGxiYWNrcyksIG9yaWdp biwgd2ViRnJhbWUsIGRhdGFEaXIpOwogfQogCi1ib29sIElEQkZhY3RvcnlCYWNrZW5kUHJveHk6 OmFsbG93SURCRnJvbVdvcmtlclRocmVhZChXb3JrZXJDb250ZXh0KiwgY29uc3QgU3RyaW5nJiwg Y29uc3QgV2ViU2VjdXJpdHlPcmlnaW4mKQorc3RhdGljIGNvbnN0IGNoYXIgYWxsb3dJbmRleGVk REJNb2RlW10gPSAiYWxsb3dJbmRleGVkREJNb2RlIjsKKworY2xhc3MgQWxsb3dJbmRleGVkREJN YWluVGhyZWFkQnJpZGdlIDogcHVibGljIFRocmVhZFNhZmVSZWZDb3VudGVkPEFsbG93SW5kZXhl ZERCTWFpblRocmVhZEJyaWRnZT4geworcHVibGljOgorICAgIHN0YXRpYyBQYXNzUmVmUHRyPEFs bG93SW5kZXhlZERCTWFpblRocmVhZEJyaWRnZT4gY3JlYXRlKFdlYldvcmtlckNsaWVudEltcGwq IHdlYldvcmtlckNsaWVudEltcGwsIGNvbnN0IFN0cmluZyYgbW9kZSwgY29uc3QgU3RyaW5nJiBu YW1lKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBBbGxvd0luZGV4ZWREQk1h aW5UaHJlYWRCcmlkZ2Uod2ViV29ya2VyQ2xpZW50SW1wbCwgbW9kZSwgbmFtZSkpOworICAgIH0K KworICAgIC8vIFRoZXNlIG1ldGhvZHMgYXJlIGludm9rZWQgb24gdGhlIHdvcmtlciBjb250ZXh0 LgorICAgIHZvaWQgY2FuY2VsKCkKKyAgICB7CisgICAgICAgIE11dGV4TG9ja2VyIGxvY2tlciht X211dGV4KTsKKyAgICAgICAgbV93ZWJXb3JrZXJDbGllbnRJbXBsID0gMDsKKyAgICB9CisKKyAg ICBib29sIHJlc3VsdCgpCisgICAgeworICAgICAgICByZXR1cm4gbV9yZXN1bHQ7CisgICAgfQor CisgICAgLy8gVGhpcyBtZXRob2QgaXMgaW52b2tlZCBvbiB0aGUgbWFpbiB0aHJlYWQuCisgICAg dm9pZCBzaWduYWxDb21wbGV0ZWQoYm9vbCByZXN1bHQsIGNvbnN0IFN0cmluZyYgbW9kZSkKKyAg ICB7CisgICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX211dGV4KTsKKyAgICAgICAgaWYgKG1f d2ViV29ya2VyQ2xpZW50SW1wbCkKKyAgICAgICAgICAgIG1fd2ViV29ya2VyQ2xpZW50SW1wbC0+ cG9zdFRhc2tGb3JNb2RlVG9Xb3JrZXJDb250ZXh0KGNyZWF0ZUNhbGxiYWNrVGFzaygmZGlkQ29t cGxldGUsIHRoaXMsIHJlc3VsdCksIG1vZGUpOworICAgIH0KKworcHJpdmF0ZToKKyAgICBBbGxv d0luZGV4ZWREQk1haW5UaHJlYWRCcmlkZ2UoV2ViV29ya2VyQ2xpZW50SW1wbCogd2ViV29ya2Vy Q2xpZW50SW1wbCwgY29uc3QgU3RyaW5nJiBtb2RlLCBjb25zdCBTdHJpbmcmIG5hbWUpCisgICAg ICAgIDogbV9yZXN1bHQoZmFsc2UpCisgICAgICAgICwgbV93ZWJXb3JrZXJDbGllbnRJbXBsKHdl YldvcmtlckNsaWVudEltcGwpCisgICAgeworICAgICAgICBXZWJGcmFtZUltcGwqIHdlYkZyYW1l ID0gc3RhdGljX2Nhc3Q8V2ViRnJhbWVJbXBsKj4od2ViV29ya2VyQ2xpZW50SW1wbC0+dmlldygp LT5tYWluRnJhbWUoKSk7CisgICAgICAgIC8vIHdlYkZyYW1lIGlzIG5vdCBkZWxldGVkIGFzIGxv bmcgYXMgdGhlIHByb2Nlc3MgaXMgYWxpdmUsIHJlbHlpbmcgb24KKyAgICAgICAgLy8gaXQgdG8g ZXhpc3Qgb24gdGhlIG1haW4gdGhyZWFkIHNob3VsZCBiZSBvay4KKyAgICAgICAgV2ViV29ya2Vy QmFzZTo6ZGlzcGF0Y2hUYXNrVG9NYWluVGhyZWFkKAorICAgICAgICAgICAgY3JlYXRlQ2FsbGJh Y2tUYXNrKCZhbGxvd0luZGV4ZWREQlRhc2ssIHRoaXMsIFdlYkNvcmU6OkFsbG93Q3Jvc3NUaHJl YWRBY2Nlc3Mod2ViRnJhbWUpLCBuYW1lLCBtb2RlKSk7CisgICAgfQorCisgICAgc3RhdGljIHZv aWQgYWxsb3dJbmRleGVkREJUYXNrKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRy PEFsbG93SW5kZXhlZERCTWFpblRocmVhZEJyaWRnZT4gYnJpZGdlLCBQYXNzUmVmUHRyPFdlYkZy YW1lSW1wbD4gcHJwV2ViRnJhbWUsIGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiBt b2RlKQorICAgIHsKKyAgICAgICAgUmVmUHRyPFdlYkZyYW1lSW1wbD4gd2ViRnJhbWUgPSBwcnBX ZWJGcmFtZTsKKyAgICAgICAgV2ViVmlld0ltcGwqIHdlYlZpZXcgPSB3ZWJGcmFtZS0+dmlld0lt cGwoKTsKKyAgICAgICAgaWYgKCF3ZWJWaWV3KSB7CisgICAgICAgICAgICBicmlkZ2UtPnNpZ25h bENvbXBsZXRlZChmYWxzZSwgbW9kZSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0K KyAgICAgICAgYm9vbCBhbGxvd2VkID0gIXdlYlZpZXctPnBlcm1pc3Npb25DbGllbnQoKSB8fCB3 ZWJWaWV3LT5wZXJtaXNzaW9uQ2xpZW50KCktPmFsbG93SW5kZXhlZERCKHdlYkZyYW1lLmdldCgp LCBuYW1lLCBXZWJTZWN1cml0eU9yaWdpbigpKTsKKyAgICAgICAgYnJpZGdlLT5zaWduYWxDb21w bGV0ZWQoYWxsb3dlZCwgbW9kZSk7CisgICAgfQorCisgICAgc3RhdGljIHZvaWQgZGlkQ29tcGxl dGUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgUGFzc1JlZlB0cjxBbGxvd0luZGV4 ZWREQk1haW5UaHJlYWRCcmlkZ2U+IGJyaWRnZSwgYm9vbCByZXN1bHQpCisgICAgeworICAgICAg ICBicmlkZ2UtPm1fcmVzdWx0ID0gcmVzdWx0OworICAgIH0KKworICAgIGJvb2wgbV9yZXN1bHQ7 CisgICAgTXV0ZXggbV9tdXRleDsKKyAgICAvLyBXZWJXb3JrZXJDbGllbnRJbXBsIGlzIG5ldmVy IGRlbGV0ZWQgYXMgbG9uZyBhcyB0aGUgcmVuZGVyZXIgcHJvY2VzcworICAgIC8vIGlzIGFsaXZl LiBXZSB1c2UgaXQgb24gdGhlIG1haW4gdGhyZWFkIHRvIG5vdGlmeSB0aGUgd29ya2VyIHRocmVh ZCB0aGF0CisgICAgLy8gdGhlIHBlcm1pc3Npb24gcmVzdWx0IGhhcyBiZWVuIHNldC4gVGhlIHVu ZGVybHlpbmcgbWVzc2FnZSBwcm94eSBvYmplY3QKKyAgICAvLyBpcyB2YWxpZCBhcyBsb25nIGFz IHRoZSB3b3JrZXIgcnVuIGxvb3AgaGFzbid0IHJldHVybmVkCisgICAgLy8gTWVzc2FnZVF1ZXVl VGVybWluYXRlZCwgaW4gd2hpY2ggY2FzZSB3ZSBkb24ndCB1c2UgdGhlCisgICAgLy8gV2ViV29y a2VyQ2xpZW50SW1wbC4KKyAgICBXZWJXb3JrZXJDbGllbnRJbXBsKiBtX3dlYldvcmtlckNsaWVu dEltcGw7Cit9OworCitib29sIElEQkZhY3RvcnlCYWNrZW5kUHJveHk6OmFsbG93SURCRnJvbVdv cmtlclRocmVhZChXb3JrZXJDb250ZXh0KiB3b3JrZXJDb250ZXh0LCBjb25zdCBTdHJpbmcmIG5h bWUsIGNvbnN0IFdlYlNlY3VyaXR5T3JpZ2luJikKIHsKLSAgICByZXR1cm4gdHJ1ZTsKKyAgICBX ZWJXb3JrZXJDbGllbnRJbXBsKiB3ZWJXb3JrZXJDbGllbnRJbXBsID0gc3RhdGljX2Nhc3Q8V2Vi V29ya2VyQ2xpZW50SW1wbCo+KCZ3b3JrZXJDb250ZXh0LT50aHJlYWQoKS0+d29ya2VyTG9hZGVy UHJveHkoKSk7CisgICAgV29ya2VyUnVuTG9vcCYgcnVuTG9vcCA9IHdvcmtlckNvbnRleHQtPnRo cmVhZCgpLT5ydW5Mb29wKCk7CisKKyAgICBTdHJpbmcgbW9kZSA9IGFsbG93SW5kZXhlZERCTW9k ZTsKKyAgICBtb2RlLmFwcGVuZChTdHJpbmc6Om51bWJlcihydW5Mb29wLmNyZWF0ZVVuaXF1ZUlk KCkpKTsKKyAgICBSZWZQdHI8QWxsb3dJbmRleGVkREJNYWluVGhyZWFkQnJpZGdlPiBicmlkZ2Ug PSBBbGxvd0luZGV4ZWREQk1haW5UaHJlYWRCcmlkZ2U6OmNyZWF0ZSh3ZWJXb3JrZXJDbGllbnRJ bXBsLCBtb2RlLCBuYW1lKTsKKworICAgIC8vIEVpdGhlciB0aGUgYnJpZGdlIHJldHVybnMsIG9y IHRoZSBxdWV1ZSBnZXRzIHRlcm1pbmF0ZWQuCisgICAgaWYgKHJ1bkxvb3AucnVuSW5Nb2RlKHdv cmtlckNvbnRleHQsIG1vZGUpID09IE1lc3NhZ2VRdWV1ZVRlcm1pbmF0ZWQpIHsKKyAgICAgICAg YnJpZGdlLT5jYW5jZWwoKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKworICAgIHJl dHVybiBicmlkZ2UtPnJlc3VsdCgpOwogfQogCiB2b2lkIElEQkZhY3RvcnlCYWNrZW5kUHJveHk6 Om9wZW5Gcm9tV29ya2VyKGNvbnN0IFN0cmluZyYgbmFtZSwgSURCQ2FsbGJhY2tzKiBjYWxsYmFj a3MsIFBhc3NSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IHBycE9yaWdpbiwgV29ya2VyQ29udGV4dCog Y29udGV4dCwgY29uc3QgU3RyaW5nJiBkYXRhRGlyKQo=