125401 2013-12-07 18:53:49 -0800 [Cocoa] Convert a few more parts of MiniBrowser over to the Objective-C API 2013-12-07 18:57:44 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 957562 0 sam 2013-12-07 18:53:49 -0800 [Cocoa] Convert a few more parts of MiniBrowser over to the Objective-C API 957563 1 218673 sam 2013-12-07 18:54:09 -0800 Created attachment 218673 Patch 957564 2 sam 2013-12-07 18:57:44 -0800 Committed r160276: <http://trac.webkit.org/changeset/160276> 218673 2013-12-07 18:54:09 -0800 2013-12-07 18:56:19 -0800 Patch bug-125401-20131207185409.patch text/plain 6529 sam SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE2MDI3NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI1IEBACisyMDEzLTEyLTA3ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgW0NvY29hXSBDb252ZXJ0IGEgZmV3IG1vcmUgcGFydHMgb2YgTWluaUJyb3dzZXIgb3Zl ciB0byB0aGUgT2JqZWN0aXZlLUMgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMjU0MDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9XSzJCcm93c2VyV2luZG93Q29udHJv bGxlci5tOgorICAgICAgICAoLVtXSzJCcm93c2VyV2luZG93Q29udHJvbGxlciBmZXRjaDpdKToK KyAgICAgICAgKC1bV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgcmVsb2FkOl0pOgorICAgICAg ICAoLVtXSzJCcm93c2VyV2luZG93Q29udHJvbGxlciBnb0JhY2s6XSk6CisgICAgICAgICgtW1dL MkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIGdvRm9yd2FyZDpdKToKKyAgICAgICAgKC1bV0syQnJv d3NlcldpbmRvd0NvbnRyb2xsZXIgdmFsaWRhdGVVc2VySW50ZXJmYWNlSXRlbTpdKToKKyAgICAg ICAgKC1bV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgY3VycmVudFpvb21GYWN0b3JdKToKKyAg ICAgICAgKC1bV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgc2V0Q3VycmVudFpvb21GYWN0b3I6 XSk6CisgICAgICAgICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIHpvb21JbjpdKToKKyAg ICAgICAgKC1bV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgem9vbU91dDpdKToKKyAgICAgICAg KC1bV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgY2FuUmVzZXRab29tXSk6CisgICAgICAgICgt W1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIHJlc2V0Wm9vbTpdKToKKyAgICAgICAgKC1bV0sy QnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgdG9nZ2xlWm9vbU1vZGU6XSk6CisgICAgICAgICgtW1dL MkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIHVwZGF0ZVRleHRGaWVsZEZyb21VUkw6XSk6CisKIDIw MTMtMTItMDcgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBDb252ZXJ0 IE1pbmlCcm93c2VyIHRvIHVzZSBXS1Byb2Nlc3NHcm91cCBhbmQgV0tCcm93c2luZ0NvbnRleHRH cm91cApJbmRleDogVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMkJyb3dzZXJXaW5kb3dDb250cm9s bGVyLm0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMkJyb3dzZXJXaW5k b3dDb250cm9sbGVyLm0JKHJldmlzaW9uIDE2MDI3NSkKKysrIFRvb2xzL01pbmlCcm93c2VyL21h Yy9XSzJCcm93c2VyV2luZG93Q29udHJvbGxlci5tCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw3ICsz Myw2IEBACiAjaW1wb3J0IDxXZWJLaXQyL1dLQnJvd3NpbmdDb250ZXh0TG9hZERlbGVnYXRlUHJp dmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0Mi9XS0Jyb3dzaW5nQ29udGV4dFBvbGljeURlbGVnYXRl Lmg+CiAjaW1wb3J0IDxXZWJLaXQyL1dLTmF2aWdhdGlvbkRhdGEuaD4KLSNpbXBvcnQgPFdlYktp dDIvV0tQYWdlUHJpdmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0Mi9XS1N0cmluZ0NGLmg+CiAjaW1w b3J0IDxXZWJLaXQyL1dLVVJMQ0YuaD4KICNpbXBvcnQgPFdlYktpdDIvV0tWaWV3UHJpdmF0ZS5o PgpAQCAtNzksMTUgKzc4LDcgQEAgLSAoSUJBY3Rpb24pZmV0Y2g6KGlkKXNlbmRlcgogewogICAg IFt1cmxUZXh0IHNldFN0cmluZ1ZhbHVlOltzZWxmIGFkZFByb3RvY29sSWZOZWNlc3Nhcnk6W3Vy bFRleHQgc3RyaW5nVmFsdWVdXV07CiAKLSAgICBDRlVSTFJlZiBjZlVSTCA9IENGVVJMQ3JlYXRl V2l0aFN0cmluZygwLCAoQ0ZTdHJpbmdSZWYpW3VybFRleHQgc3RyaW5nVmFsdWVdLCAwKTsKLSAg ICBpZiAoIWNmVVJMKQotICAgICAgICByZXR1cm47Ci0KLSAgICBXS1VSTFJlZiB1cmwgPSBXS1VS TENyZWF0ZVdpdGhDRlVSTChjZlVSTCk7Ci0gICAgQ0ZSZWxlYXNlKGNmVVJMKTsKLQotICAgIFdL UGFnZUxvYWRVUkwoX3dlYlZpZXcucGFnZVJlZiwgdXJsKTsKLSAgICBXS1JlbGVhc2UodXJsKTsK KyAgICBbX3dlYlZpZXcuYnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciBsb2FkUmVxdWVzdDpbTlNV UkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOlt1cmxUZXh0IHN0 cmluZ1ZhbHVlXV1dXTsKIH0KIAogLSAoSUJBY3Rpb24pc2hvd0hpZGVXZWJWaWV3OihpZClzZW5k ZXIKQEAgLTEzNSw3ICsxMjYsNyBAQCAtIChCT09MKXZhbGlkYXRlTWVudUl0ZW06KE5TTWVudUl0 ZW0gKiltCiAKIC0gKElCQWN0aW9uKXJlbG9hZDooaWQpc2VuZGVyCiB7Ci0gICAgV0tQYWdlUmVs b2FkKF93ZWJWaWV3LnBhZ2VSZWYpOworICAgIFtfd2ViVmlldy5icm93c2luZ0NvbnRleHRDb250 cm9sbGVyIHJlbG9hZF07CiB9CiAKIC0gKElCQWN0aW9uKWZvcmNlUmVwYWludDooaWQpc2VuZGVy CkBAIC0xNDUsMTIgKzEzNiwxMiBAQCAtIChJQkFjdGlvbilmb3JjZVJlcGFpbnQ6KGlkKXNlbmRl cgogCiAtIChJQkFjdGlvbilnb0JhY2s6KGlkKXNlbmRlcgogewotICAgIFdLUGFnZUdvQmFjayhf d2ViVmlldy5wYWdlUmVmKTsKKyAgICBbX3dlYlZpZXcuYnJvd3NpbmdDb250ZXh0Q29udHJvbGxl ciBnb0JhY2tdOwogfQogCiAtIChJQkFjdGlvbilnb0ZvcndhcmQ6KGlkKXNlbmRlcgogewotICAg IFdLUGFnZUdvRm9yd2FyZChfd2ViVmlldy5wYWdlUmVmKTsKKyAgICBbX3dlYlZpZXcuYnJvd3Np bmdDb250ZXh0Q29udHJvbGxlciBnb0ZvcndhcmRdOwogfQogCiAtIChCT09MKXZhbGlkYXRlVXNl ckludGVyZmFjZUl0ZW06KGlkIDxOU1ZhbGlkYXRlZFVzZXJJbnRlcmZhY2VJdGVtPilpdGVtCkBA IC0xNTgsMTAgKzE0OSwxMCBAQCAtIChCT09MKXZhbGlkYXRlVXNlckludGVyZmFjZUl0ZW06KGlk IDxOCiAgICAgU0VMIGFjdGlvbiA9IFtpdGVtIGFjdGlvbl07CiAKICAgICBpZiAoYWN0aW9uID09 IEBzZWxlY3Rvcihnb0JhY2s6KSkKLSAgICAgICAgcmV0dXJuIF93ZWJWaWV3ICYmIFdLUGFnZUNh bkdvQmFjayhfd2ViVmlldy5wYWdlUmVmKTsKKyAgICAgICAgcmV0dXJuIF93ZWJWaWV3ICYmIFtf d2ViVmlldy5icm93c2luZ0NvbnRleHRDb250cm9sbGVyIGNhbkdvQmFja107CiAgICAgCiAgICAg aWYgKGFjdGlvbiA9PSBAc2VsZWN0b3IoZ29Gb3J3YXJkOikpCi0gICAgICAgIHJldHVybiBfd2Vi VmlldyAmJiBXS1BhZ2VDYW5Hb0ZvcndhcmQoX3dlYlZpZXcucGFnZVJlZik7CisgICAgICAgIHJl dHVybiBfd2ViVmlldyAmJiBbX3dlYlZpZXcuYnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciBjYW5H b0ZvcndhcmRdOwogICAgIAogICAgIHJldHVybiBZRVM7CiB9CkBAIC0xOTQsMTQgKzE4NSwxNyBA QCAtICh2b2lkKWFwcGxpY2F0aW9uVGVybWluYXRpbmcKICNkZWZpbmUgRGVmYXVsdE1heGltdW1a b29tRmFjdG9yICgzLjApCiAjZGVmaW5lIERlZmF1bHRab29tRmFjdG9yUmF0aW8gKDEuMikKIAot LSAoZG91YmxlKWN1cnJlbnRab29tRmFjdG9yCistIChDR0Zsb2F0KWN1cnJlbnRab29tRmFjdG9y CiB7Ci0gICAgcmV0dXJuIF96b29tVGV4dE9ubHkgPyBXS1BhZ2VHZXRUZXh0Wm9vbUZhY3Rvcihf d2ViVmlldy5wYWdlUmVmKSA6IFdLUGFnZUdldFBhZ2Vab29tRmFjdG9yKF93ZWJWaWV3LnBhZ2VS ZWYpOworICAgIHJldHVybiBfem9vbVRleHRPbmx5ID8gX3dlYlZpZXcuYnJvd3NpbmdDb250ZXh0 Q29udHJvbGxlci50ZXh0Wm9vbSA6IF93ZWJWaWV3LmJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIu cGFnZVpvb207CiB9CiAKLS0gKHZvaWQpc2V0Q3VycmVudFpvb21GYWN0b3I6KGRvdWJsZSlmYWN0 b3IKKy0gKHZvaWQpc2V0Q3VycmVudFpvb21GYWN0b3I6KENHRmxvYXQpZmFjdG9yCiB7Ci0gICAg X3pvb21UZXh0T25seSA/IFdLUGFnZVNldFRleHRab29tRmFjdG9yKF93ZWJWaWV3LnBhZ2VSZWYs IGZhY3RvcikgOiBXS1BhZ2VTZXRQYWdlWm9vbUZhY3Rvcihfd2ViVmlldy5wYWdlUmVmLCBmYWN0 b3IpOworICAgIGlmIChfem9vbVRleHRPbmx5KQorICAgICAgICBfd2ViVmlldy5icm93c2luZ0Nv bnRleHRDb250cm9sbGVyLnRleHRab29tID0gZmFjdG9yOworICAgIGVsc2UKKyAgICAgICAgX3dl YlZpZXcuYnJvd3NpbmdDb250ZXh0Q29udHJvbGxlci5wYWdlWm9vbSA9IGZhY3RvcjsKIH0KIAog LSAoQk9PTCljYW5ab29tSW4KQEAgLTIxNCw3ICsyMDgsNyBAQCAtICh2b2lkKXpvb21JbjooaWQp c2VuZGVyCiAgICAgaWYgKCFbc2VsZiBjYW5ab29tSW5dKQogICAgICAgICByZXR1cm47CiAKLSAg ICBkb3VibGUgZmFjdG9yID0gW3NlbGYgY3VycmVudFpvb21GYWN0b3JdICogRGVmYXVsdFpvb21G YWN0b3JSYXRpbzsKKyAgICBDR0Zsb2F0IGZhY3RvciA9IFtzZWxmIGN1cnJlbnRab29tRmFjdG9y XSAqIERlZmF1bHRab29tRmFjdG9yUmF0aW87CiAgICAgW3NlbGYgc2V0Q3VycmVudFpvb21GYWN0 b3I6ZmFjdG9yXTsKIH0KIApAQCAtMjI4LDEzICsyMjIsMTMgQEAgLSAodm9pZCl6b29tT3V0Oihp ZClzZW5kZXIKICAgICBpZiAoIVtzZWxmIGNhblpvb21Jbl0pCiAgICAgICAgIHJldHVybjsKIAot ICAgIGRvdWJsZSBmYWN0b3IgPSBbc2VsZiBjdXJyZW50Wm9vbUZhY3Rvcl0gLyBEZWZhdWx0Wm9v bUZhY3RvclJhdGlvOworICAgIENHRmxvYXQgZmFjdG9yID0gW3NlbGYgY3VycmVudFpvb21GYWN0 b3JdIC8gRGVmYXVsdFpvb21GYWN0b3JSYXRpbzsKICAgICBbc2VsZiBzZXRDdXJyZW50Wm9vbUZh Y3RvcjpmYWN0b3JdOwogfQogCiAtIChCT09MKWNhblJlc2V0Wm9vbQogewotICAgIHJldHVybiBf em9vbVRleHRPbmx5ID8gKFdLUGFnZUdldFRleHRab29tRmFjdG9yKF93ZWJWaWV3LnBhZ2VSZWYp ICE9IDEpIDogKFdLUGFnZUdldFBhZ2Vab29tRmFjdG9yKF93ZWJWaWV3LnBhZ2VSZWYpICE9IDEp OworICAgIHJldHVybiBfem9vbVRleHRPbmx5ID8gKF93ZWJWaWV3LmJyb3dzaW5nQ29udGV4dENv bnRyb2xsZXIudGV4dFpvb20gIT0gMSkgOiAoX3dlYlZpZXcuYnJvd3NpbmdDb250ZXh0Q29udHJv bGxlci5wYWdlWm9vbSAhPSAxKTsKIH0KIAogLSAodm9pZClyZXNldFpvb206KGlkKXNlbmRlcgpA QCAtMjQzLDIwICsyMzcsMjAgQEAgLSAodm9pZClyZXNldFpvb206KGlkKXNlbmRlcgogICAgICAg ICByZXR1cm47CiAKICAgICBpZiAoX3pvb21UZXh0T25seSkKLSAgICAgICAgV0tQYWdlU2V0VGV4 dFpvb21GYWN0b3IoX3dlYlZpZXcucGFnZVJlZiwgMSk7CisgICAgICAgIF93ZWJWaWV3LmJyb3dz aW5nQ29udGV4dENvbnRyb2xsZXIudGV4dFpvb20gPSAxOwogICAgIGVsc2UKLSAgICAgICAgV0tQ YWdlU2V0UGFnZVpvb21GYWN0b3IoX3dlYlZpZXcucGFnZVJlZiwgMSk7CisgICAgICAgIF93ZWJW aWV3LmJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIucGFnZVpvb20gPSAxOwogfQogCiAtIChJQkFj dGlvbil0b2dnbGVab29tTW9kZTooaWQpc2VuZGVyCiB7CiAgICAgaWYgKF96b29tVGV4dE9ubHkp IHsKICAgICAgICAgX3pvb21UZXh0T25seSA9IE5POwotICAgICAgICBkb3VibGUgY3VycmVudFRl eHRab29tID0gV0tQYWdlR2V0VGV4dFpvb21GYWN0b3IoX3dlYlZpZXcucGFnZVJlZik7CisgICAg ICAgIGRvdWJsZSBjdXJyZW50VGV4dFpvb20gPSBfd2ViVmlldy5icm93c2luZ0NvbnRleHRDb250 cm9sbGVyLnRleHRab29tOwogICAgICAgICBXS1BhZ2VTZXRQYWdlQW5kVGV4dFpvb21GYWN0b3Jz KF93ZWJWaWV3LnBhZ2VSZWYsIGN1cnJlbnRUZXh0Wm9vbSwgMSk7CiAgICAgfSBlbHNlIHsKICAg ICAgICAgX3pvb21UZXh0T25seSA9IFlFUzsKLSAgICAgICAgZG91YmxlIGN1cnJlbnRQYWdlWm9v bSA9IFdLUGFnZUdldFBhZ2Vab29tRmFjdG9yKF93ZWJWaWV3LnBhZ2VSZWYpOworICAgICAgICBk b3VibGUgY3VycmVudFBhZ2Vab29tID0gX3dlYlZpZXcuYnJvd3NpbmdDb250ZXh0Q29udHJvbGxl ci5wYWdlWm9vbTsKICAgICAgICAgV0tQYWdlU2V0UGFnZUFuZFRleHRab29tRmFjdG9ycyhfd2Vi Vmlldy5wYWdlUmVmLCAxLCBjdXJyZW50UGFnZVpvb20pOwogICAgIH0KIH0KQEAgLTU3Niw3ICs1 NzAsNyBAQCAtICh2b2lkKXVwZGF0ZVRleHRGaWVsZEZyb21VUkw6KE5TVVJMICopCiAgICAgaWYg KCFVUkwuYWJzb2x1dGVTdHJpbmcubGVuZ3RoKQogICAgICAgICByZXR1cm47CiAKLSAgICB1cmxU ZXh0LnN0cmluZ1ZhbHVlID0gKE5TU3RyaW5nICopQ0ZVUkxHZXRTdHJpbmcoKENGVVJMUmVmKVVS TCk7CisgICAgdXJsVGV4dC5zdHJpbmdWYWx1ZSA9IFtVUkwgYWJzb2x1dGVTdHJpbmddOwogfQog CiAtICh2b2lkKXVwZGF0ZVByb3Zpc2lvbmFsVVJMCg==