141010 2015-01-28 13:59:57 -0800 Remove Mountain Lion code from WebKit and WebKit2 2015-01-28 14:22:45 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned andersca ap bdakin mitz sam thorton oldest_to_newest 1065027 0 bdakin 2015-01-28 13:59:57 -0800 Remove Mountain Lion code from WebKit and WebKit2 1065029 1 245571 bdakin 2015-01-28 14:02:01 -0800 Created attachment 245571 Patch 1065030 2 245571 sam 2015-01-28 14:19:08 -0800 Comment on attachment 245571 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=245571&action=review > Source/WebKit2/WebKit2Prefix.h:-60 > -#define WTF_USE_XPC_SERVICES 1 You got this one backwards, we still need WTF_USE_XPC_SERVICES defined to 1. That said, you could actually get rid of this, and just find the one or two users of USE(XPC_SERVICES) and remove them since it should always be true now. > Source/WebKit2/UIProcess/API/mac/WKView.mm:-4003 > NSRect contentRect = [[NSScreen mainScreen] frame]; > -#endif I would get rid of the variable and just do this on the next line. > Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in:282 > I would get rid of this blank line. 1065033 3 bdakin 2015-01-28 14:22:45 -0800 Thanks Sam! I fixed the things you found. http://trac.webkit.org/changeset/179294 245571 2015-01-28 14:02:01 -0800 2015-01-28 14:19:08 -0800 Patch for-review.txt text/plain 14498 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3OTI5MSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE1LTAxLTI4ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgTW91bnRhaW4gTGlvbiBj b2RlIGZyb20gV2ViS2l0IGFuZCBXZWJLaXQyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEwMTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL21hYy9jb20uYXBwbGUuV2ViS2l0 Lk5ldHdvcmtQcm9jZXNzLnNiLmluOgorICAgICAgICAqIFBsdWdpblByb2Nlc3MvRW50cnlQb2lu dC9tYWMvTGVnYWN5UHJvY2Vzcy9QbHVnaW5Qcm9jZXNzTWFpbi5tbToKKyAgICAgICAgKiBTaGFy ZWQvbWFjL0NoaWxkUHJvY2Vzc01hYy5tbToKKyAgICAgICAgKFdlYktpdDo6Q2hpbGRQcm9jZXNz Ojppbml0aWFsaXplU2FuZGJveCk6CisgICAgICAgICogU2hhcmVkL21hYy9XZWJFdmVudEZhY3Rv cnkubW06CisgICAgICAgIChXZWJLaXQ6OnBoYXNlRm9yRXZlbnQpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvbWFjL1dLVmlldy5tbToKKyAgICAgICAgKC1bV0tWaWV3IHF1aWNrTG9va1dpdGhF dmVudDpdKToKKyAgICAgICAgKC1bV0tWaWV3IHVwZGF0ZUxheWVyXSk6CisgICAgICAgICgtW1dL VmlldyBjcmVhdGVGdWxsU2NyZWVuV2luZG93XSk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9Q YWdlQ2xpZW50SW1wbC5tbToKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6OmlzVmll d1Zpc2libGUpOgorICAgICAgICAqIFdlYktpdDJQcmVmaXguaDoKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJTeXN0ZW1JbnRlcmZhY2UubW06CisgICAgICAgIChJ bml0V2ViQ29yZVN5c3RlbUludGVyZmFjZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb20uYXBw bGUuV2ViUHJvY2Vzcy5zYi5pbjoKKwogMjAxNS0wMS0yOCAgSm9zZXBoIFBlY29yYXJvICA8cGVj b3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IENyYXNoIHdoZW4gY2xv c2luZyBpbnNwZWN0ZWQgcGFnZQpJbmRleDogU291cmNlL1dlYktpdDIvV2ViS2l0MlByZWZpeC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYktpdDJQcmVmaXguaAkocmV2aXNpb24g MTc5Mjc0KQorKysgU291cmNlL1dlYktpdDIvV2ViS2l0MlByZWZpeC5oCSh3b3JraW5nIGNvcHkp CkBAIC01NiwyMCArNTYsNiBAQAogCiAjZW5kaWYKIAotI2lmICEoZGVmaW5lZChfX01BQ19PU19Y X1ZFUlNJT05fTUlOX1JFUVVJUkVEKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVE ID09IDEwODApCi0jZGVmaW5lIFdURl9VU0VfWFBDX1NFUlZJQ0VTIDEKLSNlbmRpZgotCi0jaWYg UExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID09IDEwODAg JiYgZGVmaW5lZChfX09CSkNfXykKLUBpbnRlcmZhY2UgTlNLZXllZEFyY2hpdmVyIChXS0RldGFp bHMpCi0tICh2b2lkKXNldFJlcXVpcmVzU2VjdXJlQ29kaW5nOihCT09MKXJlcXVpcmVzU2VjdXJl Q29kaW5nOwotQGVuZAotCi1AaW50ZXJmYWNlIE5TS2V5ZWRVbmFyY2hpdmVyIChXS0RldGFpbHMp Ci0tICh2b2lkKXNldFJlcXVpcmVzU2VjdXJlQ29kaW5nOihCT09MKXJlcXVpcmVzU2VjdXJlQ29k aW5nOwotQGVuZAotI2VuZGlmCi0KICNpZiBQTEFURk9STShHVEspCiAjZGVmaW5lIEVOQUJMRV9O RVRXT1JLX1BST0NFU1MgMQogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJv Y2Vzcy9tYWMvY29tLmFwcGxlLldlYktpdC5OZXR3b3JrUHJvY2Vzcy5zYi5pbgo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9tYWMvY29tLmFwcGxlLldlYktpdC5O ZXR3b3JrUHJvY2Vzcy5zYi5pbgkocmV2aXNpb24gMTc5Mjc0KQorKysgU291cmNlL1dlYktpdDIv TmV0d29ya1Byb2Nlc3MvbWFjL2NvbS5hcHBsZS5XZWJLaXQuTmV0d29ya1Byb2Nlc3Muc2IuaW4J KHdvcmtpbmcgY29weSkKQEAgLTcxLDExICs3MSw3IEBACiAocmVhZC1vbmx5LWFuZC1pc3N1ZS1l eHRlbnNpb25zIChleHRlbnNpb24gImNvbS5hcHBsZS5hcHAtc2FuZGJveC5yZWFkIikpCiAocmVh ZC13cml0ZS1hbmQtaXNzdWUtZXh0ZW5zaW9ucyAoZXh0ZW5zaW9uICJjb20uYXBwbGUuYXBwLXNh bmRib3gucmVhZC13cml0ZSIpKQogCi0jaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJF RCA+PSAxMDgwCiAoYWxsb3cgZmlsZS1yZWFkKiBmaWxlLXdyaXRlKiAoc3VicGF0aCAocGFyYW0g IkRBUldJTl9VU0VSX0NBQ0hFX0RJUiIpKSkKLSNlbHNlCi0oYWxsb3cgZmlsZS1yZWFkKiBmaWxl LXdyaXRlKiAoc3VicGF0aCAoc3RyaW5nLWFwcGVuZCAocGFyYW0gIkRBUldJTl9VU0VSX0NBQ0hF X0RJUiIpICIvbWRzIikpKQotI2VuZGlmCiAKIChhbGxvdyBmaWxlLXJlYWQqIGZpbGUtd3JpdGUq IChzdWJwYXRoIChwYXJhbSAiREFSV0lOX1VTRVJfVEVNUF9ESVIiKSkpCiAKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvRW50cnlQb2ludC9tYWMvTGVnYWN5UHJvY2Vzcy9QbHVn aW5Qcm9jZXNzTWFpbi5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9j ZXNzL0VudHJ5UG9pbnQvbWFjL0xlZ2FjeVByb2Nlc3MvUGx1Z2luUHJvY2Vzc01haW4ubW0JKHJl dmlzaW9uIDE3OTI3NCkKKysrIFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvRW50cnlQb2lu dC9tYWMvTGVnYWN5UHJvY2Vzcy9QbHVnaW5Qcm9jZXNzTWFpbi5tbQkod29ya2luZyBjb3B5KQpA QCAtMTA4LDcgKzEwOCw2IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBkb1Bvc3RSdW5X b3JrKCkgb3ZlcnJpZGUKICAgICB7Ci0jaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJF RCA+PSAxMDgwCiAgICAgICAgIC8vIElmIHdlIGhhdmUgcHJpdmF0ZSB0ZW1wb3JhcnkgYW5kIGNh Y2hlIGRpcmVjdG9yaWVzLCBjbGVhbiB0aGVtIHVwLgogICAgICAgICBpZiAoZ2V0ZW52KCJESVJI RUxQRVJfVVNFUl9ESVJfU1VGRklYIikpIHsKICAgICAgICAgICAgIGNoYXIgZGFyd2luRGlyZWN0 b3J5W1BBVEhfTUFYXTsKQEAgLTExNyw3ICsxMTYsNiBAQCBwdWJsaWM6CiAgICAgICAgICAgICBp ZiAoY29uZnN0cihfQ1NfREFSV0lOX1VTRVJfQ0FDSEVfRElSLCBkYXJ3aW5EaXJlY3RvcnksIHNp emVvZihkYXJ3aW5EaXJlY3RvcnkpKSkKICAgICAgICAgICAgICAgICBbW05TRmlsZU1hbmFnZXIg ZGVmYXVsdE1hbmFnZXJdIHJlbW92ZUl0ZW1BdFBhdGg6W1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRN YW5hZ2VyXSBzdHJpbmdXaXRoRmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uOmRhcndpbkRpcmVjdG9y eSBsZW5ndGg6c3RybGVuKGRhcndpbkRpcmVjdG9yeSldIGVycm9yOm5pbF07CiAgICAgICAgIH0K LSNlbmRpZgogICAgIH0KIH07CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvQ2hp bGRQcm9jZXNzTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMv Q2hpbGRQcm9jZXNzTWFjLm1tCShyZXZpc2lvbiAxNzkyNzQpCisrKyBTb3VyY2UvV2ViS2l0Mi9T aGFyZWQvbWFjL0NoaWxkUHJvY2Vzc01hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTEzLDcgKzEx Myw2IEBAIHZvaWQgQ2hpbGRQcm9jZXNzOjppbml0aWFsaXplU2FuZGJveChjb24KICAgICBTdHJp bmcgb3NWZXJzaW9uID0gb3NWZXJzaW9uUGFydHNbMF0gKyAnLicgKyBvc1ZlcnNpb25QYXJ0c1sx XTsKICAgICBzYW5kYm94UGFyYW1ldGVycy5hZGRQYXJhbWV0ZXIoIl9PU19WRVJTSU9OIiwgb3NW ZXJzaW9uLnV0ZjgoKS5kYXRhKCkpOwogCi0jaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFV SVJFRCA+PSAxMDgwCiAgICAgLy8gVXNlIHByaXZhdGUgdGVtcG9yYXJ5IGFuZCBjYWNoZSBkaXJl Y3Rvcmllcy4KICAgICBzZXRlbnYoIkRJUkhFTFBFUl9VU0VSX0RJUl9TVUZGSVgiLCBmaWxlU3lz dGVtUmVwcmVzZW50YXRpb24oc2FuZGJveFBhcmFtZXRlcnMuc3lzdGVtRGlyZWN0b3J5U3VmZml4 KCkpLmRhdGEoKSwgMCk7CiAgICAgY2hhciB0ZW1wb3JhcnlEaXJlY3RvcnlbUEFUSF9NQVhdOwpA QCAtMTIyLDcgKzEyMSw2IEBAIHZvaWQgQ2hpbGRQcm9jZXNzOjppbml0aWFsaXplU2FuZGJveChj b24KICAgICAgICAgZXhpdChFWF9OT1BFUk0pOwogICAgIH0KICAgICBzZXRlbnYoIlRNUERJUiIs IHRlbXBvcmFyeURpcmVjdG9yeSwgMSk7Ci0jZW5kaWYKIAogICAgIHNhbmRib3hQYXJhbWV0ZXJz LmFkZFBhdGhQYXJhbWV0ZXIoIldFQktJVDJfRlJBTUVXT1JLX0RJUiIsIFtbd2Via2l0MkJ1bmRs ZSBidW5kbGVQYXRoXSBzdHJpbmdCeURlbGV0aW5nTGFzdFBhdGhDb21wb25lbnRdKTsKICAgICBz YW5kYm94UGFyYW1ldGVycy5hZGRDb25mRGlyZWN0b3J5UGFyYW1ldGVyKCJEQVJXSU5fVVNFUl9U RU1QX0RJUiIsIF9DU19EQVJXSU5fVVNFUl9URU1QX0RJUik7CkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvbWFjL1dlYkV2ZW50RmFjdG9yeS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvbWFjL1dlYkV2ZW50RmFjdG9yeS5tbQkocmV2aXNpb24gMTc5Mjc0KQorKysg U291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkubW0JKHdvcmtpbmcgY29w eSkKQEAgLTIxNSwxMCArMjE1LDggQEAgc3RhdGljIFdlYldoZWVsRXZlbnQ6OlBoYXNlIHBoYXNl Rm9yRXZlbgogICAgICAgICBwaGFzZSB8PSBXZWJXaGVlbEV2ZW50OjpQaGFzZUVuZGVkOwogICAg IGlmIChbZXZlbnQgcGhhc2VdICYgTlNFdmVudFBoYXNlQ2FuY2VsbGVkKQogICAgICAgICBwaGFz ZSB8PSBXZWJXaGVlbEV2ZW50OjpQaGFzZUNhbmNlbGxlZDsKLSNpZiBfX01BQ19PU19YX1ZFUlNJ T05fTUlOX1JFUVVJUkVEID49IDEwODAKICAgICBpZiAoW2V2ZW50IHBoYXNlXSAmIE5TRXZlbnRQ aGFzZU1heUJlZ2luKQogICAgICAgICBwaGFzZSB8PSBXZWJXaGVlbEV2ZW50OjpQaGFzZU1heUJl Z2luOwotI2VuZGlmCiAKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8V2ViV2hlZWxFdmVudDo6UGhh c2U+KHBoYXNlKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dL Vmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9X S1ZpZXcubW0JKHJldmlzaW9uIDE3OTI3NCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvbWFjL1dLVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtMjg1MCw3ICsyODUwLDYgQEAgLSAo dm9pZClfc2V0RHJhd2luZ0FyZWFTaXplOihOU1NpemUpc2l6ZQogICAgIF9kYXRhLT5fcmVzaXpl U2Nyb2xsT2Zmc2V0ID0gTlNaZXJvU2l6ZTsKIH0KIAotI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9N SU5fUkVRVUlSRUQgPj0gMTA4MAogLSAodm9pZClxdWlja0xvb2tXaXRoRXZlbnQ6KE5TRXZlbnQg KilldmVudAogewogICAgIGlmIChfZGF0YS0+X2lnbm9yZXNOb25XaGVlbEV2ZW50cykKQEAgLTI4 NTksNyArMjg1OCw2IEBAIC0gKHZvaWQpcXVpY2tMb29rV2l0aEV2ZW50OihOU0V2ZW50ICopZXYK ICAgICBOU1BvaW50IGxvY2F0aW9uSW5WaWV3Q29vcmRpbmF0ZXMgPSBbc2VsZiBjb252ZXJ0UG9p bnQ6W2V2ZW50IGxvY2F0aW9uSW5XaW5kb3ddIGZyb21WaWV3Om5pbF07CiAgICAgX2RhdGEtPl9w YWdlLT5wZXJmb3JtRGljdGlvbmFyeUxvb2t1cEF0TG9jYXRpb24oRmxvYXRQb2ludChsb2NhdGlv bkluVmlld0Nvb3JkaW5hdGVzLngsIGxvY2F0aW9uSW5WaWV3Q29vcmRpbmF0ZXMueSkpOwogfQot I2VuZGlmCiAKIC0gKHN0ZDo6dW5pcXVlX3B0cjxXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHk+KV9j cmVhdGVEcmF3aW5nQXJlYVByb3h5CiB7CkBAIC0zODEzLDcgKzM4MTEsNiBAQCAtIChpZClpbml0 V2l0aEZyYW1lOihOU1JlY3QpZnJhbWUgY29uZmlnCiAgICAgcmV0dXJuIFtzZWxmIGluaXRXaXRo RnJhbWU6ZnJhbWUgcHJvY2Vzc1Bvb2w6cHJvY2Vzc1Bvb2wgY29uZmlndXJhdGlvbjp3ZWJQYWdl Q29uZmlndXJhdGlvbiB3ZWJWaWV3Om5pbF07CiB9CiAKLSNpZiBfX01BQ19PU19YX1ZFUlNJT05f TUlOX1JFUVVJUkVEID49IDEwODAKIC0gKEJPT0wpd2FudHNVcGRhdGVMYXllcgogewogICAgIHJl dHVybiBZRVM7CkBAIC0zODM1LDcgKzM4MzIsNiBAQCAtICh2b2lkKXVwZGF0ZUxheWVyCiAgICAg aWYgKERyYXdpbmdBcmVhUHJveHkqIGRyYXdpbmdBcmVhID0gX2RhdGEtPl9wYWdlLT5kcmF3aW5n QXJlYSgpKQogICAgICAgICBkcmF3aW5nQXJlYS0+d2FpdEZvclBvc3NpYmxlR2VvbWV0cnlVcGRh dGUoKTsKIH0KLSNlbmRpZgogCiAtIChXS1BhZ2VSZWYpcGFnZVJlZgogewpAQCAtMzk5NiwxMSAr Mzk5Miw3IEBAIC0gKE5TVmlldyAqKWZ1bGxTY3JlZW5QbGFjZWhvbGRlclZpZXcKIC0gKE5TV2lu ZG93ICopY3JlYXRlRnVsbFNjcmVlbldpbmRvdwogewogI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQ SSkKLSNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDw9IDEwODAKLSAgICBOU1Jl Y3QgY29udGVudFJlY3QgPSBOU1plcm9SZWN0OwotI2Vsc2UKICAgICBOU1JlY3QgY29udGVudFJl Y3QgPSBbW05TU2NyZWVuIG1haW5TY3JlZW5dIGZyYW1lXTsKLSNlbmRpZgogICAgIHJldHVybiBb W1tXZWJDb3JlRnVsbFNjcmVlbldpbmRvdyBhbGxvY10gaW5pdFdpdGhDb250ZW50UmVjdDpjb250 ZW50UmVjdCBzdHlsZU1hc2s6KE5TQm9yZGVybGVzc1dpbmRvd01hc2sgfCBOU1Jlc2l6YWJsZVdp bmRvd01hc2spIGJhY2tpbmc6TlNCYWNraW5nU3RvcmVCdWZmZXJlZCBkZWZlcjpOT10gYXV0b3Jl bGVhc2VdOwogI2Vsc2UKICAgICByZXR1cm4gbmlsOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCShyZXZpc2lvbiAxNzkyNzQpCisrKyBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCSh3b3JraW5nIGNv cHkpCkBAIC0yMzQsMjAgKzIzNCwxMSBAQCBib29sIFBhZ2VDbGllbnRJbXBsOjppc1ZpZXdWaXNp YmxlKCkKICAgICBpZiAoIWFjdGl2ZVZpZXdXaW5kb3cuaXNWaXNpYmxlKQogICAgICAgICByZXR1 cm4gZmFsc2U7CiAKLSNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDw9IDEwODAK LSAgICAvLyBNb3VudGFpbiBMaW9uIGFuZCBwcmV2aW91cyBkbyBub3Qgc3VwcG9ydCBvY2NsdXNp b24gbm90aWZpY2F0aW9ucywgYW5kIGFzIHN1Y2ggd2lsbAotICAgIC8vIGNvbnRpbnVlIHRvIHJl cG9ydCBhcyAidmlzaWJsZSIgd2hlbiBub3Qgb24gdGhlIGFjdGl2ZSBzcGFjZS4KLSAgICBpZiAo IWFjdGl2ZVZpZXdXaW5kb3cuaXNPbkFjdGl2ZVNwYWNlKQotICAgICAgICByZXR1cm4gZmFsc2U7 Ci0jZW5kaWYKLQogICAgIGlmIChhY3RpdmVWaWV3LmlzSGlkZGVuT3JIYXNIaWRkZW5BbmNlc3Rv cikKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0jaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9S RVFVSVJFRCA+PSAxMDkwCiAgICAgaWYgKFttX3drVmlldyB3aW5kb3dPY2NsdXNpb25EZXRlY3Rp b25FbmFibGVkXSAmJiAoYWN0aXZlVmlld1dpbmRvdy5vY2NsdXNpb25TdGF0ZSAmIE5TV2luZG93 T2NjbHVzaW9uU3RhdGVWaXNpYmxlKSAhPSBOU1dpbmRvd09jY2x1c2lvblN0YXRlVmlzaWJsZSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwotI2VuZGlmCiAKICAgICByZXR1cm4gdHJ1ZTsKIH0KSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW4K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2ViUHJv Y2Vzcy5zYi5pbgkocmV2aXNpb24gMTc5Mjc0KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9jb20uYXBwbGUuV2ViUHJvY2Vzcy5zYi5pbgkod29ya2luZyBjb3B5KQpAQCAtMTIyLDEzICsx MjIsOCBAQAogKGFsbG93IGZpbGUtcmVhZCogZmlsZS13cml0ZSogKGhvbWUtbGl0ZXJhbCAiL0xp YnJhcnkvUHJlZmVyZW5jZXMvY29tLmFwcGxlLm1lZGlhYWNjZXNzaWJpbGl0eS5wdWJsaWMucGxp c3QiKSkKICNlbmRpZgogCi0jaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAx MDgwCiAoaWYgKHBvc2l0aXZlPyAoc3RyaW5nLWxlbmd0aCAocGFyYW0gIkRBUldJTl9VU0VSX0NB Q0hFX0RJUiIpKSkKICAgICAoYWxsb3cgZmlsZSogKHN1YnBhdGggKHBhcmFtICJEQVJXSU5fVVNF Ul9DQUNIRV9ESVIiKSkpKQotI2Vsc2UKLShpZiAocG9zaXRpdmU/IChzdHJpbmctbGVuZ3RoIChw YXJhbSAiREFSV0lOX1VTRVJfQ0FDSEVfRElSIikpKQotICAgIChhbGxvdyBmaWxlKiAoc3VicGF0 aCAoc3RyaW5nLWFwcGVuZCAocGFyYW0gIkRBUldJTl9VU0VSX0NBQ0hFX0RJUiIpICIvbWRzIikp KSkKLSNlbmRpZgogCiAoaWYgKHBvc2l0aXZlPyAoc3RyaW5nLWxlbmd0aCAocGFyYW0gIkRBUldJ Tl9VU0VSX1RFTVBfRElSIikpKQogICAgIChhbGxvdyBmaWxlKiAoc3VicGF0aCAocGFyYW0gIkRB UldJTl9VU0VSX1RFTVBfRElSIikpKSkKQEAgLTE0MSw4ICsxMzYsNiBAQAogICAgICAgIChpb2tp dC11c2VyLWNsaWVudC1jbGFzcyAiSU9BdWRpb0NvbnRyb2xVc2VyQ2xpZW50IikKICAgICAgICAo aW9raXQtdXNlci1jbGllbnQtY2xhc3MgIklPQXVkaW9FbmdpbmVVc2VyQ2xpZW50IikpCiAKLSNp ZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwODAKLQogOzsgY29va2llZC4K IDs7IEZJWE1FOiBVcGRhdGUgZm9yIDxyZGFyOi8vcHJvYmxlbS8xMzY0Mjg1Mj4uCiAoYWxsb3cg aXBjLXBvc2l4LXNobS1yZWFkLWRhdGEKQEAgLTE3MCw4ICsxNjMsNiBAQAogKGFsbG93IGlwYy1w b3NpeC1zaG0tcmVhZCogaXBjLXBvc2l4LXNobS13cml0ZS1kYXRhCiAgICAgKGlwYy1wb3NpeC1u YW1lLXJlZ2V4ICMiXkF1ZGlvSU8iKSkKIAotI2VuZGlmCi0KIDs7IFJlbW90ZSBXZWIgSW5zcGVj dG9yCiAoYWxsb3cgbWFjaC1sb29rdXAKICAgICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS53 ZWJpbnNwZWN0b3IiKSkKQEAgLTIyNCwxMCArMjE1LDggQEAKICAgICAgICAoaG9tZS1saXRlcmFs ICIvTGlicmFyeS9BcHBsaWNhdGlvbiBTdXBwb3J0L1N5bmNTZXJ2aWNlcy9Mb2NhbC9DbGllbnRz V2l0aENoYW5nZXMvY29tLmFwcGxlLktleWNoYWluIikKICAgICAgICAoaG9tZS1saXRlcmFsICIv TGlicmFyeS9QcmVmZXJlbmNlcy9jb20uYXBwbGUuc2VjdXJpdHkucGxpc3QiKQogICAgICAgICho b21lLWxpdGVyYWwgIi9MaWJyYXJ5L1ByZWZlcmVuY2VzL2NvbS5hcHBsZS5zZWN1cml0eS5yZXZv Y2F0aW9uLnBsaXN0IikpCi0jaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAx MDgwCiAoYWxsb3cgaXBjLXBvc2l4LXNobS1yZWFkKiBpcGMtcG9zaXgtc2htLXdyaXRlLWRhdGEK ICAgICAgICAoaXBjLXBvc2l4LW5hbWUgImNvbS5hcHBsZS5BcHBsZURhdGFiYXNlQ2hhbmdlZCIp KQotI2VuZGlmCiAKIDs7IENvcmVGb3VuZGF0aW9uLiBXZSBkb24ndCBpbXBvcnQgY29tLmFwcGxl LmNvcmVmb3VuZGF0aW9uLnNiLCBiZWNhdXNlIGl0IGFsbG93cyB1bm5lY2Vzc2FyeSBhY2Nlc3Mg dG8gcGFzdGVib2FyZC4KIChhbGxvdyBtYWNoLWxvb2t1cApAQCAtMjkwLDEyICsyNzksNiBAQAog I2VuZGlmCiAKIChkZW55IGZpbGUtcmVhZCogZmlsZS13cml0ZSogKHdpdGggbm8tbG9nKQotI2lm IF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPD0gMTA4MAotICAgICAgIChob21lLWxp dGVyYWwgIi9MaWJyYXJ5L0NhY2hlcy9DYWNoZS5kYiIpIDs7IDxyZGFyOi8vcHJvYmxlbS85NDIy OTU3PgotI2VuZGlmCi0jaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA9PSAxMDgw Ci0gICAgICAgKGhvbWUtc3VicGF0aCAiL0xpYnJhcnkvQ2FjaGVzL2NvbS5hcHBsZS5XZWJQcm9j ZXNzIikgOzsgPHJkYXI6Ly9wcm9ibGVtLzEyNjU2ODE0PgotI2VuZGlmCiAKICAgICAgICA7OyBG SVhNRTogU2hvdWxkIGJlIHJlbW92ZWQgYWZ0ZXIgPHJkYXI6Ly9wcm9ibGVtLzEwNDYzODgxPiBp cyBmaXhlZC4KICAgICAgICAoaG9tZS1saXRlcmFsICIvTGlicmFyeS9QcmVmZXJlbmNlcy9jb20u YXBwbGUuTGF1bmNoU2VydmljZXMuUXVhcmFudGluZUV2ZW50c1YyIikKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYlN5c3RlbUludGVyZmFjZS5t bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L21hYy9XZWJTeXN0ZW1JbnRlcmZhY2UubW0JKHJldmlzaW9uIDE3OTI3NCkKKysrIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYlN5c3RlbUludGVyZmFjZS5t bQkod29ya2luZyBjb3B5KQpAQCAtNDMsNyArNDMsNyBAQCB2b2lkIEluaXRXZWJDb3JlU3lzdGVt SW50ZXJmYWNlKHZvaWQpCiAgICAgICAgIElOSVQoQ0dDb250ZXh0R2V0U2hvdWxkU21vb3RoRm9u dHMpOwogICAgICAgICBJTklUKENHUGF0dGVybkNyZWF0ZVdpdGhJbWFnZUFuZFRyYW5zZm9ybSk7 CiAgICAgICAgIElOSVQoQ0dDb250ZXh0UmVzZXRDbGlwKTsKLSNpZiAhUExBVEZPUk0oSU9TKSAm JiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwODAKKyNpZiAhUExBVEZPUk0o SU9TKQogICAgICAgICBJTklUKENHQ29udGV4dERyYXdzV2l0aENvcnJlY3RTaGFkb3dPZmZzZXRz KTsKICNlbmRpZgogICAgICAgICBJTklUKENvcHlDT05ORUNUUHJveHlSZXNwb25zZSk7CkBAIC0x NjYsNyArMTY2LDcgQEAgdm9pZCBJbml0V2ViQ29yZVN5c3RlbUludGVyZmFjZSh2b2lkKQogCiAg ICAgICAgIElOSVQoRGVzdHJveVJlbmRlcmluZ1Jlc291cmNlcyk7CiAKLSNpZiAhUExBVEZPUk0o SU9TKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwODAKKyNpZiAhUExB VEZPUk0oSU9TKQogICAgICAgICBJTklUKEV4ZWN1dGFibGVXYXNMaW5rZWRPbk9yQmVmb3JlTGlv bik7CiAjZW5kaWYKICAgICAgICAgCkBAIC0xODUsNyArMTg1LDcgQEAgdm9pZCBJbml0V2ViQ29y ZVN5c3RlbUludGVyZmFjZSh2b2lkKQogICAgICAgICBJTklUKEdldFZlbmRvck5hbWVGb3JOYXZp Z2F0b3IpOwogI2VuZGlmCiAKLSNpZiAhUExBVEZPUk0oSU9TKSAmJiBfX01BQ19PU19YX1ZFUlNJ T05fTUlOX1JFUVVJUkVEID49IDEwODAKKyNpZiAhUExBVEZPUk0oSU9TKQogICAgICAgICBJTklU KE5TRWxhc3RpY0RlbHRhRm9yVGltZURlbHRhKTsKICAgICAgICAgSU5JVChOU0VsYXN0aWNEZWx0 YUZvclJlYm91bmREZWx0YSk7CiAgICAgICAgIElOSVQoTlNSZWJvdW5kRGVsdGFGb3JFbGFzdGlj RGVsdGEpOwpJbmRleDogU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkocmV2aXNpb24gMTc5MjkxKQorKysgU291cmNl L1dlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIw MTUtMDEtMjggIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92 ZSBNb3VudGFpbiBMaW9uIGNvZGUgZnJvbSBXZWJLaXQgYW5kIFdlYktpdDIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MTAxMAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRE9NL1dlYkRPTU9wZXJhdGlv bnMubW06CisgICAgICAgICh0b05TRXZlbnRQaGFzZSk6CisgICAgICAgICogV2ViVmlldy9XZWJI VE1MVmlldy5tbToKKyAgICAgICAgKGlzUXVpY2tMb29rRXZlbnQpOgorCiAyMDE1LTAxLTI4ICBE YW5hIEJ1cmthcnQgIDxkYnVya2FydEBhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBBU2FuIGZs YWcgc2V0dGluZ3MgZnJvbSBEZWJ1Z1JlbGVhc2UueGNjb25maWcgdG8gQmFzZS54Y2NvbmZpZwpJ bmRleDogU291cmNlL1dlYktpdC9tYWMvRE9NL1dlYkRPTU9wZXJhdGlvbnMubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9tYWMvRE9NL1dlYkRPTU9wZXJhdGlvbnMubW0JKHJldmlzaW9u IDE3OTI3NCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0RPTS9XZWJET01PcGVyYXRpb25zLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC0yNDIsMTAgKzI0Miw4IEBAIHN0YXRpYyBOU0V2ZW50UGhhc2UgdG9O U0V2ZW50UGhhc2UoUGxhdGYKICAgICAgICAgcGhhc2UgfD0gTlNFdmVudFBoYXNlRW5kZWQ7CiAg ICAgaWYgKHBsYXRmb3JtUGhhc2UgJiBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZUNhbmNlbGxlZCkK ICAgICAgICAgcGhhc2UgfD0gTlNFdmVudFBoYXNlQ2FuY2VsbGVkOwotI2lmIF9fTUFDX09TX1hf VkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA4MAogICAgIGlmIChwbGF0Zm9ybVBoYXNlICYgUGxh dGZvcm1XaGVlbEV2ZW50UGhhc2VNYXlCZWdpbikKICAgICAgICAgcGhhc2UgfD0gTlNFdmVudFBo YXNlTWF5QmVnaW47Ci0jZW5kaWYKIAogICAgIHJldHVybiBzdGF0aWNfY2FzdDxOU0V2ZW50UGhh c2U+KHBoYXNlKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZp ZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmll dy5tbQkocmV2aXNpb24gMTc5Mjc0KQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJI VE1MVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTUwMiwxMiArMTUwMiw4IEBAIC0gKEJPT0wp X2luc2lkZUFub3RoZXJIVE1MVmlldwogI2lmICFQTEFURk9STShJT1MpCiBzdGF0aWMgQk9PTCBp c1F1aWNrTG9va0V2ZW50KE5TRXZlbnQgKmV2ZW50KQogewotI2lmIF9fTUFDX09TX1hfVkVSU0lP Tl9NSU5fUkVRVUlSRUQgPj0gMTA4MAogICAgIGNvbnN0IGludCBrQ0dTRXZlbnRTeXN0ZW1TdWJ0 eXBlSG90S2V5Q29tYmluYXRpb25SZWxlYXNlZCA9IDk7CiAgICAgcmV0dXJuIFtldmVudCB0eXBl XSA9PSBOU1N5c3RlbURlZmluZWQgJiYgW2V2ZW50IHN1YnR5cGVdID09IGtDR1NFdmVudFN5c3Rl bVN1YnR5cGVIb3RLZXlDb21iaW5hdGlvblJlbGVhc2VkICYmIFtldmVudCBkYXRhMV0gPT0gJ2xr dXAnOwotI2Vsc2UKLSAgICByZXR1cm4gTk87Ci0jZW5kaWYKIH0KICNlbmRpZgogCkBAIC01MzQ5 LDcgKzUzNDUsNyBAQCAtIChCT09MKV93YW50c0tleURvd25Gb3JFdmVudDooTlNFdmVudCAqCiAg ICAgcmV0dXJuIGhhdmVXZWJDb3JlRnJhbWU7CiB9CiAKLSNpZiAhUExBVEZPUk0oSU9TKSAmJiBf X01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwODAKKyNpZiAhUExBVEZPUk0oSU9T KQogLSAoQk9PTClfYXV0b21hdGljRm9jdXNSaW5nRGlzYWJsZWQKIHsKICAgICAvLyBUaGUgZGVm YXVsdCBzdGF0ZSBmb3IgX2F1dG9tYXRpY0ZvY3VzUmluZ0Rpc2FibGVkIGlzIE5PLCB3aGljaCBw cmV2ZW50cyBmb2N1cyByaW5ncwo=