132095 2014-04-23 18:55:32 -0700 Remove Apple Dictionary workaround in WebFrameLoaderClient. 2014-04-23 21:43:29 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling darin kling oldest_to_newest 1003461 0 kling 2014-04-23 18:55:32 -0700 WK1's WebFrameLoaderClient does some things for the benefit of 2009-era Dictionary.app. We can probably stop doing that now, since the client bug was fixed long ago. 1003463 1 230030 kling 2014-04-23 18:57:02 -0700 Created attachment 230030 Patch 1003530 2 kling 2014-04-23 21:43:29 -0700 Committed r167745: <http://trac.webkit.org/changeset/167745> 230030 2014-04-23 18:57:02 -0700 2014-04-23 21:36:31 -0700 Patch bug-132095.diff text/plain 4779 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwppbmRleCA1YTA3ZWNmLi44NzU5MjgyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTQtMDQtMjMgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUu Y29tPgorCisgICAgICAgIFJlbW92ZSBBcHBsZSBEaWN0aW9uYXJ5IHdvcmthcm91bmQgaW4gV2Vi RnJhbWVMb2FkZXJDbGllbnQuCisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xMzIwOTU+ CisKKyAgICAgICAgS2lsbCBhIGhhY2sgdG8gd29yayBhcm91bmQgYSBXSzEgY2xpZW50IGJ1ZyB0 aGF0IGdvdCBmaXhlZCB5ZWFycyBhZ28uCisgICAgICAgIFNlZSA8cmRhcjovL3Byb2JsZW0vNjQ3 MTA1OD4gZm9yIGJhY2tzdG9yeS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tOgor ICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkTG9hZFJlc291cmNlRnJv bU1lbW9yeUNhY2hlKToKKyAgICAgICAgKFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaFdp bGxTZW5kUmVxdWVzdCk6CisgICAgICAgIChhcHBseUFwcGxlRGljdGlvbmFyeUFwcGxpY2F0aW9u UXVpcmtOb25JbmxpbmVQYXJ0KTogRGVsZXRlZC4KKyAgICAgICAgKGFwcGx5QXBwbGVEaWN0aW9u YXJ5QXBwbGljYXRpb25RdWlyayk6IERlbGV0ZWQuCisKIDIwMTQtMDQtMjIgIFJ5b3N1a2UgTml3 YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQ3Vyc29yIGRvZXNuJ3QgY2hhbmdlIGJh Y2sgdG8gcG9pbnRlciB3aGVuIGxlYXZpbmcgdGhlIFNhZmFyaSB3aW5kb3cKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1t IGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQu bW0KaW5kZXggYzZkMzBhMC4uOTYyNDM4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMv V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KKysrIGIvU291cmNlL1dlYktp dC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KQEAgLTk4LDcgKzk4 LDYgQEAKICNpbXBvcnQgPFdlYkNvcmUvSFRNTEZvcm1FbGVtZW50Lmg+CiAjaW1wb3J0IDxXZWJD b3JlL0hUTUxGcmFtZUVsZW1lbnQuaD4KICNpbXBvcnQgPFdlYkNvcmUvSFRNTEZyYW1lT3duZXJF bGVtZW50Lmg+Ci0jaW1wb3J0IDxXZWJDb3JlL0hUTUxIZWFkRWxlbWVudC5oPgogI2ltcG9ydCA8 V2ViQ29yZS9IVE1MTmFtZXMuaD4KICNpbXBvcnQgPFdlYkNvcmUvSFRNTFBhcnNlcklkaW9tcy5o PgogI2ltcG9ydCA8V2ViQ29yZS9IVE1MUGx1Z0luRWxlbWVudC5oPgpAQCAtMTg4LDUyICsxODcs NiBAQCBzdGF0aWMgaW5saW5lIFdlYkRhdGFTb3VyY2UgKmRhdGFTb3VyY2UoRG9jdW1lbnRMb2Fk ZXIqIGxvYWRlcikKICAgICByZXR1cm4gbG9hZGVyID8gc3RhdGljX2Nhc3Q8V2ViRG9jdW1lbnRM b2FkZXJNYWMqPihsb2FkZXIpLT5kYXRhU291cmNlKCkgOiBuaWw7CiB9CiAKLSNpZiAhUExBVEZP Uk0oSU9TKQotLy8gUXVpcmsgZm9yIHRoZSBBcHBsZSBEaWN0aW9uYXJ5IGFwcGxpY2F0aW9uLgot Ly8KLS8vIElmIGEgdG9wIGxldmVsIGZyYW1lIGhhcyBhIDxzY3JpcHQ+IGVsZW1lbnQgaW4gaXRz IDxoZWFkPiBmb3IgYSBzY3JpcHQgbmFtZWQgTWFpblBhZ2VKYXZhU2NyaXB0LmpzLAotLy8gdGhl biBmb3IgdGhhdCBmcmFtZSdzIGRvY3VtZW50LCBpZ25vcmUgY2hhbmdlcyB0byB0aGUgc2Nyb2xs aW5nIGF0dHJpYnV0ZSBvZiBmcmFtZXMuIFRoYXQgc2NyaXB0Ci0vLyBoYXMgYSBidWcgaW4gaXQg d2hlcmUgaXQgc2V0cyB0aGUgc2Nyb2xsaW5nIGF0dHJpYnV0ZSBvbiBmcmFtZXMsIGFuZCB0aGF0 IGVycm9uZW91cyBzY3JvbGxpbmcKLS8vIGF0dHJpYnV0ZSBuZWVkcyB0byBiZSBpZ25vcmVkIHRv IGF2b2lkIHNob3dpbmcgZXh0cmEgc2Nyb2xsIGJhcnMgaW4gdGhlIHdpbmRvdy4KLS8vIFRoaXMg cXVpcmsgY2FuIGJlIHJlbW92ZWQgd2hlbiBBcHBsZSBEaWN0aW9uYXJ5IGlzIGZpeGVkIChzZWUg PHJkYXI6Ly9wcm9ibGVtLzY0NzEwNTg+KS4KLQotc3RhdGljIHZvaWQgYXBwbHlBcHBsZURpY3Rp b25hcnlBcHBsaWNhdGlvblF1aXJrTm9uSW5saW5lUGFydChXZWJGcmFtZUxvYWRlckNsaWVudCog Y2xpZW50LCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCi17Ci0gICAgaWYgKCFyZXF1 ZXN0LnVybCgpLmlzTG9jYWxGaWxlKCkpCi0gICAgICAgIHJldHVybjsKLSAgICBpZiAoIXJlcXVl c3QudXJsKCkuc3RyaW5nKCkuZW5kc1dpdGgoIk1haW5QYWdlSmF2YVNjcmlwdC5qcyIpKQotICAg ICAgICByZXR1cm47Ci0gICAgRnJhbWUqIGZyYW1lID0gY29yZShjbGllbnQtPndlYkZyYW1lKCkp OwotICAgIGlmICghZnJhbWUpCi0gICAgICAgIHJldHVybjsKLSAgICBpZiAoZnJhbWUtPnRyZWUo KS5wYXJlbnQoKSkKLSAgICAgICAgcmV0dXJuOwotICAgIERvY3VtZW50KiBkb2N1bWVudCA9IGZy YW1lLT5kb2N1bWVudCgpOwotICAgIGlmICghZG9jdW1lbnQpCi0gICAgICAgIHJldHVybjsKLSAg ICBIVE1MSGVhZEVsZW1lbnQqIGhlYWQgPSBkb2N1bWVudC0+aGVhZCgpOwotICAgIGlmICghaGVh ZCkKLSAgICAgICAgcmV0dXJuOwotICAgIGZvciAoTm9kZSogYyA9IGhlYWQtPmZpcnN0Q2hpbGQo KTsgYzsgYyA9IGMtPm5leHRTaWJsaW5nKCkpIHsKLSAgICAgICAgaWYgKGMtPmhhc1RhZ05hbWUo c2NyaXB0VGFnKSAmJiB0b0VsZW1lbnQoYyktPmdldEF0dHJpYnV0ZShzcmNBdHRyKSA9PSAiTWFp blBhZ2VKYXZhU2NyaXB0LmpzIikgewotICAgICAgICAgICAgZG9jdW1lbnQtPnNldEZyYW1lRWxl bWVudHNTaG91bGRJZ25vcmVTY3JvbGxpbmcodHJ1ZSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgIH0KLSAgICB9Ci19Ci0jZW5kaWYKLQotc3RhdGljIGlubGluZSB2b2lkIGFwcGx5QXBw bGVEaWN0aW9uYXJ5QXBwbGljYXRpb25RdWlyayhXZWJGcmFtZUxvYWRlckNsaWVudCogY2xpZW50 LCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCi17Ci0jaWYgIVBMQVRGT1JNKElPUykK LSAgICAvLyBVc2UgYSBvbmUtdGltZS1pbml0aWFsaXplZCBnbG9iYWwgdmFyaWFibGUgc28gd2Ug Y2FuIHF1aWNrbHkgZGV0ZXJtaW5lIHRoZXJlJ3Mgbm90aGluZyB0byBkbyBpbgotICAgIC8vIGFs bCBhcHBsaWNhdGlvbnMgb3RoZXIgdGhhbiBBcHBsZSBEaWN0aW9uYXJ5LgotICAgIHN0YXRpYyBi b29sIGlzQXBwbGVEaWN0aW9uYXJ5ID0gW1tbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gYnVuZGxlSWRl bnRpZmllcl0gaXNFcXVhbFRvU3RyaW5nOkAiY29tLmFwcGxlLkRpY3Rpb25hcnkiXTsKLSAgICBp ZiAoaXNBcHBsZURpY3Rpb25hcnkpCi0gICAgICAgIGFwcGx5QXBwbGVEaWN0aW9uYXJ5QXBwbGlj YXRpb25RdWlya05vbklubGluZVBhcnQoY2xpZW50LCByZXF1ZXN0KTsKLSNlbmRpZgotfQotCiBX ZWJGcmFtZUxvYWRlckNsaWVudDo6V2ViRnJhbWVMb2FkZXJDbGllbnQoV2ViRnJhbWUgKndlYkZy YW1lKQogICAgIDogbV93ZWJGcmFtZSh3ZWJGcmFtZSkKIHsKQEAgLTM0Niw4ICsyOTksNiBAQCB2 b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojpjb252ZXJ0TWFpblJlc291cmNlTG9hZFRvRG93bmxv YWQoRG9jdW1lbnRMb2FkZXIqIGRvYwogCiBib29sIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNw YXRjaERpZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZShEb2N1bWVudExvYWRlciogbG9hZGVy LCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFJlc291cmNlUmVzcG9uc2Um IHJlc3BvbnNlLCBpbnQgbGVuZ3RoKQogewotICAgIGFwcGx5QXBwbGVEaWN0aW9uYXJ5QXBwbGlj YXRpb25RdWlyayh0aGlzLCByZXF1ZXN0KTsKLQogICAgIFdlYlZpZXcgKndlYlZpZXcgPSBnZXRX ZWJWaWV3KG1fd2ViRnJhbWUuZ2V0KCkpOwogICAgIFdlYlJlc291cmNlRGVsZWdhdGVJbXBsZW1l bnRhdGlvbkNhY2hlKiBpbXBsZW1lbnRhdGlvbnMgPSBXZWJWaWV3R2V0UmVzb3VyY2VMb2FkRGVs ZWdhdGVJbXBsZW1lbnRhdGlvbnMod2ViVmlldyk7CiAjaWYgUExBVEZPUk0oSU9TKQpAQCAtMzkw LDggKzM0MSw2IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmFzc2lnbklkZW50aWZpZXJU b0luaXRpYWxSZXF1ZXN0KHVuc2lnbmVkIGxvbmcgaWRlbnRpCiAKIHZvaWQgV2ViRnJhbWVMb2Fk ZXJDbGllbnQ6OmRpc3BhdGNoV2lsbFNlbmRSZXF1ZXN0KERvY3VtZW50TG9hZGVyKiBsb2FkZXIs IHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25z dCBSZXNvdXJjZVJlc3BvbnNlJiByZWRpcmVjdFJlc3BvbnNlKQogewotICAgIGFwcGx5QXBwbGVE aWN0aW9uYXJ5QXBwbGljYXRpb25RdWlyayh0aGlzLCByZXF1ZXN0KTsKLQogICAgIFdlYlZpZXcg KndlYlZpZXcgPSBnZXRXZWJWaWV3KG1fd2ViRnJhbWUuZ2V0KCkpOwogICAgIFdlYlJlc291cmNl RGVsZWdhdGVJbXBsZW1lbnRhdGlvbkNhY2hlKiBpbXBsZW1lbnRhdGlvbnMgPSBXZWJWaWV3R2V0 UmVzb3VyY2VMb2FkRGVsZWdhdGVJbXBsZW1lbnRhdGlvbnMod2ViVmlldyk7CiAK