136624 2014-09-08 03:21:40 -0700 Fix 32-bit Mac build for new warnings 2014-09-08 18:46:29 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mjs mjs benjamin cmarcelo commit-queue jberlin oldest_to_newest 1033814 0 mjs 2014-09-08 03:21:40 -0700 Fix 32-bit Mac build for new warnings 1033815 1 237776 mjs 2014-09-08 03:23:22 -0700 Created attachment 237776 Patch 1033868 2 237776 darin 2014-09-08 09:24:56 -0700 Comment on attachment 237776 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=237776&action=review > Source/WebKit/mac/Carbon/HIViewAdapter.m:49 > + Looks like there’s an extra blank line here we could omit. 1033870 3 jberlin 2014-09-08 09:32:52 -0700 I fixed these this morning individually. I wish I had seen this patch first :( 1033932 4 mjs 2014-09-08 13:13:55 -0700 I probably should have landed it without waiting for review. 1034024 5 mjs 2014-09-08 18:46:29 -0700 Committed r173415: <http://trac.webkit.org/changeset/173415> 237776 2014-09-08 03:23:22 -0700 2014-09-08 09:24:55 -0700 Patch bug-136624-20140908032317.patch text/plain 10260 mjs SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTczMzczKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBA CisyMDE0LTA5LTA4ICBNYWNpZWogU3RhY2hvd2lhayAgPG1qc0BhcHBsZS5jb20+CisKKyAgICAg ICAgRml4IDMyLWJpdCBNYWMgYnVpbGQgZm9yIG5ldyB3YXJuaW5ncworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2NjI0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQz Ml82NC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUpOiBB IDMyLWJpdCBvbmx5IGNhc2Ugb2YKKyAgICAgICAgdW5yZWFjaGFibGUgY29kZS4KKwogMjAxNC0w OS0wNyAgTWFjaWVqIFN0YWNob3dpYWsgIDxtanNAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCB0 eXBvcyBpbiBsYXN0IHBhdGNoIHRvIGZpeCBidWlsZC4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNwcAkocmV2aXNpb24g MTczMzcwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDMy XzY0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjIwNSw4ICsyMjA1LDEwIEBAIHZvaWQgU3BlY3Vs YXRpdmVKSVQ6OmNvbXBpbGUoTm9kZSogbm9kZSkKICAgICAgICAgY2FzZSBBcnJheTo6U2VsZWN0 VXNpbmdQcmVkaWN0aW9uczoKICAgICAgICAgY2FzZSBBcnJheTo6Rm9yY2VFeGl0OgogICAgICAg ICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyNpZiBDT01QSUxFUl9RVUlSSyhD T05TSURFUlNfVU5SRUFDSEFCTEVfQ09ERSkKICAgICAgICAgICAgIHRlcm1pbmF0ZVNwZWN1bGF0 aXZlRXhlY3V0aW9uKEluYWRlcXVhdGVDb3ZlcmFnZSwgSlNWYWx1ZVJlZ3MoKSwgMCk7CiAgICAg ICAgICAgICBicmVhazsKKyNlbmRpZgogICAgICAgICBjYXNlIEFycmF5OjpHZW5lcmljOiB7CiAg ICAgICAgICAgICBTcGVjdWxhdGVDZWxsT3BlcmFuZCBiYXNlKHRoaXMsIG5vZGUtPmNoaWxkMSgp KTsgLy8gU2F2ZSBhIHJlZ2lzdGVyLCBzcGVjdWxhdGUgY2VsbC4gV2UnbGwgcHJvYmFibHkgYmUg cmlnaHQuCiAgICAgICAgICAgICBKU1ZhbHVlT3BlcmFuZCBwcm9wZXJ0eSh0aGlzLCBub2RlLT5j aGlsZDIoKSk7CkBAIC0yNDM1LDkgKzI0MzcsMTEgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29t cGlsZShOb2RlKiBub2RlKQogICAgICAgICBjYXNlIEFycmF5OjpTZWxlY3RVc2luZ1ByZWRpY3Rp b25zOgogICAgICAgICBjYXNlIEFycmF5OjpGb3JjZUV4aXQ6CiAgICAgICAgICAgICBSRUxFQVNF X0FTU0VSVF9OT1RfUkVBQ0hFRCgpOworI2lmIENPTVBJTEVSX1FVSVJLKENPTlNJREVSU19VTlJF QUNIQUJMRV9DT0RFKQogICAgICAgICAgICAgdGVybWluYXRlU3BlY3VsYXRpdmVFeGVjdXRpb24o SW5hZGVxdWF0ZUNvdmVyYWdlLCBKU1ZhbHVlUmVncygpLCAwKTsKICAgICAgICAgICAgIGFscmVh ZHlIYW5kbGVkID0gdHJ1ZTsKICAgICAgICAgICAgIGJyZWFrOworI2VuZGlmCiAgICAgICAgIGNh c2UgQXJyYXk6OkdlbmVyaWM6IHsKICAgICAgICAgICAgIEFTU0VSVChub2RlLT5vcCgpID09IFB1 dEJ5VmFsIHx8IG5vZGUtPm9wKCkgPT0gUHV0QnlWYWxEaXJlY3QpOwogICAgICAgICAgICAgCklu ZGV4OiBTb3VyY2UvV1RGL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL0NoYW5n ZUxvZwkocmV2aXNpb24gMTczMzczKQorKysgU291cmNlL1dURi9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxNC0wOS0wOCAgTWFjaWVqIFN0YWNob3dpYWsgIDxt anNAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCAzMi1iaXQgTWFjIGJ1aWxkIGZvciBuZXcgd2Fy bmluZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEz NjYyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog d3RmL2R0b2Evc3RydG9kLmNjOiBSZWFycmFuZ2UgdGhpcyB0byBhdm9pZCB1bnJlYWNoYWJsZSBj b2RlCisgICAgICAgIG9yIHVudXNlZCBwYXJhbXMgaW4gdGhlIDMyLWJpdCBjb2RlIHBhdGguCisK IDIwMTQtMDktMDcgIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KIAogICAgICAg ICBJbnRyb2R1Y2UgQ09NUElMRVJfUVVJUksoQ09OU0lERVJTX1VOUkVBQ0hBQkxFX0NPREUpIGFu ZCB1c2UgaXQKSW5kZXg6IFNvdXJjZS9XVEYvd3RmL2R0b2Evc3RydG9kLmNjCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XVEYvd3RmL2R0b2Evc3RydG9kLmNjCShyZXZpc2lvbiAxNzMzNjkpCisrKyBT b3VyY2UvV1RGL3d0Zi9kdG9hL3N0cnRvZC5jYwkod29ya2luZyBjb3B5KQpAQCAtMzksMTAgKzM5 LDYgQEAgbmFtZXNwYWNlIFdURiB7CiAKIG5hbWVzcGFjZSBkb3VibGVfY29udmVyc2lvbiB7CiAg ICAgCi0gICAgLy8gMl41MyA9IDkwMDcxOTkyNTQ3NDA5OTIuCi0gICAgLy8gQW55IGludGVnZXIg d2l0aCBhdCBtb3N0IDE1IGRlY2ltYWwgZGlnaXRzIHdpbGwgaGVuY2UgZml0IGludG8gYSBkb3Vi bGUKLSAgICAvLyAod2hpY2ggaGFzIGEgNTNiaXQgc2lnbmlmaWNhbmQpIHdpdGhvdXQgbG9zcyBv ZiBwcmVjaXNpb24uCi0gICAgc3RhdGljIGNvbnN0IGludCBrTWF4RXhhY3REb3VibGVJbnRlZ2Vy RGVjaW1hbERpZ2l0cyA9IDE1OwogICAgIC8vIDJeNjQgPSAxODQ0Njc0NDA3MzcwOTU1MTYxNiA+ IDEwXjE5CiAgICAgc3RhdGljIGNvbnN0IGludCBrTWF4VWludDY0RGVjaW1hbERpZ2l0cyA9IDE5 OwogICAgIApAQCAtNTgsMzUgKzU0LDYgQEAgbmFtZXNwYWNlIGRvdWJsZV9jb252ZXJzaW9uIHsK ICAgICAvLyAyXjY0ID0gMTg0NDY3NDQwNzM3MDk1NTE2MTYKICAgICBzdGF0aWMgY29uc3QgdWlu dDY0X3Qga01heFVpbnQ2NCA9IFVJTlQ2NF8yUEFSVF9DKDB4RkZGRkZGRkYsIEZGRkZGRkZGKTsK ICAgICAKLSAgICAKLSAgICBzdGF0aWMgY29uc3QgZG91YmxlIGV4YWN0X3Bvd2Vyc19vZl90ZW5b XSA9IHsKLSAgICAgICAgMS4wLCAgLy8gMTBeMAotICAgICAgICAxMC4wLAotICAgICAgICAxMDAu MCwKLSAgICAgICAgMTAwMC4wLAotICAgICAgICAxMDAwMC4wLAotICAgICAgICAxMDAwMDAuMCwK LSAgICAgICAgMTAwMDAwMC4wLAotICAgICAgICAxMDAwMDAwMC4wLAotICAgICAgICAxMDAwMDAw MDAuMCwKLSAgICAgICAgMTAwMDAwMDAwMC4wLAotICAgICAgICAxMDAwMDAwMDAwMC4wLCAgLy8g MTBeMTAKLSAgICAgICAgMTAwMDAwMDAwMDAwLjAsCi0gICAgICAgIDEwMDAwMDAwMDAwMDAuMCwK LSAgICAgICAgMTAwMDAwMDAwMDAwMDAuMCwKLSAgICAgICAgMTAwMDAwMDAwMDAwMDAwLjAsCi0g ICAgICAgIDEwMDAwMDAwMDAwMDAwMDAuMCwKLSAgICAgICAgMTAwMDAwMDAwMDAwMDAwMDAuMCwK LSAgICAgICAgMTAwMDAwMDAwMDAwMDAwMDAwLjAsCi0gICAgICAgIDEwMDAwMDAwMDAwMDAwMDAw MDAuMCwKLSAgICAgICAgMTAwMDAwMDAwMDAwMDAwMDAwMDAuMCwKLSAgICAgICAgMTAwMDAwMDAw MDAwMDAwMDAwMDAwLjAsICAvLyAxMF4yMAotICAgICAgICAxMDAwMDAwMDAwMDAwMDAwMDAwMDAw LjAsCi0gICAgICAgIC8vIDEwXjIyID0gMHgyMWUxOWUwYzliYWIyNDAwMDAwID0gMHg4Nzg2Nzgz MjZlYWM5ICogMl4yMgotICAgICAgICAxMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4wCi0gICAgfTsK LSAgICBzdGF0aWMgY29uc3QgaW50IGtFeGFjdFBvd2Vyc09mVGVuU2l6ZSA9IEFSUkFZX1NJWkUo ZXhhY3RfcG93ZXJzX29mX3Rlbik7Ci0gICAgCiAgICAgLy8gTWF4aW11bSBudW1iZXIgb2Ygc2ln bmlmaWNhbnQgZGlnaXRzIGluIHRoZSBkZWNpbWFsIHJlcHJlc2VudGF0aW9uLgogICAgIC8vIElu IGZhY3QgdGhlIHZhbHVlIGlzIDc3MiAoc2VlIGNvbnZlcnNpb25zLmNjKSwgYnV0IHRvIGdpdmUg dXMgc29tZSBtYXJnaW4KICAgICAvLyB3ZSByb3VuZCB1cCB0byA3ODAuCkBAIC0xNzEsMTIgKzEz OCwxMSBAQCBuYW1lc3BhY2UgZG91YmxlX2NvbnZlcnNpb24gewogICAgICAgICAgICAgKnJlbWFp bmluZ19kZWNpbWFscyA9IGJ1ZmZlci5sZW5ndGgoKSAtIHJlYWRfZGlnaXRzOwogICAgICAgICB9 CiAgICAgfQotICAgIAotICAgIAotICAgIHN0YXRpYyBib29sIERvdWJsZVN0cnRvZChCdWZmZXJS ZWZlcmVuY2U8Y29uc3QgY2hhcj4gdHJpbW1lZCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaW50IGV4cG9uZW50LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkb3VibGUqIHJl c3VsdCkgeworCiAjaWYgIWRlZmluZWQoRE9VQkxFX0NPTlZFUlNJT05fQ09SUkVDVF9ET1VCTEVf T1BFUkFUSU9OUykKKyAgICBzdGF0aWMgYm9vbCBEb3VibGVTdHJ0b2QoQnVmZmVyUmVmZXJlbmNl PGNvbnN0IGNoYXI+LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGRvdWJsZSopIHsKICAgICAgICAgLy8gT24geDg2IHRoZSBm bG9hdGluZy1wb2ludCBzdGFjayBjYW4gYmUgNjQgb3IgODAgYml0cyB3aWRlLiBJZiBpdCBpcwog ICAgICAgICAvLyA4MCBiaXRzIHdpZGUgKGFzIGlzIHRoZSBjYXNlIG9uIExpbnV4KSB0aGVuIGRv dWJsZS1yb3VuZGluZyBvY2N1cnMgYW5kIHRoZQogICAgICAgICAvLyByZXN1bHQgaXMgbm90IGFj Y3VyYXRlLgpAQCAtMTg0LDcgKzE1MCw0NCBAQCBuYW1lc3BhY2UgZG91YmxlX2NvbnZlcnNpb24g ewogICAgICAgICAvLyBOb3RlIHRoYXQgdGhlIEFSTSBzaW11bGF0b3IgaXMgY29tcGlsZWQgZm9y IDMyYml0cy4gSXQgdGhlcmVmb3JlIGV4aGliaXRzCiAgICAgICAgIC8vIHRoZSBzYW1lIHByb2Js ZW0uCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSNlbmRpZgorICAgIH0gICAgCisjZWxzZQorICAg IAorICAgIC8vIDJeNTMgPSA5MDA3MTk5MjU0NzQwOTkyLgorICAgIC8vIEFueSBpbnRlZ2VyIHdp dGggYXQgbW9zdCAxNSBkZWNpbWFsIGRpZ2l0cyB3aWxsIGhlbmNlIGZpdCBpbnRvIGEgZG91Ymxl CisgICAgLy8gKHdoaWNoIGhhcyBhIDUzYml0IHNpZ25pZmljYW5kKSB3aXRob3V0IGxvc3Mgb2Yg cHJlY2lzaW9uLgorICAgIHN0YXRpYyBjb25zdCBpbnQga01heEV4YWN0RG91YmxlSW50ZWdlckRl Y2ltYWxEaWdpdHMgPSAxNTsKKyAgICBzdGF0aWMgY29uc3QgZG91YmxlIGV4YWN0X3Bvd2Vyc19v Zl90ZW5bXSA9IHsKKyAgICAgICAgMS4wLCAgLy8gMTBeMAorICAgICAgICAxMC4wLAorICAgICAg ICAxMDAuMCwKKyAgICAgICAgMTAwMC4wLAorICAgICAgICAxMDAwMC4wLAorICAgICAgICAxMDAw MDAuMCwKKyAgICAgICAgMTAwMDAwMC4wLAorICAgICAgICAxMDAwMDAwMC4wLAorICAgICAgICAx MDAwMDAwMDAuMCwKKyAgICAgICAgMTAwMDAwMDAwMC4wLAorICAgICAgICAxMDAwMDAwMDAwMC4w LCAgLy8gMTBeMTAKKyAgICAgICAgMTAwMDAwMDAwMDAwLjAsCisgICAgICAgIDEwMDAwMDAwMDAw MDAuMCwKKyAgICAgICAgMTAwMDAwMDAwMDAwMDAuMCwKKyAgICAgICAgMTAwMDAwMDAwMDAwMDAw LjAsCisgICAgICAgIDEwMDAwMDAwMDAwMDAwMDAuMCwKKyAgICAgICAgMTAwMDAwMDAwMDAwMDAw MDAuMCwKKyAgICAgICAgMTAwMDAwMDAwMDAwMDAwMDAwLjAsCisgICAgICAgIDEwMDAwMDAwMDAw MDAwMDAwMDAuMCwKKyAgICAgICAgMTAwMDAwMDAwMDAwMDAwMDAwMDAuMCwKKyAgICAgICAgMTAw MDAwMDAwMDAwMDAwMDAwMDAwLjAsICAvLyAxMF4yMAorICAgICAgICAxMDAwMDAwMDAwMDAwMDAw MDAwMDAwLjAsCisgICAgICAgIC8vIDEwXjIyID0gMHgyMWUxOWUwYzliYWIyNDAwMDAwID0gMHg4 Nzg2NzgzMjZlYWM5ICogMl4yMgorICAgICAgICAxMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4wCisg ICAgfTsKKyAgICBzdGF0aWMgY29uc3QgaW50IGtFeGFjdFBvd2Vyc09mVGVuU2l6ZSA9IEFSUkFZ X1NJWkUoZXhhY3RfcG93ZXJzX29mX3Rlbik7CisKKyAgICBzdGF0aWMgYm9vbCBEb3VibGVTdHJ0 b2QoQnVmZmVyUmVmZXJlbmNlPGNvbnN0IGNoYXI+IHRyaW1tZWQsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGludCBleHBvbmVudCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZG91YmxlKiByZXN1bHQpIHsKICAgICAgICAgaWYgKHRyaW1tZWQubGVuZ3RoKCkgPD0ga01heEV4 YWN0RG91YmxlSW50ZWdlckRlY2ltYWxEaWdpdHMpIHsKICAgICAgICAgICAgIGludCByZWFkX2Rp Z2l0czsKICAgICAgICAgICAgIC8vIFRoZSB0cmltbWVkIGlucHV0IGZpdHMgaW50byBhIGRvdWJs ZS4KQEAgLTIyMyw2ICsyMjYsNyBAQCBuYW1lc3BhY2UgZG91YmxlX2NvbnZlcnNpb24gewogICAg ICAgICB9CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CisjZW5kaWYKICAgICAKICAgICAK ICAgICAvLyBSZXR1cm5zIDEwXmV4cG9uZW50IGFzIGFuIGV4YWN0IERpeUZwLgpJbmRleDogU291 cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFj L0NoYW5nZUxvZwkocmV2aXNpb24gMTczMzczKQorKysgU291cmNlL1dlYktpdC9tYWMvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDktMDggIE1hY2llaiBT dGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggMzItYml0IE1hYyBidWls ZCBmb3IgbmV3IHdhcm5pbmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMzY2MjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIENhcmJvbi9ISVZpZXdBZGFwdGVyLm06CisgICAgICAgICgrW0hJVmlld0Fk YXB0ZXIgYmluZEhJVmlld1RvTlNWaWV3Om5zVmlldzpdKTogTmVlZCB0byB1c2UgZXhwbGljaXQg Y2FzdGluZyBub3cuCisKIDIwMTQtMDktMDcgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgogCiAgICAgICAgIEZpeCBidWlsZCBmYWlsdXJlIHNlZW4gb24gTW91bnRhaW4gTGlvbiBidWls ZGJvdC4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NhcmJvbi9ISVZpZXdBZGFwdGVyLm0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvQ2FyYm9uL0hJVmlld0FkYXB0ZXIubQkocmV2 aXNpb24gMTczMzY5KQorKysgU291cmNlL1dlYktpdC9tYWMvQ2FyYm9uL0hJVmlld0FkYXB0ZXIu bQkod29ya2luZyBjb3B5KQpAQCAtNDYsOSArNDYsMTQgQEAgLSAoTlNSZWN0KV9kaXJ0eVJlY3Q7 CiAKIHN0YXRpYyBDRk11dGFibGVEaWN0aW9uYXJ5UmVmIHNWaWV3TWFwOwogCi1zdGF0aWMgSU1Q IG9sZE5TVmlld1NldE5lZWRzRGlzcGxheUlNUDsKLXN0YXRpYyBJTVAgb2xkTlNWaWV3U2V0TmVl ZHNEaXNwbGF5SW5SZWN0SU1QOwotc3RhdGljIElNUCBvbGROU1ZpZXdOZXh0VmFsaWRLZXlWaWV3 SU1QOworCit0eXBlZGVmIHZvaWQgKCpTZXROZWVkc0Rpc3BsYXlNZXRob2QpKGlkLCBTRUwsIEJP T0wpOwordHlwZWRlZiB2b2lkICgqU2V0TmVlZHNEaXNwbGF5SW5SZWN0TWV0aG9kKShpZCwgU0VM LCBOU1JlY3QpOwordHlwZWRlZiBOU1ZpZXcgKigqTmV4dFZhbGlkS2V5Vmlld01ldGhvZCkoaWQs IFNFTCk7CisKK3N0YXRpYyBTZXROZWVkc0Rpc3BsYXlNZXRob2Qgb2xkTlNWaWV3U2V0TmVlZHNE aXNwbGF5SU1QOworc3RhdGljIFNldE5lZWRzRGlzcGxheUluUmVjdE1ldGhvZCBvbGROU1ZpZXdT ZXROZWVkc0Rpc3BsYXlJblJlY3RJTVA7CitzdGF0aWMgTmV4dFZhbGlkS2V5Vmlld01ldGhvZCBv bGROU1ZpZXdOZXh0VmFsaWRLZXlWaWV3SU1QOwogCiBzdGF0aWMgdm9pZCBfd2Via2l0X05TVmll d19zZXROZWVkc0Rpc3BsYXkoaWQgc2VsZiwgU0VMIF9jbWQsIEJPT0wgZmxhZyk7CiBzdGF0aWMg dm9pZCBfd2Via2l0X05TVmlld19zZXROZWVkc0Rpc3BsYXlJblJlY3QoaWQgc2VsZiwgU0VMIF9j bWQsIE5TUmVjdCBpbnZhbGlkUmVjdCk7CkBAIC02MywxOSArNjgsMTkgQEAgKyAodm9pZCliaW5k SElWaWV3VG9OU1ZpZXc6KEhJVmlld1JlZiloaQogICAgICAgICBNZXRob2Qgc2V0TmVlZHNEaXNw bGF5TWV0aG9kID0gY2xhc3NfZ2V0SW5zdGFuY2VNZXRob2Qob2JqY19nZXRDbGFzcygiTlNWaWV3 IiksIEBzZWxlY3RvcihzZXROZWVkc0Rpc3BsYXk6KSk7CiAgICAgICAgIEFTU0VSVChzZXROZWVk c0Rpc3BsYXlNZXRob2QpOwogICAgICAgICBBU1NFUlQoIW9sZE5TVmlld1NldE5lZWRzRGlzcGxh eUlNUCk7Ci0gICAgICAgIG9sZE5TVmlld1NldE5lZWRzRGlzcGxheUlNUCA9IG1ldGhvZF9zZXRJ bXBsZW1lbnRhdGlvbihzZXROZWVkc0Rpc3BsYXlNZXRob2QsIChJTVApX3dlYmtpdF9OU1ZpZXdf c2V0TmVlZHNEaXNwbGF5KTsKKyAgICAgICAgb2xkTlNWaWV3U2V0TmVlZHNEaXNwbGF5SU1QID0g KFNldE5lZWRzRGlzcGxheU1ldGhvZCltZXRob2Rfc2V0SW1wbGVtZW50YXRpb24oc2V0TmVlZHNE aXNwbGF5TWV0aG9kLCAoSU1QKV93ZWJraXRfTlNWaWV3X3NldE5lZWRzRGlzcGxheSk7CiAKICAg ICAgICAgLy8gT3ZlcnJpZGUgLVtOU1ZpZXcgc2V0TmVlZHNEaXNwbGF5SW5SZWN0Ol0KICAgICAg ICAgTWV0aG9kIHNldE5lZWRzRGlzcGxheUluUmVjdE1ldGhvZCA9IGNsYXNzX2dldEluc3RhbmNl TWV0aG9kKG9iamNfZ2V0Q2xhc3MoIk5TVmlldyIpLCBAc2VsZWN0b3Ioc2V0TmVlZHNEaXNwbGF5 SW5SZWN0OikpOwogICAgICAgICBBU1NFUlQoc2V0TmVlZHNEaXNwbGF5SW5SZWN0TWV0aG9kKTsK ICAgICAgICAgQVNTRVJUKCFvbGROU1ZpZXdTZXROZWVkc0Rpc3BsYXlJblJlY3RJTVApOwotICAg ICAgICBvbGROU1ZpZXdTZXROZWVkc0Rpc3BsYXlJblJlY3RJTVAgPSBtZXRob2Rfc2V0SW1wbGVt ZW50YXRpb24oc2V0TmVlZHNEaXNwbGF5SW5SZWN0TWV0aG9kLCAoSU1QKV93ZWJraXRfTlNWaWV3 X3NldE5lZWRzRGlzcGxheUluUmVjdCk7CisgICAgICAgIG9sZE5TVmlld1NldE5lZWRzRGlzcGxh eUluUmVjdElNUCA9IChTZXROZWVkc0Rpc3BsYXlJblJlY3RNZXRob2QpbWV0aG9kX3NldEltcGxl bWVudGF0aW9uKHNldE5lZWRzRGlzcGxheUluUmVjdE1ldGhvZCwgKElNUClfd2Via2l0X05TVmll d19zZXROZWVkc0Rpc3BsYXlJblJlY3QpOwogCiAgICAgICAgIC8vIE92ZXJyaWRlIC1bTlNWaWV3 IG5leHRWYWxpZEtleVZpZXddCiAgICAgICAgIE1ldGhvZCBuZXh0VmFsaWRLZXlWaWV3TWV0aG9k ID0gY2xhc3NfZ2V0SW5zdGFuY2VNZXRob2Qob2JqY19nZXRDbGFzcygiTlNWaWV3IiksIEBzZWxl Y3RvcihuZXh0VmFsaWRLZXlWaWV3KSk7CiAgICAgICAgIEFTU0VSVChuZXh0VmFsaWRLZXlWaWV3 TWV0aG9kKTsKICAgICAgICAgQVNTRVJUKCFvbGROU1ZpZXdOZXh0VmFsaWRLZXlWaWV3SU1QKTsK LSAgICAgICAgb2xkTlNWaWV3TmV4dFZhbGlkS2V5Vmlld0lNUCA9IG1ldGhvZF9zZXRJbXBsZW1l bnRhdGlvbihuZXh0VmFsaWRLZXlWaWV3TWV0aG9kLCAoSU1QKV93ZWJraXRfTlNWaWV3X25leHRW YWxpZEtleVZpZXcpOworICAgICAgICBvbGROU1ZpZXdOZXh0VmFsaWRLZXlWaWV3SU1QID0gKE5l eHRWYWxpZEtleVZpZXdNZXRob2QpbWV0aG9kX3NldEltcGxlbWVudGF0aW9uKG5leHRWYWxpZEtl eVZpZXdNZXRob2QsIChJTVApX3dlYmtpdF9OU1ZpZXdfbmV4dFZhbGlkS2V5Vmlldyk7CiAgICAg fQogCiAgICAgQ0ZEaWN0aW9uYXJ5QWRkVmFsdWUoc1ZpZXdNYXAsIG5zVmlldywgaGlWaWV3KTsK